From: vsr Date: Thu, 13 Dec 2012 08:40:36 +0000 (+0000) Subject: Merge from V6_main 13/12/2012 X-Git-Tag: V7_1_0_pre X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb33929a623da3858f8105e54f0834f8393f5414;p=modules%2Fgeom.git Merge from V6_main 13/12/2012 --- diff --git a/doc/salome/gui/GEOM/images/3dsketch4.png b/doc/salome/gui/GEOM/images/3dsketch4.png new file mode 100644 index 000000000..b5a4d9eca Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch4.png differ diff --git a/doc/salome/gui/GEOM/images/3dsketch_2angles_rel.png b/doc/salome/gui/GEOM/images/3dsketch_2angles_rel.png new file mode 100644 index 000000000..7e815d4ea Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch_2angles_rel.png differ diff --git a/doc/salome/gui/GEOM/images/3dsketch_angle_abs.png b/doc/salome/gui/GEOM/images/3dsketch_angle_abs.png new file mode 100644 index 000000000..ff81225b7 Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch_angle_abs.png differ diff --git a/doc/salome/gui/GEOM/images/3dsketch_angle_height_rel.png b/doc/salome/gui/GEOM/images/3dsketch_angle_height_rel.png new file mode 100644 index 000000000..333cc19e9 Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch_angle_height_rel.png differ diff --git a/doc/salome/gui/GEOM/images/3dsketch_angle_rel.png b/doc/salome/gui/GEOM/images/3dsketch_angle_rel.png new file mode 100644 index 000000000..f57c097a4 Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch_angle_rel.png differ diff --git a/doc/salome/gui/GEOM/images/3dsketch_dlg.png b/doc/salome/gui/GEOM/images/3dsketch_dlg.png new file mode 100644 index 000000000..2edb64da6 Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch_dlg.png differ diff --git a/doc/salome/gui/GEOM/images/fused_wire.png b/doc/salome/gui/GEOM/images/fused_wire.png new file mode 100644 index 000000000..108f33fc5 Binary files /dev/null and b/doc/salome/gui/GEOM/images/fused_wire.png differ diff --git a/doc/salome/gui/GEOM/images/iges_unit.png b/doc/salome/gui/GEOM/images/iges_unit.png index 60aba603a..cb74fb319 100644 Binary files a/doc/salome/gui/GEOM/images/iges_unit.png and b/doc/salome/gui/GEOM/images/iges_unit.png differ diff --git a/doc/salome/gui/GEOM/images/pipe_path.png b/doc/salome/gui/GEOM/images/pipe_path.png new file mode 100644 index 000000000..92d5d626a Binary files /dev/null and b/doc/salome/gui/GEOM/images/pipe_path.png differ diff --git a/doc/salome/gui/GEOM/images/pipe_path_dlg.png b/doc/salome/gui/GEOM/images/pipe_path_dlg.png new file mode 100644 index 000000000..e2f969d8c Binary files /dev/null and b/doc/salome/gui/GEOM/images/pipe_path_dlg.png differ diff --git a/doc/salome/gui/GEOM/images/wire_before_fuse.png b/doc/salome/gui/GEOM/images/wire_before_fuse.png new file mode 100644 index 000000000..0a3397964 Binary files /dev/null and b/doc/salome/gui/GEOM/images/wire_before_fuse.png differ diff --git a/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc b/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc index 81d8379a0..568725868 100644 --- a/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc +++ b/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc @@ -7,9 +7,9 @@ considered as a compound of blocks, the given shape must satisfy the following conditions: \n Informs of the following possible errors: diff --git a/doc/salome/gui/GEOM/input/creating_3dsketcher.doc b/doc/salome/gui/GEOM/input/creating_3dsketcher.doc index 651ebc461..6c44c25da 100755 --- a/doc/salome/gui/GEOM/input/creating_3dsketcher.doc +++ b/doc/salome/gui/GEOM/input/creating_3dsketcher.doc @@ -5,27 +5,24 @@ 3D Sketcher allows creating a closed or unclosed 3D wire, made of consequent straight segments. +Example: + +\image html 3dsketch4.png + To create a 3D Sketch, select in the main menu New Entity -> Basic -> 3D Sketch. -\image html 3dsketch2.png +\image html 3dsketch_dlg.png -The first sketcher point can be defined by \b Absolute coordinates X, Y and Z. +The first point of a sketch can be defined by \b Absolute coordinates X, Y and Z. When the first point is defined, it is possible to add straight segments. -Each segment will start at the end point of previous segment or at the -sketcher first point, if there are no validated segments. - -Segment can be defined by: - - \b Absolute coordinates X, Y and Z of its second end, - - \b Relative coordinates DX, DY and DZ of its second end with - respect to the previous applied point, - - \b Direction and \b Length of the segment. Direction is set by two - \b Angles in selected coordinate system. +Each segment will start at the end point of the previous segment or at the +first point of the sketch, if there are no validated segments. The way of segment construction can be selected by the Coordinates Type radio buttons. -To validate the segment and to proceed with the definition of the next -segment, click Apply button. \b Undo and \b Redo buttons, +To validate a segment and to proceed with the definition of the next +one, click Apply button. \b Undo and \b Redo buttons, respectively, remove or restore the last segment in the wire. \n "Sketch Validation" button applies the wire, built by the @@ -33,9 +30,37 @@ user, "as is". \n "Sketch Closure" closes the Sketch by a straight line from the start to the end point and applies it. -Example: +A segment can be defined by: +- Cartesian coordinates of its second end, which can be either: + - \b Absolute coordinates X, Y and Z, or + - \b Relative coordinates DX, DY and DZ with + respect to the previous applied point, + +- Angular coordinates of its second end specified by: + TUI Command: geompy.Make3DSketcher( [ PointsList ] ) This algorithm creates a wire from the list of real values, which diff --git a/doc/salome/gui/GEOM/input/creating_adv_obj.doc b/doc/salome/gui/GEOM/input/creating_adv_obj.doc deleted file mode 100644 index 648a18ae9..000000000 --- a/doc/salome/gui/GEOM/input/creating_adv_obj.doc +++ /dev/null @@ -1,14 +0,0 @@ -/*! - -\page create_adv_obj_page Creating Advanced Geometrical Objects - -New Entity -> Advanced submenu allows to create additional complex topological objects. - - - -*/ diff --git a/doc/salome/gui/GEOM/input/creating_complex_obj.doc b/doc/salome/gui/GEOM/input/creating_complex_obj.doc index 0d0404336..46c4baa90 100644 --- a/doc/salome/gui/GEOM/input/creating_complex_obj.doc +++ b/doc/salome/gui/GEOM/input/creating_complex_obj.doc @@ -14,7 +14,7 @@ axis, creating a body of revolution.
  • \subpage create_filling_page "Create a surface" from a set of edges.
  • \subpage create_extrusion_alongpath_page "Extrude an object along a path", creating a more complex trajectory object.
    • - +
  • \subpage create_pipe_path_page "Restore Path" of a pipe-like shape.
    • */ diff --git a/doc/salome/gui/GEOM/input/creating_compound.doc b/doc/salome/gui/GEOM/input/creating_compound.doc index ad1a899fe..ecb165584 100644 --- a/doc/salome/gui/GEOM/input/creating_compound.doc +++ b/doc/salome/gui/GEOM/input/creating_compound.doc @@ -22,4 +22,8 @@ Entity - > Build - > Compound. Our TUI Scripts provide you with useful examples of creation of \ref tui_creation_compound "Advanced Geometric Objects". + More details: + +Perhaps you ask yourself : \ref partition_explanation "What's the difference between partition, compounds and fuse operation ?" + */ diff --git a/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc b/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc index 169666a39..14a1eb36a 100644 --- a/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc +++ b/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc @@ -2,11 +2,11 @@ \page create_dividedcylinder_page DividedCylinder -The Divided cylinder object is a cylinder divided into \b blocks for easy hexaedral meshing.Two division patterns are available : +The Divided cylinder object is a cylinder divided into \b blocks for easy hexahedral meshing. Two division patterns are available : \image html dividedcylinder.png diff --git a/doc/salome/gui/GEOM/input/creating_divideddisk.doc b/doc/salome/gui/GEOM/input/creating_divideddisk.doc index 2d471e6a1..6b6011b17 100644 --- a/doc/salome/gui/GEOM/input/creating_divideddisk.doc +++ b/doc/salome/gui/GEOM/input/creating_divideddisk.doc @@ -2,15 +2,15 @@ \page create_divideddisk_page DividedDisk -The Divided disk object is a disk divided into \b blocks. It means that it's a shape prepared for hexaedral meshing. Two division patterns are available : +The Divided disk object is a disk divided into \b blocks for easy hexahedral meshing. Two division patterns are available : -\n Moreover this shape can be used as a basis in an \ref create_extrusion_alongpath_page "Extrusion along a path" operation in order to obtain any tube shape prepared for hexaedral meshing +\n Moreover, this shape can be used as a basis in an \ref create_extrusion_alongpath_page "Extrusion along a path" operation in order to obtain any tube shape prepared for hexahedral meshing (see example below). (Another alternative is to create a 2D mesh on the divided disk and create a 3D mesh by extrusion in the SMESH module.) @@ -21,13 +21,13 @@ Example: To create a Divided Disk in the Main Menu select New Entity - > Advanced - > DividedDisk -\n Then there are 2 ways to create a Divided Disk in 3D space. +\n There are 2 ways to create a Divided Disk in 3D space. \n For both operations : Specify the parameters of the DividedDisk object creation in the opened dialog box and press "Apply" or "Apply & Close" button. The result of each operation will be a GEOM_Object. -\n First way : by radius and orientation (plane "OXY", "OYZ" or "OZX"). The resulting disk is located at the origin of coordinates +\n At first it is possible to define a disk by its radius and orientation (plane "OXY", "OYZ" or "OZX"). The resulting disk is located at the origin of coordinates TUI Command: geompy.MakeDividedDisk(Radius, Orientation, Pattern) @@ -38,7 +38,7 @@ The result of each operation will be a GEOM_Object. \image html divided_disk_dlg.png -\n Second way : by giving its center, normal and radius. +\n At second the disk can be defined by its center, normal and radius. TUI Command: geompy.MakeDividedDiskPntVecR(Center, Vector, Radius, Pattern) diff --git a/doc/salome/gui/GEOM/input/creating_hexaedral_solid.doc b/doc/salome/gui/GEOM/input/creating_hexaedral_solid.doc index fbfa2dc3d..d08eeb91d 100644 --- a/doc/salome/gui/GEOM/input/creating_hexaedral_solid.doc +++ b/doc/salome/gui/GEOM/input/creating_hexaedral_solid.doc @@ -2,33 +2,30 @@ \page create_hexa_solid_page Hexaedral solid -\n Description: Builds a hexahedral solid. either of the below -mentioned arguments. This operation allows to build a solid bypassing -the intermediate stage of building a shell and 4 faces (in the case of -building by 2 faces) or just a shell (in the case of building by 6 +This operation allows to build a hexahedral solid bypassing +the intermediate stage of building a shell and 4 faces (in case of +building by 2 faces) or just a shell (in case of building by 6 faces). +There are 2 algorithms to create a hexahedral solid in the 3D space. \n The \b Result of the operation will be a \b GEOM_Object (solid). -\n TUI Command: - +Firstly, you can define a Hexahedral Solid by two faces, other four faces are created automatically. -\n Arguments: - - -\n Dialog Box: +TUI Command: geompy.MakeHexa2Faces(F1, F2), +Arguments: Name + 2 Faces. \image html block4.png +\n Example: + +\image html image181.png +
    Hexahedral Solid built on the base of two Faces
    +Secondly, you can define a Hexahedral Solid by all six faces. + +TUI Command: geompy.MakeHexa(F1, F2, F3, F4, F5, F6), +Arguments: Name + 6 Faces. \image html block5.png @@ -37,9 +34,6 @@ automatically. \image html image180.png
    Hexahedral Solid built on the base of six Faces
    -\image html image181.png -
    Hexahedral Solid built on the base of two Faces
    - The created blocks can be processed with \ref blocks_operations_page "Operations on Blocks". diff --git a/doc/salome/gui/GEOM/input/creating_pipe_path.doc b/doc/salome/gui/GEOM/input/creating_pipe_path.doc new file mode 100644 index 000000000..52a2e5403 --- /dev/null +++ b/doc/salome/gui/GEOM/input/creating_pipe_path.doc @@ -0,0 +1,44 @@ +/*! + +\page create_pipe_path_page Restore Path + +To generate a \b Path in the Main Menu select New Entity - > Generation - > Restore Path + +\image html pipe_path_dlg.png + +\n To obtain the \b Path of a pipe-like shape, you should define the +Pipe-like shell or solid and two pipe \b Bases, which can +be defined by a wire, a face or a list of edges.
    +\n Select unpublished edges checkbox - if checked, allows +selecting in the viewer the edges, that are not published in the Object +Browser.
    +\n The \b Result of the operation will be a GEOM_Object (edge or wire).
    + +\n Advanced options: +
    + +\note It is not always possible to obtain an exact or approximate + copy of the Shape by applying the \b Pipe operation to the + resulting "Path" wire with the first Base as the base; + though in some particular cases it might + work. Thus, Restore Path function should not + be considered as an exact reverse operation of the Pipe.
    + +\n Example: + +\image html pipe_path.png "Path (red) between two faces (green)" + +\n TUI Command: geompy.RestorePath(aShape, aBase1, aBase2) +\n Arguments: Name + 1 pipe-like shape (shell or solid) + 1 +shape (edge, wire or face) for the first base + 1 shape (edge, wire or +face) for the last base. +\n TUI Command: geompy.RestorePathEdges(aShape, listEdges1, listEdges2) +\n Arguments: Name + 1 pipe-like shape (shell or solid) + 1 +list of edges for the first base + 1 list of edges for the last base. + +Our TUI Scripts provide you with useful examples of creation of +\ref tui_creation_pipe_path "Complex Geometric Objects". + +*/ diff --git a/doc/salome/gui/GEOM/input/creating_quadrangle_face.doc b/doc/salome/gui/GEOM/input/creating_quadrangle_face.doc index 1aa7c91f8..63d2e9494 100644 --- a/doc/salome/gui/GEOM/input/creating_quadrangle_face.doc +++ b/doc/salome/gui/GEOM/input/creating_quadrangle_face.doc @@ -2,39 +2,45 @@ \page create_quadrangle_face_page Quadrangle face -\n Description: Builds a face using the below mentioned -arguments. This operation allows to build a face bypassing the -intermediate stage of building edges and wires (in the case of -building by 4 points) or wires (in the case of building by 4 or 2 +This operation allows to build a face bypassing the +intermediate stage of building edges and wires (in case of +building by 4 points) or wires (in case of building by 4 or 2 edges). -\n The \b Result of the operation will be a \b GEOM_Object (face). - -\n TUI Command: - - -Arguments: - - -\n Dialog Box: +There are 3 algorithms to create a Quadrangle Face in the 3D space. +\n The \b Result of each op + +The created blocks can be processed with \ref blocks_operations_page "Operations on Blocks". + +Our TUI Scripts provide you with useful examples of +\ref tui_building_by_blocks_p + +The created blocks can be processed with \ref blocks_operations_page "Operations on Blocks". + +Our TUI Scripts provide you with useful examples of +\ref tui_building_by_blocks_page "Building by Blocks". +age "Building by Blocks". +eration will be a \b GEOM_Object (face). + +Firstly you can define a Quadrangle Face by four vertices. Edges are +created automatically. + +TUI Command: geompy.MakeQuad4Vertices(V1, V2, V3, V4), +Arguments: Name + 4 Points. \image html block1.png +Secondly, you can define a Quadrangle Face by two edges, while the other two edges are created automatically. +TUI Command: geompy.MakeQuad2Edges(E1, E2) +Arguments: Name + 2 Edges. + \image html block2.png +Finally, you can define a Quadrangle Face by four edges. + +TUI Command: geompy.MakeQuad(E1, E2, E3, E4),. +Arguments: Name + 4 Edges. + \image html block3.png \n Example: diff --git a/doc/salome/gui/GEOM/input/creating_sketcher.doc b/doc/salome/gui/GEOM/input/creating_sketcher.doc index 7aa11153a..922f2a6aa 100644 --- a/doc/salome/gui/GEOM/input/creating_sketcher.doc +++ b/doc/salome/gui/GEOM/input/creating_sketcher.doc @@ -27,7 +27,7 @@ To create a 2D Sketch:
  • Select the \b plane or the planar face on which to create the sketch. \note By default the sketch is created on the XOY plane of the global coordinate system. If Local Coordinate Systems have been created in the study they appear -in the combobox and can be selected as a reference coordinate system.
    • +in the combo-box and can be selected as a reference coordinate system.
  • Choose a \b segment or an \b arc element to start a \b profile or choose \b rectangle to draw a rectangle. @@ -50,7 +50,7 @@ origin of the reference coordinate system.
  • You can define the segment by either its end point or \b direction and \b length. The direction is defined relatively to the tangent at the last point of the sketch. It can be:
      -
    • Tangent (colinear to the tangent at the last point)
      • +
    • Tangent (collinear to the tangent at the last point)
    • Perpendicular
    • Defined by an angle
    • Defined by a vector (Vx, Vy)
      • @@ -159,7 +159,7 @@ points in the current LCS. Our TUI Scripts provide you with useful examples of the use of \ref tui_sketcher_page "Sketcher". -A wrapper also exists to help in the construction of a sketcher using simple commands. +There is also a wrapper that can help in the construction of a sketcher using simple commands. The description of this wrapper can be found in the dedicated page of the salome.geom python package. diff --git a/doc/salome/gui/GEOM/input/faq.doc b/doc/salome/gui/GEOM/input/faq.doc new file mode 100644 index 000000000..78fa0d58c --- /dev/null +++ b/doc/salome/gui/GEOM/input/faq.doc @@ -0,0 +1,12 @@ +/*! + +\page faq FAQ ("Frequently Asked Questions") + +Here you can find the answers to some frequently asked questions: + +
        +
      • \subpage partition_explanation "What is the difference between partition, compounds and fuse operation ?"
        • +
      + + +*/ diff --git a/doc/salome/gui/GEOM/input/fillet1d_operation.doc b/doc/salome/gui/GEOM/input/fillet1d_operation.doc index 322b7c965..9893650c5 100644 --- a/doc/salome/gui/GEOM/input/fillet1d_operation.doc +++ b/doc/salome/gui/GEOM/input/fillet1d_operation.doc @@ -18,7 +18,7 @@ vertexes on this wire in the OCC Viewer and define the \b Radius of the Fillet. \b Note: This Operation Works for the Wires with Planar Edges only. \b Note: Use option Fuse collinear edges to allow bigger radius - to allow ignoring of possible secant points, i.e. the + in order to ignore possible secant points, i.e. the joints of collinear edges, thus processing such edges as one. TUI Command: geompy.MakeFillet1D(Shape, R, ListVertexes) diff --git a/doc/salome/gui/GEOM/input/first_steps_guide.doc b/doc/salome/gui/GEOM/input/first_steps_guide.doc deleted file mode 100644 index 17ca4e8c5..000000000 --- a/doc/salome/gui/GEOM/input/first_steps_guide.doc +++ /dev/null @@ -1,12 +0,0 @@ -/*! - -\page first_steps_guide First steps in GEOM - -You can find here some useful information to start working with GEOM - -
        -
      • \subpage partition_explanation "Partition, compounds and boolean operations"
        • -
      - - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GEOM/input/fuse_edges_operation.doc b/doc/salome/gui/GEOM/input/fuse_edges_operation.doc index 7924f73eb..5f6b96343 100644 --- a/doc/salome/gui/GEOM/input/fuse_edges_operation.doc +++ b/doc/salome/gui/GEOM/input/fuse_edges_operation.doc @@ -4,10 +4,20 @@ \n To Fuse Collinear Edges within a Wire in the Main Menu select Repair - > Fuse Collinear Edges within a Wire. -\n This operation removes selected vertices from a given wire in case -if adjacent edges are C1 continuous. The function takes a list of +\n This operation removes the selected vertices from a given wire, +provided that the junction of two adjacent edges is C1 continuous +(i.e. the edges have equal tangents at the junction). +\n The function takes a list of vertices to suppress as a parameter. If the list is empty, all -vertices in a wire are assumed. +vertices in a wire are taken into account. + +\n \b Example: + +Wire with 2 colinear edges: +\image html wire_before_fuse.png + +Fused wire (only one edge): +\image html fused_wire.png \n Arguments: Name + a wire + a list of vertices (can be empty). diff --git a/doc/salome/gui/GEOM/input/fuse_operation.doc b/doc/salome/gui/GEOM/input/fuse_operation.doc index 4dd3a7bf5..df13c732e 100644 --- a/doc/salome/gui/GEOM/input/fuse_operation.doc +++ b/doc/salome/gui/GEOM/input/fuse_operation.doc @@ -2,24 +2,11 @@ \page fuse_operation_page Fuse -For detail description of the Boolean operations please refer to -this document. -It provides a general review of the Partition and Boolean -operations algorithms, describes the usage methodology and highlighs -major limitations of these operations. - To produce a \b Fuse operation in the Main Menu select -Operations - > Boolean - > Fuse - -This operation creates a shape from two shapes. +Operations - > Boolean - > Fuse. +This operation creates one shape from two shapes. The \b Result will be any \b GEOM_Object. -TUI Command: geompy.MakeFuse(s1, s2) -Arguments: Name + 2 shapes. -Advanced option: -\ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". - -\image html bool1.png Example: @@ -27,7 +14,24 @@ The \b Result will be any \b GEOM_Object. \image html fusesn2.png "The resulting fuse" +TUI Command: geompy.MakeFuse(s1, s2)\n +Arguments: Name + 2 shapes.\n +Advanced option: +\ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". + +\image html bool1.png + Our TUI Scripts provide you with useful examples of the use of \ref tui_fuse "Boolean Operations". + More details +
        +
      • For a detailed description of the Boolean operations please refer to +this document. +It provides a general review of the Partition and Boolean +operations algorithms, describes the usage methodology and highlights +major limitations of these operations.
        • +
      • Perhaps you also ask yourself : \ref partition_explanation "What is the difference between partition, compounds and fuse operation ?"
        • +
      + */ diff --git a/doc/salome/gui/GEOM/input/get_non_blocks.doc b/doc/salome/gui/GEOM/input/get_non_blocks.doc index 8df0e324c..1bf4806b3 100644 --- a/doc/salome/gui/GEOM/input/get_non_blocks.doc +++ b/doc/salome/gui/GEOM/input/get_non_blocks.doc @@ -4,18 +4,18 @@ \image html measures2.png -Retrieve all non blocks solids and faces from the given shape. -Collect them in two groups: solids and faces separately. +This operation retrieves all non block solids and faces from the given +shape in two groups: solids and faces separately. -\n Result: Two or less groups are published in the Object - Browser under the processed object. Reports error if - no bad sub-shapes (solids and faces) have been found. +Two or less groups are published in the Object +Browser under the processed object. An error is raised if +no bad sub-shapes (solids and faces) have been found. \n TUI Command: geompy.GetNonBlocks(Compound). Returns a tuple of two GEOM_Objects. The first object is a group of all non block solids - (= not 6 faces, or with 6 faces, but with the presence of - non-quadrangular faces). The second object is a group of all non + (not having 6 faces, or having 6 faces, but some of them + are not quadrangular). The second object is a group of all non quadrangular faces. See also a \ref tui_get_non_blocks_page "TUI example". diff --git a/doc/salome/gui/GEOM/input/import_export.doc b/doc/salome/gui/GEOM/input/import_export.doc index 70537f934..62a80da55 100644 --- a/doc/salome/gui/GEOM/input/import_export.doc +++ b/doc/salome/gui/GEOM/input/import_export.doc @@ -22,10 +22,10 @@ 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 Object Browser. -\note If the selected file is in IGES format and the length is not -expressed in meters, it will be suggested to scale the model into the -metric system (see the picture below). This feature can be helpful if -some wrong units have been written to the IGES file by a +\note If the selected file is in IGES or STEP format and the length +is not expressed in meters, it will be asked whether to take or not these +units into account (see the picture below). This feature can be +helpful if some wrong units have been written to the IGES or STEP file by a 3rd-party software. \image html iges_unit.png diff --git a/doc/salome/gui/GEOM/input/index.doc b/doc/salome/gui/GEOM/input/index.doc index 26928aaac..55a17a230 100644 --- a/doc/salome/gui/GEOM/input/index.doc +++ b/doc/salome/gui/GEOM/input/index.doc @@ -4,9 +4,6 @@ \image html geomscreen.png -If you are a new user some general information about GEOM usage are given here: -\subpage first_steps_guide - \b Geometry module of SALOME is destined for: - \subpage import_export_geom_obj_page "import and export of geometrical models" in IGES, BREP and STEP formats; @@ -30,6 +27,9 @@ Geometry module preferences are described in the Almost all geometry module functionalities are accessible via \subpage geompy_page "Geometry module Python Interface" +You can find the answer to some Frequently Asked Questions in this page: +- \subpage faq "Frequently Asked Questions" + Other functions are available in salome.geom python package. \image html image3.png "Example of Geometry module usage for engineering tasks" diff --git a/doc/salome/gui/GEOM/input/partition.doc b/doc/salome/gui/GEOM/input/partition.doc index 9af094e70..dfee4899f 100644 --- a/doc/salome/gui/GEOM/input/partition.doc +++ b/doc/salome/gui/GEOM/input/partition.doc @@ -2,11 +2,15 @@ \page partition_page Partition -For detail description of the Partition operation please refer to +
        +
      • For a detailed description of the Partition operation please refer to this document. It provides a general review of the Partition and Boolean -operations algorithms, describes the usage methodology and highlighs -major limitations of these operations. +operations algorithms, describes the usage methodology and highlights +major limitations of these operations.
        • + +
      • Perhaps you also ask yourself : \ref partition_explanation "What's the difference between partition, compounds and fuse operation ?"
        • +
      To produce a \b Partition in the Main Menu select Operations - > Partition diff --git a/doc/salome/gui/GEOM/input/partition_explanation.doc b/doc/salome/gui/GEOM/input/partition_explanation.doc index 2725784af..5325b37e7 100644 --- a/doc/salome/gui/GEOM/input/partition_explanation.doc +++ b/doc/salome/gui/GEOM/input/partition_explanation.doc @@ -4,15 +4,15 @@ \tableofcontents -It is frequently asked about the difference between the above mentioned operations. It's indeed simple. Lets take the example of a cylinder and a box that you want to join together. +It is frequently asked about the difference between the above mentioned operations. It is indeed simple. Let us take the example of a cylinder and a box that you want to join together. \section sec1 Fuse -The \b fuse operation will make a single solid from the two given solids. It allows you to build complex models by putting simple shapes together. +The \b fuse operation will make a single solid from two given solids. It allows you to build complex models by putting simple shapes together. \image html fuse.png \section sec2 Partition -The \b partition operation will also connect the two solids but it will keep a face at the frontier (in brown on the picture below). The resulting shape will consist in two connected solids that share +The \b partition operation will also connect the solids but it will keep a face at the frontier (in brown in the picture below). The resulting shape will consist of two connected solids that share a face at their frontier. It means that this face is present only one time in the resulting shape and is a sub-shape of both the box and the cylinder. \n This operation allows you to identify different areas in a shape (e.g. different materials) and to ensure a conformal mesh when meshing it later. Indeed the face at the frontier is meshed only once. @@ -21,10 +21,10 @@ a face at their frontier. It means that this face is present only one time in th \section sec3 Compound -When you build a \b compound by using the build -> compound operation you just make an object that contains the two separate solids like in a "bag". +When you build a \b compound by using the Build -> Compound operation you just make an object that contains two separate solids like in a "bag". The two solids remain unconnected. The compound is just a set of shapes, no more. -\n The compound Allows applying operations to a collection of shapes. +\n The compound allows applying operations to a collection of shapes. \image html compound2.png @@ -42,7 +42,7 @@ In the frame of this example we can summarize the following differences:
    • \b Partition
      • \a Result : Two connected solids sharing faces.
        • -
      • \a Purpose : Useful to ensure a conformal mesh of separated areas of your model (fluid / solid , concrete / steel ...)
        • +
      • \a Purpose : Useful to ensure a conformal mesh of separate areas of your model (fluid / solid , concrete / steel ...).
    • \b Compound
        diff --git a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc index 4b9047f34..1d469e9e8 100644 --- a/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_advanced_geom_objs.doc @@ -86,16 +86,17 @@ gg.createAndDisplayGO(id_pipetshapefillet_position) \code import geompy import salome +import GEOM gg = salome.ImportComponentGUI("GEOM") # create DividedDisk object -divideddisk = geompy.MakeDividedDisk(100, 50) +divideddisk = geompy.MakeDividedDisk(100, 1, GEOM.SQUARE) # add object in the study id_divideddisk = geompy.addToStudy(divideddisk,"DividedDisk") # display divideddisk -gg.createAndDisplayGO(id_divideddisk) +gg.createAndDisplayGO(id_divideddisk) \endcode \anchor tui_creation_dividedcylinder @@ -104,16 +105,17 @@ gg.createAndDisplayGO(id_divideddisk) \code import geompy import salome +import GEOM gg = salome.ImportComponentGUI("GEOM") # create DividedCylinder object -dividedcylinder = geompy.MakeDividedCylinder(100, 300) +dividedcylinder = geompy.MakeDividedCylinder(100, 300, GEOM.SQUARE) # add object in the study id_dividedcylinder = geompy.addToStudy(dividedcylinder,"DividedCylinder") # display dividedcylinder -gg.createAndDisplayGO(id_dividedcylinder) +gg.createAndDisplayGO(id_dividedcylinder) \endcode diff --git a/doc/salome/gui/GEOM/input/tui_complex_objs.doc b/doc/salome/gui/GEOM/input/tui_complex_objs.doc index 7dcf151c1..2cdcf156a 100644 --- a/doc/salome/gui/GEOM/input/tui_complex_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_complex_objs.doc @@ -623,31 +623,78 @@ from math import pi spring = MakeSpring(50, 100, 2*pi, 1, 5, pi/2) \endcode -

        Creation of Tangent Plane On Face

        + +\anchor tui_creation_pipe_path +

        Creation of a Middle Path

        + \code import salome import geompy - # Create Vertexes for curve - Vertex_1 = geompy.MakeVertex(0, 0, 0) - Vertex_2 = geompy.MakeVertex(0, 90, 30) - Vertex_3 = geompy.MakeVertex(100, 90, 0) - Vertex_4 = geompy.MakeVertex(-100, 90, 0) - # Create curve - Curve_1 = geompy.MakeInterpol([Vertex_4, Vertex_2, Vertex_3, Vertex_1]) - # Create Face by Extrusion of the Curve - Extrusion_1 = geompy.MakePrismDXDYDZ(Curve_1, 0, 30, -60) - # Make Tangent on this Extrusion (Face) - Tangent_1 = geompy.MakeTangentPlaneOnFace(Extrusion_1, 0.7, 0.5, 150) - # Publish in the study - geompy.addToStudy( Vertex_1, "Vertex_1" ) - geompy.addToStudy( Vertex_2, "Vertex_2" ) - geompy.addToStudy( Vertex_3, "Vertex_3" ) - geompy.addToStudy( Vertex_4, "Vertex_4" ) - geompy.addToStudy( Curve_1, "Curve_1" ) - geompy.addToStudy( Extrusion_1, "Extrusion_1" ) - geompy.addToStudy( Tangent_1, "Tangent_1" ) +# Create a box +Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) + +# Get two opposite faces +[Face_1,Face_2] = geompy.SubShapes(Box_1, [31, 33]) + +# Get edges +Box_1_edge_12 = geompy.GetSubShape(Box_1, [12]) +Box_1_edge_22 = geompy.GetSubShape(Box_1, [22]) +Box_1_edge_25 = geompy.GetSubShape(Box_1, [25]) +Box_1_edge_29 = geompy.GetSubShape(Box_1, [29]) +Box_1_edge_8 = geompy.GetSubShape(Box_1, [8]) +Box_1_edge_18 = geompy.GetSubShape(Box_1, [18]) +Box_1_edge_26 = geompy.GetSubShape(Box_1, [26]) +Box_1_edge_30 = geompy.GetSubShape(Box_1, [30]) + +# These three calls to RestorePath return the same result +Path_1 = geompy.RestorePath(Box_1, Face_1, Face_2) +Path_2 = geompy.RestorePathEdges(Box_1, [Face_1], [Face_2]) +Path_3 = geompy.RestorePathEdges(Box_1, + [Box_1_edge_12, Box_1_edge_22, Box_1_edge_25, Box_1_edge_29], + [Box_1_edge_8, Box_1_edge_18, Box_1_edge_26, Box_1_edge_30]) + +# Publish created objects +geompy.addToStudy( Box_1, 'Box_1' ) +geompy.addToStudyInFather( Box_1, Face_1, 'Face_1' ) +geompy.addToStudyInFather( Box_1, Face_2, 'Face_2' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_25, 'Box_1:edge_25' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_22, 'Box_1:edge_22' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_12, 'Box_1:edge_12' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_29, 'Box_1:edge_29' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_18, 'Box_1:edge_18' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_26, 'Box_1:edge_26' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_8, 'Box_1:edge_8' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_30, 'Box_1:edge_30' ) +geompy.addToStudy( Path_1, 'Path_1' ) +geompy.addToStudy( Path_2, 'Path_2' ) +geompy.addToStudy( Path_3, 'Path_3' ) \endcode +

        Creation of Tangent Plane On Face

        +\code +import salome +import geompy + +# Create Vertexes for curve +Vertex_1 = geompy.MakeVertex(0, 0, 0) +Vertex_2 = geompy.MakeVertex(0, 90, 30) +Vertex_3 = geompy.MakeVertex(100, 90, 0) +Vertex_4 = geompy.MakeVertex(-100, 90, 0) +# Create curve +Curve_1 = geompy.MakeInterpol([Vertex_4, Vertex_2, Vertex_3, Vertex_1]) +# Create Face by Extrusion of the Curve +Extrusion_1 = geompy.MakePrismDXDYDZ(Curve_1, 0, 30, -60) +# Make Tangent on this Extrusion (Face) +Tangent_1 = geompy.MakeTangentPlaneOnFace(Extrusion_1, 0.7, 0.5, 150) +# Publish in the study +geompy.addToStudy( Vertex_1, "Vertex_1" ) +geompy.addToStudy( Vertex_2, "Vertex_2" ) +geompy.addToStudy( Vertex_3, "Vertex_3" ) +geompy.addToStudy( Vertex_4, "Vertex_4" ) +geompy.addToStudy( Curve_1, "Curve_1" ) +geompy.addToStudy( Extrusion_1, "Extrusion_1" ) +geompy.addToStudy( Tangent_1, "Tangent_1" ) +\endcode */ diff --git a/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc b/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc index 6f648f9a0..b83ea9647 100644 --- a/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc +++ b/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc @@ -14,7 +14,7 @@ geompy.addToStudy(box, 'box') geompy.addToStudy(cyl, 'cyl') # make a compound -compound = geompy.MakeCompound([box1, box2]) +compound = geompy.MakeCompound([box, cyl]) geompy.addToStudy(compound, 'compound') # explore the compound diff --git a/doc/salome/gui/GEOM/input/working_with_groups.doc b/doc/salome/gui/GEOM/input/working_with_groups.doc index a09865efa..99b98bac9 100644 --- a/doc/salome/gui/GEOM/input/working_with_groups.doc +++ b/doc/salome/gui/GEOM/input/working_with_groups.doc @@ -3,8 +3,8 @@ \page work_with_groups_page Working with groups Creation and editing groups of sub-shapes of a geometrical object makes -handling sub-shapes much easier. Also some Boolean operations on -groups are available. +handling sub-shapes much easier. Boolean operations on +groups are also available.
        • \ref create_groups_anchor "Create a Group"
          • @@ -142,7 +142,7 @@ The following dialog box will appear: \image html groups_union_dlg.png In this dialog box you should specify the name of the resulting group -and set of groups which will be united. +and select the groups, which will be united.
        • Click the \b Apply or Apply and Close button to confirm creation of the group.
          • @@ -155,7 +155,7 @@ and set of groups which will be united.

          Intersection of groups

          This operation allows to create a new group in such a way that only -sub-shapes that are present in all initial groups together are added to the +the sub-shapes that are present in all initial groups are added to the new one. To intersect groups: @@ -166,7 +166,7 @@ The following dialog box will appear: \image html groups_intersect_dlg.png In this dialog box you should specify the name of the resulting group -and set of groups which will be intersected. +and select the groups, which will be intersected.
        • Click the \b Apply or Apply and Close button to confirm creation of the group.
          • @@ -190,10 +190,9 @@ The following dialog box will appear: \image html groups_cut_dlg.png In this dialog box you should specify the name of the resulting group -and groups which will be cut. +and the groups which will be cut. -
        • Click the \b Apply or Apply and Close button to confirm creation of the -group.
          • +
        • Click the \b Apply or Apply and Close button to confirm creation of the group.
          • Our TUI Scripts provide you with useful examples of diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 8f90021eb..f35c7935e 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -209,7 +209,10 @@ module GEOM { /*! - * \brief Get an entry of the object in GEOM component. + * \brief Get internal (unique) entry of the object in the GEOM component's data tree. + * \note This is not an entry of the data object in SALOME study. + * This is internal function of GEOM component, though it can be used outside it for + appropriate reason (e.g. for unique identification of geometry object). */ string GetEntry(); @@ -715,6 +718,11 @@ module GEOM in double theTrimSize); }; + /*! + * \brief Interface for shapes transforming. + * + * Translation, rotation, scaling, mirroring, offset, projection, recomputing. + */ interface GEOM_ITransformOperations : GEOM_IOperations { /*! @@ -1077,7 +1085,8 @@ module GEOM * \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 theReverse is a true or false parameter. true is to reverse direction, false is to move normal direction. + * \param theReverse 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, @@ -1105,7 +1114,6 @@ module GEOM GEOM_Object RecomputeObject (in GEOM_Object theObject); }; - // # GEOM_I3DPrimOperations: /*! * \brief Interface for 3D primitives creation * @@ -1485,9 +1493,49 @@ module GEOM in GEOM_Object thePath, in GEOM_Object theVec); + /*! + * \brief Build a middle path of a pipe-like shape. + * + * The path shape can be a wire or an edge. + * \param theShape It can be closed or unclosed pipe-like shell + * or a pipe-like solid. + * \param theBase1, theBase2 Two bases of the supposed pipe. This + * should be wires or faces of \a theShape. + * \note It is not assumed that exact or approximate copy of \a theShape + * can be obtained by applying existing Pipe operation on the + * resulting "Path" wire taking \a theBase1 as the base - it is not + * always possible; though in some particular cases it might work + * it is not guaranteed. Thus, RestorePath function should not be + * considered as an exact reverse operation of the Pipe. + * \return New GEOM_Object, containing an edge or wire that represent + * source pipe's "path". + */ + GEOM_Object RestorePath (in GEOM_Object theShape, + in GEOM_Object theBase1, + in GEOM_Object theBase2); + + /*! + * \brief Build a middle path of a pipe-like shape. + * + * The path shape can be a wire or an edge. + * \param theShape It can be closed or unclosed pipe-like shell + * or a pipe-like solid. + * \param theBase1, theBase2 Two bases of the supposed pipe. This + * should be lists of edges of \a theShape. + * \note It is not assumed that exact or approximate copy of \a theShape + * can be obtained by applying existing Pipe operation on the + * resulting "Path" wire taking \a theBase1 as the base - it is not + * always possible; though in some particular cases it might work + * it is not guaranteed. Thus, RestorePath function should not be + * considered as an exact reverse operation of the Pipe. + * \return New GEOM_Object, containing an edge or wire that represent + * source pipe's "path". + */ + GEOM_Object RestorePathEdges (in GEOM_Object theShape, + in ListOfGO theBase1, + in ListOfGO theBase2); }; - // # GEOM_IShapesOperations /*! * \brief Interface for Shapes creation: * @@ -3244,8 +3292,9 @@ module GEOM * \param theFileName The file, containing the shape. * \param theFormatName Specify format for the file reading. * Available formats can be obtained with ImportTranslators() method. - * If format 'IGES_SCALE' is used instead 'IGES' length unit will be - * set to 'meter' and result model will be scaled. + * If format 'IGES_SCALE' is used instead of 'IGES' or + * format 'STEP_SCALE' is used instead of 'STEP', + * file length unit will be ignored (set to 'meter') and result model will be scaled. * \return New GEOM_Object, containing the imported shape. */ GEOM_Object ImportFile (in string theFileName, in string theFormatName); diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index b44cbd49c..073969747 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -26,7 +26,8 @@ #include "EntityGUI_3DSketcherDlg.h" #include "EntityGUI_Widgets.h" -#include + +#include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include @@ -65,19 +67,25 @@ #include #include #include +#if OCC_VERSION_LARGE > 0x06050300 +#include +#include +#include +#include +#include +#include +#include +#endif // OCC_VERSION_LARGE > 0x06050300 // This include must be *AFTER* SOCC_ViewModel.h because // of the constant ROTATE which is a #define in // GEOMImpl_Types.hxx and an enum in SOCC_ViewModel.h #include -enum -{ - NONE, - TYPE_LENGTH, - TYPE_ANGLE, - TYPE_TWO_ANGLES -}; +// TODO +// +// Avoid duplication of angle coordinates in cylindrical mode +// Check spherical mode in absolute enum { @@ -95,6 +103,107 @@ private: bool& myLock; }; +#if OCC_VERSION_LARGE > 0x06050300 +DEFINE_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject) + +class AIS_Text:public AIS_InteractiveObject +{ +public: + // CASCADE RTTI + DEFINE_STANDARD_RTTI(AIS_Text ); + + AIS_Text(){}; + + AIS_Text + ( + const TCollection_ExtendedString& , const gp_Pnt& , + Quantity_Color color, + Standard_Integer aHJust, + Standard_Integer aVJust , + Standard_Real Angle , + Standard_Boolean Zoom , + Standard_Real Height, + Font_FontAspect FontAspect, + Standard_CString Font + ); + +private: + + void Compute ( const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer aMode); + + void ComputeSelection ( const Handle(SelectMgr_Selection)& aSelection, + const Standard_Integer aMode){} ; + +protected: + TCollection_ExtendedString aText; + gp_Pnt aPosition; + Standard_Real Red; + Standard_Real Green; + Standard_Real Blue; + Standard_Real aAngle; + Standard_Real aHeight; + Standard_Boolean aZoomable; + Quantity_Color aColor; + Standard_CString aFont; + Font_FontAspect aFontAspect; + Graphic3d_HorizontalTextAlignment aHJustification; + Graphic3d_VerticalTextAlignment aVJustification; +}; + +IMPLEMENT_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject) +IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject) + +AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& position, + Quantity_Color color = Quantity_NOC_YELLOW, + Standard_Integer aHJust = Graphic3d_HTA_LEFT, + Standard_Integer aVJust = Graphic3d_VTA_BOTTOM, + Standard_Real angle = 0.0 , + Standard_Boolean zoomable = Standard_False, + Standard_Real height = 16., + Font_FontAspect fontAspect = Font_FA_Regular, + Standard_CString font = "Courier") +{ + aText = text; + aPosition = position; + aHJustification = Graphic3d_HorizontalTextAlignment(aHJust); + aVJustification = Graphic3d_VerticalTextAlignment(aVJust); + aAngle = angle; + aZoomable = zoomable; + aHeight = height; + aColor = color; + aFontAspect = fontAspect; + aFont = font; +}; + +void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer aMode) +{ + + aPresentation->Clear(); + + Handle_Prs3d_TextAspect asp = myDrawer->TextAspect(); + + asp->SetFont(aFont); + asp->SetColor(aColor); + asp->SetHeight(aHeight); // I am changing the myHeight value + + asp->SetHorizontalJustification(aHJustification); + asp->SetVerticalJustification(aVJustification); + asp->Aspect()->SetTextZoomable(aZoomable); + asp->Aspect()->SetTextAngle(aAngle); + asp->Aspect()->SetTextFontAspect(aFontAspect); + Prs3d_Text::Draw(aPresentation, asp, aText, aPosition); +}; +#endif // OCC_VERSION_LARGE > 0x06050300 + +bool isSame (double d1, double d2) +{ + return Abs(d1 - d2) <= Precision::Confusion(); +} + //================================================================================= // class : EntityGUI_3DSketcherDlg() // purpose : Constructs a EntityGUI_3DSketcherDlg which is a child of 'parent', with the @@ -111,7 +220,6 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q myLineWidth(lineWidth), myGeometryGUI(theGeometryGUI), myLengthIORedoList() -// myLastAngleNormal() { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_UNDO"))); @@ -127,16 +235,23 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q mainFrame()->RadioButton2->close(); mainFrame()->RadioButton3->close(); - GroupType = new DlgRef_3Radio(centralWidget()); - GroupType->GroupBox1->setTitle(tr("GEOM_COORDINATES_TYPE")); + GroupType = new EntityGUI_Type(centralWidget()); + GroupType->GroupType2->setTitle(tr("GEOM_COORDINATES_TYPE")); + GroupType->GroupType1->setTitle(tr("GEOM_MODE")); GroupType->RadioButton1->setText(tr("GEOM_SKETCHER_ABS")); GroupType->RadioButton2->setText(tr("GEOM_SKETCHER_REL")); - GroupType->RadioButton3->setText(tr("Angles")); //TODO translation -// GroupType->RadioButton3->close(); - myTypeGroup = new QButtonGroup(this); - myTypeGroup->addButton(GroupType->RadioButton1, 0); - myTypeGroup->addButton(GroupType->RadioButton2, 1); - myTypeGroup->addButton(GroupType->RadioButton3, 2); + GroupType->RadioButton3->setText(tr("(X,Y,Z)")); + GroupType->RadioButton4->setText(tr("GEOM_ANGLES")); + + myTypeGroup1 = new QButtonGroup(this); + myTypeGroup1->setExclusive(true); + myTypeGroup1->addButton(GroupType->RadioButton1, 0); + myTypeGroup1->addButton(GroupType->RadioButton2, 1); + + myTypeGroup2 = new QButtonGroup(this); + myTypeGroup2->setExclusive(true); + myTypeGroup2->addButton(GroupType->RadioButton3, 0); + myTypeGroup2->addButton(GroupType->RadioButton4, 1); Group3Spin = new EntityGUI_3Spin(centralWidget()); Group3Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES")); @@ -151,13 +266,16 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q GroupAngles->buttonApply->setText(tr("GEOM_SKETCHER_APPLY")); GroupAngles->buttonUndo->setIcon(image1); GroupAngles->buttonRedo->setIcon(image2); - GroupAngles->checkBox->setText(tr("Angle 2")); //TODO translation + GroupAngles->TextLabel1->setText(tr("GEOM_LENGTH")); + GroupAngles->TextLabel2->setText(tr("GEOM_ANGLE")); + GroupAngles->checkBox ->setText(tr("GEOM_ANGLE_2")); + GroupAngles->checkBox_2->setText(tr("GEOM_HEIGHT")); GroupControls = new EntityGUI_Controls(centralWidget()); GroupControls->GroupBox1->setTitle(tr("GEOM_CONTROLS")); - GroupControls->CheckBox1->setText(tr("Show length dimensions")); //TODO translation - GroupControls->CheckBox2->setText(tr("Show angle dimensions")); //TODO translation - GroupControls->CheckBox3->setText(tr("Show start/end point coordinates")); //TODO translation + GroupControls->CheckBox1->setText(tr("GEOM_SHOW_LENGTH")); + GroupControls->CheckBox2->setText(tr("GEOM_SHOW_ANGLE")); + GroupControls->CheckBox3->setText(tr("GEOM_SHOW_POINTS_COORD")); GroupControls->lineEdit_1->setReadOnly(true); GroupControls->lineEdit_2->setReadOnly(true); GroupControls->lineEdit_3->setReadOnly(true); @@ -170,6 +288,8 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q GroupControls->label_4->setText(tr("X:")); GroupControls->label_5->setText(tr("Y:")); GroupControls->label_6->setText(tr("Z:")); + GroupControls->label_7->setText(tr("GEOM_START")); + GroupControls->label_8->setText(tr("GEOM_END")); buttonOk()->setText(tr("GEOM_BUT_END_SKETCH")); buttonApply()->setText(tr("GEOM_BUT_CLOSE_SKETCH")); @@ -204,16 +324,16 @@ void EntityGUI_3DSketcherDlg::Init() { myOK = false; myOrientation = OXY; - myPrsType = NONE; + myPrsType = prsType(); SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); myAnglePrs = dynamic_cast(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); myLengthPrs = dynamic_cast(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); +#if OCC_VERSION_LARGE > 0x06050300 + myTextPrs = dynamic_cast(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); +#endif // OCC_VERSION_LARGE > 0x06050300 - //TEST localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); -// globalSelection(GEOM_PREVIEW); -// setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); /* Get setting of step value from file configuration */ double step = SUIT_Session::session()->resourceMgr()->doubleValue("Geometry", "SettingsGeomStep", 100.0); @@ -223,9 +343,10 @@ void EntityGUI_3DSketcherDlg::Init() initSpinBox(Group3Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, "length_precision"); initSpinBox(Group3Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, "length_precision"); - initSpinBox(GroupAngles->SpinBox_DA , -180.0, 180.0, step, "angular_precision"); + initSpinBox(GroupAngles->SpinBox_DA , -360.0, 360.0, step, "angular_precision"); initSpinBox(GroupAngles->SpinBox_DA2, -90.0, 90.0, step, "angular_precision"); initSpinBox(GroupAngles->SpinBox_DL , COORD_MIN, COORD_MAX, step, "length_precision"); + initSpinBox(GroupAngles->SpinBox_DH , COORD_MIN, COORD_MAX, step, "length_precision"); Group3Spin->SpinBox_DX->setValue(0.0); Group3Spin->SpinBox_DY->setValue(0.0); @@ -234,10 +355,13 @@ void EntityGUI_3DSketcherDlg::Init() GroupAngles->SpinBox_DA->setValue(0.0); GroupAngles->SpinBox_DA2->setValue(0.0); GroupAngles->SpinBox_DL->setValue(0.0); + GroupAngles->SpinBox_DH->setValue(0.0); GroupAngles->radioButton_1->setChecked(true); GroupAngles->checkBox->setChecked(false); + GroupAngles->checkBox_2->setChecked(false); GroupAngles->SpinBox_DA2->setEnabled(false); + GroupAngles->SpinBox_DH->setEnabled(false); GroupControls->CheckBox1->setChecked(true); GroupControls->CheckBox2->setChecked(true); @@ -254,29 +378,32 @@ void EntityGUI_3DSketcherDlg::Init() 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(Group3Spin->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnAddPoint())); + connect(Group3Spin->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo())); + connect(Group3Spin->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo())) ; connect(GroupAngles->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnAddPoint())); connect(GroupAngles->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo())); connect(GroupAngles->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo())) ; - connect(myTypeGroup, SIGNAL(buttonClicked(int)), this, SLOT(TypeClicked(int))); + connect(myTypeGroup1, SIGNAL(buttonClicked(int)), this, SLOT(TypeClicked(int))); + connect(myTypeGroup2, SIGNAL(buttonClicked(int)), this, SLOT(TypeClicked(int))); - 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(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(GroupAngles->SpinBox_DA, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(GroupAngles->SpinBox_DA2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(GroupAngles->SpinBox_DL, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); + connect(GroupAngles->SpinBox_DA, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); + connect(GroupAngles->SpinBox_DA2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); + connect(GroupAngles->SpinBox_DL, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); + connect(GroupAngles->SpinBox_DH, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupAngles->radioButton_1, SIGNAL(clicked (bool)), this, SLOT(ButtonClicked(bool))) ; connect(GroupAngles->radioButton_2, SIGNAL(clicked (bool)), this, SLOT(ButtonClicked(bool))) ; connect(GroupAngles->radioButton_3, SIGNAL(clicked (bool)), this, SLOT(ButtonClicked(bool))) ; connect(GroupAngles->checkBox, SIGNAL(clicked (bool)), this, SLOT(BoxChecked (bool))) ; + connect(GroupAngles->checkBox_2, SIGNAL(clicked (bool)), this, SLOT(BoxChecked (bool))) ; connect(GroupControls->CheckBox1, SIGNAL(clicked (bool)), this, SLOT(BoxChecked (bool))) ; connect(GroupControls->CheckBox2, SIGNAL(clicked (bool)), this, SLOT(BoxChecked (bool))) ; connect(GroupControls->CheckBox3, SIGNAL(clicked (bool)), this, SLOT(BoxChecked (bool))) ; @@ -291,6 +418,10 @@ void EntityGUI_3DSketcherDlg::Init() GroupControls->CheckBox3->click(); UpdateButtonsState(); + + myMode = 0; + myCoordType = 0; + GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth); } @@ -298,10 +429,24 @@ void EntityGUI_3DSketcherDlg::Init() // function : TypeClicked() // purpose : Radio button management //================================================================================= -void EntityGUI_3DSketcherDlg::TypeClicked (int mode) +void EntityGUI_3DSketcherDlg::TypeClicked (int id) { - if (mode == myMode) return; - + QButtonGroup* send = (QButtonGroup*) sender(); + + int coordType = myCoordType; + int mode = myMode; + + if (send == myTypeGroup1) + { + if(id == myMode) return; + mode = id; + } + else if (send == myTypeGroup2) + { + if (id == myCoordType) return; + coordType = id; + } + GroupAngles->hide(); Group3Spin->show(); @@ -317,31 +462,35 @@ void EntityGUI_3DSketcherDlg::TypeClicked (int mode) Group3Spin->SpinBox_DY->text().toDouble(&oky); Group3Spin->SpinBox_DZ->text().toDouble(&okz); - if (mode == 0) { // XYZ - Group3Spin->TextLabel1->setText(tr("GEOM_SKETCHER_X2")); - Group3Spin->TextLabel2->setText(tr("GEOM_SKETCHER_Y2")); - Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_Z2")); - if (myMode == 1) - { - if (okx) Group3Spin->SpinBox_DX->setValue(xyz.x + Group3Spin->SpinBox_DX->value()); - if (oky) Group3Spin->SpinBox_DY->setValue(xyz.y + Group3Spin->SpinBox_DY->value()); - if (okz) Group3Spin->SpinBox_DZ->setValue(xyz.z + Group3Spin->SpinBox_DZ->value()); + if (coordType == 0) // Cartesian coordinates + { + if (mode == 0) { // XYZ + Group3Spin->TextLabel1->setText(tr("GEOM_SKETCHER_X2")); + Group3Spin->TextLabel2->setText(tr("GEOM_SKETCHER_Y2")); + Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_Z2")); + if (myCoordType == 0 && myMode == 1) + { + if (okx) Group3Spin->SpinBox_DX->setValue(xyz.x + Group3Spin->SpinBox_DX->value()); + if (oky) Group3Spin->SpinBox_DY->setValue(xyz.y + Group3Spin->SpinBox_DY->value()); + if (okz) Group3Spin->SpinBox_DZ->setValue(xyz.z + Group3Spin->SpinBox_DZ->value()); + } + Group3Spin->buttonApply->setFocus(); } - Group3Spin->buttonApply->setFocus(); - } - else if (mode == 1) { // DXDYDZ - Group3Spin->TextLabel1->setText(tr("GEOM_SKETCHER_DX2")); - Group3Spin->TextLabel2->setText(tr("GEOM_SKETCHER_DY2")); - Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_DZ2")); - if (myMode == 0) - { - if (okx) Group3Spin->SpinBox_DX->setValue(Group3Spin->SpinBox_DX->value() - xyz.x); - if (oky) Group3Spin->SpinBox_DY->setValue(Group3Spin->SpinBox_DY->value() - xyz.y); - if (okz) Group3Spin->SpinBox_DZ->setValue(Group3Spin->SpinBox_DZ->value() - xyz.z); + else if (mode == 1) { // DXDYDZ + Group3Spin->TextLabel1->setText(tr("GEOM_SKETCHER_DX2")); + Group3Spin->TextLabel2->setText(tr("GEOM_SKETCHER_DY2")); + Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_DZ2")); + if (myCoordType == 0 && myMode == 0) + { + if (okx) Group3Spin->SpinBox_DX->setValue(Group3Spin->SpinBox_DX->value() - xyz.x); + if (oky) Group3Spin->SpinBox_DY->setValue(Group3Spin->SpinBox_DY->value() - xyz.y); + if (okz) Group3Spin->SpinBox_DZ->setValue(Group3Spin->SpinBox_DZ->value() - xyz.z); + } + Group3Spin->buttonApply->setFocus(); } - Group3Spin->buttonApply->setFocus(); } - else if (mode == 2) { // Angles and Length + else if (coordType == 1) // Angles and Length + { Group3Spin->hide(); GroupAngles->show(); GroupAngles->buttonApply->setFocus(); @@ -352,6 +501,7 @@ void EntityGUI_3DSketcherDlg::TypeClicked (int mode) Group3Spin->SpinBox_DZ->blockSignals(blocked); myMode = mode; + myCoordType = coordType; updateGeometry(); resize(minimumSizeHint()); @@ -370,44 +520,25 @@ void EntityGUI_3DSketcherDlg::ClickOnAddPoint() showError(msg); return; } - - // Display and store angle dimensions interactive objects in Prs - if (GroupType->RadioButton3->isChecked()) // ANGLES - { - double anAngle2 = 0.0; - if (GroupAngles->checkBox->isChecked()) - anAngle2 = GroupAngles->SpinBox_DA2->value(); - - // Store angle dimensions - displayAngle(GroupAngles->SpinBox_DA->value(), anAngle2, - GroupAngles->SpinBox_DL->value(), myOrientation, /*store =*/true); - // Store length dimensions - displayLength(GroupAngles->SpinBox_DL->value(), /*store =*/true, /*type=*/myPrsType); - } - - // Display and store store length dimension interactive object in Prs - if (GroupType->RadioButton1->isChecked() || // ABSOLUTE or RELATIVE coordinates - GroupType->RadioButton2->isChecked()) - { - displayLength(-1, /*store=*/true); - } + + myPrsType = prsType(); + +// if(myMode == 1) + displayDimensions( /*store = */true); myPointsList.append(getCurrentPoint()); - myPrsTypeList.push_back(myPrsType); - - // Clean redo lists myRedoList.clear(); - myPrsTypeRedoList.clear(); myLengthIORedoList.Clear(); myAngleIORedoList.Clear(); + myTextIORedoList.Clear(); - if (myMode == 1) + if (myCoordType == 0 && myMode == 1) // RELATIVE CARTESIAN COORDINATES { Group3Spin->SpinBox_DX->setValue(0.0); Group3Spin->SpinBox_DY->setValue(0.0); Group3Spin->SpinBox_DZ->setValue(0.0); } - else if (myMode == 2) + else if (myCoordType == 1 && myMode == 1) // RELATIVE ANGULAR COORDINATES { GroupAngles->SpinBox_DA->setValue(0.0); GroupAngles->SpinBox_DL->setValue(0.0); @@ -426,9 +557,14 @@ void EntityGUI_3DSketcherDlg::ClickOnAddPoint() //================================================================================= void EntityGUI_3DSketcherDlg::UpdateButtonsState() { - if (myPointsList.count() == 0) GroupType->RadioButton1->click(); + if (myPointsList.count() == 0) + { + GroupType->RadioButton1->click(); + GroupType->RadioButton3->click(); + } GroupType->RadioButton2->setEnabled(myPointsList.count() > 0); - GroupType->RadioButton3->setEnabled(myPointsList.count() > 0); +// GroupType->RadioButton3->setEnabled(myPointsList.count() > 0); +// GroupType->RadioButton4->setEnabled(myPointsList.count() > 0); Group3Spin->buttonUndo->setEnabled(myPointsList.count() > 0); Group3Spin->buttonRedo->setEnabled(myRedoList.count() > 0); GroupAngles->buttonUndo->setEnabled(myPointsList.count() > 0); @@ -480,41 +616,28 @@ void EntityGUI_3DSketcherDlg::UpdatePointCoordinates() void EntityGUI_3DSketcherDlg::ClickOnUndo() { if (myPointsList.count() > 0) { - myRedoList.append(myPointsList.takeLast()); - UpdateButtonsState(); - GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth); + + myRedoList.append(myPointsList.last()); // Erase dimensions presentations SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myLengthPrs, true); ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myAnglePrs, true); - - if (myPrsTypeList.back() != NONE) - { - // Remove last prepended IO - removeLastIOFromPrs(TYPE_LENGTH); - } - if (myPrsTypeList.back() == TYPE_ANGLE || - myPrsTypeList.back() == TYPE_TWO_ANGLES) - { - // Remove first Angle IO from presentation - removeLastIOFromPrs(TYPE_ANGLE); - if (myPrsTypeList.back() == TYPE_TWO_ANGLES) - { - // Remove second Angle IO - removeLastIOFromPrs(TYPE_ANGLE); - } - } - - // Erase last action type and store it in redo list - myPrsTypeRedoList.push_back(myPrsTypeList.back()); - myPrsTypeList.pop_back(); + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myTextPrs, true); + + removeLastIOFromPrs(); // Display modified presentation if (isLengthVisible) ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myLengthPrs); if (isAngleVisible) ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myAnglePrs); + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myTextPrs); + + // Remove last point from list + myPointsList.removeLast(); + GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth); + UpdateButtonsState(); // Update of point coordinates in the control groupbox UpdatePointCoordinates(); @@ -530,39 +653,28 @@ void EntityGUI_3DSketcherDlg::ClickOnUndo() void EntityGUI_3DSketcherDlg::ClickOnRedo() { if (myRedoList.count() > 0) { - myPointsList.append(myRedoList.takeLast()); - UpdateButtonsState(); - GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth); + + myPointsList.append(myRedoList.last()); // Erase dimensions presentations SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myLengthPrs, true); ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myAnglePrs, true); - - if (myPrsTypeRedoList.back() != NONE) - restoreLastIOToPrs(TYPE_LENGTH); - - if (myPrsTypeRedoList.back() == TYPE_ANGLE || - myPrsTypeRedoList.back() == TYPE_TWO_ANGLES) - { - // Add a first IO from the Redo list - restoreLastIOToPrs(TYPE_ANGLE); - if (myPrsTypeRedoList.back() == TYPE_TWO_ANGLES) - { - // Add a second IO from the Redo list - restoreLastIOToPrs(TYPE_ANGLE); - } - } - - // Record last prs type - myPrsTypeList.push_back(myPrsTypeRedoList.back()); - myPrsTypeRedoList.pop_back(); + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myTextPrs, true); + + restoreLastIOToPrs(); // Display modified presentation if (isLengthVisible) ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myLengthPrs); if (isAngleVisible) ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myAnglePrs); + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myTextPrs); + + // Remove last point from redo list + myRedoList.removeLast(); + GEOMBase_Helper::displayPreview(true, false, true, true, myLineWidth); + UpdateButtonsState(); // Update of point coordinates in the control groupbox UpdatePointCoordinates(); @@ -575,40 +687,54 @@ void EntityGUI_3DSketcherDlg::ClickOnRedo() // function : removeLastIO() // purpose : //================================================================================= -void EntityGUI_3DSketcherDlg::removeLastIOFromPrs (int type) +void EntityGUI_3DSketcherDlg::removeLastIOFromPrs () { AIS_ListOfInteractive anIOList; - - if (type == TYPE_LENGTH) + XYZ Last = getLastPoint(); + + for (int l = 0; lGetObjects(anIOList); myLengthIORedoList.Prepend(anIOList.First()); // Store last prepended Length IO in redo list myLengthPrs->RemoveFirst(); // Remove it from myLengthPrs } - if (type == TYPE_ANGLE) + for (int a = 0; aGetObjects(anIOList); myAngleIORedoList.Prepend(anIOList.First()); // Store last prepended Angle IO in redo list myAnglePrs->RemoveFirst(); // Remove it from myAnglePrs } + for (int t = 0; tGetObjects(anIOList); + myTextIORedoList.Prepend(anIOList.First()); // Store last prepended Text IO in redo list + myTextPrs->RemoveFirst(); // Remove it from myTextPrs + } } //================================================================================= // function : restoreLastIO() // purpose : //================================================================================= -void EntityGUI_3DSketcherDlg::restoreLastIOToPrs (int type) +void EntityGUI_3DSketcherDlg::restoreLastIOToPrs () { - if (type == TYPE_LENGTH) + XYZ LastDeleted = myRedoList.last(); + + for (int l = 0; lPrependObject(myLengthIORedoList.First()); // Restore last removed IO myLengthIORedoList.RemoveFirst(); // Remove it from redo list - } - if (type == TYPE_ANGLE) + } + for (int a = 0; aPrependObject(myAngleIORedoList.First()); // Restore last removed IO myAngleIORedoList.RemoveFirst(); // Remove it from redo list } + for (int t = 0; tPrependObject(myTextIORedoList.First()); // Restore last removed IO + myTextIORedoList.RemoveFirst(); // Remove it from redo list + } } //================================================================================= @@ -720,7 +846,23 @@ void EntityGUI_3DSketcherDlg::BoxChecked (bool checked) SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); if (send == GroupAngles->checkBox) + { GroupAngles->SpinBox_DA2->setEnabled(checked); + if(checked) + { + GroupAngles->SpinBox_DH->setEnabled(false); + GroupAngles->checkBox_2->setChecked(false); + } + } + else if (send == GroupAngles->checkBox_2) + { + GroupAngles->SpinBox_DH->setEnabled(checked); + if(checked) + { + GroupAngles->SpinBox_DA2->setEnabled(false); + GroupAngles->checkBox->setChecked(false); + } + } else if (send == GroupControls->CheckBox1) { @@ -854,6 +996,7 @@ bool EntityGUI_3DSketcherDlg::execute (ObjectList& objects) aParameters << xyz.params; } +// MESSAGE("aCommands.last() = "<< aCommands.last().toStdString()); GEOM::GEOM_ICurvesOperations_var anOper = GEOM::GEOM_ICurvesOperations::_narrow(getOperation()); //GEOM::GEOM_Object_var anObj = anOper->Make3DSketcher(aCoordsArray); GEOM::GEOM_Object_var anObj = anOper->Make3DSketcherCommand(aCommands.join(":").toLatin1().constData()); @@ -875,9 +1018,10 @@ void EntityGUI_3DSketcherDlg::SetDoubleSpinBoxStep (double step) Group3Spin->SpinBox_DX->setSingleStep(step); Group3Spin->SpinBox_DY->setSingleStep(step); Group3Spin->SpinBox_DZ->setSingleStep(step); - GroupAngles->SpinBox_DA->setSingleStep(step); - GroupAngles->SpinBox_DL->setSingleStep(step); + GroupAngles->SpinBox_DA ->setSingleStep(step); GroupAngles->SpinBox_DA2->setSingleStep(step); + GroupAngles->SpinBox_DL->setSingleStep(step); + GroupAngles->SpinBox_DH->setSingleStep(step); } //================================================================================= @@ -947,60 +1091,110 @@ EntityGUI_3DSketcherDlg::XYZ EntityGUI_3DSketcherDlg::getCurrentPoint() const SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); int aPrecision = resMgr->integerValue("Geometry", "length_precision", 7); + + bool spherical = GroupAngles->checkBox->isChecked(); + bool cylindrical = GroupAngles->checkBox_2->isChecked(); - if (myMode == 2) { + if (myCoordType == 1) + { if (GroupAngles->radioButton_1->isChecked()) - xyz.command = "OXY "; + xyz.command = "OXY"; else if (GroupAngles->radioButton_2->isChecked()) - xyz.command = "OYZ "; + xyz.command = "OYZ"; else - xyz.command = "OXZ "; + xyz.command = "OXZ"; + + if (cylindrical) // Cylindrical coordinates (radius, angle, height) + xyz.command += "C"; + else + xyz.command += "S"; // Spherical coordinates (radius, angle1, angle2) --> polar if angle2 = 0 + + if (myMode == 0) // Absolute coordinates + xyz.command += "A "; + else if (myMode == 1) // Relative coordinates + xyz.command += "R "; + double anAngle = GroupAngles->SpinBox_DA->value(); double aLength = GroupAngles->SpinBox_DL->value(); double anAngle2 = 0.0; QString da2 = "0"; - if (GroupAngles->checkBox->isChecked()) { + if (spherical) { // Spherical coordinates (radius, angle1, angle2) anAngle2 = GroupAngles->SpinBox_DA2->value(); da2 = GroupAngles->SpinBox_DA2->text(); } + + double aHeight = 0.0; + QString dh = "0"; + if (cylindrical) { + aHeight = GroupAngles->SpinBox_DH->value(); + dh = GroupAngles->SpinBox_DH->text(); + } xyz.command += - QString::number(anAngle, 'g', aPrecision) + " " + - QString::number(anAngle2, 'g', aPrecision) + " " + - QString::number(aLength, 'g', aPrecision); + QString::number(anAngle, 'g', aPrecision) + " "; xyz.params = - GroupAngles->SpinBox_DA->text() + ":" + - da2 + ":" + + GroupAngles->SpinBox_DA->text() + ":"; + + if(cylindrical) + { + xyz.command += + QString::number(aHeight, 'g', aPrecision) + " "; + xyz.params += + dh + ":"; + } + else // Spherical or polar coordinates + { + xyz.command += + QString::number(anAngle2, 'g', aPrecision) + " "; + xyz.params += + dh + ":"; + } + + xyz.command += + QString::number(aLength, 'g', aPrecision); + xyz.params += GroupAngles->SpinBox_DL->text(); + // Calculate point coordinates for preview anAngle = anAngle * M_PI/180.0; anAngle2 = anAngle2 * M_PI/180.0; double aProjectedLength = aLength * cos(anAngle2); - + XYZ xyzP = getLastPoint(); + if (myMode == 0) + xyzP.x=xyzP.y=xyzP.z=0.0; if (GroupAngles->radioButton_1->isChecked()) // OXY { xyz.x = xyzP.x + aProjectedLength * cos(anAngle); xyz.y = xyzP.y + aProjectedLength * sin(anAngle); - xyz.z = xyzP.z + aLength * sin(anAngle2); + if (cylindrical) + xyz.z = xyzP.z + aHeight; + else + xyz.z = xyzP.z + aLength * sin(anAngle2); } else if (GroupAngles->radioButton_2->isChecked()) // OYZ { xyz.y = xyzP.y + aProjectedLength * cos(anAngle); xyz.z = xyzP.z + aProjectedLength * sin(anAngle); - xyz.x = xyzP.x + aLength * sin(anAngle2); + if (cylindrical) + xyz.x = xyzP.x + aHeight; + else + xyz.x = xyzP.x + aLength * sin(anAngle2); } else // OXZ { xyz.z = xyzP.z + aProjectedLength * sin(anAngle); xyz.x = xyzP.x + aProjectedLength * cos(anAngle); - xyz.y = xyzP.y + aLength * sin(anAngle2); + if (cylindrical) + xyz.y = xyzP.y + aHeight; + else + xyz.y = xyzP.y + aLength * sin(anAngle2); } } - else { + else if(myCoordType == 0) { if (myMode == 0) { // XYZ xyz.x = Group3Spin->SpinBox_DX->value(); xyz.y = Group3Spin->SpinBox_DY->value(); @@ -1028,9 +1222,92 @@ EntityGUI_3DSketcherDlg::XYZ EntityGUI_3DSketcherDlg::getCurrentPoint() const Group3Spin->SpinBox_DY->text() + ":" + Group3Spin->SpinBox_DZ->text(); } + // Update point presentation type + xyz.A = myPrsType.A; // Number of angle diomensions + xyz.L = myPrsType.L; // Number of length dimensions + xyz.T = myPrsType.T; // Number of text objects + return xyz; } + +//================================================================================= +// function : getPresentationPlane() +// purpose : returns the suitable plane for right +// relative positioning of dimension presentations +//================================================================================= +gp_Dir EntityGUI_3DSketcherDlg::getPresentationPlane() const +{ + bool withAngle = (myCoordType == 1); + bool twoAngles = GroupAngles->checkBox->isChecked(); + + XYZ Last = getLastPoint(); + XYZ Current = getCurrentPoint(); + XYZ Penultimate = getPenultimatePoint(); + + gp_Pnt P1 = gp_Pnt(Last.x,Last.y,Last.z); + if (myMode == 0) // Absolute coordinates + P1 = gp::Origin(); + + gp_Pnt P2 = gp_Pnt(Current.x,Current.y,Current.z); + gp_Pnt P3 = gp_Pnt(Penultimate.x,Penultimate.y,Penultimate.z); + + gp_Vec Vec1(P1,P2); + gp_Vec Vec2(P1,P3); + + gp_Dir aNormal; // Normal defining the plane of the presentation + + if (withAngle) // If one angle + { + // Transformation from the current coordinate system + // to the reference coordinate system + gp_Trsf aTransform = toReferenceSystem (P1); + gp_Dir N1 = gp::DZ(); + gp_Dir N2 = gp::DY(); + N1.Transform(aTransform); + N2.Transform(aTransform); + + if (Vec1.CrossMagnitude(N1) > Precision::Confusion()) + { + // The plane is orthogonal to the angle presentation plane + // and contains the current edge + aNormal = N1.Crossed(gp_Dir(Vec1)); + } + else + aNormal = N2; + + if (twoAngles) + { + gp_Vec V = Vec1.Transformed(aTransform.Inverted()); + gp_Vec Vec3(V.X(),V.Y(),0.0); + + // Express the coordinates in the refernce coordinate system (OXY) + Vec3.Transform(aTransform); + if(Abs(Vec1.CrossMagnitude(Vec3)) > Precision::Confusion()) + { + // set the normal as the cross product of the current edge with its projection + // it ensures that the dimension changes side when the angle becomes negative + aNormal = gp_Dir(Vec1.Crossed(Vec3)); + } + } + } + else + { + // Check colinearity + if (Abs(Vec1.CrossMagnitude(Vec2)) < Precision::Confusion()) + { + Vec2 = gp_Vec(gp::DX()); + if (Abs(Vec1.CrossMagnitude(Vec2)) < Precision::Confusion()) + { + Vec2 = gp_Vec(gp::DY()); + } + } + // If no angles, the plane is the one formed by the last edge and the current one + aNormal = gp_Dir(Vec1.Crossed(Vec2)); + } + return aNormal; +} + //================================================================ // Function : displayPreview // Purpose : Method for displaying preview of resulting shape @@ -1084,22 +1361,12 @@ void EntityGUI_3DSketcherDlg::displayPreview (GEOM::GEOM_Object_ptr object, getDisplayer()->SetColor(line_color); - // Display local trihedron if the mode is relatives coordinates or angles - if (myMode == 1 || myMode == 2) + // Display local trihedron if the mode is relative + if (myMode == 1) displayTrihedron(2); // Display preview of suitable dimension presentations - if (myMode == 2) // ANGLES - { - double anAngle2 = 0.0; - if (GroupAngles->checkBox->isChecked()) - anAngle2 = GroupAngles->SpinBox_DA2->value(); - - displayAngle(GroupAngles->SpinBox_DA->value(), anAngle2, GroupAngles->SpinBox_DL->value(), myOrientation); - displayLength(GroupAngles->SpinBox_DL->value(), /*store=*/false, /*type=*/myPrsType); - } - if (myMode == 0 || myMode == 1) // COORDINATES - displayLength(); + displayDimensions(false); getDisplayer()->UnsetName(); @@ -1131,280 +1398,331 @@ void EntityGUI_3DSketcherDlg::displayTrihedron (int selMode) } //================================================================ -// Function : displayAngle() -// Purpose : Method for displaying angle dimensions +// Function : displayDimensions( bool store ) +// Purpose : Method for displaying dimensions. If store = true +// the presentation is stored in a list //================================================================ -void EntityGUI_3DSketcherDlg::displayAngle (double theAngle1, double theAngle2, - double theLength, int theOrientation, bool store) +void EntityGUI_3DSketcherDlg::displayDimensions (bool store) { - if (Abs(theAngle2 - 90.0) < Precision::Angular() || - theLength < Precision::Confusion()) - return; - - SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); - + myPrsType = prsType(); XYZ Last = getLastPoint(); XYZ Current = getCurrentPoint(); gp_Pnt Last_Pnt(Last.x,Last.y,Last.z); + + gp_Pnt P0 = Last_Pnt; + gp_Pnt Origin = gp::Origin(); + if (myMode == 0) // Absolute coordinates + P0 = Origin; + gp_Pnt Current_Pnt(Current.x,Current.y,Current.z); gp_Pnt P1, P2; - - bool twoAngles = GroupAngles->checkBox->isChecked(); - - switch(theOrientation) + + // Check if last end current point are coincident + if (Last_Pnt.IsEqual(Current_Pnt, 1e-7)) + return; + + gp_Dir aNormal = getPresentationPlane(); + + if (myCoordType == 0) { - case OXY: + bool oneDimensionalMove = (isSame(Last_Pnt.X(), Current_Pnt.X()) && + isSame(Last_Pnt.Y(), Current_Pnt.Y()) ) || + (isSame(Last_Pnt.Y(), Current_Pnt.Y()) && + isSame(Last_Pnt.Z(), Current_Pnt.Z()) ) || + (isSame(Last_Pnt.X(), Current_Pnt.X()) && + isSame(Last_Pnt.Z(), Current_Pnt.Z()) ); + + if (myMode == 0) { - P1 = gp_Pnt(Last.x + theLength,Last.y,Last.z); // X direction - P2 = gp_Pnt(Last.x + theLength * cos(theAngle1 * M_PI / 180.), - Last.y + theLength * sin(theAngle1 * M_PI / 180.), - Last.z); - break; + std::string aCoordText = "( " + doubleToString(Current_Pnt.X()) + + ", " + doubleToString(Current_Pnt.Y()) + + ", " + doubleToString(Current_Pnt.Z()) + " )"; + displayText(aCoordText, Current_Pnt, store); } - case OYZ: + else + { + if (oneDimensionalMove) + { + // For better colocation of dimensions if only one coordinate changes (aNormal is a better choice) + displayLength(P0, Current_Pnt, aNormal, store); + } + else + { + displayLength(gp_Pnt(P0.X(),Current.y,P0.Z()), gp_Pnt(Current.x,Current.y,P0.Z()), gp::DZ().Reversed(), store); + displayLength(gp_Pnt(Current.x,P0.Y(),P0.Z()), gp_Pnt(Current.x,Current.y,P0.Z()), gp::DZ(), store); + displayLength(gp_Pnt(Current.x,Current.y,P0.Z()), Current_Pnt, gp::DX(), store); + } + } + } + else if (myCoordType == 1) // ANGLES + { + bool spherical = GroupAngles->checkBox->isChecked(); + bool cylindrical = GroupAngles->checkBox_2->isChecked(); + + double anAngle1 = GroupAngles->SpinBox_DA->value(); + double aLength = GroupAngles->SpinBox_DL->value(); + + // Set the coordinates in the current coordinate system + P1.SetCoord( aLength, 0.0, 0.0); // X direction + P2.SetCoord( aLength * cos(anAngle1 * M_PI / 180. ), + aLength * sin(anAngle1 * M_PI / 180. ), + 0.0); + + // Express the coordinates in the refernce coordinate system (OXY) + gp_Trsf aTranform = toReferenceSystem(P0); + P1.Transform(aTranform); + P2.Transform(aTranform); + P1.Translate(Origin, P0); + P2.Translate(Origin, P0); + + if(myMode !=0 || !store) + displayAngle(anAngle1, P0, P1, P2, store); + else { - P1 = gp_Pnt(Last.x, Last.y + theLength,Last.z); // Y direction - P2 = gp_Pnt(Last.x, - Last.y + theLength * cos(theAngle1 * M_PI / 180.), - Last.z + theLength * sin(theAngle1 * M_PI / 180.)); - break; + std::string anAngleText = doubleToString(anAngle1) + " deg."; + displayText(anAngleText, Current_Pnt, store); } - case OXZ: + + if(spherical) { - P1 = gp_Pnt(Last.x + theLength,Last.y,Last.z); // X direction - P2 = gp_Pnt(Last.x + theLength * cos(theAngle1 * M_PI / 180.) , - Last.y, - Last.z + theLength * sin(theAngle1 * M_PI / 180.)); - break; + double anAngle2 = GroupAngles->SpinBox_DA2->value(); + displayAngle(anAngle2, P0, P2, Current_Pnt, store); + displayLength(P0, Current_Pnt, aNormal, store); + } + else + { + bool sameRadius = isSame ( radius(Last_Pnt), radius(Current_Pnt) ); + bool sameHeight = isSame ( height(Last_Pnt), height(Current_Pnt) ); + + gp_Vec aVec(P2, Current_Pnt); + + if (myMode == 0 && !sameRadius) + { + displayLength(P0.Translated(aVec), P2.Translated(aVec), aNormal, store); // Radius + } + else if (myMode == 1) + displayLength(P0, P2, aNormal, store); + + if ( cylindrical && + (myMode == 1 || !sameHeight) ) + displayLength(P2, Current_Pnt, aNormal.Reversed(), store); // Height } } +} - TopoDS_Vertex V1 = BRepBuilderAPI_MakeVertex(P1); - TopoDS_Vertex V2 = BRepBuilderAPI_MakeVertex(P2); - TopoDS_Vertex LastV = BRepBuilderAPI_MakeVertex(Last_Pnt); - TopoDS_Vertex CurV = BRepBuilderAPI_MakeVertex(Current_Pnt); - TopoDS_Edge anEdge1 = BRepBuilderAPI_MakeEdge(LastV, V1); - TopoDS_Edge anEdge2 = BRepBuilderAPI_MakeEdge(LastV, V2); - TopoDS_Edge anEdge3 = BRepBuilderAPI_MakeEdge(LastV, CurV); - - gce_MakePln gce_MP (Last_Pnt, P1, P2); - Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP.Value()); - - // Convert angles to string - std::string Angle1_str = doubleToString(theAngle1); - std::string Angle2_str = doubleToString(theAngle2); - - // Create interactive object - Handle(AIS_AngleDimension) anAngleIO = new AIS_AngleDimension - (anEdge1, anEdge2, aPlane, theAngle1 * M_PI / 180., - TCollection_ExtendedString(Angle1_str.c_str())); - anAngleIO->SetArrowSize((theAngle1 * M_PI / 180) * (theLength/20)); - - SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); - int w = resMgr->integerValue("Geometry", "measures_line_width", 1); - - Handle(Prs3d_AngleAspect) asp = new Prs3d_AngleAspect(); - asp->LineAspect()->SetWidth(w); - anAngleIO->Attributes()->SetAngleAspect(asp); - - SOCC_Prs* aSPrs = dynamic_cast - (((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); - +//================================================================ +// Function : displayAngle() +// Purpose : Method for displaying angle dimensions +//================================================================ +void EntityGUI_3DSketcherDlg::displayAngle (double theAngle, + gp_Pnt P0, + gp_Pnt P1, + gp_Pnt P2, + bool store) +{ + SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); + + // Creation of the AIS object + Handle(AIS_AngleDimension) anAngleIO = createAISAngleDimension(theAngle, + P0, + P1, + P2); + if (anAngleIO == NULL) + return; + if (store) { // Erase dimensions presentations ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myAnglePrs, true); myAnglePrs->PrependObject(anAngleIO); - + // Display modified presentation if (isAngleVisible) ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myAnglePrs); + + // Update dimension presentation angle count for later undo / redo + myPrsType.A += 1; } - else if (aSPrs) - { - aSPrs->AddObject(anAngleIO); - } - myPrsType = TYPE_ANGLE; // Overwrite type with ANGLE - - if (twoAngles) + else if ( isAngleVisible) { - gce_MakePln gce_MP2(Last_Pnt, P2, Current_Pnt); - Handle(Geom_Plane) aPlane2 = new Geom_Plane(gce_MP2.Value()); - - Handle(AIS_AngleDimension) anAngle2IO = - new AIS_AngleDimension(anEdge2, anEdge3, aPlane2, theAngle2 * M_PI / 180., - TCollection_ExtendedString(Angle2_str.c_str())); - anAngle2IO->SetArrowSize((theAngle2 * M_PI / 180) * (theLength/20)); - - anAngle2IO->Attributes()->SetAngleAspect(asp); - - if (store) - { - // Erase dimensions presentations - ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myAnglePrs, true); - myAnglePrs->PrependObject(anAngle2IO); - - // Display modified presentation - if (isAngleVisible) - ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myAnglePrs); - } - else if (aSPrs) + SOCC_Prs* aSPrs = dynamic_cast + (((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); + + if (aSPrs) { - aSPrs->AddObject(anAngle2IO); + aSPrs->AddObject(anAngleIO); + GEOMBase_Helper::displayPreview(aSPrs, true, true); } - - myPrsType = TYPE_TWO_ANGLES; // Overwrite type with TWO_ANGLES - } - - if (!store && isAngleVisible) - { - GEOMBase_Helper::displayPreview(aSPrs, true, true); } } + //================================================================ // Function : displayLength() -// Purpose : Method for displaying length dimensions +// Purpose : Method for displaying length dimensions for a segment +// creation step //================================================================ -void EntityGUI_3DSketcherDlg::displayLength (double theLength, bool store, int type) +void EntityGUI_3DSketcherDlg::displayLength (gp_Pnt P1, + gp_Pnt P2, + gp_Dir theNormal, + bool store) { SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); - - XYZ Last = getLastPoint(); - XYZ Current = getCurrentPoint(); - XYZ Penultimate = getPenultimatePoint(); - bool withAngle = (type == TYPE_ANGLE || type == TYPE_TWO_ANGLES); - bool twoAngles = (type == TYPE_TWO_ANGLES); + double aLength = P1.Distance(P2); - double aLength = 0.0; - - if (theLength < 0) // Calculate length if not given - { - aLength = sqrt((Last.x - Current.x)*(Last.x - Current.x) + - (Last.y - Current.y)*(Last.y - Current.y) + - (Last.z - Current.z)*(Last.z - Current.z)); - } - else - aLength = theLength; - - if (aLengthgetViewManager()->getViewModel()))->Erase(myLengthPrs, true); + myLengthPrs->PrependObject(anIO); - // Convert length to string - std::string aLength_str = doubleToString(aLength); - - // Define the suitable plane for right relative positioning of dimension presentations - - gp_Dir aNormal; // Normal defining the plane of the presentation - if (withAngle) // If one angle + // Display modified presentation + if (isLengthVisible) + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myLengthPrs); + + // Update dimension presentation length count for later undo / redo + myPrsType.L += 1; + } + else if (isLengthVisible) { - switch(myOrientation) + SOCC_Prs* aSPrs = dynamic_cast + (((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); + if (aSPrs) { - case OXY: - { - aNormal = gp::DZ().Crossed(gp_Dir(Vec1));//--> the plane is orthogonal to the angle presentation - // plane and contains the current edge - if (twoAngles) // If two angles - { - gp_XYZ Vec1_XY(Vec1.X(),Vec1.Y(),0.0);// --> define Vec3 as the projection of the current - Vec3 = gp_Vec(Vec1_XY); // edge on the plane chosen for the first angle - } - break; - } - case OYZ: - { - aNormal = gp::DX().Crossed(gp_Dir(Vec1)); - if (twoAngles) - { - gp_XYZ Vec1_YZ(0.0,Vec1.Y(),Vec1.Z()); - Vec3 = gp_Vec(Vec1_YZ); - } - break; - } - case OXZ: - { - aNormal = gp::DY().Crossed(gp_Dir(Vec1)); - if (twoAngles) - { - gp_XYZ Vec1_XZ(Vec1.X(),0.0,Vec1.Z()); - Vec3 = gp_Vec(Vec1_XZ); - } - break; - } + aSPrs->PrependObject(anIO); + GEOMBase_Helper::displayPreview(aSPrs, true, true); } - if(twoAngles // If two angles - && Abs(Vec1.CrossMagnitude(Vec3)) > Precision::Confusion()) - { - aNormal = gp_Dir(Vec1.Crossed(Vec3));// --> set the normal as the cross product of - } // the current edge with its projection - } // it ensures that the dimension changes + } +} + +//================================================================ +// Function : displayText() +// Purpose : Method for displaying length dimensions for a segment +// creation step +//================================================================ +void EntityGUI_3DSketcherDlg::displayText ( std::string theText, + gp_Pnt P, + bool store ) +{ +#if OCC_VERSION_LARGE > 0x06050300 + SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); + + Handle(AIS_Text) anIO = new AIS_Text(TCollection_ExtendedString(theText.c_str()), P); + + if (store) + { + // Erase length dimensions presentation + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myTextPrs, true); + myTextPrs->PrependObject(anIO); + + // Display modified presentation + ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myTextPrs); + + // Update dimension presentation text count for later undo / redo + myPrsType.T += 1; + } else { - // Check colinearity - if (Abs(Vec1.CrossMagnitude(Vec2)) < Precision::Confusion()) + SOCC_Prs* aSPrs = dynamic_cast + (((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); + if (aSPrs) { - Vec2 = gp_Vec(gp::DX()); - if (Abs(Vec1.CrossMagnitude(Vec2)) < Precision::Confusion()) - { - Vec2 = gp_Vec(gp::DY()); - } + aSPrs->PrependObject(anIO); + GEOMBase_Helper::displayPreview(aSPrs, true, true); } - aNormal = gp_Dir(Vec1.Crossed(Vec2)); // If no angles --> the plane is the one formed by - } // the last edge and the current one + } +#endif // OCC_VERSION_LARGE > 0x06050300 +} + +//================================================================ +// Function : createAISLengthDimension() +// Purpose : Method for creation of a length dimension object +// Returns an Handle on the AIS_LengthDimension obect +//================================================================ +Handle(AIS_LengthDimension) EntityGUI_3DSketcherDlg::createAISLengthDimension(double theLength, + gp_Pnt P1, + gp_Pnt P2, + gp_Dir theNormal) +{ + // Convert length to string + std::string aLength_str = doubleToString(theLength); // Plane construction - gce_MakePln gce_MP(P1, aNormal); + gce_MakePln gce_MP(P1, theNormal); Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP.Value()); + + TopoDS_Vertex aVert1 = BRepBuilderAPI_MakeVertex(P1); + TopoDS_Vertex aVert2 = BRepBuilderAPI_MakeVertex(P2); Handle(AIS_LengthDimension) anIO = new AIS_LengthDimension(aVert1, aVert2, aPlane, - aLength, + theLength, TCollection_ExtendedString(aLength_str.c_str())); - anIO->SetArrowSize(aLength/20); + anIO->SetArrowSize(theLength/20); SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); int w = resMgr->integerValue("Geometry", "measures_line_width", 1); Handle(Prs3d_LengthAspect) asp = new Prs3d_LengthAspect(); asp->LineAspect()->SetWidth(w); anIO->Attributes()->SetLengthAspect(asp); + + return anIO; +} - if (store) - { - // Erase length dimensions presentation - ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Erase(myLengthPrs, true); - myLengthPrs->PrependObject(anIO); +//================================================================ +// Function : createAISAngleDimension() +// Purpose : Method for creation of an angle dimension object +// Returns an Handle on the AIS_AngleDimension obect +//================================================================ +Handle(AIS_AngleDimension) EntityGUI_3DSketcherDlg::createAISAngleDimension(double theAngle, + gp_Pnt P0, + gp_Pnt P1, + gp_Pnt P2) +{ + // Length of the built segment + double aLength = P0.Distance(P1); + + // Check input data + if (Abs(theAngle) < Precision::Angular() || + aLength < Precision::Confusion()) + return NULL; + + // Convert angles to string + std::string Angle_str = doubleToString(theAngle); + + // Construction of the plane + gce_MakePln gce_MP2(P0, P1, P2); + Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP2.Value()); + + TopoDS_Vertex V0 = BRepBuilderAPI_MakeVertex(P0); + TopoDS_Vertex V1 = BRepBuilderAPI_MakeVertex(P1); + TopoDS_Vertex V2 = BRepBuilderAPI_MakeVertex(P2); + + TopoDS_Edge anEdge1 = BRepBuilderAPI_MakeEdge(V0, V1); + TopoDS_Edge anEdge2 = BRepBuilderAPI_MakeEdge(V0, V2); - // Display modified presentation - if (isLengthVisible) - ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->Display(myLengthPrs); - } - else if (isLengthVisible) - { - SOCC_Prs* aSPrs = dynamic_cast - (((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); - if (aSPrs) - { - aSPrs->PrependObject(anIO); - GEOMBase_Helper::displayPreview(aSPrs, true, true); - } - } + Handle(AIS_AngleDimension) anIO = + new AIS_AngleDimension(anEdge1, anEdge2, aPlane, theAngle * M_PI / 180., + TCollection_ExtendedString(Angle_str.c_str())); + + anIO->SetArrowSize((theAngle * M_PI / 180) * (aLength/20)); + + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + int w = resMgr->integerValue("Geometry", "measures_line_width", 1); + Handle(Prs3d_AngleAspect) asp = new Prs3d_AngleAspect(); + asp->LineAspect()->SetWidth(w); + anIO->Attributes()->SetAngleAspect(asp); - myPrsType = TYPE_LENGTH; + return anIO; } //================================================================ @@ -1496,3 +1814,69 @@ std::string EntityGUI_3DSketcherDlg::doubleToString (double num) return QString::number(num, format, digNum).toStdString(); } + +//================================================================ +// Function : toReferenceSystem () +// Purpose : +//================================================================ +gp_Trsf EntityGUI_3DSketcherDlg::toReferenceSystem(gp_Pnt origin) const +{ + gp_Trsf T; // Identity transformation + gp_Ax3 reference_system; // OXY + reference_system.SetLocation(origin); + + gp_Ax3 current_system = reference_system; + switch (myOrientation) + { + case OYZ: + { + current_system = gp_Ax3(origin, gp::DX(), gp::DY()); + break; + } + case OXZ: + { + current_system = gp_Ax3(origin, gp::DY().Reversed(), gp::DX()); + break; + } + } + + T.SetTransformation( current_system, reference_system ); + + return T; +} + +//================================================================ +// Function : toCurrentSystem () +// Purpose : +//================================================================ +gp_Trsf EntityGUI_3DSketcherDlg::toCurrentSystem(gp_Pnt origin) const +{ + return toReferenceSystem(origin).Inverted(); +} + +//================================================================ +// Function : radius (gp_Pnt) const +// Purpose : +//================================================================ +double EntityGUI_3DSketcherDlg::radius (gp_Pnt thePnt) const +{ + // Get the point coordinates in the current coordinates system + gp_Trsf aTrsf = toCurrentSystem(gp::Origin()); + gp_Pnt aPnt = thePnt.Transformed(aTrsf); + + double radius = sqrt(aPnt.X()*aPnt.X() + aPnt.Y()*aPnt.Y()); + return radius; +} + +//================================================================ +// Function : height (gp_Pnt) const +// Purpose : +//================================================================ +double EntityGUI_3DSketcherDlg::height (gp_Pnt thePnt) const +{ + // Get the point coordinates in the current coordinates system + gp_Trsf aTrsf = toCurrentSystem(gp::Origin()); + gp_Pnt aPnt = thePnt.Transformed(aTrsf); + + return aPnt.Z(); +} diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.h b/src/EntityGUI/EntityGUI_3DSketcherDlg.h index 8888cf065..a4b4d98af 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.h +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.h @@ -28,12 +28,15 @@ class QButtonGroup; class QDoubleSpinBox; class EntityGUI_3Spin; +class EntityGUI_Type; class EntityGUI_Angles; class EntityGUI_Controls; -class DlgRef_3Radio; class SOCC_Prs; +class gp_Dir; #include +#include +#include #ifndef COORD_MIN # define COORD_MIN -1e+15 @@ -42,6 +45,9 @@ class SOCC_Prs; # define DBL_DIGITS_DISPLAY 16 #endif // COORD_MIN +// For convenience +bool isSame (double d1, double d2); + //================================================================================= // class : EntityGUI_Dlg // purpose : @@ -52,11 +58,21 @@ class EntityGUI_3DSketcherDlg : public GEOMBase_Skeleton struct XYZ { - XYZ() { x = y = z = 0.0; command = params = ""; } + XYZ() { x = y = z = 0.0; command = params = ""; L=A=T=0; } double x, y, z; // for preview only + int L, A, T; // for preview only QString command; QString params; }; + + struct prsType + { + prsType(){L=A=T=0;} + int L; + int A; + int T; + }; + typedef QList XYZList; public: @@ -82,10 +98,34 @@ private: const int = -1, const int = -1); + Handle(AIS_LengthDimension) createAISLengthDimension(double theLength, + gp_Pnt P1, + gp_Pnt P2, + gp_Dir theNormal); + + Handle(AIS_AngleDimension) createAISAngleDimension(double theAngle, + gp_Pnt P0, + gp_Pnt P1, + gp_Pnt P2); + + void displayAngle(double theAngle, + gp_Pnt P0, + gp_Pnt P1, + gp_Pnt P2, + bool store = false); + + void displayLength(gp_Pnt P1, + gp_Pnt P2, + gp_Dir theNormal, + bool store = false); + + void displayText(std::string theText, + gp_Pnt P, + bool store = false); + void displayTrihedron( int ); - void displayAngle( double, double, double, int, bool store = false ); - void displayLength( double theLength = -1.0, bool store = false, int type = 1); + void displayDimensions(bool store = false); bool createShapes( GEOM::GEOM_Object_ptr, TopoDS_Shape&, @@ -95,27 +135,38 @@ private: XYZ getPenultimatePoint() const; XYZ getCurrentPoint() const; + gp_Dir getPresentationPlane() const; + std::string doubleToString( double ); - void removeLastIOFromPrs( int ); - void restoreLastIOToPrs( int ); + gp_Trsf toReferenceSystem(gp_Pnt origin) const; + gp_Trsf toCurrentSystem(gp_Pnt origin) const; + + void removeLastIOFromPrs(); + void restoreLastIOToPrs(); + + double radius(gp_Pnt) const; + double height(gp_Pnt) const; + double longitude(gp_Pnt) const; + double latitude(gp_Pnt) const; private: XYZList myPointsList; XYZList myRedoList; AIS_ListOfInteractive myLengthIORedoList; AIS_ListOfInteractive myAngleIORedoList; - int myPrsType; - std::list myPrsTypeList; - std::list myPrsTypeRedoList; + AIS_ListOfInteractive myTextIORedoList; + prsType myPrsType; EntityGUI_3Spin* Group3Spin; EntityGUI_Angles* GroupAngles; EntityGUI_Controls* GroupControls; - DlgRef_3Radio* GroupType; - QButtonGroup* myTypeGroup; + EntityGUI_Type* GroupType; + QButtonGroup* myTypeGroup1; + QButtonGroup* myTypeGroup2; int myMode; + int myCoordType; int myOrientation; bool myOK; bool isLengthVisible; @@ -125,6 +176,7 @@ private: GeometryGUI* myGeometryGUI; SOCC_Prs* myAnglePrs; SOCC_Prs* myLengthPrs; + SOCC_Prs* myTextPrs; private slots: void ClickOnOk(); diff --git a/src/EntityGUI/EntityGUI_Angles_QTD.ui b/src/EntityGUI/EntityGUI_Angles_QTD.ui index 41199563b..a5c4aa5fb 100644 --- a/src/EntityGUI/EntityGUI_Angles_QTD.ui +++ b/src/EntityGUI/EntityGUI_Angles_QTD.ui @@ -6,8 +6,8 @@ 0 0 - 351 - 148 + 488 + 172 @@ -27,7 +27,7 @@ - + 0 @@ -42,10 +42,10 @@ - + - + Create @@ -53,7 +53,7 @@ - + 0 @@ -68,10 +68,10 @@ - + - + 0 @@ -95,7 +95,27 @@ - + + + + CheckBox + + + + + + + + + + CheckBox + + + + + + + @@ -120,16 +140,6 @@ - - - - CheckBox - - - - - - diff --git a/src/EntityGUI/EntityGUI_Controls_QTD.ui b/src/EntityGUI/EntityGUI_Controls_QTD.ui index b58621ea5..7d8c71b74 100644 --- a/src/EntityGUI/EntityGUI_Controls_QTD.ui +++ b/src/EntityGUI/EntityGUI_Controls_QTD.ui @@ -45,7 +45,7 @@ - + @@ -56,13 +56,6 @@ - - - - Start: - - - @@ -93,13 +86,6 @@ - - - - End: - - - @@ -130,6 +116,20 @@ + + + + Start : + + + + + + + End : + + + diff --git a/src/EntityGUI/EntityGUI_Type_QTD.ui b/src/EntityGUI/EntityGUI_Type_QTD.ui new file mode 100644 index 000000000..987571944 --- /dev/null +++ b/src/EntityGUI/EntityGUI_Type_QTD.ui @@ -0,0 +1,87 @@ + + + EntityGUI_Type_QTD + + + + 0 + 0 + 271 + 92 + + + + + + + + 0 + + + + + GroupBox + + + + + + RadioButton3 + + + false + + + + + + + RadioButton4 + + + false + + + + + + + + + + GroupBox + + + + + + RadioButton1 + + + false + + + + + + + RadioButton2 + + + false + + + + + + + + + + qPixmapFromMimeSource + + RadioButton3 + + + + diff --git a/src/EntityGUI/EntityGUI_Widgets.cxx b/src/EntityGUI/EntityGUI_Widgets.cxx index ddaa42e3d..0c59c7345 100644 --- a/src/EntityGUI/EntityGUI_Widgets.cxx +++ b/src/EntityGUI/EntityGUI_Widgets.cxx @@ -210,6 +210,20 @@ EntityGUI_Point::~EntityGUI_Point() { } +////////////////////////////////////////// +// EntityGUI_Type +////////////////////////////////////////// + +EntityGUI_Type::EntityGUI_Type( QWidget* parent, Qt::WindowFlags f ) +: QWidget( parent, f ) +{ + setupUi( this ); +} + +EntityGUI_Type::~EntityGUI_Type() +{ +} + ////////////////////////////////////////// // EntityGUI_Angles ////////////////////////////////////////// diff --git a/src/EntityGUI/EntityGUI_Widgets.h b/src/EntityGUI/EntityGUI_Widgets.h index 7e8f14e47..2668b91a8 100644 --- a/src/EntityGUI/EntityGUI_Widgets.h +++ b/src/EntityGUI/EntityGUI_Widgets.h @@ -222,6 +222,22 @@ public: QButtonGroup* ButtonGroup; }; +////////////////////////////////////////// +// EntityGUI_Type +////////////////////////////////////////// + +#include "ui_EntityGUI_Type_QTD.h" + +class EntityGUI_Type : public QWidget, + public Ui::EntityGUI_Type_QTD +{ + Q_OBJECT + +public: + EntityGUI_Type( QWidget* = 0, Qt::WindowFlags = 0 ); + ~EntityGUI_Type(); +}; + ////////////////////////////////////////// // EntityGUI_Angles ////////////////////////////////////////// diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am index aece4f4a5..e6082ead5 100644 --- a/src/EntityGUI/Makefile.am +++ b/src/EntityGUI/Makefile.am @@ -85,6 +85,7 @@ UIC_FILES = \ ui_EntityGUI_Dir2_QTD.h \ ui_EntityGUI_Point_QTD.h \ ui_EntityGUI_Skeleton_QTD.h \ + ui_EntityGUI_Type_QTD.h \ ui_EntityGUI_Angles_QTD.h \ ui_EntityGUI_Controls_QTD.h diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 32d3e97c2..501909d7a 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -1101,10 +1101,19 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction, else if (aCMDpref == "WW") { aNewDescr += "sk.close()"; } - else { - aNewDescr += "sk.addPointAnglesLength(\""; - aNewDescr += aCMDpref + "\", " + - aStrVals.Value(2) + ", " + aStrVals.Value(3) + ", " + aStrVals.Value(4) + ")"; + else if (aCMDpref.Value(1) == 'O'){ + TCollection_AsciiString aCMDtrunc = aStrVals.Value(1); + aCMDtrunc.Trunc(3); + if (aCMDpref.Value(4) == 'C') + aNewDescr += "sk.addPointRadiusAngleH"; + else + aNewDescr += "sk.addPointRadiusAngles"; + if (aCMDpref.Value(5) == 'A') + aNewDescr += "Absolute("; + else + aNewDescr += "Relative("; + aNewDescr += aStrVals.Value(4) + ", " + + aStrVals.Value(2) + ", " + aStrVals.Value(3) + ", " + "\""+aCMDtrunc+"\"" + ")"; } } aNewDescr += "\n\t"; diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx index 9e2db755a..2abc08316 100644 --- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx +++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx @@ -40,6 +40,8 @@ #include #include #include +#include +#include //======================================================================= @@ -88,6 +90,16 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& aFace, if(Vmax > PI2 - Precision::PConfusion() || Vmin < -PI2+::Precision::PConfusion()) { Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(S); gp_Sphere sp = aSphere->Sphere(); + //modified by jgv, 12.11.2012 for issue 21777// + Standard_Real Radius = sp.Radius(); + Standard_Real HalfArea = 2.*M_PI*Radius*Radius; + GProp_GProps Properties; + BRepGProp::SurfaceProperties(aFace, Properties); + Standard_Real anArea = Properties.Mass(); + Standard_Real AreaTol = Radius*Radius*1.e-6; + if (anArea > HalfArea - AreaTol) //no chance to avoid singularity + return Standard_False; + /////////////////////////////////////////////// gp_Ax3 ax3 = sp.Position(); if(Abs(Vmax-Vmin) < PI2) { gp_Ax3 axnew3(ax3.Axis().Location(), ax3.Direction()^ax3.XDirection(),ax3.XDirection()); diff --git a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx index 09809f8cd..0272529f9 100755 --- a/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Builder_2.cxx @@ -101,11 +101,10 @@ static const Standard_Integer , NMTTools_IndexedDataMapOfIndexedMapOfInteger& ); -//modified by NIZNHY-PKV Thu Feb 16 12:24:52 2012f static Standard_Boolean IsClosed(const TopoDS_Edge& , - const TopoDS_Face& ); -//modified by NIZNHY-PKV Thu Feb 16 12:24:56 2012t + const TopoDS_Face&, + Standard_Boolean& ); //======================================================================= //function : FillImagesFaces @@ -216,6 +215,7 @@ void GEOMAlgo_Builder::BuildSplitFaces() const Handle(IntTools_Context)& aCtx= pPF->Context(); // Standard_Boolean bToReverse, bIsClosed, bIsDegenerated; + Standard_Boolean bFlagClosed; Standard_Integer i, aNb, aNbF, nF; TopTools_MapOfShape aMFence; TColStd_IndexedMapOfInteger aMFP; @@ -312,10 +312,7 @@ void GEOMAlgo_Builder::BuildSplitFaces() } // bIsDegenerated=BRep_Tool::Degenerated(aE); - //modified by NIZNHY-PKV Wed Mar 07 07:46:09 2012f - bIsClosed=IsClosed(aE, aF); - //bIsClosed=BRep_Tool::IsClosed(aE, aF); - //modified by NIZNHY-PKV Wed Mar 07 07:46:13 2012t + bIsClosed=IsClosed(aE, aF, bFlagClosed); // const TopTools_ListOfShape& aLIE=myImages.Image(aE); aIt.Initialize(aLIE); @@ -349,7 +346,16 @@ void GEOMAlgo_Builder::BuildSplitFaces() aWES.AddStartElement(aSp); } continue; - }// if (aMFence.Add(aSp)) + }// if (bIsClosed){ + // + //modified by NIZNHY-PKV Wed Nov 28 13:50:34 2012f + if (!bIsClosed && bFlagClosed) { + if (!BRep_Tool::IsClosed(aSp, aF)){ + BOPTools_Tools3D::DoSplitSEAMOnFace(aSp, aF); + } + } + //modified by NIZNHY-PKV Wed Nov 28 13:50:36 2012t + // // aSp.Orientation(anOriE); bToReverse=BOPTools_Tools3D::IsSplitToReverse1(aSp, aE, aCtx); @@ -942,11 +948,13 @@ void UpdateCandidates(const Standard_Integer theNF, //purpose : //======================================================================= Standard_Boolean IsClosed(const TopoDS_Edge& aE, - const TopoDS_Face& aF) + const TopoDS_Face& aF, + Standard_Boolean& bFlag) { Standard_Boolean bRet; // bRet=BRep_Tool::IsClosed(aE, aF); + bFlag=bRet; if (bRet) { Standard_Integer iCnt; TopoDS_Shape aE1; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index 020703409..5f3641cf3 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -78,12 +78,25 @@ #include #include #include +// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include //======================================================================= //function : GEOMAlgo_FinderShapeOn1 //purpose : //======================================================================= - GEOMAlgo_FinderShapeOn2::GEOMAlgo_FinderShapeOn2() +GEOMAlgo_FinderShapeOn2::GEOMAlgo_FinderShapeOn2() : GEOMAlgo_ShapeAlgo() { @@ -97,14 +110,14 @@ //function : ~ //purpose : //======================================================================= - GEOMAlgo_FinderShapeOn2::~GEOMAlgo_FinderShapeOn2() +GEOMAlgo_FinderShapeOn2::~GEOMAlgo_FinderShapeOn2() { } //======================================================================= //function : SetClsf //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) +void GEOMAlgo_FinderShapeOn2::SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) { myClsf=aClsf; } @@ -112,7 +125,7 @@ //function : Clsf //purpose : //======================================================================= - const Handle(GEOMAlgo_Clsf)& GEOMAlgo_FinderShapeOn2::Clsf() const +const Handle(GEOMAlgo_Clsf)& GEOMAlgo_FinderShapeOn2::Clsf() const { return myClsf; } @@ -120,7 +133,7 @@ //function : SetShapeType //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::SetShapeType(const TopAbs_ShapeEnum aType) +void GEOMAlgo_FinderShapeOn2::SetShapeType(const TopAbs_ShapeEnum aType) { myShapeType=aType; } @@ -128,7 +141,7 @@ //function : ShapeType //purpose : //======================================================================= - TopAbs_ShapeEnum GEOMAlgo_FinderShapeOn2::ShapeType()const +TopAbs_ShapeEnum GEOMAlgo_FinderShapeOn2::ShapeType()const { return myShapeType; } @@ -136,7 +149,7 @@ //function : SetState //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::SetState(const GEOMAlgo_State aState) +void GEOMAlgo_FinderShapeOn2::SetState(const GEOMAlgo_State aState) { myState=aState; } @@ -144,7 +157,7 @@ //function : State //purpose : //======================================================================= - GEOMAlgo_State GEOMAlgo_FinderShapeOn2::State() const +GEOMAlgo_State GEOMAlgo_FinderShapeOn2::State() const { return myState; } @@ -152,7 +165,7 @@ //function : SetNbPntsMin //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::SetNbPntsMin(const Standard_Integer aNb) +void GEOMAlgo_FinderShapeOn2::SetNbPntsMin(const Standard_Integer aNb) { myNbPntsMin=aNb; } @@ -160,7 +173,7 @@ //function : NbPntsMin //purpose : //======================================================================= - Standard_Integer GEOMAlgo_FinderShapeOn2::NbPntsMin()const +Standard_Integer GEOMAlgo_FinderShapeOn2::NbPntsMin()const { return myNbPntsMin; } @@ -168,7 +181,7 @@ //function : SetNbPntsMax //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::SetNbPntsMax(const Standard_Integer aNb) +void GEOMAlgo_FinderShapeOn2::SetNbPntsMax(const Standard_Integer aNb) { myNbPntsMax=aNb; } @@ -176,7 +189,7 @@ //function : NbPntsMax //purpose : //======================================================================= - Standard_Integer GEOMAlgo_FinderShapeOn2::NbPntsMax()const +Standard_Integer GEOMAlgo_FinderShapeOn2::NbPntsMax()const { return myNbPntsMax; } @@ -192,7 +205,7 @@ // function: Shapes // purpose: //======================================================================= - const TopTools_ListOfShape& GEOMAlgo_FinderShapeOn2::Shapes() const +const TopTools_ListOfShape& GEOMAlgo_FinderShapeOn2::Shapes() const { Standard_Integer i, aNb; TopTools_ListOfShape* pL; @@ -213,7 +226,7 @@ //function : Perform //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::Perform() +void GEOMAlgo_FinderShapeOn2::Perform() { myErrorStatus=0; myWarningStatus=0; @@ -265,7 +278,7 @@ //function : CheckData //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::CheckData() +void GEOMAlgo_FinderShapeOn2::CheckData() { Standard_Integer iErr; // @@ -306,7 +319,7 @@ //function : ProcessVertices //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::ProcessVertices() +void GEOMAlgo_FinderShapeOn2::ProcessVertices() { myErrorStatus=0; // @@ -347,7 +360,7 @@ //function : ProcessEdges //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::ProcessEdges() +void GEOMAlgo_FinderShapeOn2::ProcessEdges() { myErrorStatus=0; // @@ -450,7 +463,7 @@ //function : ProcessFaces //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::ProcessFaces() +void GEOMAlgo_FinderShapeOn2::ProcessFaces() { myErrorStatus=0; // @@ -545,7 +558,7 @@ //function : ProcessSolids //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::ProcessSolids() +void GEOMAlgo_FinderShapeOn2::ProcessSolids() { myErrorStatus=0; // @@ -592,11 +605,9 @@ //function : InnerPoints //purpose : //======================================================================= - void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF, +void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF, GEOMAlgo_ListOfPnt& aLP) { - myErrorStatus=0; - // Standard_Integer j, j1, j2, k, n[4], aNbLinks, aNx, aNb, iCnt;//, aNbMax, *pIds; TopLoc_Location aLoc; Handle(Poly_Triangulation) aTRF; @@ -604,6 +615,8 @@ GEOMAlgo_DataMapOfPassKeyInteger aMPKI; GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger aIt; gp_Pnt aP, aP1, aP2; + // + myErrorStatus=0; // aLP.Clear(); // @@ -648,20 +661,11 @@ iCnt=aIt.Value(); if (iCnt==1) { const GEOMAlgo_PassKey& aPK=aIt.Key(); - //qf - /* - aNbMax=aPK.NbMax(); - pIds=(Standard_Integer*)aPK.Key(); - for (k=1; k<3; ++k) { - aNx=*(pIds+aNbMax-k); - aMBN.Add(aNx); - } - */ aNx=(Standard_Integer)aPK.Id(1); aMBN.Add(aNx); aNx=(Standard_Integer)aPK.Id(2); aMBN.Add(aNx); - //qt + } } // @@ -677,74 +681,76 @@ // aNb=aLP.Extent(); // - if (!aNb && myNbPntsMin) { - // try to fill it yourself - Standard_Boolean bIsDone; - Standard_Integer aN1, aN2; + //modified by NIZNHY-PKV Mon Sep 24 08:42:32 2012f + if (!aNb && myNbPntsMin) { // A + Standard_Boolean bIsDone, bHasFirstPoint, bHasSecondPoint; + Standard_Integer i, aNb, aIx, iErr, aNbDomains; + Standard_Real aUMin, aUMax, aVMin, aVMax, dU, aUx, aVx, aV1, aV2; + gp_Pnt aPx; + gp_Dir2d aD2D (0., 1.); + gp_Pnt2d aP2D; + Handle(Geom2d_Line) aL2D; Handle(Geom_Surface) aS; - GeomAdaptor_Surface aGAS; - GeomAbs_SurfaceType aType; + TopoDS_Face aFF; // - aS=BRep_Tool::Surface(aF); - aGAS.Load(aS); - aType=aGAS.GetType(); - if (aType==GeomAbs_Plane || aType==GeomAbs_Cylinder) { - // inner links - aNbLinks=aMPKI.Extent(); - aIt.Initialize(aMPKI); - for (; aIt.More(); aIt.Next()) { - iCnt=aIt.Value(); - if (iCnt>1) { - // take the first having occured inner link - // and discretize it - const GEOMAlgo_PassKey& aPK=aIt.Key(); - //qf - /* - aNbMax=aPK.NbMax(); - pIds=(Standard_Integer*)aPK.Key(); - aN1=*(pIds+aNbMax-1); - aN2=*(pIds+aNbMax-2); - */ - // - aN1=(Standard_Integer)aPK.Id(1); - aN2=(Standard_Integer)aPK.Id(2); - //qt - aP1=aNodes(aN1).Transformed(aTrsf); - aP2=aNodes(aN2).Transformed(aTrsf); - // - if (aType==GeomAbs_Cylinder) { - Standard_Real aTolSM; - gp_Cylinder aCyl; - // - aTolSM=1.523e-6;//~1.-cos(0.1 deg) - aCyl=aGAS.Cylinder(); - if (!GEOMAlgo_SurfaceTools::IsCoaxial(aP1, aP2, aCyl, aTolSM)) { - continue; - } - } - // - BRepLib_MakeEdge aBME(aP1, aP2); - bIsDone=aBME.IsDone(); - if (!bIsDone) { - myErrorStatus=30; //can not obtain the line fron the link - return; - } - // - const TopoDS_Shape& aSx=aBME.Shape(); - const TopoDS_Edge& aE=TopoDS::Edge(aSx); - // - InnerPoints(aE, myNbPntsMin, aLP); - break; - }// if (iCnt>1) - }// for (; aIt.More(); aIt.Next()) - }// if (aType==GeomAbs_Plane || aType==GeomAbs_Cylinder) + aFF=aF; + aFF.Orientation (TopAbs_FORWARD); + // + Geom2dHatch_Hatcher& aHatcher=myContext->Hatcher(aFF); + // + aS=BRep_Tool::Surface(aFF); + BRepTools::UVBounds(aFF, aUMin, aUMax, aVMin, aVMax); + // + aNb=myNbPntsMin+1; + dU=(aUMax-aUMin)/aNb; + for (i=1; iD0(aUx, aVx, aPx); + aLP.Append(aPx); + break; + } + }// for (i=1; i1) { + // take the first having occured inner link + // and discretize it + const GEOMAlgo_PassKey& aPK=aIt.Key(); + // + aN1=(Standard_Integer)aPK.Id(1); + aN2=(Standard_Integer)aPK.Id(2); + // + aP1=aNodes(aN1).Transformed(aTrsf); + aP2=aNodes(aN2).Transformed(aTrsf); + // + if (aType==GeomAbs_Cylinder) { + Standard_Real aTolSM; + gp_Cylinder aCyl; + // + aTolSM=1.523e-6;//~1.-cos(0.1 deg) + aCyl=aGAS.Cylinder(); + if (!GEOMAlgo_SurfaceTools::IsCoaxial(aP1, aP2, aCyl, aTolSM)) { + continue; + } + } + // + BRepLib_MakeEdge aBME(aP1, aP2); + bIsDone=aBME.IsDone(); + if (!bIsDone) { + myErrorStatus=30; //can not obtain the line fron the link + return; + } + // + const TopoDS_Shape& aSx=aBME.Shape(); + const TopoDS_Edge& aE=TopoDS::Edge(aSx); + // + InnerPoints(aE, myNbPntsMin, aLP); + break; + }// if (iCnt>1) + }// for (; aIt.More(); aIt.Next()) + }// if (aType==GeomAbs_Plane || aType==GeomAbs_Cylinder) + }// if (!aNb && myNbPntsMin) { +*/ diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx index 2c4d0afea..c8b331334 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx @@ -110,7 +110,7 @@ TopAbs_State GEOMAlgo_FinderShapeOnQuad::GetPointState(const gp_Pnt& aP) // In the case of concave quadrangle, return IN if // aP is OUT of only one concave side double nbIn = 0.; - for ( int i = 0; i < myPlanes.size(); ++i ) + for ( size_t i = 0; i < myPlanes.size(); ++i ) { TopAbs_State aSt; GEOMAlgo_SurfaceTools::GetState(aP, myPlanes[i], myTolerance, aSt); diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx index 3cc870da4..f409c17fc 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_3.cxx @@ -125,7 +125,7 @@ const NMTTools_CoupleOfShape& GEOMAlgo_GetInPlaceIterator::Value()const Standard_Integer TypeToInteger(const TopAbs_ShapeEnum aType1, const TopAbs_ShapeEnum aType2) { - Standard_Integer iRet, iT1, iT2, iX; + Standard_Integer iRet; // iRet=-1; // diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index fb8d5dfdc..14a7ed5d5 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -511,8 +511,7 @@ void GEOMAlgo_GlueDetector::CheckDetected const TopTools_IndexedDataMapOfShapeListOfShape& aMVE, const TopTools_IndexedDataMapOfShapeListOfShape& aMEV) { - Standard_Integer i, aNbVSD, aNbA, iRet; - TopAbs_ShapeEnum aTypeS, aTypeA[2]; + Standard_Integer aNbVSD, iRet; TopExp_Explorer aExp, aExpA; TopTools_MapOfShape aMFence, aMVSD; TopTools_ListOfShape aLV; diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx index 400613da7..bcc94c5fd 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_1.cxx @@ -100,7 +100,6 @@ void GEOMAlgo_Gluer2::MakeFace(const TopoDS_Face& theF, Standard_Boolean bIsToReverse, bIsUPeriodic; Standard_Integer iRet; Standard_Real aTol, aUMin, aUMax, aVMin, aVMax; - TopAbs_Orientation aOrE; Handle(Geom_Surface) aS; TopLoc_Location aLoc; TopoDS_Shape aW, aWr; diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 7edbae5b2..1718d7d0b 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -116,10 +116,10 @@ // If the next macro is defined, autocolor feature works for all sub-shapes; // if it is undefined, autocolor feature works for groups only -//#define GENERAL_AUTOCOLOR +#define GENERAL_AUTOCOLOR // Below macro, when uncommented, switches on simplified (more performant) algorithm // of auto-color picking up -//#define SIMPLE_AUTOCOLOR +#define SIMPLE_AUTOCOLOR //================================================================ // Function : getActiveStudy @@ -1835,19 +1835,15 @@ SALOMEDS::Color GEOM_Displayer::getPredefinedUniqueColor() static QList colors; if ( colors.isEmpty() ) { - const int rfactor = 4; // red color component split factor, must be > 0 - const int gfactor = 4; // green color component split factor, must be > 0 - const int bfactor = 3; // blue color component split factor, must be > 0 - // - - // total number of pre-defined colors is defined as - // nbcolors = rfactor * gfactor * bfactor - // NB: all three factors should not have same values - // otherwise all colors will be greyish - - for ( int g = 0; g < gfactor; g++ ) { - for ( int r = 0; r < rfactor; r++ ) { - for ( int b = 0; b < bfactor; b++ ) - colors.append( QColor( qRgb( r * 255 / (rfactor-1), g * 255 / (gfactor-1), b * 255 / (bfactor-1) ) ) ); + + for (int s = 0; s < 2 ; s++) + { + for (int v = 100; v >= 40; v = v - 20) + { + for (int h = 0; h < 359 ; h = h + 60) + { + colors.append(QColor::fromHsv(h, 255 - s * 127, v * 255 / 100)); + } } } } diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts index 96b164f7b..9cd7e615e 100644 --- a/src/GEOMGUI/GEOM_images.ts +++ b/src/GEOMGUI/GEOM_images.ts @@ -363,6 +363,10 @@ ICON_DLG_PARTITION_PLANE partitionplane.png + + ICON_DLG_PIPE_PATH + pipe.png + ICON_DLG_PIPE pipe.png @@ -995,6 +999,10 @@ ICO_PIPE pipe.png + + ICO_PIPE_PATH + pipe.png + ICO_PLANE plane.png diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index d0ec111bb..ed57921e0 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -113,6 +113,14 @@ Please, select face, shell or solid and try again GEOM_ANGLE Angle : + + GEOM_ANGLES + Angles + + + GEOM_ANGLE_2 + Angle 2 : + GEOM_ANGLE_1 Angle @@ -1078,6 +1086,10 @@ Please, select face, shell or solid and try again GEOM_MIRROR_TITLE Mirror An Object + + GEOM_MODE + Mode + GEOM_MULTIROTATION Multi-Rotation @@ -1266,6 +1278,26 @@ Please, select face, shell or solid and try again GEOM_PIPE_TITLE Pipe Construction + + GEOM_PIPE_PATH + Path + + + GEOM_PIPE_PATH_TITLE + Restore Path + + + GEOM_PIPE_LIKE_SHAPE + Pipe-like shell or solid + + + GEOM_PIPE_BASE1_OBJECT + First base face/wire/edges + + + GEOM_PIPE_BASE2_OBJECT + Last base face/wire/edges + GEOM_PROFILE Profile @@ -1638,6 +1670,18 @@ Please, select face, shell or solid and try again GEOM_SHELL_TITLE Shell Construction + + GEOM_SHOW_LENGTH + Show length dimensions + + + GEOM_SHOW_ANGLE + Show angle dimensions + + + GEOM_SHOW_POINTS_COORD + Show start/end point coordinates + GEOM_SKETCH Sketch @@ -1848,7 +1892,7 @@ Please, select face, shell or solid and try again GEOM_CONTROLS - Dimensions + Controls GEOM_SOLID @@ -1886,6 +1930,14 @@ Please, select face, shell or solid and try again GEOM_SQUARE Square + + GEOM_START + Start : + + + GEOM_END + End : + GEOM_START_LCS Start LCS @@ -2682,6 +2734,10 @@ Please, select face, shell or solid and try again MEN_PIPE Extrusion Along Path + + MEN_PIPE_PATH + Restore Path + MEN_PLANE Plane @@ -3462,6 +3518,10 @@ Please, select face, shell or solid and try again STB_PIPE Create a shape by extrusion along a path + + STB_PIPE_PATH + Restore path from a pipe-like shape + STB_PLANE Create a plane @@ -3746,6 +3806,10 @@ Please, select face, shell or solid and try again TOOL_BASIC Basic + + TOOL_BLOCKS + Blocks + TOOL_BOOLEAN Boolean operations @@ -4082,6 +4146,10 @@ Please, select face, shell or solid and try again TOP_PIPE Extrusion along path + + TOP_PIPE_PATH + Restore path + TOP_PLANE Create a plane @@ -4687,8 +4755,9 @@ shells and solids on the other hand. GEOM_SCALE_DIMENSIONS - Would you like to take into account the units? -Otherwise the dimensions will be kept without modifications. + Take into account the units (%1) embedded to the file? +Ignoring units will cause model scaling (as dimensions are supposed to +be specified in meters). GEOM_ADVANCED diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 75db6a8ae..81d5072c6 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -7,6 +7,10 @@ BRep_API: command not done Erreur: impossible de construire l'objet + + PAL_NOT_DONE_ERROR + Opération annulée + CHANGE_ORIENTATION_NEW_OBJ_NAME Inverser @@ -109,6 +113,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_ANGLE Angle : + + GEOM_ANGLES + Angles + + + GEOM_ANGLE_2 + Angle 2 : + GEOM_ANGLE_1 Angle @@ -357,6 +369,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES Sous-objets incriminés + + GEOM_GETNONBLOCKS_TITLE + Récupérer les solides non-hexahédres et les faces non-quadrangles + + + GEOM_GETNONBLOCKS + Récupérer les solides non blocs + + + GEOM_NONBLOCKS + GroupeSolidesNonBlocs + GEOM_CHECK_INFOS Objet et son information topologique @@ -710,6 +734,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_FILLET_1D Congé 1D + + GEOM_FILLET_1D_IGNORE_SECANT + Fusionner les arêtes collinéaires pour permettre des rayons plus grands + GEOM_FILLET_ABORT Il n'est pas possible de calculer un congé avec le rayon %1 @@ -836,7 +864,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_HEIGHT - Hauteur: + Hauteur : GEOM_HEXAGON @@ -1058,6 +1086,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_MIRROR_TITLE Refléter un objet + + GEOM_MODE + Mode + GEOM_MULTIROTATION Multi-rotation @@ -1246,6 +1278,26 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_PIPE_TITLE Construction d'un tuyau + + GEOM_PIPE_PATH + Chemin + + + GEOM_PIPE_PATH_TITLE + Récupérer le chemin + + + GEOM_PIPE_LIKE_SHAPE + Coque ou solide de type tuyau + + + GEOM_PIPE_BASE1_OBJECT + Premier(ère) face/contour/arête de base + + + GEOM_PIPE_BASE2_OBJECT + Dernier(ère) face/contour/arête de base + GEOM_PROFILE Profile @@ -1618,6 +1670,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_SHELL_TITLE Construction d'une coque + + GEOM_SHOW_LENGTH + Afficher les cotes de longueur + + + GEOM_SHOW_ANGLE + Afficher les cotes d'angle + + + GEOM_SHOW_POINTS_COORD + Afficher les points de départ/arrivée + GEOM_SKETCH Esquisse @@ -1826,6 +1890,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_COORDINATES_TYPE Type de coordonnées + + GEOM_CONTROLS + Eléments de contrôle + GEOM_SOLID Solide @@ -1862,6 +1930,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_SQUARE Carré + + GEOM_START + Départ : + + + GEOM_END + Arrivée : + GEOM_START_LCS SCL du Début @@ -2306,6 +2382,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_CHECK_COMPOUND Contrôler un assemblage de blocs + + MEN_GET_NON_BLOCKS + Récupérer les solides non blocs + MEN_CHECK_SELF_INTERSECTIONS Détections des auto-intersections @@ -2418,6 +2498,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_DISPLAY_ONLY Afficher uniquement + + MEN_SHOW_ONLY_CHILDREN + Afficher uniquement les enfants + MEN_BRING_TO_FRONT Afficher au premier plan @@ -2546,6 +2630,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_GROUP_EDIT Editer + + MEN_GROUP_UNION + Union de groupes + + + MEN_GROUP_INTERSECT + Intersection de groupes + + + MEN_GROUP_CUT + Découpe de groupes + MEN_RELOAD_IMPORTED Recharger à partir du disque @@ -2638,6 +2734,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_PIPE Extrusion suivant un chemin + + MEN_PIPE_PATH + Retrouver le chemin + MEN_PLANE Plan @@ -3014,6 +3114,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_TOPLEVEL_COLOR Couleur des objets mis au premier plan + + PREF_TOPLEVEL_DM + Mode d'affichage des objets mis au premier plan + + + MEN_KEEP_CURRENT_DM + Conserver le mode d'affichage en cours + + + MEN_SHOW_ADD_WACTOR + Afficher un contour en plus + PREF_LINE_COLOR Couleur des arêtes, vecteurs, contours @@ -3138,6 +3250,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_CHECK_COMPOUND Contrôler un assemblage de blocs + + STB_GET_NON_BLOCKS + Récupérer les solides non-blocs + STB_CHECK_SELF_INTERSECTIONS Détecte les auto-intersections @@ -3218,6 +3334,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_DISPLAY_ONLY Afficher uniquement + + STB_SHOW_ONLY_CHILDREN + Afficher uniquement les enfants + STB_EDGE Créer une arête @@ -3306,6 +3426,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_GROUP_EDIT Editer un groupe + + STB_GROUP_UNION + Union de groupes + + + STB_GROUP_INTERSECT + Intersection de groupes + + + STB_GROUP_CUT + Découpe de groupes + STB_RELOAD_IMPORTED Recharger l'objet importé depuis le disque @@ -3386,6 +3518,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_PIPE Créer un objet par extrusion suivant un chemin + + STB_PIPE_PATH + Retrouver le chemin à partir d'un objet de type tuyau + STB_PLANE Créer un plan @@ -3410,10 +3546,6 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_POP_CREATE_GROUP Créer un groupe - - STB_POP_SHOW_CHILDREN - Monter les objets fils - STB_POP_UNPUBLISH_OBJ Dépublier l'objet @@ -3423,7 +3555,11 @@ Choisissez une face, une coque ou un solide et essayez de nouveau Publier l'objet - STB_POP_HIDE_CHILDREN + STB_POP_DISCLOSE_CHILDREN + Afficher les objets fils + + + STB_POP_CONCEAL_CHILDREN Cacher les objets fils @@ -3670,6 +3806,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOOL_BASIC Objets de base + + TOOL_BLOCKS + Blocs + TOOL_BOOLEAN Opérations booléennes @@ -3746,6 +3886,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_CHECK_COMPOUND Valider l'assemblage de blocs + + TOP_GET_NON_BLOCKS + Récupérer les solides non-blocs + TOP_CHECK_SELF_INTERSECTIONS Détection des auto-intersections @@ -3822,6 +3966,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_DISPLAY_ONLY Afficher uniquement + + TOP_SHOW_ONLY_CHILDREN + Afficher uniquement les enfants + TOP_EDGE Construire une arête @@ -3902,6 +4050,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_GROUP_EDIT Editer un groupe + + TOP_GROUP_UNION + Union de groupes + + + TOP_GROUP_INTERSECT + Intersection de groupes + + + TOP_GROUP_CUT + Découpe de groupes + TOP_HEX_SOLID Solide hexaédrique @@ -3986,6 +4146,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_PIPE Extrusion suivant un chemin + + TOP_PIPE_PATH + Retrouver le chemin + TOP_PLANE Créer un plan @@ -4010,10 +4174,6 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_POP_CREATE_GROUP Créer un groupe - - TOP_POP_SHOW_CHILDREN - Montrer les enfants - TOP_POP_UNPUBLISH_OBJ Dépublier l'objet @@ -4023,8 +4183,12 @@ Choisissez une face, une coque ou un solide et essayez de nouveau Publier l'objet - TOP_POP_HIDE_CHILDREN - Cacher les enfants + TOP_POP_DISCLOSE_CHILDREN + Afficher les objets fils + + + TOP_POP_CONCEAL_CHILDREN + Cacher les objets fils TOP_POP_ISOS @@ -4294,6 +4458,30 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_REMOVE_EXTRA_EDGES Supprimer les arêtes inutiles + + GEOM_FUSE_EDGES_TITLE + Fusionner les arêtes collinéaires au sein d'un contour + + + GEOM_FUSE_EDGES + Fusionner les arêtes + + + FUSE_EDGES_NEW_OBJ_NAME + FusionArêtes + + + TOP_FUSE_EDGES + Fusionner les arêtes collinéaires au sein d'un contour + + + MEN_FUSE_EDGES + Fusionner les arêtes collinéaires au sein d'un contour + + + STB_FUSE_EDGES + Fusionner les arêtes collinéaires au sein d'un contour + TOP_NORMALE Vecteur normal à une face @@ -4568,7 +4756,7 @@ les coques et solides d'un autre. GEOM_SCALE_DIMENSIONS Voulez-vous prendre les unités en considération? -Sinon les dimensions seront préservées sans modifications. +Sinon le modèle sera mis à l'échèlle GEOM (unités interprétées comme des mètres). GEOM_ADVANCED @@ -4997,6 +5185,45 @@ Le nombre de points n'est pas suffisant Choisissez un groupe à éditer + + GroupGUI_BooleanDlg + + GEOM_UNION + Union + + + GEOM_UNION_TITLE + Union de groupes + + + GEOM_INTERSECT + Intersection + + + GEOM_INTERSECT_TITLE + Intersection de groupes + + + GEOM_CUT + Découpe + + + GEOM_CUT_TITLE + Découpe de groupes + + + GEOM_GROUPS + Groupes + + + GEOM_MAIN_GROUPS + Groupes principaux + + + GEOM_TOOL_GROUPS + Groups outils + + GroupGUI_GroupDlg diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index cfb646deb..d13a0fd99 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -107,7 +107,6 @@ #include - #include "GEOMImpl_Types.hxx" extern "C" { @@ -135,7 +134,7 @@ GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() bool GeometryGUI::InitGeomGen() { GeometryGUI aGG; - if( CORBA::is_nil( myComponentGeom ) ) return false; + if ( CORBA::is_nil( myComponentGeom ) ) return false; return true; } @@ -173,12 +172,12 @@ SALOMEDS::Study_var GeometryGUI::ClientStudyToStudy (_PTR(Study) theStudy) return aDSStudy._retn(); } -void GeometryGUI::Modified( bool theIsUpdateActions ) +void GeometryGUI::Modified (bool theIsUpdateActions) { - if( SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ) ) { - if( SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ) ) { + if ( SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ) ) { + if ( SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ) ) { appStudy->Modified(); - if( theIsUpdateActions ) + if ( theIsUpdateActions ) app->updateActions(); } } @@ -281,17 +280,17 @@ void GeometryGUI::ActiveWorkingPlane() bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); bool ViewVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() ); - if( ViewOCC ) { + if ( ViewOCC ) { OCCViewer_ViewWindow* vw = dynamic_cast( window ); if ( vw ) { Handle(V3d_View) view3d = vw->getViewPort()->getView(); view3d->SetProj(DZ.X(), DZ.Y(), DZ.Z()); view3d->SetUp(DY.X(), DY.Y(), DY.Z()); - vw->onViewFitAll(); + vw->onViewFitAll(); } } - else if( ViewVTK ) { + else if ( ViewVTK ) { SVTK_ViewWindow* vw = dynamic_cast( window ); if ( vw ) { vtkCamera* camera = vw->getRenderer()->GetActiveCamera(); @@ -473,6 +472,7 @@ void GeometryGUI::OnGUIEvent( int id ) case GEOMOp::OpRevolution: // MENU GENERATION - REVOLUTION case GEOMOp::OpFilling: // MENU GENERATION - FILLING case GEOMOp::OpPipe: // MENU GENERATION - PIPE + case GEOMOp::OpPipePath: // MENU GENERATION - RESTORE PATH libName = "GenerationGUI"; break; case GEOMOp::Op2dSketcher: // MENU ENTITY - SKETCHER @@ -596,15 +596,15 @@ void GeometryGUI::OnGUIEvent( int id ) // call method of corresponding GUI library if ( library ) { library->OnGUIEvent( id, desk ); - + // Update a list of materials for "Preferences" dialog if ( id == GEOMOp::OpMaterialProperties ) { LightApp_Preferences* pref = preferences(); if ( pref ) { - Material_ResourceMgr aMatResMgr; - setPreferenceProperty( pref->rootItem()->findItem( tr( "PREF_MATERIAL" ), true )->id(), - "strings", - aMatResMgr.materials() ); + Material_ResourceMgr aMatResMgr; + setPreferenceProperty( pref->rootItem()->findItem( tr( "PREF_MATERIAL" ), true )->id(), + "strings", + aMatResMgr.materials() ); } } } @@ -689,11 +689,11 @@ void GeometryGUI::createGeomAction( const int id, const QString& label, const QS void GeometryGUI::createOriginAndBaseVectors() { SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); - if( appStudy ) { + if ( appStudy ) { _PTR(Study) studyDS = appStudy->studyDS(); - if( studyDS && !CORBA::is_nil( GetGeomGen() ) ) { + if ( studyDS && !CORBA::is_nil( GetGeomGen() ) ) { GEOM::GEOM_IBasicOperations_var aBasicOperations = GetGeomGen()->GetIBasicOperations( studyDS->StudyId() ); - if( !aBasicOperations->_is_nil() ) { + if ( !aBasicOperations->_is_nil() ) { SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr(); double aLength = aResourceMgr->doubleValue( "Geometry", "base_vectors_length", 1.0 ); GEOM::GEOM_Object_var anOrigin = aBasicOperations->MakePointXYZ( 0.0, 0.0, 0.0 ); @@ -751,6 +751,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::OpRevolution, "REVOLUTION" ); createGeomAction( GEOMOp::OpFilling, "FILLING" ); createGeomAction( GEOMOp::OpPipe, "PIPE" ); + createGeomAction( GEOMOp::OpPipePath, "PIPE_PATH" ); createGeomAction( GEOMOp::OpGroupCreate, "GROUP_CREATE" ); createGeomAction( GEOMOp::OpGroupEdit, "GROUP_EDIT" ); @@ -950,6 +951,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpRevolution, genId, -1 ); createMenu( GEOMOp::OpFilling, genId, -1 ); createMenu( GEOMOp::OpPipe, genId, -1 ); +#if OCC_VERSION_LARGE > 0x06050300 + createMenu( GEOMOp::OpPipePath, genId, -1 ); +#endif // int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); @@ -983,9 +987,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpShell, buildId, -1 ); createMenu( GEOMOp::OpSolid, buildId, -1 ); createMenu( GEOMOp::OpCompound, buildId, -1 ); - + createMenu( separator(), newEntId, -1 ); - + createMenu( GEOMOp::OpPictureImport, newEntId, -1 ); #ifdef WITH_OPENCV createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 ); @@ -1110,7 +1114,7 @@ void GeometryGUI::initialize( CAM_Application* app ) */ // ---- create toolbars -------------------------- - + int basicTbId = createTool( tr( "TOOL_BASIC" ) ); createTool( GEOMOp::OpPoint, basicTbId ); createTool( GEOMOp::OpLine, basicTbId ); @@ -1124,11 +1128,11 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpPlane, basicTbId ); createTool( GEOMOp::OpLCS, basicTbId ); createTool( GEOMOp::OpOriginAndVectors, basicTbId ); - + // int sketchTbId = createTool( tr( "TOOL_SKETCH" ) ); // createTool( GEOMOp::Op2dSketcher, sketchTbId ); // createTool( GEOMOp::Op3dSketcher, sketchTbId ); - + int primTbId = createTool( tr( "TOOL_PRIMITIVES" ) ); createTool( GEOMOp::OpBox, primTbId ); createTool( GEOMOp::OpCylinder, primTbId ); @@ -1138,26 +1142,29 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpRectangle, primTbId ); createTool( GEOMOp::OpDisk, primTbId ); createTool( GEOMOp::OpPipeTShape, primTbId ); //rnc - + int blocksTbId = createTool( tr( "TOOL_BLOCKS" ) ); createTool( GEOMOp::OpDividedDisk, blocksTbId ); createTool( GEOMOp::OpDividedCylinder, blocksTbId ); - + // int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); //rnc // createTool( GEOMOp::OpPipeTShape, advancedTbId ); - + int boolTbId = createTool( tr( "TOOL_BOOLEAN" ) ); createTool( GEOMOp::OpFuse, boolTbId ); createTool( GEOMOp::OpCommon, boolTbId ); createTool( GEOMOp::OpCut, boolTbId ); createTool( GEOMOp::OpSection, boolTbId ); - - int genTbId = createTool( tr( "TOOL_GENERATION" ) ); + + int genTbId = createTool( tr( "TOOL_GENERATION" ) ); createTool( GEOMOp::OpPrism, genTbId ); createTool( GEOMOp::OpRevolution, genTbId ); createTool( GEOMOp::OpFilling, genTbId ); createTool( GEOMOp::OpPipe, genTbId ); - +#if OCC_VERSION_LARGE > 0x06050300 + createTool( GEOMOp::OpPipePath, genTbId ); +#endif + int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ) ); createTool( GEOMOp::OpTranslate, transTbId ); createTool( GEOMOp::OpRotate, transTbId ); @@ -1169,14 +1176,14 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( separator(), transTbId ); createTool( GEOMOp::OpMultiTranslate, transTbId ); createTool( GEOMOp::OpMultiRotate, transTbId ); - + int operTbId = createTool( tr( "TOOL_OPERATIONS" ) ); createTool( GEOMOp::OpExplode, operTbId ); createTool( GEOMOp::OpPartition, operTbId ); createTool( GEOMOp::OpArchimede, operTbId ); createTool( GEOMOp::OpShapesOnShape, operTbId ); createTool( GEOMOp::OpSharedShapes, operTbId ); - + int featTbId = createTool( tr( "TOOL_FEATURES" ) ); createTool( GEOMOp::OpFillet1d, featTbId ); createTool( GEOMOp::OpFillet2d, featTbId ); @@ -1184,7 +1191,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpChamfer, featTbId ); createTool( GEOMOp::OpExtrudedBoss, featTbId ); createTool( GEOMOp::OpExtrudedCut, featTbId ); - + int buildTbId = createTool( tr( "TOOL_BUILD" ) ); createTool( GEOMOp::OpEdge, buildTbId ); createTool( GEOMOp::OpWire, buildTbId ); @@ -1219,7 +1226,7 @@ void GeometryGUI::initialize( CAM_Application* app ) #ifdef WITH_OPENCV createTool( GEOMOp::OpFeatureDetect, picturesTbId ); #endif - + // int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// @@ -1261,7 +1268,7 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->setRule(action(GEOMOp::OpBringToFront), bringRule, QtxPopupMgr::VisibleRule ); mgr->setRule(action(GEOMOp::OpBringToFront), "topLevel=true", QtxPopupMgr::ToggleRule ); mgr->insert( action(GEOMOp::OpClsBringToFront ), -1, -1 ); // clear bring to front - mgr->setRule( action(GEOMOp::OpClsBringToFront ), clientOCC, QtxPopupMgr::VisibleRule ); + mgr->setRule( action(GEOMOp::OpClsBringToFront ), clientOCC, QtxPopupMgr::VisibleRule ); #endif mgr->insert( separator(), -1, -1 ); // ----------- dispmodeId = mgr->insert( tr( "MEN_DISPLAY_MODE" ), -1, -1 ); // display mode menu @@ -1293,7 +1300,7 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->insert( action( GEOMOp::OpPointMarker ), -1, -1 ); // point marker //mgr->setRule( action( GEOMOp::OpPointMarker ), QString( "selcount>0 and $typeid in {%1}" ).arg(GEOM_POINT ), QtxPopupMgr::VisibleRule ); mgr->setRule( action( GEOMOp::OpPointMarker ), QString( "selcount>0 and ( $typeid in {%1} or compoundOfVertices=true ) " ).arg(GEOM::VERTEX).arg(GEOM::COMPOUND), QtxPopupMgr::VisibleRule ); - mgr->insert( action( GEOMOp::OpMaterialProperties ), -1, -1 ); // material properties + mgr->insert( action( GEOMOp::OpMaterialProperties ), -1, -1 ); // material properties mgr->setRule( action( GEOMOp::OpMaterialProperties ), clientOCCorVTK_AndSomeVisible + " and ($component={'GEOM'}) and selcount>0 and isVisible", QtxPopupMgr::VisibleRule ); mgr->insert( action( GEOMOp::OpSetTexture ), -1, -1 ); // texture mgr->setRule( action( GEOMOp::OpSetTexture ), clientOCCorOB_AndSomeVisible + " and ($component={'GEOM'})", QtxPopupMgr::VisibleRule ); @@ -1304,7 +1311,7 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->insert( action( GEOMOp::OpIsosWidth ), lineW, -1 ); // isos width mgr->setRule( action( GEOMOp::OpIsosWidth ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule ); - + mgr->insert( separator(), -1, -1 ); // ----------- mgr->insert( action( GEOMOp::OpAutoColor ), -1, -1 ); // auto color mgr->setRule( action( GEOMOp::OpAutoColor ), autoColorPrefix + " and isAutoColor=false", QtxPopupMgr::VisibleRule ); @@ -1363,7 +1370,6 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->insert( action( GEOMOp::OpUnpublishObject ), -1, -1 ); // Unpublish object mgr->setRule( action( GEOMOp::OpUnpublishObject ), QString("client='ObjectBrowser' and $type in {'Shape' 'Group'} and selcount>0"), QtxPopupMgr::VisibleRule ); - mgr->insert( action( GEOMOp::OpPublishObject ), -1, -1 ); // Publish object mgr->setRule( action( GEOMOp::OpPublishObject ), QString("client='ObjectBrowser' and isComponent=true"), QtxPopupMgr::VisibleRule ); @@ -1372,9 +1378,8 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->hide( mgr->actionId( action( myEraseAll ) ) ); - SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); - if(resMgr) { + if (resMgr) { GEOM_AISShape::setTopLevelDisplayMode((GEOM_AISShape::TopLevelDispMode)resMgr->integerValue("Geometry", "toplevel_dm", 0)); QColor c = resMgr->colorValue( "Geometry", "toplevel_color", QColor( 170, 85, 0 ) ); GEOM_AISShape::setTopLevelColor(SalomeApp_Tools::color(c)); @@ -1399,16 +1404,18 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) // import Python module that manages GEOM plugins (need to be here because SalomePyQt API uses active module) PyGILState_STATE gstate = PyGILState_Ensure(); - PyObject* pluginsmanager=PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager"); - if(pluginsmanager==NULL) + PyObject* pluginsmanager = PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager"); + if (pluginsmanager == NULL) PyErr_Print(); - else - { - PyObject* result=PyObject_CallMethod( pluginsmanager, (char*)"initialize", (char*)"isss",1,"geom",tr("MEN_NEW_ENTITY").toStdString().c_str(),tr("GEOM_PLUGINS_OTHER").toStdString().c_str()); - if(result==NULL) - PyErr_Print(); - Py_XDECREF(result); - } + else { + PyObject* result = + PyObject_CallMethod(pluginsmanager, (char*)"initialize", (char*)"isss", 1, "geom", + tr("MEN_NEW_ENTITY").toStdString().c_str(), + tr("GEOM_PLUGINS_OTHER").toStdString().c_str()); + if (result == NULL) + PyErr_Print(); + Py_XDECREF(result); + } PyGILState_Release(gstate); // end of GEOM plugins loading @@ -1466,13 +1473,13 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) // 0020836 (Basic vectors and origin) SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr(); - if( aResourceMgr->booleanValue( "Geometry", "auto_create_base_objects", false ) ) { + if ( aResourceMgr->booleanValue( "Geometry", "auto_create_base_objects", false ) ) { SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); - if( appStudy ) { + if ( appStudy ) { _PTR(Study) studyDS = appStudy->studyDS(); - if( studyDS ) { + if ( studyDS ) { _PTR(SComponent) aSComponent = studyDS->FindComponent("GEOM"); - if( !aSComponent ) // create objects automatically only if there is no GEOM component + if ( !aSComponent ) // create objects automatically only if there is no GEOM component createOriginAndBaseVectors(); } } @@ -1481,7 +1488,6 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) return true; } - //======================================================================= // function : GeometryGUI::deactivateModule() // purpose : Called when GEOM module is deactivated @@ -1571,7 +1577,7 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm ) this, SLOT( OnMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) ); connect( vm, SIGNAL( mouseRelease ( SUIT_ViewWindow*, QMouseEvent* ) ), this, SLOT( OnMouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ) ); - + LightApp_SelectionMgr* sm = getApp()->selectionMgr(); myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); @@ -1741,31 +1747,30 @@ void GeometryGUI::createPreferences() LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" ); int material = addPreference( tr( "PREF_MATERIAL" ), genGroup, - LightApp_Preferences::Selector, - "Geometry", "material" ); - + LightApp_Preferences::Selector, + "Geometry", "material" ); + const int nb = 4; int wd[nb]; int iter=0; wd[iter++] = addPreference( tr( "PREF_EDGE_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "edge_width" ); + LightApp_Preferences::IntSpin, "Geometry", "edge_width" ); wd[iter++] = addPreference( tr( "PREF_ISOLINES_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "isolines_width" ); + LightApp_Preferences::IntSpin, "Geometry", "isolines_width" ); wd[iter++] = addPreference( tr( "PREF_PREVIEW_EDGE_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "preview_edge_width" ); - + LightApp_Preferences::IntSpin, "Geometry", "preview_edge_width" ); + wd[iter++] = addPreference( tr( "PREF_MEASURES_LINE_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "measures_line_width" ); + LightApp_Preferences::IntSpin, "Geometry", "measures_line_width" ); - for(int i = 0; i < nb; i++) { - setPreferenceProperty( wd[i], "min", 1 ); + for (int i = 0; i < nb; i++) { + setPreferenceProperty( wd[i], "min", 1 ); setPreferenceProperty( wd[i], "max", 5 ); } - // Quantities with individual precision settings int precGroup = addPreference( tr( "GEOM_PREF_GROUP_PRECISION" ), tabId ); setPreferenceProperty( precGroup, "columns", 2 ); @@ -1819,7 +1824,6 @@ void GeometryGUI::createPreferences() setPreferenceProperty( dispmode, "strings", aModesList ); setPreferenceProperty( dispmode, "indexes", anIndexesList ); - // Set property for top level display mode QStringList aTopModesList; aTopModesList.append( tr("MEN_SHOW_ADD_WACTOR") ); @@ -1891,7 +1895,6 @@ void GeometryGUI::createPreferences() addPreference( tr( "PREF_AUTO_CREATE" ), originGroup, LightApp_Preferences::Bool, "Geometry", "auto_create_base_objects" ); - int operationsGroup = addPreference( tr( "PREF_GROUP_OPERATIONS" ), tabId ); setPreferenceProperty( operationsGroup, "columns", 2 ); @@ -1906,18 +1909,20 @@ void GeometryGUI::preferencesChanged( const QString& section, const QString& par if (param == QString("SettingsGeomStep")) { double spin_step = aResourceMgr->doubleValue(section, param, 100.); EmitSignalDefaultStepValueChanged(spin_step); - } else if(param == QString("toplevel_color")) { + } + else if (param == QString("toplevel_color")) { QColor c = aResourceMgr->colorValue( "Geometry", "toplevel_color", QColor( 170, 85, 0 ) ); GEOM_AISShape::setTopLevelColor(SalomeApp_Tools::color(c)); - } else if(param == QString("toplevel_dm")) { + } + else if (param == QString("toplevel_dm")) { GEOM_AISShape::setTopLevelDisplayMode((GEOM_AISShape::TopLevelDispMode)aResourceMgr->integerValue("Geometry", "toplevel_dm", 0)); } - } + } } LightApp_Displayer* GeometryGUI::displayer() { - if( !myDisplayer ) + if ( !myDisplayer ) myDisplayer = new GEOM_Displayer( dynamic_cast( getApp()->activeStudy() ) ); return myDisplayer; } @@ -1926,6 +1931,7 @@ void GeometryGUI::setLocalSelectionMode(const int mode) { myLocalSelectionMode = mode; } + int GeometryGUI::getLocalSelectionMode() const { return myLocalSelectionMode; @@ -1986,7 +1992,7 @@ void GeometryGUI::storeVisualParameters (int savePoint) std::string entry = ip->encodeEntry(o_it.key().toLatin1().data(), componentName); _PTR(GenericAttribute) anAttr; - if( !obj->FindAttribute(anAttr, "AttributeIOR")) + if (!obj->FindAttribute(anAttr, "AttributeIOR")) continue; std::string param,occParam = vType.toLatin1().data(); @@ -1994,17 +2000,17 @@ void GeometryGUI::storeVisualParameters (int savePoint) occParam += QString::number(aMgrId).toLatin1().data(); occParam += NAME_SEPARATOR; - if(aProps.contains(VISIBILITY_PROP)) { + if (aProps.contains(VISIBILITY_PROP)) { param = occParam + VISIBILITY_PROP; ip->setParameter(entry, param, aProps.value(VISIBILITY_PROP).toInt() == 1 ? "On" : "Off"); } - if(aProps.contains(DISPLAY_MODE_PROP)) { + if (aProps.contains(DISPLAY_MODE_PROP)) { param = occParam + DISPLAY_MODE_PROP; ip->setParameter(entry, param, QString::number(aProps.value(DISPLAY_MODE_PROP).toInt()).toLatin1().data()); } - if(aProps.contains(COLOR_PROP)) { + if (aProps.contains(COLOR_PROP)) { QColor c = aProps.value(COLOR_PROP).value(); QString colorStr = QString::number(c.red()/255.); colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.green()/255.); @@ -2013,59 +2019,59 @@ void GeometryGUI::storeVisualParameters (int savePoint) ip->setParameter(entry, param, colorStr.toLatin1().data()); } - if(vType == SVTK_Viewer::Type()) { - if(aProps.contains(OPACITY_PROP)) { + if (vType == SVTK_Viewer::Type()) { + if (aProps.contains(OPACITY_PROP)) { param = occParam + OPACITY_PROP; ip->setParameter(entry, param, QString::number(1. - aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data()); } } else if (vType == SOCC_Viewer::Type()) { - if(aProps.contains(TRANSPARENCY_PROP)) { + if (aProps.contains(TRANSPARENCY_PROP)) { param = occParam + TRANSPARENCY_PROP; ip->setParameter(entry, param, QString::number(aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data()); } - if(aProps.contains(TOP_LEVEL_PROP)) { + if (aProps.contains(TOP_LEVEL_PROP)) { param = occParam + TOP_LEVEL_PROP; - Standard_Boolean val = aProps.value(TOP_LEVEL_PROP).value(); - if (val == Standard_True) - ip->setParameter(entry, param, "1"); - } + Standard_Boolean val = aProps.value(TOP_LEVEL_PROP).value(); + if (val == Standard_True) + ip->setParameter(entry, param, "1"); + } } - if(aProps.contains(ISOS_PROP)) { + if (aProps.contains(ISOS_PROP)) { param = occParam + ISOS_PROP; ip->setParameter(entry, param, aProps.value(ISOS_PROP).toString().toLatin1().data()); } - if(aProps.contains(VECTOR_MODE_PROP)) { + if (aProps.contains(VECTOR_MODE_PROP)) { param = occParam + VECTOR_MODE_PROP; ip->setParameter(entry, param, QString::number(aProps.value(VECTOR_MODE_PROP).toInt()).toLatin1().data()); } - if(aProps.contains(DEFLECTION_COEFF_PROP)) { + if (aProps.contains(DEFLECTION_COEFF_PROP)) { param = occParam + DEFLECTION_COEFF_PROP; ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data()); } //Marker type of the vertex - ONLY for the "Vertex" and "Compound of the Vertex" - if(aProps.contains(MARKER_TYPE_PROP)) { + if (aProps.contains(MARKER_TYPE_PROP)) { param = occParam + MARKER_TYPE_PROP; ip->setParameter(entry, param, aProps.value(MARKER_TYPE_PROP).toString().toLatin1().data()); } - if(aProps.contains(MATERIAL_PROP)) { + if (aProps.contains(MATERIAL_PROP)) { param = occParam + MATERIAL_PROP; ip->setParameter(entry, param, aProps.value(MATERIAL_PROP).toString().toLatin1().data()); } - if(aProps.contains( EDGE_WIDTH_PROP )) { + if (aProps.contains(EDGE_WIDTH_PROP)) { param = occParam + EDGE_WIDTH_PROP; - ip->setParameter(entry, param, aProps.value(EDGE_WIDTH_PROP).toString().toLatin1().data()); + ip->setParameter(entry, param, aProps.value(EDGE_WIDTH_PROP).toString().toLatin1().data()); } - - if(aProps.contains( ISOS_WIDTH_PROP )) { - param = occParam + ISOS_WIDTH_PROP; - ip->setParameter(entry, param, aProps.value(ISOS_WIDTH_PROP).toString().toLatin1().data()); + + if (aProps.contains(ISOS_WIDTH_PROP)) { + param = occParam + ISOS_WIDTH_PROP; + ip->setParameter(entry, param, aProps.value(ISOS_WIDTH_PROP).toString().toLatin1().data()); } } // object iterator } // for (views) @@ -2141,52 +2147,42 @@ void GeometryGUI::restoreVisualParameters (int savePoint) if (!ok) // bad conversion of view index to integer continue; - if((viewIndex + 1) > aListOfMap.count()) { + if ((viewIndex + 1) > aListOfMap.count()) { aListOfMap.resize(viewIndex + 1); } QString val((*valuesIt).c_str()); - if(paramNameStr == VISIBILITY_PROP){ + if (paramNameStr == VISIBILITY_PROP) { aListOfMap[viewIndex].insert(VISIBILITY_PROP, val == "On" ? 1 : 0); - - } else if(paramNameStr == OPACITY_PROP) { + } else if (paramNameStr == OPACITY_PROP) { aListOfMap[viewIndex].insert(TRANSPARENCY_PROP, 1. - val.toDouble()); - - } else if(paramNameStr == TRANSPARENCY_PROP) { + } else if (paramNameStr == TRANSPARENCY_PROP) { aListOfMap[viewIndex].insert( TRANSPARENCY_PROP, val.toDouble() ); - - } else if(paramNameStr == TOP_LEVEL_PROP) { - aListOfMap[viewIndex].insert( TRANSPARENCY_PROP, val == "1" ? Standard_True : Standard_False ); - - } else if(paramNameStr == DISPLAY_MODE_PROP) { + } else if (paramNameStr == TOP_LEVEL_PROP) { + aListOfMap[viewIndex].insert( TRANSPARENCY_PROP, val == "1" ? Standard_True : Standard_False ); + } else if (paramNameStr == DISPLAY_MODE_PROP) { aListOfMap[viewIndex].insert( DISPLAY_MODE_PROP, val.toInt()); - - } else if(paramNameStr == ISOS_PROP) { + } else if (paramNameStr == ISOS_PROP) { aListOfMap[viewIndex].insert( ISOS_PROP, val); - - } else if(paramNameStr == COLOR_PROP) { + } else if (paramNameStr == COLOR_PROP) { QStringList rgb = val.split(DIGIT_SEPARATOR); - if(rgb.count() == 3) { + if (rgb.count() == 3) { QColor c(int(rgb[0].toDouble()*255), int(rgb[1].toDouble()*255), int(rgb[2].toDouble()*255)); aListOfMap[viewIndex].insert( COLOR_PROP, c); } - } else if(paramNameStr == VECTOR_MODE_PROP) { + } else if (paramNameStr == VECTOR_MODE_PROP) { aListOfMap[viewIndex].insert( VECTOR_MODE_PROP, val.toInt()); - - } else if(paramNameStr == DEFLECTION_COEFF_PROP) { + } else if (paramNameStr == DEFLECTION_COEFF_PROP) { aListOfMap[viewIndex].insert( DEFLECTION_COEFF_PROP, val.toDouble()); - } else if(paramNameStr == MARKER_TYPE_PROP) { + } else if (paramNameStr == MARKER_TYPE_PROP) { aListOfMap[viewIndex].insert( MARKER_TYPE_PROP, val); - } else if(paramNameStr == MATERIAL_PROP) { + } else if (paramNameStr == MATERIAL_PROP) { aListOfMap[viewIndex].insert( MATERIAL_PROP, val); - } else if(paramNameStr == EDGE_WIDTH_PROP) { - aListOfMap[viewIndex].insert( EDGE_WIDTH_PROP , val); - } else if(paramNameStr == ISOS_WIDTH_PROP) { - aListOfMap[viewIndex].insert( ISOS_WIDTH_PROP , val); + } else if (paramNameStr == EDGE_WIDTH_PROP) { + aListOfMap[viewIndex].insert( EDGE_WIDTH_PROP, val); + } else if (paramNameStr == ISOS_WIDTH_PROP) { + aListOfMap[viewIndex].insert( ISOS_WIDTH_PROP, val); } - - - } // for names/parameters iterator QList lst = getApp()->viewManagers(); @@ -2202,7 +2198,6 @@ void GeometryGUI::restoreVisualParameters (int savePoint) displayer()->Display(entry, true, dynamic_cast(vmodel)); } } - } // for entries iterator // update all VTK and OCC views @@ -2243,7 +2238,7 @@ void GeometryGUI::onViewAboutToShow() /*! \brief Return action by id \param id identifier of the action - \return action + \return action */ QAction* GeometryGUI::getAction(const int id) { return action(id); @@ -2261,32 +2256,32 @@ QAction* GeometryGUI::getAction(const int id) { bool GeometryGUI::renameAllowed( const QString& entry) const { SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); - SalomeApp_Study* appStudy = app ? dynamic_cast( app->activeStudy() ) : 0; + SalomeApp_Study* appStudy = app ? dynamic_cast( app->activeStudy() ) : 0; SalomeApp_DataObject* obj = appStudy ? dynamic_cast(appStudy->findObjectByEntry(entry)) : 0; - + return (app && appStudy && obj && !appStudy->isComponent(entry) && !obj->isReference()); } - /*! Rename object by entry. \param entry entry of the object \param name new name of the object \brief Return \c true if rename operation finished successfully, \c false otherwise. */ -bool GeometryGUI::renameObject( const QString& entry, const QString& name) { - +bool GeometryGUI::renameObject( const QString& entry, const QString& name) +{ bool result = false; - - SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication()); + + SalomeApp_Application* app = + dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication()); SalomeApp_Study* appStudy = app ? dynamic_cast( app->activeStudy() ) : 0; - - if(!appStudy) + + if (!appStudy) return result; - + _PTR(Study) aStudy = appStudy->studyDS(); - - if(!aStudy) + + if (!aStudy) return result; bool aLocked = (_PTR(AttributeStudyProperties)(appStudy->studyDS()->GetProperties()))->IsLocked(); @@ -2311,4 +2306,3 @@ bool GeometryGUI::renameObject( const QString& entry, const QString& name) { } return result; } - diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index 75e45e43f..e17172e49 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -98,6 +98,7 @@ namespace GEOMOp { OpRevolution = 3201, // MENU NEW ENTITY - GENERATION - REVOLUTION OpFilling = 3202, // MENU NEW ENTITY - GENERATION - FILLING OpPipe = 3203, // MENU NEW ENTITY - GENERATION - EXTRUSION ALONG PATH + OpPipePath = 3204, // MENU NEW ENTITY - GENERATION - RESTORE PATH // EntityGUI -------------------//-------------------------------- Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx index d50aec791..3b2255a1f 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx @@ -39,6 +39,8 @@ #include +#include + //======================================================================= //function : GetID //purpose : @@ -214,9 +216,19 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) cons if (aStrVals.Length() != 4) Standard_ConstructionError::Raise("3D Sketcher error: Bad format of command."); + char type = aStrVals.Value(1).Value(4); + char mode = aStrVals.Value(1).Value(5); + double anAngle = aStrVals.Value(2).RealValue() * M_PI/180.0; - double anAngle2 = aStrVals.Value(3).RealValue() * M_PI/180.0; + double anAngle2 = aStrVals.Value(3).RealValue() * M_PI/180.0; double aLength = aStrVals.Value(4).RealValue(); + + double aHeight = aLength * sin(anAngle2); + if (type == 'C') + { + aHeight = aStrVals.Value(3).RealValue(); + anAngle2 = 0.0; + } double aProjectedLength = aLength * cos(anAngle2); @@ -224,21 +236,28 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) cons vp.SetX(aStrVals.Value(2).RealValue()); vp.SetY(aStrVals.Value(3).RealValue()); vp.SetZ(aStrVals.Value(4).RealValue()); - - if (aStrVals.Value(1) == "OXY") { - vp.SetX(p.X() + aProjectedLength * cos(anAngle)); - vp.SetY(p.Y() + aProjectedLength * sin(anAngle)); - vp.SetZ(p.Z() + aLength * sin(anAngle2)); + + gp_XYZ pref = gp::Origin().XYZ(); + if(mode == 'R') + pref = p; + + TCollection_AsciiString aTruncatedCommand = aStrVals.Value(1); + aTruncatedCommand.Trunc(3); + + if (aTruncatedCommand == "OXY") { + vp.SetX(pref.X() + aProjectedLength * cos(anAngle)); + vp.SetY(pref.Y() + aProjectedLength * sin(anAngle)); + vp.SetZ(pref.Z() + aHeight); } - else if (aStrVals.Value(1) == "OYZ") { - vp.SetX(p.X() + aLength * sin(anAngle2)); - vp.SetY(p.Y() + aProjectedLength * cos(anAngle)); - vp.SetZ(p.Z() + aProjectedLength * sin(anAngle)); + else if (aTruncatedCommand == "OYZ") { + vp.SetX(pref.X() + aHeight); + vp.SetY(pref.Y() + aProjectedLength * cos(anAngle)); + vp.SetZ(pref.Z() + aProjectedLength * sin(anAngle)); } - else if (aStrVals.Value(1) == "OXZ") { - vp.SetX(p.X() + aProjectedLength * cos(anAngle)); - vp.SetY(p.Y() + aLength * sin(anAngle2)); - vp.SetZ(p.Z() + aProjectedLength * sin(anAngle)); + else if (aTruncatedCommand == "OXZ") { + vp.SetX(pref.X() + aProjectedLength * cos(anAngle)); + vp.SetY(pref.Y() + aHeight); + vp.SetZ(pref.Z() + aProjectedLength * sin(anAngle)); } else Standard_ConstructionError::Raise("3D Sketcher error: Bad format of command."); @@ -295,7 +314,7 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) cons } else { } - + if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index 884da5cb1..f8f02247d 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -18,7 +18,6 @@ // 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 ) @@ -54,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -122,6 +122,7 @@ GEOMImpl_Gen::GEOMImpl_Gen() TFunction_DriverTable::Get()->AddDriver(GEOMImpl_CylinderDriver::GetID(), new GEOMImpl_CylinderDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PrismDriver::GetID(), new GEOMImpl_PrismDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipeDriver::GetID(), new GEOMImpl_PipeDriver()); + TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipePathDriver::GetID(), new GEOMImpl_PipePathDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_ThruSectionsDriver::GetID(), new GEOMImpl_ThruSectionsDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_RevolutionDriver::GetID(), new GEOMImpl_RevolutionDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_SphereDriver::GetID(), new GEOMImpl_SphereDriver()); diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index dc2ab3599..ffe04f377 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -18,7 +18,6 @@ // 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 @@ -49,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -69,6 +69,7 @@ #include #include #include +#include #include @@ -2176,7 +2177,6 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeShellsWithoutPath( } - //============================================================================= /*! * MakePipeBiNormalAlongVector @@ -2236,3 +2236,173 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeBiNormalAlongVector (Han SetErrorCode(OK); return aPipe; } + +//============================================================================= +/*! + * RestorePath + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath (Handle(GEOM_Object) theShape, + Handle(GEOM_Object) theBase1, + Handle(GEOM_Object) theBase2) +{ + SetErrorCode(KO); + + if (theShape.IsNull() || theBase1.IsNull() || theBase2.IsNull()) return NULL; + + // Add a new Path object + Handle(GEOM_Object) aPath = GetEngine()->AddObject(GetDocID(), GEOM_PIPE_PATH); + + // Add a new Path function + Handle(GEOM_Function) aFunction = + aPath->AddFunction(GEOMImpl_PipePathDriver::GetID(), PIPE_PATH_TWO_BASES); + if (aFunction.IsNull()) return NULL; + + // Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_PipePathDriver::GetID()) return NULL; + + GEOMImpl_IPipePath aCI (aFunction); + + Handle(GEOM_Function) aRefShape = theShape->GetLastFunction(); + Handle(GEOM_Function) aRefBase1 = theBase1->GetLastFunction(); + Handle(GEOM_Function) aRefBase2 = theBase2->GetLastFunction(); + + if (aRefShape.IsNull() || aRefBase1.IsNull() || aRefBase2.IsNull()) return NULL; + + aCI.SetShape(aRefShape); + aCI.SetBase1(aRefBase1); + aCI.SetBase2(aRefBase2); + + // Compute the Path value + try { +#if OCC_VERSION_LARGE > 0x06010000 + OCC_CATCH_SIGNALS; +#endif + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("PipePath driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode("RestorePath: inappropriate arguments given"); + return NULL; + } + + // Make a Python command + GEOM::TPythonDump(aFunction) << aPath << " = geompy.RestorePath(" + << theShape << ", " << theBase1 << ", " << theBase2 << ")"; + + SetErrorCode(OK); + return aPath; +} + +//============================================================================= +/*! + * RestorePath + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath + (Handle(GEOM_Object) theShape, + const Handle(TColStd_HSequenceOfTransient)& theBase1, + const Handle(TColStd_HSequenceOfTransient)& theBase2) +{ + SetErrorCode(KO); + + if (theShape.IsNull() || theBase1.IsNull() || theBase2.IsNull()) return NULL; + + Standard_Integer nbBases1 = theBase1->Length(); + Standard_Integer nbBases2 = theBase2->Length(); + + if (!nbBases1 || !nbBases2) + return NULL; + + // Add a new Path object + Handle(GEOM_Object) aPath = GetEngine()->AddObject(GetDocID(), GEOM_PIPE_PATH); + + // Add a new Path function + Handle(GEOM_Function) aFunction = + aPath->AddFunction(GEOMImpl_PipePathDriver::GetID(), PIPE_PATH_TWO_SEQS); + if (aFunction.IsNull()) return NULL; + + // Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_PipePathDriver::GetID()) return NULL; + + GEOMImpl_IPipePath aCI (aFunction); + + Handle(GEOM_Function) aRefShape = theShape->GetLastFunction(); + if (aRefShape.IsNull()) return NULL; + + Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient; + Handle(TColStd_HSequenceOfTransient) aSeqBases2 = new TColStd_HSequenceOfTransient; + + Standard_Integer i; + for (i = 1; i <= nbBases1; i++) { + Handle(Standard_Transient) anItem = theBase1->Value(i); + if (!anItem.IsNull()) { + Handle(GEOM_Object) aBase = Handle(GEOM_Object)::DownCast(anItem); + if (!aBase.IsNull()) { + Handle(GEOM_Function) aRefBase = aBase->GetLastFunction(); + if (!aRefBase.IsNull()) + aSeqBases1->Append(aRefBase); + } + } + } + for (i = 1; i <= nbBases2; i++) { + Handle(Standard_Transient) anItem = theBase2->Value(i); + if (!anItem.IsNull()) { + Handle(GEOM_Object) aBase = Handle(GEOM_Object)::DownCast(anItem); + if (!aBase.IsNull()) { + Handle(GEOM_Function) aRefBase = aBase->GetLastFunction(); + if (!aRefBase.IsNull()) + aSeqBases2->Append(aRefBase); + } + } + } + if (!aSeqBases1->Length() || !aSeqBases2->Length()) return NULL; + + aCI.SetShape(aRefShape); + aCI.SetBaseSeq1(aSeqBases1); + aCI.SetBaseSeq2(aSeqBases2); + + // Compute the Path value + try { +#if OCC_VERSION_LARGE > 0x06010000 + OCC_CATCH_SIGNALS; +#endif + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("PipePath driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode("RestorePath: inappropriate arguments given"); + return NULL; + } + + // Make a Python command + GEOM::TPythonDump pyDump (aFunction); + pyDump << aPath << " = geompy.RestorePathEdges(" << theShape << ", ["; + for (i = 1; i <= nbBases1; i++) { + Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(theBase1->Value(i)); + if (!anObj.IsNull()) { + pyDump << anObj; + if (i < nbBases1) + pyDump << ", "; + } + } + pyDump<< "], ["; + for (i = 1; i <= nbBases2; i++) { + Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(theBase2->Value(i)); + if (!anObj.IsNull()) { + pyDump << anObj; + if (i < nbBases2) + pyDump << ", "; + } + } + pyDump << "])"; + + SetErrorCode(OK); + return aPath; +} diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx index c567d0333..6cd2dd25d 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx @@ -18,7 +18,6 @@ // 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_ @@ -131,14 +130,21 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations { bool theWithContact, bool theWithCorrections); - Standard_EXPORT Handle(GEOM_Object) MakePipeShellsWithoutPath( - const Handle(TColStd_HSequenceOfTransient)& theBases, - const Handle(TColStd_HSequenceOfTransient)& theLocations); + Standard_EXPORT Handle(GEOM_Object) MakePipeShellsWithoutPath + (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); + Standard_EXPORT Handle(GEOM_Object) RestorePath (Handle(GEOM_Object) theShape, + Handle(GEOM_Object) theBase1, + Handle(GEOM_Object) theBase2); + + Standard_EXPORT Handle(GEOM_Object) RestorePath (Handle(GEOM_Object) theShape, + const Handle(TColStd_HSequenceOfTransient)& theBase1, + const Handle(TColStd_HSequenceOfTransient)& theBase2); }; #endif diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 7fc3b43bc..9b982e735 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -70,6 +71,7 @@ #include #include #include +#include #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC @@ -1138,6 +1140,11 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Objec return false; } + // Copy source shape + TopoDS_Shape aShapeCopy; + TColStd_IndexedDataMapOfTransientTransient aMapTShapes; + TNaming_CopyShape::CopyTool(Te7->GetValue(), aMapTShapes, aShapeCopy); + Handle(GEOM_Object) Te8 = myShapesOperations->MakeGlueFaces(Te7, 1e-7, true); if (Te8.IsNull()) { SetErrorCode("Impossible to glue faces of TShape"); @@ -1145,6 +1152,34 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Objec } TopoDS_Shape aShape = Te8->GetValue(); + BRepCheck_Analyzer anAna (aShape, Standard_True); + + if (!anAna.IsValid()) { + // Try to do gluing with the tolerance equal to maximal + // tolerance of vertices of the source shape. + Standard_Real aTolMax = -RealLast(); + + for (TopExp_Explorer ExV (aShapeCopy, TopAbs_VERTEX); ExV.More(); ExV.Next()) { + TopoDS_Vertex aVertex = TopoDS::Vertex(ExV.Current()); + Standard_Real aTol = BRep_Tool::Tolerance(aVertex); + + if (aTol > aTolMax) { + aTolMax = aTol; + } + } + + // Perform gluing + Te7->GetLastFunction()->SetValue(aShapeCopy); + Te8 = myShapesOperations->MakeGlueFaces(Te7, aTolMax, true); + + if (Te8.IsNull()) { + SetErrorCode("Impossible to glue faces of TShape"); + return false; + } + + aShape = Te8->GetValue(); + } + theShape->GetLastFunction()->SetValue(aShape); @@ -2252,7 +2287,14 @@ Handle(GEOM_Object) GEOMImpl_IAdvancedOperations::MakeDividedDisk (double theR, int theOrientation, int thePattern) { SetErrorCode(KO); - + + if (theOrientation != 1 && + theOrientation != 2 && + theOrientation != 3) + { + SetErrorCode("theOrientation must be 1(=OXY), 2(=OYZ) or 3(=OZX)"); + return NULL; + } //Add a new object Handle(GEOM_Object) aShape = GetEngine()->AddObject(GetDocID(), GEOM_DIVIDEDDISK); diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index f4508d35b..22237b786 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -975,15 +975,17 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric return NULL; } - Handle(TColStd_HArray1OfReal) aCoordsArray = new TColStd_HArray1OfReal (1, PyList_Size( coords ) * 3); + int lsize = PyList_Size( coords ); - if(PyList_Size( coords ) <= 0) { + if(lsize <= 0) { SetErrorCode("Empty list of the points, please check input parameters !!!"); return NULL; } + Handle(TColStd_HArray1OfReal) aCoordsArray = new TColStd_HArray1OfReal (1, lsize * 3); + int k=1; - for ( Py_ssize_t i = 0; i< PyList_Size( coords ); ++i ) { + for ( Py_ssize_t i = 0; i < lsize; ++i ) { PyObject* coord = PyList_GetItem( coords, i ); if (coord != NULL) { for ( Py_ssize_t j = 0; j < PyList_Size(coord); ++j) { @@ -1016,7 +1018,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric GEOMImpl_IPolyline aCI (aFunction); - aCI.SetLength(PyList_Size( coords )); + aCI.SetLength(lsize); aCI.SetConstructorType(COORD_CONSTRUCTOR); aCI.SetIsClosed(false); aCI.SetCoordinates(aCoordsArray); @@ -1036,7 +1038,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric GEOMImpl_ISpline aCI (aFunction); - aCI.SetLength(PyList_Size( coords )); + aCI.SetLength(lsize); aCI.SetConstructorType(COORD_CONSTRUCTOR); aCI.SetIsClosed(false); aCI.SetCoordinates(aCoordsArray); @@ -1056,7 +1058,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric GEOMImpl_ISpline aCI (aFunction); aCI.SetConstructorType(COORD_CONSTRUCTOR); - aCI.SetLength(PyList_Size( coords )); + aCI.SetLength(lsize); aCI.SetIsClosed(false); aCI.SetDoReordering(false); aCI.SetCoordinates(aCoordsArray); diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index d806a4a2d..afd889529 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -246,9 +246,22 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import } //Make a Python command - if( theFormatName != "IGES_UNIT" ) { - GEOM::TPythonDump(aFunction) << result << " = geompy.ImportFile(\"" - << theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")"; + if (theFormatName != "IGES_UNIT") { + GEOM::TPythonDump pd (aFunction); + if (theFormatName == "BREP") + pd << result << " = geompy.ImportBREP(\"" << theFileName.ToCString() << "\")"; + else if (theFormatName == "IGES") + pd << result << " = geompy.ImportIGES(\"" << theFileName.ToCString() << "\")"; + else if (theFormatName == "IGES_SCALE") + pd << result << " = geompy.ImportIGES(\"" << theFileName.ToCString() << "\", True)"; + else if (theFormatName == "STEP") + pd << result << " = geompy.ImportSTEP(\"" << theFileName.ToCString() << "\")"; + else if (theFormatName == "STEP_SCALE") + pd << result << " = geompy.ImportSTEP(\"" << theFileName.ToCString() << "\", True)"; + else { + pd << result << " = geompy.ImportFile(\"" + << theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")"; + } } SetErrorCode(OK); @@ -260,9 +273,9 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import gp_Pnt P = BRep_Tool::Pnt(V); double scale = P.X(); TCollection_AsciiString aUnitName = "UNIT_M"; - if( fabs(scale-0.01) < 1.e-6 ) + if (fabs(scale-0.01) < 1.e-6) aUnitName = "UNIT_CM"; - else if( fabs(scale-0.001) < 1.e-6 ) + else if (fabs(scale-0.001) < 1.e-6) aUnitName = "UNIT_MM"; //cout<<"IIO: aUnitName = "<SetReference(PIPE_PATH_SHAPE, theShape); } + void SetBase1 (Handle(GEOM_Function) theBase1) { _func->SetReference(PIPE_PATH_BASE1, theBase1); } + void SetBase2 (Handle(GEOM_Function) theBase2) { _func->SetReference(PIPE_PATH_BASE2, theBase2); } + void SetBaseSeq1 (const Handle(TColStd_HSequenceOfTransient)& theBase1) + { _func->SetReferenceList(PIPE_PATH_SEQ1, theBase1); } + void SetBaseSeq2 (const Handle(TColStd_HSequenceOfTransient)& theBase2) + { _func->SetReferenceList(PIPE_PATH_SEQ2, theBase2); } + + Handle(GEOM_Function) GetShape() { return _func->GetReference(PIPE_PATH_SHAPE); } + Handle(GEOM_Function) GetBase1() { return _func->GetReference(PIPE_PATH_BASE1); } + Handle(GEOM_Function) GetBase2() { return _func->GetReference(PIPE_PATH_BASE2); } + Handle(TColStd_HSequenceOfTransient) GetBaseSeq1 () + { return _func->GetReferenceList(PIPE_PATH_SEQ1); } + Handle(TColStd_HSequenceOfTransient) GetBaseSeq2 () + { return _func->GetReferenceList(PIPE_PATH_SEQ2); } + + protected: + + Handle(GEOM_Function) _func; +}; + +#endif diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 703735b22..72c03e5bb 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -147,15 +147,10 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const if (aShape_i.IsNull()) { Standard_NullObject::Raise("In Partition a shape is null"); } - // - //BRepBuilderAPI_Copy aCopyTool (aShape_i); + TopoDS_Shape aShape_i_copy; TNaming_CopyShape::CopyTool(aShape_i, aMapTShapes, aShape_i_copy); - //if (aCopyTool.IsDone()) - // aShape_i_copy = aCopyTool.Shape(); - //else - // Standard_NullObject::Raise("Bad shape detected"); - // + // fill aCopyMap for history TopTools_IndexedMapOfShape aShape_i_inds; TopTools_IndexedMapOfShape aShape_i_copy_inds; @@ -384,11 +379,17 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const } aShape = PS.Shape(); - if (aShape.IsNull()) return 0; + if (aShape.IsNull()) { + // Mantis issue 22009 + if (PS.ErrorStatus() == 10 && PS.Tools().Extent() == 0 && PS.Shapes().Extent() == 1) + aShape = PS.Shapes().First(); + else + return 0; + } //Alternative case to check not valid partition IPAL21418 TopoDS_Iterator It (aShape, Standard_True, Standard_True); - int nbSubshapes=0; + int nbSubshapes = 0; for (; It.More(); It.Next()) nbSubshapes++; if (!nbSubshapes) diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 21475ee42..400c2a03c 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -41,15 +42,14 @@ #include #include +#include +#include #include #include #include +#include #include #include -#include -#include -#include -#include #include #include @@ -68,6 +68,8 @@ #include #include +#include + #include #include #include @@ -88,6 +90,7 @@ #include #include + #include #include #include @@ -100,7 +103,7 @@ //======================================================================= const Standard_GUID& GEOMImpl_PipeDriver::GetID() { - static Standard_GUID aPipeDriver("FF1BBB19-5D14-4df2-980B-3A668264EA16"); + static Standard_GUID aPipeDriver ("FF1BBB19-5D14-4df2-980B-3A668264EA16"); return aPipeDriver; } @@ -2277,23 +2280,23 @@ static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const { - //cout<<"PipeDriver::Execute"<GetType(); + + GEOMImpl_IPipe* aCI = 0; if (aType == PIPE_BASE_PATH) - aCI = new GEOMImpl_IPipe(aFunction); + aCI = new GEOMImpl_IPipe (aFunction); else if (aType == PIPE_DIFFERENT_SECTIONS) - aCI = new GEOMImpl_IPipeDiffSect(aFunction); + aCI = new GEOMImpl_IPipeDiffSect (aFunction); else if (aType == PIPE_SHELL_SECTIONS) - aCI = new GEOMImpl_IPipeShellSect(aFunction); + aCI = new GEOMImpl_IPipeShellSect (aFunction); else if (aType == PIPE_SHELLS_WITHOUT_PATH) - aCI = new GEOMImpl_IPipeShellSect(aFunction); + aCI = new GEOMImpl_IPipeShellSect (aFunction); else if (aType == PIPE_BI_NORMAL_ALONG_VECTOR) - aCI = new GEOMImpl_IPipeBiNormal(aFunction); + aCI = new GEOMImpl_IPipeBiNormal (aFunction); else return 0; diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx new file mode 100644 index 000000000..5acf28f12 --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx @@ -0,0 +1,242 @@ +// Copyright (C) 2007-2012 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 + +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if OCC_VERSION_LARGE > 0x06050300 +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include "utilities.h" + +//======================================================================= +//function : GetID +//purpose : +//======================================================================= +const Standard_GUID& GEOMImpl_PipePathDriver::GetID() +{ + static Standard_GUID aPipePathDriver ("FF1BBB19-5D14-4df2-980B-3A668264EA17"); + return aPipePathDriver; +} + +//======================================================================= +//function : GEOMImpl_PipePathDriver +//purpose : +//======================================================================= +GEOMImpl_PipePathDriver::GEOMImpl_PipePathDriver() +{ +} + +//======================================================================= +//function : Execute +//purpose : +//======================================================================= +Standard_Integer GEOMImpl_PipePathDriver::Execute (TFunction_Logbook& log) const +{ + if (Label().IsNull()) return 0; + Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); + Standard_Integer aType = aFunction->GetType(); + + TopoDS_Shape aRes; + + // RestorePath + if (aType == PIPE_PATH_TWO_BASES) { + GEOMImpl_IPipePath aPI (aFunction); + + Handle(GEOM_Function) aRefShape = aPI.GetShape(); + Handle(GEOM_Function) aRefBase1 = aPI.GetBase1(); + Handle(GEOM_Function) aRefBase2 = aPI.GetBase2(); + + TopoDS_Shape aShape = aRefShape->GetValue(); + TopoDS_Shape aBase1 = aRefBase1->GetValue(); + TopoDS_Shape aBase2 = aRefBase2->GetValue(); + + if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) + Standard_NullObject::Raise("RestorePath aborted : null argument"); + +#if OCC_VERSION_LARGE > 0x06050300 + BRepOffsetAPI_MiddlePath aMPB (aShape, aBase1, aBase2); + aMPB.Build(); + if (aMPB.IsDone()) { + aRes = aMPB.Shape(); + } +#else + Standard_NullObject::Raise("RestorePath is not implemented in used OCCT version"); +#endif + } + else if (aType == PIPE_PATH_TWO_SEQS) { + GEOMImpl_IPipePath aPI (aFunction); + + Handle(GEOM_Function) aRefShape = aPI.GetShape(); + TopoDS_Shape aShape = aRefShape->GetValue(); + + Handle(TColStd_HSequenceOfTransient) aBaseSeq1 = aPI.GetBaseSeq1(); + Handle(TColStd_HSequenceOfTransient) aBaseSeq2 = aPI.GetBaseSeq2(); + + TopoDS_Shape aBase1; + TopoDS_Shape aBase2; + + if (aBaseSeq1->Length() == 1 && aBaseSeq2->Length() == 1) { + Handle(GEOM_Function) aRefShape1 = Handle(GEOM_Function)::DownCast(aBaseSeq1->Value(1)); + Handle(GEOM_Function) aRefShape2 = Handle(GEOM_Function)::DownCast(aBaseSeq2->Value(1)); + aBase1 = aRefShape1->GetValue(); + aBase2 = aRefShape2->GetValue(); + } + else { + aBase1 = GEOMImpl_ShapeDriver::MakeWireFromEdges(aBaseSeq1, Precision::Confusion()); + aBase2 = GEOMImpl_ShapeDriver::MakeWireFromEdges(aBaseSeq2, Precision::Confusion()); + } + + if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) + Standard_NullObject::Raise("RestorePath aborted : null argument"); + +#if OCC_VERSION_LARGE > 0x06050300 + BRepOffsetAPI_MiddlePath aMPB (aShape, aBase1, aBase2); + aMPB.Build(); + if (aMPB.IsDone()) { + aRes = aMPB.Shape(); + } +#else + Standard_NullObject::Raise("RestorePath is not implemented in used OCCT version"); +#endif + } + else { + } + + if (aRes.IsNull()) return 0; + + aFunction->SetValue(aRes); + log.SetTouched(Label()); + + return 1; +} + +//======================================================================= +//function : GEOMImpl_PipePathDriver_Type_ +//purpose : +//======================================================================= +Standard_EXPORT Handle_Standard_Type& GEOMImpl_PipePathDriver_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_PipePathDriver", + sizeof(GEOMImpl_PipePathDriver), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); + + return _aType; +} + +//======================================================================= +//function : DownCast +//purpose : +//======================================================================= +const Handle(GEOMImpl_PipePathDriver) Handle(GEOMImpl_PipePathDriver)::DownCast(const Handle(Standard_Transient)& AnObject) +{ + Handle(GEOMImpl_PipePathDriver) _anOtherObject; + + if (!AnObject.IsNull()) { + if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_PipePathDriver))) { + _anOtherObject = Handle(GEOMImpl_PipePathDriver)((Handle(GEOMImpl_PipePathDriver)&)AnObject); + } + } + + return _anOtherObject; +} diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx new file mode 100644 index 000000000..36bf36314 --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -0,0 +1,167 @@ +// Copyright (C) 2007-2012 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_PipePathDriver.ixx +// Module : GEOMImpl + +#ifndef _GEOMImpl_PipePathDriver_HeaderFile +#define _GEOMImpl_PipePathDriver_HeaderFile + +#ifndef _TColStd_SequenceOfExtendedString_HeaderFile +#include +#endif +#ifndef _Standard_TypeMismatch_HeaderFile +#include +#endif + +#ifndef _Standard_HeaderFile +#include +#endif + +#ifndef _Standard_Macro_HeaderFile +#include +#endif +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _Standard_GUID_HeaderFile +#include +#endif + +#ifndef _Handle_TFunction_Driver_HeaderFile +#include +#endif + + +class Standard_Transient; +class Handle_Standard_Type; +class Handle(TFunction_Driver); +class GEOMImpl_PipePathDriver; + +Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_PipePathDriver); + +class Handle(GEOMImpl_PipePathDriver) : 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_PipePathDriver)():Handle(TFunction_Driver)() {} + Handle(GEOMImpl_PipePathDriver)(const Handle(GEOMImpl_PipePathDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) + { + } + + Handle(GEOMImpl_PipePathDriver)(const GEOMImpl_PipePathDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) + { + } + + Handle(GEOMImpl_PipePathDriver)& operator=(const Handle(GEOMImpl_PipePathDriver)& aHandle) + { + Assign(aHandle.Access()); + return *this; + } + + Handle(GEOMImpl_PipePathDriver)& operator=(const GEOMImpl_PipePathDriver* anItem) + { + Assign((Standard_Transient *)anItem); + return *this; + } + + GEOMImpl_PipePathDriver* operator->() + { + return (GEOMImpl_PipePathDriver *)ControlAccess(); + } + + GEOMImpl_PipePathDriver* operator->() const + { + return (GEOMImpl_PipePathDriver *)ControlAccess(); + } + + Standard_EXPORT ~Handle(GEOMImpl_PipePathDriver)() {}; + + Standard_EXPORT static const Handle(GEOMImpl_PipePathDriver) DownCast(const Handle(Standard_Transient)& AnObject); +}; + +#ifndef _TFunction_Driver_HeaderFile +#include +#endif +#ifndef _TFunction_Logbook_HeaderFile +#include +#endif +#ifndef _Standard_CString_HeaderFile +#include +#endif + +#include +#include +#include + +class TColStd_SequenceOfExtendedString; + + +class GEOMImpl_PipePathDriver : 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_PipePathDriver(); + 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_PipePathDriver() {}; + + // Type management + // + Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_PipePathDriver_Type_(); + Standard_EXPORT const Handle(Standard_Type)& DynamicType() const + { return STANDARD_TYPE(GEOMImpl_PipePathDriver) ; } + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const + { return (STANDARD_TYPE(GEOMImpl_PipePathDriver) == AType || + TFunction_Driver::IsKind(AType)); } + +}; + +#endif diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 9f2ec8081..12962ffc7 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -133,66 +133,12 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const if (aType == WIRE_EDGES) { Handle(TColStd_HSequenceOfTransient) aShapes = aCI.GetShapes(); - TopoDS_Wire aWire; - B.MakeWire(aWire); - // add edges - for (unsigned int ind = 1; ind <= aShapes->Length(); ind++) { - Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(ind)); - TopoDS_Shape aShape_i = aRefShape->GetValue(); - if (aShape_i.IsNull()) { - Standard_NullObject::Raise("Shape for wire construction is null"); - } - if (aShape_i.ShapeType() == TopAbs_EDGE || aShape_i.ShapeType() == TopAbs_WIRE) { - TopExp_Explorer exp (aShape_i, TopAbs_EDGE); - for (; exp.More(); exp.Next()) - B.Add(aWire, TopoDS::Edge(exp.Current())); - } else { - Standard_TypeMismatch::Raise - ("Shape for wire construction is neither an edge nor a wire"); - } - } - - // fix edges order - Handle(ShapeFix_Wire) aFW = new ShapeFix_Wire; - aFW->Load(aWire); - aFW->FixReorder(); - - if (aFW->StatusReorder(ShapeExtend_FAIL1)) { - Standard_ConstructionError::Raise("Wire construction failed: several loops detected"); - } else if (aFW->StatusReorder(ShapeExtend_FAIL)) { - Standard_ConstructionError::Raise("Wire construction failed"); - } else { - } - - // IMP 0019766: Building a Wire from unconnected edges by introducing a tolerance Standard_Real aTolerance = aCI.GetTolerance(); if (aTolerance < Precision::Confusion()) aTolerance = Precision::Confusion(); - aFW->ClosedWireMode() = Standard_False; - aFW->FixConnected(aTolerance); - if (aFW->StatusConnected(ShapeExtend_FAIL)) { - Standard_ConstructionError::Raise("Wire construction failed: cannot build connected wire"); - } - // IMP 0019766 - if (aFW->StatusConnected(ShapeExtend_DONE3)) { - // Confused with but not Analyzer.Precision(), set the same - aFW->FixGapsByRangesMode() = Standard_True; - if (aFW->FixGaps3d()) { - Handle(ShapeExtend_WireData) sbwd = aFW->WireData(); - Handle(ShapeFix_Edge) aFe = new ShapeFix_Edge; - for (Standard_Integer iedge = 1; iedge <= sbwd->NbEdges(); iedge++) { - TopoDS_Edge aEdge = TopoDS::Edge(sbwd->Edge(iedge)); - aFe->FixVertexTolerance(aEdge); - aFe->FixSameParameter(aEdge); - } - } - else if (aFW->StatusGaps3d(ShapeExtend_FAIL)) { - Standard_ConstructionError::Raise("Wire construction failed: cannot fix 3d gaps"); - } - } - aShape = aFW->WireAPIMake(); + aShape = MakeWireFromEdges(aShapes, aTolerance); } else if (aType == FACE_WIRE) { Handle(GEOM_Function) aRefBase = aCI.GetBase(); @@ -594,6 +540,10 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const BRepCheck_Analyzer ana (aShape, false); if (!ana.IsValid()) { //Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result"); + // For Mantis issue 0021772: EDF 2336 GEOM: Non valid face created from two circles + Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape (aShape); + aSfs->Perform(); + aShape = aSfs->Shape(); } aFunction->SetValue(aShape); @@ -606,6 +556,73 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const return 1; } +TopoDS_Wire GEOMImpl_ShapeDriver::MakeWireFromEdges(const Handle(TColStd_HSequenceOfTransient)& theEdgesFuncs, + const Standard_Real theTolerance) +{ + BRep_Builder B; + + TopoDS_Wire aWire; + B.MakeWire(aWire); + + // add edges + for (unsigned int ind = 1; ind <= theEdgesFuncs->Length(); ind++) { + Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(theEdgesFuncs->Value(ind)); + TopoDS_Shape aShape_i = aRefShape->GetValue(); + if (aShape_i.IsNull()) { + Standard_NullObject::Raise("Shape for wire construction is null"); + } + if (aShape_i.ShapeType() == TopAbs_EDGE || aShape_i.ShapeType() == TopAbs_WIRE) { + TopExp_Explorer exp (aShape_i, TopAbs_EDGE); + for (; exp.More(); exp.Next()) + B.Add(aWire, TopoDS::Edge(exp.Current())); + } else { + Standard_TypeMismatch::Raise + ("Shape for wire construction is neither an edge nor a wire"); + } + } + + // fix edges order + Handle(ShapeFix_Wire) aFW = new ShapeFix_Wire; + aFW->Load(aWire); + aFW->FixReorder(); + + if (aFW->StatusReorder(ShapeExtend_FAIL1)) { + Standard_ConstructionError::Raise("Wire construction failed: several loops detected"); + } + else if (aFW->StatusReorder(ShapeExtend_FAIL)) { + Standard_ConstructionError::Raise("Wire construction failed"); + } + else { + } + + // IMP 0019766: Building a Wire from unconnected edges by introducing a tolerance + aFW->ClosedWireMode() = Standard_False; + aFW->FixConnected(theTolerance); + if (aFW->StatusConnected(ShapeExtend_FAIL)) { + Standard_ConstructionError::Raise("Wire construction failed: cannot build connected wire"); + } + // IMP 0019766 + if (aFW->StatusConnected(ShapeExtend_DONE3)) { + // Confused with but not Analyzer.Precision(), set the same + aFW->FixGapsByRangesMode() = Standard_True; + if (aFW->FixGaps3d()) { + Handle(ShapeExtend_WireData) sbwd = aFW->WireData(); + Handle(ShapeFix_Edge) aFe = new ShapeFix_Edge; + for (Standard_Integer iedge = 1; iedge <= sbwd->NbEdges(); iedge++) { + TopoDS_Edge aEdge = TopoDS::Edge(sbwd->Edge(iedge)); + aFe->FixVertexTolerance(aEdge); + aFe->FixSameParameter(aEdge); + } + } + else if (aFW->StatusGaps3d(ShapeExtend_FAIL)) { + Standard_ConstructionError::Raise("Wire construction failed: cannot fix 3d gaps"); + } + } + aWire = aFW->WireAPIMake(); + + return aWire; +} + TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, const Standard_Real LinTol, const Standard_Real AngTol) diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 653ad7e13..87c55c501 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -120,6 +120,8 @@ class Handle(GEOMImpl_ShapeDriver) : public Handle(TFunction_Driver) { #include #include +#include +#include class TColStd_SequenceOfExtendedString; @@ -151,9 +153,13 @@ public: Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT static TopoDS_Edge MakeEdgeFromWire(const TopoDS_Shape& aWire, - const Standard_Real LinTol, - const Standard_Real AngTol); + Standard_EXPORT static TopoDS_Edge MakeEdgeFromWire (const TopoDS_Shape& aWire, + const Standard_Real LinTol, + const Standard_Real AngTol); + + Standard_EXPORT static TopoDS_Wire MakeWireFromEdges + (const Handle(TColStd_HSequenceOfTransient)& theEdgesFuncs, + const Standard_Real theTolerance); // Type management // diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx index 5182f8cdc..4aeed6398 100755 --- a/src/GEOMImpl/GEOMImpl_Types.hxx +++ b/src/GEOMImpl/GEOMImpl_Types.hxx @@ -100,6 +100,8 @@ #define GEOM_EXTRUDED_BOSS 47 +#define GEOM_PIPE_PATH 48 + //GEOM_Function types #define COPY_WITH_REF 1 @@ -214,6 +216,10 @@ #define PIPE_SHELLS_WITHOUT_PATH 4 #define PIPE_BI_NORMAL_ALONG_VECTOR 5 +// RestorePath +#define PIPE_PATH_TWO_BASES 1 +#define PIPE_PATH_TWO_SEQS 2 + #define THRUSECTIONS_RULED 1 #define THRUSECTIONS_SMOOTHED 2 diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am index 69cda82da..8ce12ca2e 100644 --- a/src/GEOMImpl/Makefile.am +++ b/src/GEOMImpl/Makefile.am @@ -83,6 +83,7 @@ salomeinclude_HEADERS = \ GEOMImpl_ITorus.hxx \ GEOMImpl_IPrism.hxx \ GEOMImpl_IPipe.hxx \ + GEOMImpl_IPipePath.hxx \ GEOMImpl_IRevolution.hxx \ GEOMImpl_IMeasure.hxx \ GEOMImpl_IShapes.hxx \ @@ -111,6 +112,7 @@ salomeinclude_HEADERS = \ GEOMImpl_TorusDriver.hxx \ GEOMImpl_PrismDriver.hxx \ GEOMImpl_PipeDriver.hxx \ + GEOMImpl_PipePathDriver.hxx \ GEOMImpl_ThruSectionsDriver.hxx \ GEOMImpl_RevolutionDriver.hxx \ GEOMImpl_ShapeDriver.hxx \ @@ -185,6 +187,7 @@ dist_libGEOMimpl_la_SOURCES = \ GEOMImpl_TorusDriver.cxx \ GEOMImpl_PrismDriver.cxx \ GEOMImpl_PipeDriver.cxx \ + GEOMImpl_PipePathDriver.cxx \ GEOMImpl_ThruSectionsDriver.cxx \ GEOMImpl_RevolutionDriver.cxx \ GEOMImpl_ShapeDriver.cxx \ diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index e83523ea4..01f2c182f 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -649,9 +649,9 @@ bool GEOMToolsGUI::Import() // jfa 21.08.2012 for mantis issue 21511 (STEP file units) CORBA::String_var aUnits = aInsOp->ReadValue(fileN, fileT, "LEN_UNITS"); - TCollection_AsciiString aUnitsStr (aUnits.in()); + QString aUnitsStr (aUnits.in()); bool needConvert = true; - if (aUnitsStr.IsEmpty() || aUnitsStr == "UNIT_M") + if (aUnitsStr.isEmpty() || aUnitsStr == "M" || aUnitsStr.toLower() == "metre") needConvert = false; if (needConvert) { @@ -664,7 +664,7 @@ bool GEOMToolsGUI::Import() if (i < fileNames.count() - 1) btns = btns | SUIT_MessageBox::YesToAll | SUIT_MessageBox::NoToAll; igesAnswer = SUIT_MessageBox::question(app->desktop(), "Question",//tr("WRN_WARNING"), - tr("GEOM_SCALE_DIMENSIONS"), + tr("GEOM_SCALE_DIMENSIONS").arg(aUnitsStr), btns | SUIT_MessageBox::Cancel, SUIT_MessageBox::No); switch (igesAnswer) { diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index c73767ca2..526a9b1e4 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -111,10 +111,10 @@ // If the next macro is defined, autocolor feature works for all sub-shapes; // if it is undefined, autocolor feature works for groups only -//#define GENERAL_AUTOCOLOR +#define GENERAL_AUTOCOLOR // Below macro, when uncommented, switches on simplified (more performant) algorithm // of auto-color picking up -//#define SIMPLE_AUTOCOLOR +#define SIMPLE_AUTOCOLOR void GEOMToolsGUI::OnCheckGeometry() { diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index fe877f791..3dec74459 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -28,6 +28,7 @@ #include "GEOM_Gen_i.hh" #include "GEOM_Object_i.hh" +#include "GEOM_version.h" #include #include @@ -2551,6 +2552,16 @@ char* GEOM_Gen_i::getObjectInfo(CORBA::Long studyId, const char* entry) return ret; } +// Version information +char* GEOM_Gen_i::getVersion() +{ +#if GEOM_DEVELOPMENT + return CORBA::string_dup(GEOM_VERSION_STR"dev"); +#else + return CORBA::string_dup(GEOM_VERSION_STR); +#endif +} + //===================================================================================== // EXPORTED METHODS //===================================================================================== diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index 9e65dea0c..021ce1bcb 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -264,6 +264,9 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi virtual bool hasObjectInfo(); virtual char* getObjectInfo(CORBA::Long studyId, const char* entry); + // Version information + virtual char* getVersion(); + //-----------------------------------------------------------------------// // Internal methods // //-----------------------------------------------------------------------// diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index 76febf836..95948ed24 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -18,7 +18,6 @@ // 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 @@ -1096,7 +1095,6 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath return GetObject(anObject); } - //============================================================================= /*! * MakePipeBiNormalAlongVector @@ -1127,3 +1125,81 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector return GetObject(anObject); } + +//============================================================================= +/*! + * RestorePath + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePath + (GEOM::GEOM_Object_ptr theShape, + GEOM::GEOM_Object_ptr theBase1, + GEOM::GEOM_Object_ptr theBase2) +{ + GEOM::GEOM_Object_var aGEOMObject; + + // Set a not done flag + GetOperations()->SetNotDone(); + + // Get the reference objects + Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(GEOM_Object) aBase1 = GetObjectImpl(theBase1); + Handle(GEOM_Object) aBase2 = GetObjectImpl(theBase2); + + if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn(); + + // Create the Path + Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + +//============================================================================= +/*! + * RestorePathEdges + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges + (GEOM::GEOM_Object_ptr theShape, + const GEOM::ListOfGO& theBase1, + const GEOM::ListOfGO& theBase2) +{ + GEOM::GEOM_Object_var aGEOMObject; + + // Set a not done flag + GetOperations()->SetNotDone(); + + // Get the reference objects + Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + if (aShape.IsNull()) return aGEOMObject._retn(); + + Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient; + Handle(TColStd_HSequenceOfTransient) aSeqBases2 = new TColStd_HSequenceOfTransient; + + int ind; + int aNbBases1 = theBase1.length(); + int aNbBases2 = theBase2.length(); + + for (ind = 0; ind < aNbBases1; ind++) { + Handle(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); + if (!aBase.IsNull()) + aSeqBases1->Append(aBase); + } + for (ind = 0; ind < aNbBases2; ind++) { + Handle(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); + if (!aBase.IsNull()) + aSeqBases2->Append(aBase); + } + + if (!aSeqBases1->Length() || !aSeqBases2->Length()) + return aGEOMObject._retn(); + + // Create the Path + Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh index 05a748932..5b274671b 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh @@ -18,7 +18,6 @@ // 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 @@ -188,6 +187,13 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i : GEOM::GEOM_Object_ptr thePath, GEOM::GEOM_Object_ptr theVec); + GEOM::GEOM_Object_ptr RestorePath (GEOM::GEOM_Object_ptr theShape, + GEOM::GEOM_Object_ptr theBase1, + GEOM::GEOM_Object_ptr theBase2); + GEOM::GEOM_Object_ptr RestorePathEdges (GEOM::GEOM_Object_ptr theShape, + const GEOM::ListOfGO& theBase1, + const GEOM::ListOfGO& theBase2); + ::GEOMImpl_I3DPrimOperations* GetOperations() { return (::GEOMImpl_I3DPrimOperations*)GetImpl(); } }; diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am index dfdba30a5..b5cd51165 100644 --- a/src/GEOM_I/Makefile.am +++ b/src/GEOM_I/Makefile.am @@ -81,7 +81,8 @@ libGEOMEngine_la_CPPFLAGS = \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMAlgo \ -I$(srcdir)/../GEOM \ - -I$(top_builddir)/idl + -I$(top_builddir)/idl \ + -I$(top_builddir) libGEOMEngine_la_LDFLAGS = \ diff --git a/src/GEOM_PY/structelem/__init__.py b/src/GEOM_PY/structelem/__init__.py index 8f90c0002..be6557887 100644 --- a/src/GEOM_PY/structelem/__init__.py +++ b/src/GEOM_PY/structelem/__init__.py @@ -147,7 +147,13 @@ class StructuralElementManager: (meshGroupList, newparams) = self._extractMeshGroups(command) for meshGroup in meshGroupList: # Get the geometrical primitive object - groupSObj = self._studyEditor.study.FindObject(meshGroup) + if meshGroup.startswith('/'): + groupSObj = self._studyEditor.study.FindObjectByPath(meshGroup) + meshGroup = meshGroup.split('/')[-1] + pass + else: + groupSObj = self._studyEditor.study.FindObject(meshGroup) + pass groupGeomObj = None if groupSObj is not None: groupGeomObj = \ diff --git a/src/GEOM_PY/structelem/orientation.py b/src/GEOM_PY/structelem/orientation.py index 7ecae7789..bbedb37e3 100644 --- a/src/GEOM_PY/structelem/orientation.py +++ b/src/GEOM_PY/structelem/orientation.py @@ -27,7 +27,7 @@ import math from salome.kernel.logger import Logger from salome.kernel import termcolor -logger = Logger("__PAL_GEOM__.structelem.orientation", color = termcolor.RED) +logger = Logger("salome.geom.structelem.orientation", color = termcolor.RED) class Orientation1D: @@ -57,25 +57,24 @@ class Orientation1D: coordinate system. The parameters can be specified several times. In this case, only the - first "VECT_Y" is taken into account, and the values of "ANGL_VRIL" - are added to obtain the total rotation angle. + last "VECT_Y" or "ANGL_VRIL" is taken into account. """ + if self._vectorYCoords is not None or self._angle != 0.0: + logger.warning('Orientation parameters are specified several ' + 'times for the same mesh group, only the last ' + 'parameter will be used') mydict = params.copy() if mydict.has_key("VECT_Y"): newVecCoords = mydict.pop("VECT_Y") - if self._vectorYCoords is None: - logger.debug("Setting orientation vector Y to %s" % + logger.debug("Setting orientation vector Y to %s" % str(newVecCoords)) - self._vectorYCoords = newVecCoords - else: - logger.warning('Orientation parameter "VECT_Y" is specified ' - 'several times for the same mesh group, vector' - ' %s will be used' % str(self._vectorYCoords)) + self._vectorYCoords = newVecCoords + self._angle = 0.0 if mydict.has_key("ANGL_VRIL"): newAngle = mydict.pop("ANGL_VRIL") - self._angle += newAngle - logger.debug("Adding angle %f to orientation, new angle is %f." % - (newAngle, self._angle)) + logger.debug("Setting orientation angle to %f" % newAngle) + self._angle = newAngle + self._vectorYCoords = None if len(mydict) > 0: logger.warning("Invalid orientation parameter(s) (ignored): %s" % str(mydict)) diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index b74b80816..3b9381772 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -109,8 +109,12 @@ def TestAll (geompy, math): sk = geompy.Sketcher3D() sk.addPointsAbsolute(0,0,0, 70,0,0) sk.addPointsRelative(0, 0, 130) - sk.addPointAnglesLength("OXY", 50, 0, 100) - sk.addPointAnglesLength("OXZ", 30, 80, 130) + sk.addPointRadiusAnglesRelative(100, 50, 0,"OXY") + sk.addPointRadiusAnglesRelative(130, 30, 80, "OXZ") + sk.addPointRadiusAnglesAbsolute(500, 60, 30,"OXY") + sk.addPointRadiusAngleHRelative(100, 50, 0,"OXY") + sk.addPointRadiusAngleHRelative(130, 30, 40, "OXZ") + sk.addPointRadiusAngleHAbsolute(800, 60, 30,"OXY") sk.close() Sketcher3d_1 = sk.wire() @@ -204,7 +208,7 @@ def TestAll (geompy, math): Line3 = geompy.MakeLineTwoFaces(prism1_faces[0], prism1_faces[1]) #(2 GEOM_Object)->GEOM_Object #Create advanced objects - Copy = geompy.MakeCopy(Box) #(GEOM_Object)->GEOM_Object + Copy = geompy.MakeCopy(Box) #(GEOM_Object)->GEOM_Object Prism = geompy.MakePrismVecH(Face, vz, 100.0) #(2 GEOM_Object, Double)->GEOM_Object Prism2Ways = geompy.MakePrismVecH2Ways(Face, vz, 10.0) #(2 GEOM_Object, Double)->GEOM_Object PrismTwoPnt = geompy.MakePrism(Face2, p0, pxyz) #(3 GEOM_Object)->GEOM_Object @@ -214,9 +218,9 @@ def TestAll (geompy, math): Revolution = geompy.MakeRevolution(Face, vz, angle2) # Revolution2Ways = geompy.MakeRevolution(Face, vz, angle1) # Filling = geompy.MakeFilling(Compound, mindeg, maxdeg, - tol2d, tol3d, nbiter) #(GEOM_Object, 4 Doubles, Short)->GEOM_Object - Pipe = geompy.MakePipe(Wire, Edge) #(2 GEOM_Object)->GEOM_Object - Sewing = geompy.MakeSewing([Face, S], precision) #(List Of GEOM_Object, Double)->GEOM_Object + tol2d, tol3d, nbiter) #(GEOM_Object, 4 Doubles, Short)->GEOM_Object + Pipe = geompy.MakePipe(Wire, Edge) #(2 GEOM_Object)->GEOM_Object + Sewing = geompy.MakeSewing([Face, S], precision) #(List Of GEOM_Object, Double)->GEOM_Object #Transform objects Translation = geompy.MakeTranslationTwoPoints(Box, px, pz) #(3 GEOM_Object)->GEOM_Object @@ -408,6 +412,28 @@ def TestAll (geompy, math): id_Pipe = geompy.addToStudy(Pipe, "Pipe") id_Sewing = geompy.addToStudy(Sewing, "Sewing") + import salome_version + if int(salome_version.getXVersion(), 16) >= int('0x060600', 16): + [Face5, Face6] = geompy.SubShapes(Box, [31, 33]) + [b1_e1, b1_e2, b1_e3, b1_e4] = geompy.SubShapes(Box, [12, 22, 25, 29]) + [b2_e1, b2_e2, b2_e3, b2_e4] = geompy.SubShapes(Box, [ 8, 18, 26, 30]) + Path1 = geompy.RestorePath(Box, Face5, Face6) + Path2 = geompy.RestorePathEdges(Box, [b1_e1, b1_e2, b1_e3, b1_e4], [b2_e1, b2_e2, b2_e3, b2_e4]) + + id_Base1 = geompy.addToStudyInFather(Box, Face5, "Base1") + id_Base2 = geompy.addToStudyInFather(Box, Face6, "Base2") + id_Base1e1 = geompy.addToStudyInFather(Box, b1_e1, "Base1 Edge1") + id_Base1e2 = geompy.addToStudyInFather(Box, b1_e2, "Base1 Edge2") + id_Base1e3 = geompy.addToStudyInFather(Box, b1_e3, "Base1 Edge3") + id_Base1e4 = geompy.addToStudyInFather(Box, b1_e4, "Base1 Edge4") + id_Base2e1 = geompy.addToStudyInFather(Box, b2_e1, "Base2 Edge1") + id_Base2e2 = geompy.addToStudyInFather(Box, b2_e2, "Base2 Edge2") + id_Base2e3 = geompy.addToStudyInFather(Box, b2_e3, "Base2 Edge3") + id_Base2e4 = geompy.addToStudyInFather(Box, b2_e4, "Base2 Edge4") + id_Path1 = geompy.addToStudy(Path1, "Path1") + id_Path2 = geompy.addToStudy(Path2, "Path2") + pass + 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") diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 4db5841a0..4f85d8183 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -78,16 +78,25 @@ def TestExportImport (geompy, shape): # Import Import = geompy.ImportFile(fileExportImport, "BREP") - id_Import = geompy.addToStudy(Import, "Import") + geompy.addToStudy(Import, "Import") # ImportBREP, ImportIGES, ImportSTEP ImportBREP = geompy.ImportBREP(fileExportImportBREP) ImportIGES = geompy.ImportIGES(fileExportImportIGES) ImportSTEP = geompy.ImportSTEP(fileExportImportSTEP) - id_ImportBREP = geompy.addToStudy(ImportBREP, "ImportBREP") - id_ImportIGES = geompy.addToStudy(ImportIGES, "ImportIGES") - id_ImportSTEP = geompy.addToStudy(ImportSTEP, "ImportSTEP") + geompy.addToStudy(ImportBREP, "ImportBREP") + geompy.addToStudy(ImportIGES, "ImportIGES") + geompy.addToStudy(ImportSTEP, "ImportSTEP") + + # GetIGESUnit and GetSTEPUnit + if geompy.GetIGESUnit(fileExportImportIGES) != "M": + ImportIGES_scaled = geompy.ImportIGES(fileExportImportIGES, True) + geompy.addToStudy(ImportIGES_scaled, "ImportIGES_scaled") + + if geompy.GetSTEPUnit(fileExportImportSTEP) != "M": + ImportSTEP_scaled = geompy.ImportSTEP(fileExportImportSTEP, True) + geompy.addToStudy(ImportSTEP_scaled, "ImportSTEP_scaled") # Remove files for Export/Import testing os.remove(fileExportImport) diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 0dd628e5a..40a7dd53a 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -2867,6 +2867,76 @@ class geompyDC(GEOM._objref_GEOM_Gen): RaiseIfFailed("MakePipeBiNormalAlongVector", self.PrimOp) return anObj + ## Build a middle path of a pipe-like shape. + # The path shape can be a wire or an edge. + # @param theShape It can be closed or unclosed pipe-like shell + # or a pipe-like solid. + # @param theBase1, theBase2 Two bases of the supposed pipe. This + # should be wires or faces of theShape. + # @note It is not assumed that exact or approximate copy of theShape + # can be obtained by applying existing Pipe operation on the + # resulting "Path" wire taking theBase1 as the base - it is not + # always possible; though in some particular cases it might work + # it is not guaranteed. Thus, RestorePath function should not be + # considered as an exact reverse operation of the Pipe. + # @return New GEOM.GEOM_Object, containing an edge or wire that represent + # source pipe's "path". + # + # @ref tui_creation_pipe_path "Example" + def RestorePath (self, theShape, theBase1, theBase2): + """ + Build a middle path of a pipe-like shape. + The path shape can be a wire or an edge. + + Parameters: + theShape It can be closed or unclosed pipe-like shell + or a pipe-like solid. + theBase1, theBase2 Two bases of the supposed pipe. This + should be wires or faces of theShape. + + Returns: + New GEOM_Object, containing an edge or wire that represent + source pipe's path. + """ + anObj = self.PrimOp.RestorePath(theShape, theBase1, theBase2) + RaiseIfFailed("RestorePath", self.PrimOp) + return anObj + + ## Build a middle path of a pipe-like shape. + # The path shape can be a wire or an edge. + # @param theShape It can be closed or unclosed pipe-like shell + # or a pipe-like solid. + # @param listEdges1, listEdges2 Two bases of the supposed pipe. This + # should be lists of edges of theShape. + # @note It is not assumed that exact or approximate copy of theShape + # can be obtained by applying existing Pipe operation on the + # resulting "Path" wire taking theBase1 as the base - it is not + # always possible; though in some particular cases it might work + # it is not guaranteed. Thus, RestorePath function should not be + # considered as an exact reverse operation of the Pipe. + # @return New GEOM.GEOM_Object, containing an edge or wire that represent + # source pipe's "path". + # + # @ref tui_creation_pipe_path "Example" + def RestorePathEdges (self, theShape, listEdges1, listEdges2): + """ + Build a middle path of a pipe-like shape. + The path shape can be a wire or an edge. + + Parameters: + theShape It can be closed or unclosed pipe-like shell + or a pipe-like solid. + listEdges1, listEdges2 Two bases of the supposed pipe. This + should be lists of edges of theShape. + + Returns: + New GEOM_Object, containing an edge or wire that represent + source pipe's path. + """ + anObj = self.PrimOp.RestorePathEdges(theShape, listEdges1, listEdges2) + RaiseIfFailed("RestorePath", self.PrimOp) + return anObj + # end of l3_complex ## @} @@ -7251,12 +7321,13 @@ class geompyDC(GEOM._objref_GEOM_Gen): # @param theFileName The file, containing the shape. # @param theFormatName Specify format for the file reading. # Available formats can be obtained with InsertOp.ImportTranslators() method. - # If format 'IGES_SCALE' is used instead 'IGES' length unit will be - # set to 'meter' and result model will be scaled. + # If format 'IGES_SCALE' is used instead of 'IGES' or + # format 'STEP_SCALE' is used instead of 'STEP', + # length unit will be set to 'meter' and result model will be scaled. # @return New GEOM.GEOM_Object, containing the imported shape. # # @ref swig_Import_Export "Example" - def ImportFile(self,theFileName, theFormatName): + def ImportFile(self, theFileName, theFormatName): """ Import a shape from the BREP or IGES or STEP file (depends on given format) with given name. @@ -7264,9 +7335,10 @@ class geompyDC(GEOM._objref_GEOM_Gen): Parameters: theFileName The file, containing the shape. theFormatName Specify format for the file reading. - Available formats can be obtained with geompy.InsertOp.ImportTranslators() method. - If format 'IGES_SCALE' is used instead 'IGES' length unit will be - set to 'meter' and result model will be scaled. + Available formats can be obtained with geompy.InsertOp.ImportTranslators() method. + If format 'IGES_SCALE' is used instead of 'IGES' or + format 'STEP_SCALE' is used instead of 'STEP', + length unit will be set to 'meter' and result model will be scaled. Returns: New GEOM.GEOM_Object, containing the imported shape. @@ -7277,7 +7349,7 @@ class geompyDC(GEOM._objref_GEOM_Gen): return anObj ## Deprecated analog of ImportFile() - def Import(self,theFileName, theFormatName): + def Import(self, theFileName, theFormatName): """ Deprecated analog of geompy.ImportFile """ @@ -7286,60 +7358,118 @@ class geompyDC(GEOM._objref_GEOM_Gen): RaiseIfFailed("Import", self.InsertOp) return anObj - ## Shortcut to ImportFile() for BREP format + ## Shortcut to ImportFile() for BREP format. + # Import a shape from the BREP file with given name. + # @param theFileName The file, containing the shape. + # @return New GEOM.GEOM_Object, containing the imported shape. # # @ref swig_Import_Export "Example" - def ImportBREP(self,theFileName): + def ImportBREP(self, theFileName): """ geompy.ImportFile(...) function for BREP format + Import a shape from the BREP file with given name. + + Parameters: + theFileName The file, containing the shape. + + Returns: + New GEOM.GEOM_Object, containing the imported shape. """ # Example: see GEOM_TestOthers.py return self.ImportFile(theFileName, "BREP") ## Shortcut to ImportFile() for IGES format + # Import a shape from the IGES file with given name. + # @param theFileName The file, containing the shape. + # @param ignoreUnits If True, file length units will be ignored (set to 'meter') + # and result model will be scaled, if its units are not meters. + # If False (default), file length units will be taken into account. + # @return New GEOM.GEOM_Object, containing the imported shape. # # @ref swig_Import_Export "Example" - def ImportIGES(self,theFileName): + def ImportIGES(self, theFileName, ignoreUnits = False): """ geompy.ImportFile(...) function for IGES format + + Parameters: + theFileName The file, containing the shape. + ignoreUnits If True, file length units will be ignored (set to 'meter') + and result model will be scaled, if its units are not meters. + If False (default), file length units will be taken into account. + + Returns: + New GEOM.GEOM_Object, containing the imported shape. """ # Example: see GEOM_TestOthers.py + if ignoreUnits: + return self.ImportFile(theFileName, "IGES_SCALE") return self.ImportFile(theFileName, "IGES") ## Return length unit from given IGES file + # @param theFileName The file, containing the shape. + # @return String, containing the units name. # # @ref swig_Import_Export "Example" - def GetIGESUnit(self,theFileName): + def GetIGESUnit(self, theFileName): """ - Return length unit from given IGES file + Return length units from given IGES file + + Parameters: + theFileName The file, containing the shape. + + Returns: + String, containing the units name. """ # Example: see GEOM_TestOthers.py - anObj = self.InsertOp.ImportFile(theFileName, "IGES_UNIT") - #RaiseIfFailed("Import", self.InsertOp) - # recieve name using returned vertex - UnitName = "M" - if anObj.GetShapeType() == GEOM.VERTEX: - vertices = [anObj] - else: - vertices = self.SubShapeAll(anObj,ShapeType["VERTEX"]) - if len(vertices)>0: - p = self.PointCoordinates(vertices[0]) - if abs(p[0]-0.01) < 1.e-6: - UnitName = "CM" - elif abs(p[0]-0.001) < 1.e-6: - UnitName = "MM" - return UnitName + aUnitName = self.InsertOp.ReadValue(theFileName, "IGES", "LEN_UNITS") + return aUnitName ## Shortcut to ImportFile() for STEP format + # Import a shape from the STEP file with given name. + # @param theFileName The file, containing the shape. + # @param ignoreUnits If True, file length units will be ignored (set to 'meter') + # and result model will be scaled, if its units are not meters. + # If False (default), file length units will be taken into account. + # @return New GEOM.GEOM_Object, containing the imported shape. # # @ref swig_Import_Export "Example" - def ImportSTEP(self,theFileName): + def ImportSTEP(self, theFileName, ignoreUnits = False): """ geompy.ImportFile(...) function for STEP format + + Parameters: + theFileName The file, containing the shape. + ignoreUnits If True, file length units will be ignored (set to 'meter') + and result model will be scaled, if its units are not meters. + If False (default), file length units will be taken into account. + + Returns: + New GEOM.GEOM_Object, containing the imported shape. """ # Example: see GEOM_TestOthers.py + if ignoreUnits: + return self.ImportFile(theFileName, "STEP_SCALE") return self.ImportFile(theFileName, "STEP") + ## Return length unit from given IGES or STEP file + # @param theFileName The file, containing the shape. + # @return String, containing the units name. + # + # @ref swig_Import_Export "Example" + def GetSTEPUnit(self, theFileName): + """ + Return length units from given STEP file + + Parameters: + theFileName The file, containing the shape. + + Returns: + String, containing the units name. + """ + # Example: see GEOM_TestOthers.py + aUnitName = self.InsertOp.ReadValue(theFileName, "STEP", "LEN_UNITS") + return aUnitName + ## Read a shape from the binary stream, containing its bounding representation (BRep). # @note This method will not be dumped to the python script by DumpStudy functionality. # @note GEOM.GEOM_Object.GetShapeStream() method can be used to obtain the shape's BRep stream. @@ -7372,7 +7502,7 @@ class geompyDC(GEOM._objref_GEOM_Gen): # Available formats can be obtained with InsertOp.ImportTranslators() method. # # @ref swig_Import_Export "Example" - def Export(self,theObject, theFileName, theFormatName): + def Export(self, theObject, theFileName, theFormatName): """ Export the given shape into a file with given name. @@ -9003,13 +9133,19 @@ class geompyDC(GEOM._objref_GEOM_Gen): RaiseIfFailed("LoadTexture", self.InsertOp) return ID - ## Get entry of the object + ## Get internal name of the object based on its study entry + # @note This method does not provide an unique identifier of the geometry object. + # @note This is internal function of GEOM component, though it can be used outside it for + # appropriate reason (e.g. for identification of geometry object). # @param obj geometry object # @return unique object identifier # @ingroup l1_geompy_auxiliary def getObjectID(self, obj): """ - Get entry of the object + Get internal name of the object based on its study entry. + Note: this method does not provide an unique identifier of the geometry object. + It is an internal function of GEOM component, though it can be used outside GEOM for + appropriate reason (e.g. for identification of geometry object). Parameters: obj geometry object diff --git a/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py index 11cb0771c..11ef9bb6d 100644 --- a/src/GEOM_SWIG/gsketcher.py +++ b/src/GEOM_SWIG/gsketcher.py @@ -121,28 +121,121 @@ class Sketcher3D: ## Add one straight segment, defined by two angles and length. # If the first point of sketcher is not yet defined, the # origin (0, 0, 0) will become the first sketcher point. - # @param axes can be: "OXY", "OYZ" or "OXZ" + # The radius and angles coordinates are defined + # in a local coordinate system which origin is the last point of the sketch + # + # @param length length of the segment # @param angle1 angle in a plane, defined by the \a axes # @param angle2 angle from the plane, defined by the \a axes - # @param length length of the segment - def addPointAnglesLength (self, axes, angle1, angle2, length): + # @param axes can be: "OXY", "OYZ" or "OXZ" + def addPointRadiusAnglesRelative (self, length, angle1, angle2, axes="OXY"): """ Add one straight segment, defined by two angles and length. If the first point of sketcher is not yet defined, the origin (0, 0, 0) will become the first sketcher point. Parameters: + length length of the segment + angle1 angle in a plane, defined by the \a axes + angle2 angle from the plane, defined by the \a axes axes can be: "OXY", "OYZ" or "OXZ" + + Example of usage: + sk = geompy.Sketcher3D() + sk.addPointRadiusAnglesRelative(100, 50, 0, "OXY") + a3D_Sketcher_1 = sk.wire() + """ + self.myCommand = self.myCommand + ":%s"%axes+"SR"+" %s %s %s" % (printVar(angle1), printVar(angle2), printVar(length)) + pass + + ## Add one straight segment, defined by two angles and radius. + # If the first point of sketcher is not yet defined, the + # origin (0, 0, 0) will become the first sketcher point. + # The radius and angles coordinates are defined + # in a coordinate system which origin is the global coordinate system origin + # + # @param radius distance to the coordinate system origin + # @param angle1 angle in a plane, defined by the \a axes + # @param angle2 angle from the plane, defined by the \a axes + # @param axes can be: "OXY", "OYZ" or "OXZ" + def addPointRadiusAnglesAbsolute (self, radius, angle1, angle2, axes="OXY"): + """ + Add one straight segment, defined by two angles and length. + If the first point of sketcher is not yet defined, the + origin (0, 0, 0) will become the first sketcher point. + + Parameters: + radius distance to the coordinate system origin angle1 angle in a plane, defined by the \a axes angle2 angle from the plane, defined by the \a axes - length length of the segment + axes can be: "OXY", "OYZ" or "OXZ" + + Example of usage: + sk = geompy.Sketcher3D() + sk.addPointRadiusAnglesAbsolute(100, 50, 0, "OXY") + a3D_Sketcher_1 = sk.wire() + """ + self.myCommand = self.myCommand + ":%s"%axes+"SA"+" %s %s %s" % (printVar(angle1), printVar(angle2), printVar(radius)) + pass + + ## Add one straight segment, defined by an angle, a height and a radius. + # If the first point of sketcher is not yet defined, the + # origin (0, 0, 0) will become the first sketcher point. + # The radius height and angle coordinates are defined + # in a local coordinate system which origin is the last point of the sketch + # + # @param axes can be: "OXY", "OYZ" or "OXZ" + # @param angle angle in a plane, defined by the \a axes + # @param height height from the plane, defined by the \a axes + # @param radius distance to the coordinate system origin + def addPointRadiusAngleHRelative (self, length, angle, height, axes="OXY"): + """ + Add one straight segment, defined by two angles and length. + If the first point of sketcher is not yet defined, the + origin (0, 0, 0) will become the first sketcher point. + + Parameters: + radius distance to the coordinate system origin + angle angle in a plane, defined by the \a axes + height height from the plane, defined by the \a axes + axes can be: "OXY", "OYZ" or "OXZ" + + Example of usage: + sk = geompy.Sketcher3D() + sk.addPointRadiusAngleHRelative(100, 50, 40, "OXY") + a3D_Sketcher_1 = sk.wire() + """ + self.myCommand = self.myCommand + ":%s"%axes+"CR"+" %s %s %s" % (printVar(angle), printVar(height), printVar(length)) + pass + + ## Add one straight segment, defined by an angle, a height and a radius. + # If the first point of sketcher is not yet defined, the + # origin (0, 0, 0) will become the first sketcher point. + # The radius height and angle coordinates are defined + # in a coordinate system which origin is the global coordinate system origin + # + # @param radius distance to the coordinate system origin + # @param angle angle in a plane, defined by the \a axes + # @param height height from the plane, defined by the \a axes + # @param axes can be: "OXY", "OYZ" or "OXZ" + def addPointRadiusAngleHAbsolute (self, radius, angle, height, axes="OXY"): + """ + Add one straight segment, defined by two angles and length. + If the first point of sketcher is not yet defined, the + origin (0, 0, 0) will become the first sketcher point. + + Parameters: + axes can be: "OXY", "OYZ" or "OXZ" + angle1 angle in a plane, defined by the \a axes + height height from the plane, defined by the \a axes + radius distance to the coordinate system origin Example of usage: sk = geompy.Sketcher3D() - sk.addPointAnglesLength("OXY", 50, 0, 100) + sk.addPointRadiusAngleHAbsolute( 100, 50, 40, "OXY") a3D_Sketcher_1 = sk.wire() """ - self.myCommand = self.myCommand + ":%s %s %s %s" % (axes, printVar(angle1), printVar(angle2), printVar(length)) + self.myCommand = self.myCommand + ":%s"%axes+"CA"+" %s %s %s" % (printVar(angle), printVar(height), printVar(radius)) pass ## Set to close the wire diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx index b341a92b0..3f94071ec 100644 --- a/src/GenerationGUI/GenerationGUI.cxx +++ b/src/GenerationGUI/GenerationGUI.cxx @@ -18,12 +18,11 @@ // 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. -// + #include "GenerationGUI.h" #include @@ -36,6 +35,7 @@ #include "GenerationGUI_RevolDlg.h" // Method REVOL #include "GenerationGUI_FillingDlg.h" // Method FILLING #include "GenerationGUI_PipeDlg.h" // Method PIPE +#include "GenerationGUI_PipePathDlg.h" // Method RESTORE PATH //======================================================================= // function : GenerationGUI() @@ -73,6 +73,7 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case GEOMOp::OpRevolution: aDlg = new GenerationGUI_RevolDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpFilling: aDlg = new GenerationGUI_FillingDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpPipe: aDlg = new GenerationGUI_PipeDlg ( getGeometryGUI(), parent ); break; + case GEOMOp::OpPipePath: aDlg = new GenerationGUI_PipePathDlg( getGeometryGUI(), parent ); break; default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break; } diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx new file mode 100644 index 000000000..b2d2d8d6b --- /dev/null +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx @@ -0,0 +1,392 @@ +// Copyright (C) 2007-2012 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 : GenerationGUI_PipePathDlg.cxx + +#include "GenerationGUI_PipePathDlg.h" + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +//================================================================================= +// class : GenerationGUI_PipePathDlg() +// purpose : Constructs a GenerationGUI_PipePathDlg 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_PipePathDlg::GenerationGUI_PipePathDlg (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_PATH"))); + QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); + + setWindowTitle(tr("GEOM_PIPE_PATH_TITLE")); + + /***************************************************************/ + mainFrame()->GroupConstructors->setTitle(tr("GEOM_PIPE_PATH")); + mainFrame()->RadioButton1->setIcon(image0); + mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton2->close(); + mainFrame()->RadioButton3->close(); + + GroupPoints = new DlgRef_3Sel1Check(centralWidget()); + + GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); + GroupPoints->TextLabel1->setText(tr("GEOM_PIPE_LIKE_SHAPE")); + GroupPoints->TextLabel2->setText(tr("GEOM_PIPE_BASE1_OBJECT")); + GroupPoints->TextLabel3->setText(tr("GEOM_PIPE_BASE2_OBJECT")); + 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_pipe_path_page.html"); + + // Initialisation + Init(); +} + +//================================================================================= +// function : ~GenerationGUI_PipePathDlg() +// purpose : Destroys the object and frees any allocated resources +//================================================================================= +GenerationGUI_PipePathDlg::~GenerationGUI_PipePathDlg() +{ + // no need to delete child widgets, Qt does it all for us +} + +//================================================================================= +// function : Init() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::Init() +{ + // init variables + GroupPoints->LineEdit1->setReadOnly(true); + GroupPoints->LineEdit2->setReadOnly(true); + GroupPoints->LineEdit3->setReadOnly(true); + + GroupPoints->LineEdit1->setText(""); + GroupPoints->LineEdit2->setText(""); + GroupPoints->LineEdit3->setText(""); + + myShape.nullify(); + + GroupPoints->CheckButton1->setEnabled(false); + + showOnlyPreviewControl(); + + // 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->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); + + connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(SelectionTypeButtonClicked())); + + initName(tr("GEOM_PIPE_PATH")); + + updateGeometry(); + resize(100,100); + + GroupPoints->PushButton1->click(); + SelectionIntoArgument(); +} + +//================================================================================= +// function : SelectionBittonClicked() +// purpose : Selection type Radio button management +//================================================================================= +void GenerationGUI_PipePathDlg::SelectionTypeButtonClicked() +{ + globalSelection(); + if (GroupPoints->CheckButton1->isChecked()) { + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + } + else { + TColStd_MapOfInteger aMap; + aMap.Add(GEOM_FACE); + aMap.Add(GEOM_WIRE); + aMap.Add(GEOM_EDGE); + globalSelection(aMap); + } + processPreview(); +} + +//================================================================================= +// function : ClickOnOk() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::ClickOnOk() +{ + setIsApplyAndClose(true); + if (ClickOnApply()) + ClickOnCancel(); +} + +//================================================================================= +// function : ClickOnApply() +// purpose : +//================================================================================= +bool GenerationGUI_PipePathDlg::ClickOnApply() +{ + if (!onAccept()) + return false; + + initName(); + // activate selection and connect selection manager + GroupPoints->PushButton1->click(); + return true; +} + +//================================================================================= +// function : SelectionIntoArgument() +// purpose : Called when selection is changed or on dialog initialization or activation +//================================================================================= +void GenerationGUI_PipePathDlg::SelectionIntoArgument() +{ + erasePreview(); + myEditCurrentArgument->setText(""); + + if (myEditCurrentArgument == GroupPoints->LineEdit1) { + QList types; + types << TopAbs_SOLID << TopAbs_SHELL << TopAbs_FACE; + myShape = getSelected(types); + if (myShape) { + QString aName = GEOMBase::GetName(myShape.get()); + myEditCurrentArgument->setText(aName); + if (myBase1Objects.isEmpty()) + GroupPoints->PushButton2->click(); + else if (myBase2Objects.isEmpty()) + GroupPoints->PushButton3->click(); + } + } + else if (myEditCurrentArgument == GroupPoints->LineEdit2) { + myBase1Objects.clear(); + QList objects = getSelected(TopAbs_SHAPE, -1); + for (int i = 0; i < objects.count(); i++) { + GEOM::shape_type stype = objects[i]->GetMaxShapeType(); + if (GEOM::FACE <= stype && stype <= GEOM::EDGE) + myBase1Objects << objects[i]; + } + int nbObj = myBase1Objects.count(); + if (nbObj) { + QString aName = + nbObj > 1 ? QString("%1_objects").arg(nbObj) : GEOMBase::GetName(myBase1Objects[0].get()); + myEditCurrentArgument->setText(aName); + } + } + else if (myEditCurrentArgument == GroupPoints->LineEdit3) { + myBase2Objects.clear(); + QList objects = getSelected(TopAbs_SHAPE, -1); + for (int i = 0; i < objects.count(); i++) { + GEOM::shape_type stype = objects[i]->GetMaxShapeType(); + if (GEOM::FACE <= stype && stype <= GEOM::EDGE) + myBase2Objects << objects[i]; + } + int nbObj = myBase2Objects.count(); + if (nbObj) { + QString aName = + nbObj > 1 ? QString("%1_objects").arg(nbObj) : GEOMBase::GetName(myBase2Objects[0].get()); + myEditCurrentArgument->setText(aName); + } + } + + processPreview(); +} + +//================================================================================= +// function : SetEditCurrentArgument() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::SetEditCurrentArgument() +{ + QPushButton* send = (QPushButton*)sender(); + + 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) { + myEditCurrentArgument = GroupPoints->LineEdit2; + + if (GroupPoints->CheckButton1->isChecked()) { + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + } + else { + TColStd_MapOfInteger aMap; + aMap.Add(GEOM_FACE); + aMap.Add(GEOM_WIRE); + aMap.Add(GEOM_EDGE); + globalSelection(aMap); + } + GroupPoints->CheckButton1->setEnabled(true); + } + else if (send == GroupPoints->PushButton3) { + myEditCurrentArgument = GroupPoints->LineEdit3; + + if (GroupPoints->CheckButton1->isChecked()) { + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + } + else { + TColStd_MapOfInteger aMap; + aMap.Add(GEOM_FACE); + aMap.Add(GEOM_WIRE); + aMap.Add(GEOM_EDGE); + globalSelection(aMap); + } + GroupPoints->CheckButton1->setEnabled(true); + } + 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 + processPreview(); +} + +//================================================================================= +// function : ActivateThisDialog() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::ActivateThisDialog() +{ + GEOMBase_Skeleton::ActivateThisDialog(); + + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); + + GroupPoints->PushButton1->click(); + SelectionIntoArgument(); +} + +//================================================================================= +// function : enterEvent() +// purpose : when mouse enter onto the QWidget +//================================================================================= +void GenerationGUI_PipePathDlg::enterEvent (QEvent*) +{ + if (!mainFrame()->GroupConstructors->isEnabled()) + ActivateThisDialog(); +} + +//================================================================================= +// function : createOperation +// purpose : +//================================================================================= +GEOM::GEOM_IOperations_ptr GenerationGUI_PipePathDlg::createOperation() +{ + return getGeomEngine()->GetI3DPrimOperations(getStudyId()); +} + +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool GenerationGUI_PipePathDlg::isValid (QString&) +{ + bool ok = myShape && !myBase1Objects.isEmpty() && !myBase2Objects.isEmpty(); + return ok; +} + +//================================================================================= +// function : execute +// purpose : +//================================================================================= +bool GenerationGUI_PipePathDlg::execute (ObjectList& objects) +{ + GEOM::ListOfGO_var aBase1 = new GEOM::ListOfGO(); + GEOM::ListOfGO_var aBase2 = new GEOM::ListOfGO(); + + aBase1->length(myBase1Objects.count()); + aBase2->length(myBase2Objects.count()); + + int i; + for (i = 0; i < myBase1Objects.count(); i++) + aBase1[i] = myBase1Objects[i].copy(); + for (i = 0; i < myBase2Objects.count(); i++) + aBase2[i] = myBase2Objects[i].copy(); + + GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation()); + GEOM::GEOM_Object_var anObj = anOper->RestorePathEdges(myShape.get(), aBase1.in(), aBase2.in()); + + if (!anObj->_is_nil()) + objects.push_back(anObj._retn()); + + return true; +} + +//================================================================================= +// function : addSubshapeToStudy +// purpose : virtual method to add new SubObjects if local selection +//================================================================================= +void GenerationGUI_PipePathDlg::addSubshapesToStudy() +{ + int i; + for (i = 0; i < myBase1Objects.count(); i++) + GEOMBase::PublishSubObject(myBase1Objects[i].get()); + for (i = 0; i < myBase2Objects.count(); i++) + GEOMBase::PublishSubObject(myBase2Objects[i].get()); +} diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.h b/src/GenerationGUI/GenerationGUI_PipePathDlg.h new file mode 100644 index 000000000..2c900bbc3 --- /dev/null +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.h @@ -0,0 +1,72 @@ +// Copyright (C) 2007-2012 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 : GenerationGUI_PipePathDlg.h + +#ifndef GENERATIONGUI_PIPEPATHDLG_H +#define GENERATIONGUI_PIPEPATHDLG_H + +#include "GEOMBase_Skeleton.h" +#include "GEOM_GenericObjPtr.h" + +class DlgRef_3Sel1Check; + +//================================================================================= +// class : GenerationGUI_PipePathDlg +// purpose : +//================================================================================= +class GenerationGUI_PipePathDlg : public GEOMBase_Skeleton +{ + Q_OBJECT + +public: + GenerationGUI_PipePathDlg (GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0); + ~GenerationGUI_PipePathDlg(); + +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::GeomObjPtr myShape; /* Pipe-like shape */ + QList myBase1Objects; /* Base 1 edges / wire / face */ + QList myBase2Objects; /* Base 2 edges / wire / face */ + + DlgRef_3Sel1Check* GroupPoints; + +private slots: + void ClickOnOk(); + bool ClickOnApply(); + void ActivateThisDialog(); + void SelectionIntoArgument(); + void SetEditCurrentArgument(); + void SelectionTypeButtonClicked(); +}; + +#endif // GENERATIONGUI_PIPEPATHDLG_H diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am index 35afde04d..cda0fad02 100644 --- a/src/GenerationGUI/Makefile.am +++ b/src/GenerationGUI/Makefile.am @@ -15,13 +15,12 @@ # 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 -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets @@ -33,7 +32,8 @@ salomeinclude_HEADERS = \ GenerationGUI_PrismDlg.h \ GenerationGUI_RevolDlg.h \ GenerationGUI_FillingDlg.h \ - GenerationGUI_PipeDlg.h + GenerationGUI_PipeDlg.h \ + GenerationGUI_PipePathDlg.h dist_libGenerationGUI_la_SOURCES = \ GenerationGUI.h \ @@ -41,18 +41,21 @@ dist_libGenerationGUI_la_SOURCES = \ GenerationGUI_RevolDlg.h \ GenerationGUI_FillingDlg.h \ GenerationGUI_PipeDlg.h \ + GenerationGUI_PipePathDlg.h \ \ GenerationGUI.cxx \ GenerationGUI_PrismDlg.cxx \ GenerationGUI_RevolDlg.cxx \ GenerationGUI_FillingDlg.cxx \ - GenerationGUI_PipeDlg.cxx + GenerationGUI_PipeDlg.cxx \ + GenerationGUI_PipePathDlg.cxx MOC_FILES = \ GenerationGUI_PrismDlg_moc.cxx \ GenerationGUI_RevolDlg_moc.cxx \ GenerationGUI_FillingDlg_moc.cxx \ - GenerationGUI_PipeDlg_moc.cxx + GenerationGUI_PipeDlg_moc.cxx \ + GenerationGUI_PipePathDlg_moc.cxx nodist_libGenerationGUI_la_SOURCES = \ $(MOC_FILES) diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx index e9c73ac4a..3eba47108 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -108,10 +108,10 @@ extern "C" if (!aModel.IsNull()) { aValue = aModel->GlobalSection().UnitName(); - if (!aValue.IsNull()) { - Handle(TCollection_HAsciiString) aPrefix = new TCollection_HAsciiString ("UNIT_"); - aValue->Prepend(aPrefix); - } + //if (!aValue.IsNull()) { + // Handle(TCollection_HAsciiString) aPrefix = new TCollection_HAsciiString ("UNIT_"); + // aValue->Prepend(aPrefix); + //} } } else { diff --git a/src/NMTTools/NMTTools_CheckerSI_1.cxx b/src/NMTTools/NMTTools_CheckerSI_1.cxx index eb00dec0f..fb03fa1ca 100755 --- a/src/NMTTools/NMTTools_CheckerSI_1.cxx +++ b/src/NMTTools/NMTTools_CheckerSI_1.cxx @@ -42,14 +42,6 @@ #include #include - - -static - Standard_Boolean IsValid(const TopoDS_Edge& aE, - const TopoDS_Vertex& aV, - const Standard_Real aTV1, - const Standard_Real aTV2); - //======================================================================= // function: PreparePaveBlocks // purpose: @@ -65,14 +57,13 @@ static //======================================================================= void NMTTools_CheckerSI::PreparePaveBlocks(const Standard_Integer nE) { - myIsDone=Standard_False; - // - // char buf[32]={"SR"}; - Standard_Boolean bIsValid; + //Standard_Boolean bIsValid; Standard_Integer nV1, nV2, iErr; Standard_Real aT1, aT2; TopoDS_Edge aE; TopoDS_Vertex aV1, aV2; + // + myIsDone=Standard_False; // BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool(myDS->RefEdge(nE)); // Edge @@ -99,21 +90,23 @@ static aV2=TopoDS::Vertex(myDS->Shape(nV2)); aT2=aPave2.Param(); // + //modified by NIZNHY-PKV Thu Nov 01 13:46:00 2012f + //w/a: http://salome.mantis.opencascade.com/view.php?id=21835 + /* bIsValid=Standard_True; if (nV1==nV2) { bIsValid=IsValid(aE, aV1, aT1, aT2); if (!bIsValid) { - //printf(" pb SR: nV nE: %d nV1:( %d %15.10lf ) nV2:( %d %15.10lf )\n", nE, nV1, aT1, nV2, aT2); myStopStatus=1; } } + */ + //modified by NIZNHY-PKV Thu Nov 01 13:46:09 2012t // IntTools_ShrunkRange aSR (aE, aV1, aV2, aRange, myContext); iErr=aSR.ErrorStatus(); if (!aSR.IsDone()) { - //printf(" pb SR: Done nE: %d nV1:( %d %15.10lf ) nV2:( %d %15.10lf )\n", nE, nV1, aT1, nV2, aT2); aSR.SetShrunkRange(aRange); - //throw BOPTColStd_Failure(buf) ; } else if (iErr!=6) { CorrectShrunkRanges (0, aPave1, aSR); @@ -124,7 +117,9 @@ static } //for (; aPBIt.More(); aPBIt.Next()) myIsDone=Standard_True; } - +//modified by NIZNHY-PKV Thu Nov 01 13:46:55 2012f +//w/a: http://salome.mantis.opencascade.com/view.php?id=21835 +/* //======================================================================= //function : IsValid //purpose : @@ -157,3 +152,5 @@ Standard_Boolean IsValid(const TopoDS_Edge& aE, } return bRet; } +*/ +//modified by NIZNHY-PKV Thu Nov 01 13:47:07 2012t diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx index 4a0805c84..abe5c310a 100644 --- a/src/STEPExport/STEPExport.cxx +++ b/src/STEPExport/STEPExport.cxx @@ -18,13 +18,11 @@ // Foundation, 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 -// -// + #include "utilities.h" #include @@ -63,36 +61,37 @@ extern "C" { -STEPEXPORT_EXPORT + STEPEXPORT_EXPORT int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) { MESSAGE("Export STEP into file " << theFileName.ToCString()); - try - { - // Set "C" numeric locale to save numbers correctly - Kernel_Utils::Localizer loc; + try + { + // Set "C" numeric locale to save numbers correctly + Kernel_Utils::Localizer loc; - IFSelect_ReturnStatus status ; - //VRV: OCC 4.0 migration - STEPControl_Writer aWriter; - //VSR: 16/09/09: Convert to METERS - Interface_Static::SetCVal("xstep.cascade.unit","M"); - Interface_Static::SetIVal("write.step.nonmanifold", 1); -//JFA: PAL6162 status = aWriter.Transfer( theShape, STEPControl_ManifoldSolidBrep ); - status = aWriter.Transfer( theShape, STEPControl_AsIs ); - //VRV: OCC 4.0 migration - if ( status == IFSelect_RetDone ) + IFSelect_ReturnStatus status ; + //VRV: OCC 4.0 migration + STEPControl_Writer aWriter; + //VSR: 16/09/09: Convert to METERS + Interface_Static::SetCVal("xstep.cascade.unit","M"); + Interface_Static::SetCVal("write.step.unit", "M"); + Interface_Static::SetIVal("write.step.nonmanifold", 1); + //JFA: PAL6162 status = aWriter.Transfer( theShape, STEPControl_ManifoldSolidBrep ); + status = aWriter.Transfer( theShape, STEPControl_AsIs ); + //VRV: OCC 4.0 migration + if ( status == IFSelect_RetDone ) status = aWriter.Write( theFileName.ToCString() ); - // Return previous locale - if ( status == IFSelect_RetDone ) - return 1; - } - catch(Standard_Failure) - { - //THROW_SALOME_CORBA_EXCEPTION("Exception catched in STEPExport", SALOME::BAD_PARAM); - } - return 0; + // Return previous locale + if ( status == IFSelect_RetDone ) + return 1; + } + catch (Standard_Failure) + { + //THROW_SALOME_CORBA_EXCEPTION("Exception catched in STEPExport", SALOME::BAD_PARAM); + } + return 0; } } diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx index 8a4015043..7ad825833 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -122,16 +122,18 @@ extern "C" TColStd_SequenceOfAsciiString anUnitSolidAngleNames; aReader.FileUnits(anUnitLengthNames, anUnitAngleNames, anUnitSolidAngleNames); if (anUnitLengthNames.Length() > 0) { + aValue = new TCollection_HAsciiString( anUnitLengthNames.First() ); + /* TCollection_AsciiString aLenUnits = anUnitLengthNames.First(); if (aLenUnits == "millimetre") - aValue = new TCollection_HAsciiString ("UNIT_MM"); + aValue = new TCollection_HAsciiString ("MM"); else if (aLenUnits == "centimetre") - aValue = new TCollection_HAsciiString ("UNIT_CM"); + aValue = new TCollection_HAsciiString ("CM"); else if (aLenUnits == "metre") - aValue = new TCollection_HAsciiString ("UNIT_M"); + aValue = new TCollection_HAsciiString ("M"); else if (aLenUnits == "INCH") - aValue = new TCollection_HAsciiString ("UNIT_INCH"); - // TODO + aValue = new TCollection_HAsciiString ("INCH"); + // TODO (for other units than mm, cm, m or inch) //else if (aLenUnits == "") // aValue = new TCollection_HAsciiString (""); @@ -141,6 +143,7 @@ extern "C" // std::cout << ", " << anUnitLengthNames.Value(ii); //std::cout << std::endl; // tmp end + */ } } else { @@ -197,7 +200,7 @@ extern "C" Interface_Static::SetCVal("xstep.cascade.unit", "MM"); else if (aLenUnits == "centimetre") Interface_Static::SetCVal("xstep.cascade.unit", "CM"); - else if (aLenUnits == "metre") + else if (aLenUnits == "metre" || aLenUnits.IsEmpty()) Interface_Static::SetCVal("xstep.cascade.unit", "M"); else if (aLenUnits == "INCH") Interface_Static::SetCVal("xstep.cascade.unit", "INCH"); @@ -205,9 +208,9 @@ extern "C" theError = "The file contains not supported units."; return aResShape; } - // TODO + // TODO (for other units than mm, cm, m or inch) //else if (aLenUnits == "") - // Interface_Static::SetCVal("xstep.cascade.unit", ""); + // Interface_Static::SetCVal("xstep.cascade.unit", "???"); } } else { diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.cxx b/src/ShHealOper/ShHealOper_ChangeOrientation.cxx index 4d2fba884..2128cd539 100644 --- a/src/ShHealOper/ShHealOper_ChangeOrientation.cxx +++ b/src/ShHealOper/ShHealOper_ChangeOrientation.cxx @@ -26,10 +26,17 @@ #include -#include #include - +#include +#include +#include +#include +#include +#include +#include +#include #include +#include //======================================================================= //function : ShHealOper_ChangeOrientation() @@ -59,7 +66,8 @@ void ShHealOper_ChangeOrientation::Init(const TopoDS_Shape& theShape) Standard_Boolean ShHealOper_ChangeOrientation::Perform() { BRep_Builder B; - if (myInitShape.ShapeType() == TopAbs_SHELL) { + if (myInitShape.ShapeType() == TopAbs_SHELL) + { myResultShape = myInitShape.EmptyCopied(); TopoDS_Iterator itr (myInitShape); while (itr.More()) { @@ -67,7 +75,8 @@ Standard_Boolean ShHealOper_ChangeOrientation::Perform() itr.Next(); } } - else if (myInitShape.ShapeType() == TopAbs_FACE) { + else if (myInitShape.ShapeType() == TopAbs_FACE) + { myResultShape = myInitShape.EmptyCopied(); TopoDS_Iterator itr (myInitShape); while (itr.More()) { @@ -76,16 +85,43 @@ Standard_Boolean ShHealOper_ChangeOrientation::Perform() } myResultShape.Reverse(); } - else if ( myInitShape.ShapeType() == TopAbs_WIRE || myInitShape.ShapeType() == TopAbs_EDGE) { - myResultShape = myInitShape.EmptyCopied(); - TopoDS_Iterator itr (myInitShape); - while (itr.More()) { - B.Add(myResultShape,itr.Value()); - itr.Next(); + else if ( myInitShape.ShapeType() == TopAbs_WIRE || myInitShape.ShapeType() == TopAbs_EDGE) + { + TopTools_ListOfShape reversedEdges; + for ( TopExp_Explorer edgeIt( myInitShape, TopAbs_EDGE ); edgeIt.More(); edgeIt.Next() ) + { + const TopoDS_Edge& edge = TopoDS::Edge( edgeIt.Current() ); + + double f,l; + Handle(Geom_Curve) curve = BRep_Tool::Curve( edge, f,l ); + Handle(Geom_TrimmedCurve) tc = Handle(Geom_TrimmedCurve)::DownCast(curve); + if ( !tc.IsNull() ) curve = tc->BasisCurve(); + + f = curve->ReversedParameter( f ); + l = curve->ReversedParameter( l ); + curve = curve->Reversed(); + reversedEdges.Prepend( BRepBuilderAPI_MakeEdge( curve, Min( f, l ), Max( f, l ))); } - myResultShape.Reverse(); + if ( myInitShape.ShapeType() == TopAbs_EDGE ) + { + myResultShape = reversedEdges.First(); + } + else + { + BRepBuilderAPI_MakeWire wire; + wire.Add( reversedEdges ); + myResultShape = wire; + } + // myResultShape = myInitShape.EmptyCopied(); + // TopoDS_Iterator itr (myInitShape); + // while (itr.More()) { + // B.Add(myResultShape,itr.Value()); + // itr.Next(); + // } + // myResultShape.Reverse(); } - else { + else + { BRepBuilderAPI_Copy Copy (myInitShape); if (!Copy.IsDone()) return false;