mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-02-11 09:23:06 +05:00
Merge from V5_1_4_BR (5_1_4rc2) 09/06/2010
This commit is contained in:
parent
3b08404d5d
commit
01f5a34efc
Binary file not shown.
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 26 KiB |
BIN
doc/salome/gui/GEOM/images/partitionsn3.png
Normal file
BIN
doc/salome/gui/GEOM/images/partitionsn3.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.2 KiB |
@ -5,23 +5,35 @@
|
|||||||
\n To <b>Add Point on Edge</b> in the <b>Main Menu</b> select
|
\n To <b>Add Point on Edge</b> in the <b>Main Menu</b> select
|
||||||
<b>Repair - > Add Point on Edge</b>.
|
<b>Repair - > Add Point on Edge</b>.
|
||||||
|
|
||||||
\n This operation splits an edge in two in accordance with the
|
\n This operation splits an edge in two new edges in accordance with the
|
||||||
specified mode (by length or by parameter) and a value specifying the
|
specified mode (by length or by parameter) and a value specifying the
|
||||||
position of the point on edge (for example val =0.5; mode =
|
position of the point on edge (for example val =0.5; mode =
|
||||||
Length). This operation is available in <b>OCC Viewer</b> only.
|
by length). This operation is available in <b>OCC Viewer</b> only.
|
||||||
|
|
||||||
\n The \b Result will be a \b GEOM_Object.
|
\n The \b Result will be a \b GEOM_Object.
|
||||||
|
|
||||||
\n <b>TUI Command:</b> <em>geompy.DivideEdge(Shape, EdgeID, Value,
|
\n <b>TUI Command:</b> <em>geompy.DivideEdge(Shape, EdgeID, Value,
|
||||||
IsByParameter), </em> where \em Shape is a shape which contains an edge to
|
IsByParameter)</em>
|
||||||
be divided, \em EdgeID is the ID of the edge to be divided, if it = -1,
|
- \em Shape is a shape which contains an edge to be divided
|
||||||
then Shape is an edge, \em Value is a paramter on the edge or a
|
- \em EdgeID is the ID of the edge to be divided, if it is = -1,
|
||||||
length. \em IsByParameter if it is True then Value is the edge parameter
|
then \em Shape should be an edge itself
|
||||||
in the range [0:1] otherwise it is a part of the length of the edge in the range
|
- \em Value is a value of parameter on edge or length parameter,
|
||||||
[0: full length of the edge]
|
depending on \em IsByParameter.
|
||||||
\n <b>Arguments:</b> Name + 1 Edge + 1 value setting the position of
|
- \em IsByParameter is a boolean flag, specifying operation mode:
|
||||||
|
- \c True: \em Value is treated as a curve parameter [0..1]
|
||||||
|
- \c False: \em Value is treated as a length parameter [0..1]
|
||||||
|
|
||||||
|
<b>Arguments:</b> Name + 1 Edge + 1 Value setting the position of
|
||||||
the point according to one of the selected modes.
|
the point according to one of the selected modes.
|
||||||
|
|
||||||
|
The difference between "by parameter" and "by length" modes becomes
|
||||||
|
apparent on the edges with irregular parametrization (for example,
|
||||||
|
b-splines which usually have irregular density by the length).
|
||||||
|
For example, value 0.5 "by length" on such edge will produce the point
|
||||||
|
in the middle of this edge (equidistant from both its ends); the same
|
||||||
|
0.5 value "by parameter" will result in the point situated closer to
|
||||||
|
one of the ends (depending on the actual parametrization).
|
||||||
|
|
||||||
\image html repair8.png
|
\image html repair8.png
|
||||||
|
|
||||||
\n <b>Example:</b>
|
\n <b>Example:</b>
|
||||||
|
@ -26,8 +26,8 @@ of the LCS are calculated automatically basing on the selected object.
|
|||||||
coordinates of origin by a point and axes directions by a line or a
|
coordinates of origin by a point and axes directions by a line or a
|
||||||
vector.
|
vector.
|
||||||
\n <b>TUI command:</b> <em>geompy.MakeMarkerPntTwoVec(Center, VectorX,
|
\n <b>TUI command:</b> <em>geompy.MakeMarkerPntTwoVec(Center, VectorX,
|
||||||
VectorY)</em> where Center is a point specified the coordinate system location,
|
VectorY)</em> where Center is the origin of the coordinate system,
|
||||||
VectorX is a derection of OX axis and VectorY direction of OY axis.
|
VectorX is the direction of OX axis and VectorY is the direction of OY axis.
|
||||||
\n <b>Arguments:</b> Name + 1 point of origin + X axis direction, Y axis direction.
|
\n <b>Arguments:</b> Name + 1 point of origin + X axis direction, Y axis direction.
|
||||||
|
|
||||||
\image html neo-localcs3.png
|
\image html neo-localcs3.png
|
||||||
@ -40,6 +40,6 @@ and in 3D viewer.
|
|||||||
|
|
||||||
\image html image145.png "Local Coordinate System"
|
\image html image145.png "Local Coordinate System"
|
||||||
|
|
||||||
<b>TUI Script</b> provide you with useful example of creation of
|
<b>TUI Script</b> provides you with a useful example of
|
||||||
\ref tui_creation_lcs "Local Coordinate System".
|
\ref tui_creation_lcs "Local Coordinate System" creation.
|
||||||
*/
|
*/
|
@ -5,23 +5,23 @@
|
|||||||
To create a \b PipeTShape in the <b>Main Menu</b> select <b>New Entity - >
|
To create a \b PipeTShape in the <b>Main Menu</b> select <b>New Entity - >
|
||||||
Advanced - > PipeTShape </b>
|
Advanced - > PipeTShape </b>
|
||||||
|
|
||||||
Specify the parameters of the PipeTShape object creation in the opened dialog
|
Specify the parameters of the PipeTShape object in the opened dialog
|
||||||
box and press "Apply" or "Apply & Close" button.
|
box and press "Apply" or "Apply & Close" button.
|
||||||
Result of each operation will be a GEOM_Object.
|
The <b>result</b> of the operation will be a <b>GEOM_Object</b>.
|
||||||
|
|
||||||
<b>TUI Command:</b> <em>geompy.MakePipeTShape(R1, W1, L1, R2, W2, L2, HexMesh=True, P1=None, P2=None, P3=None)</em>
|
<b>TUI Command:</b> <em>geompy.MakePipeTShape(R1, W1, L1, R2, W2, L2, HexMesh=True, P1=None, P2=None, P3=None)</em>
|
||||||
|
|
||||||
<b>Arguments:</b>
|
<b>Arguments:</b>
|
||||||
- \b R1 - Radius of main T-shape pipe.
|
- \b R1 - Radius of the main T-shape pipe.
|
||||||
- \b W1 - Thickness of main T-shape pipe.
|
- \b W1 - Thickness of the main T-shape pipe.
|
||||||
- \b L1 - Length of main T-shape pipe.
|
- \b L1 - Length of the main T-shape pipe.
|
||||||
- \b R2 - Radius of incident T-shape pipe.
|
- \b R2 - Radius of the incident T-shape pipe.
|
||||||
- \b W2 - Thickness of incident T-shape pipe.
|
- \b W2 - Thickness of the incident T-shape pipe.
|
||||||
- \b L2 - Length of incident T-shape pipe.
|
- \b L2 - Length of the incident T-shape pipe.
|
||||||
- \b HexMesh - If True, the shape is splitted in blocks (suitable for hexaedral mesh).
|
- \b HexMesh - If True, the shape is splitted into blocks (suitable for hexaedral mesh).
|
||||||
- \b P1 - First junction point of main pipe (GEOM Vertex).
|
- \b P1 - First junction point of the main pipe (GEOM Vertex).
|
||||||
- \b P2 - Second junction point of main pipe (GEOM Vertex).
|
- \b P2 - Second junction point of the main pipe (GEOM Vertex).
|
||||||
- \b P3 - Junction point of incident pipe (GEOM Vertex).
|
- \b P3 - Junction point of the incident pipe (GEOM Vertex).
|
||||||
|
|
||||||
\image html pipetshape_dlg.png
|
\image html pipetshape_dlg.png
|
||||||
|
|
||||||
@ -33,8 +33,8 @@ A Pipe T-Shape can be created with a chamfer at the junction of the main and the
|
|||||||
|
|
||||||
<b>TUI Command:</b> <em>geompy.MakePipeTShapeChamfer(R1, W1, L1, R2, W2, L2, H, W, HexMesh=True, P1=None, P2=None, P3=None)</em>
|
<b>TUI Command:</b> <em>geompy.MakePipeTShapeChamfer(R1, W1, L1, R2, W2, L2, H, W, HexMesh=True, P1=None, P2=None, P3=None)</em>
|
||||||
|
|
||||||
<b>Arguments are the same as normal Pipe T-Shape plus:</b>
|
<b>The arguments are the same as of the normal Pipe T-Shape plus:</b>
|
||||||
- \b H - Height of the chamfer along incident pipe.
|
- \b H - Height of the chamfer along the incident pipe.
|
||||||
- \b W - Width of the chamfer along the main pipe.
|
- \b W - Width of the chamfer along the main pipe.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
@ -45,7 +45,7 @@ A Pipe T-Shape can be created with a fillet at the junction of the main and the
|
|||||||
|
|
||||||
<b>TUI Command:</b> <em>geompy.MakePipeTShapeFillet(R1, W1, L1, R2, W2, L2, RF, HexMesh=True, P1=None, P2=None, P3=None)</em>
|
<b>TUI Command:</b> <em>geompy.MakePipeTShapeFillet(R1, W1, L1, R2, W2, L2, RF, HexMesh=True, P1=None, P2=None, P3=None)</em>
|
||||||
|
|
||||||
<b>Arguments are the same as normal Pipe T-Shape plus:</b>
|
<b>The arguments are the same as of the normal Pipe T-Shape plus:</b>
|
||||||
- \b RF - Radius of the fillet.
|
- \b RF - Radius of the fillet.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
\page deflection_page Deflection
|
\page deflection_page Deflection
|
||||||
|
|
||||||
\n In this menu you can change the deviation coefficient of the
|
\n In this menu you can change the deflection coefficient of the
|
||||||
shape. Smaller coefficient provides better quality of the shape in the
|
shape. The less is the coefficient the better is the quality of the shape in the
|
||||||
viewer.
|
viewer.
|
||||||
|
|
||||||
\n <b>Arguments: </b>1 floating point value (deviation coefficient).
|
\n <b>Arguments: </b>1 floating point value (deviation coefficient).
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
The <b>Type</b> property of the geometrical object specifies the
|
The <b>Type</b> property of the geometrical object specifies the
|
||||||
way the object has been created. It is an integer identifier that
|
way the object has been created. It is an integer identifier that
|
||||||
has predefined value depending on the function type used for the
|
has a predefined value depending on the function type used for the
|
||||||
object creation. The type of the object can be retrieved using the
|
object creation. The type of the object can be retrieved using the
|
||||||
\b %GetType() function of the \b GEOM_Object interface.
|
\b %GetType() function of the \b GEOM_Object interface.
|
||||||
|
|
||||||
@ -70,10 +70,9 @@ The possible values of the geometrical objects are listed in the table below:
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
Also geompy.py module provides a helper function ShapeIdToType()
|
Also geompy.py module provides a helper function ShapeIdToType()
|
||||||
that allows converting of the geometrical object type id value
|
that allows converting the geometrical object id value to its string representation.
|
||||||
to its string representation.
|
|
||||||
|
|
||||||
For example:
|
For example, the output of the following code:
|
||||||
\code
|
\code
|
||||||
import geompy
|
import geompy
|
||||||
box = geompy.MakeBoxDXDYDZ(10,10,10)
|
box = geompy.MakeBoxDXDYDZ(10,10,10)
|
||||||
@ -81,12 +80,12 @@ type = geompy.ShapeIdToType(box.GetType())
|
|||||||
print type
|
print type
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
The above code prints "BOX" value.
|
will be the "BOX" value.
|
||||||
|
|
||||||
<b>GetShapeType function:</b>
|
<b>GetShapeType function:</b>
|
||||||
|
|
||||||
The ShapeType property specifies the geometrical object in terms of
|
The ShapeType property specifies the geometrical object in terms of
|
||||||
its topology nature.
|
its topologic nature.
|
||||||
|
|
||||||
The possible values are defined in the GEOM namespace: { COMPOUND, COMPSOLID,
|
The possible values are defined in the GEOM namespace: { COMPOUND, COMPSOLID,
|
||||||
SOLID, SHELL, FACE, WIRE, EDGE, VERTEX, SHAPE }<br>
|
SOLID, SHELL, FACE, WIRE, EDGE, VERTEX, SHAPE }<br>
|
||||||
@ -94,7 +93,7 @@ SOLID, SHELL, FACE, WIRE, EDGE, VERTEX, SHAPE }<br>
|
|||||||
This type can be retrieved using the \b %GetShapeType() function
|
This type can be retrieved using the \b %GetShapeType() function
|
||||||
of the \b GEOM_Object interface.
|
of the \b GEOM_Object interface.
|
||||||
|
|
||||||
Example code:
|
For example:
|
||||||
\code
|
\code
|
||||||
import geompy
|
import geompy
|
||||||
import GEOM
|
import GEOM
|
||||||
@ -103,6 +102,6 @@ type = box.GetShapeType()
|
|||||||
print type == GEOM.SOLID
|
print type == GEOM.SOLID
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
This code prints "True".
|
The result is "True".
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@ -13,9 +13,11 @@ using a wide range of functions;</li>
|
|||||||
<li>\subpage transform_geom_obj_page "transformation of geometrical objects" using
|
<li>\subpage transform_geom_obj_page "transformation of geometrical objects" using
|
||||||
various algorithms;</li>
|
various algorithms;</li>
|
||||||
<li>\subpage repairing_operations_page "optimization of geometrical objects";</li>
|
<li>\subpage repairing_operations_page "optimization of geometrical objects";</li>
|
||||||
<li>\subpage geometrical_obj_prop_page "Geometrical object properties".</li>
|
<li>viewing \subpage geometrical_obj_prop_page "geometrical object properties".</li>
|
||||||
<li>\subpage using_measurement_tools_page "provision of information about geometrical objects".</li>
|
<li>and other information about geometrical objects using
|
||||||
<li>\subpage using_notebook_geom_page.</li>
|
\subpage using_measurement_tools_page "measurement tools".</li>
|
||||||
|
<li>easily setting parameters via the variables predefined in
|
||||||
|
\subpage using_notebook_geom_page "Salome notebook".</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
Almost all geometry module functionalities are accessible via
|
Almost all geometry module functionalities are accessible via
|
||||||
|
@ -4,45 +4,66 @@
|
|||||||
|
|
||||||
\n To produce a \b Partition in the <b>Main Menu</b> select <b>Operations - > Partition</b>
|
\n To produce a \b Partition in the <b>Main Menu</b> select <b>Operations - > Partition</b>
|
||||||
|
|
||||||
\n This operation builds a compound by intersection of several shapes with a tool object or a plane.
|
\n This operation builds a compound by intersection of several shapes
|
||||||
|
with a set of tool objects or with a plane.
|
||||||
\n The \b Result will be any \b GEOM_Object.
|
\n The \b Result will be any \b GEOM_Object.
|
||||||
|
|
||||||
<br><h2>Intersection of two shapes.</h2>
|
<br><h2>Intersection of two shapes.</h2>
|
||||||
|
|
||||||
|
\image html partition1.png
|
||||||
|
|
||||||
|
\n <b>Arguments:</b> Name + 2 lists of shapes (the shapes from the
|
||||||
|
first list will be intersected with the shapes from the second list) +
|
||||||
|
Resulting Type of shape.
|
||||||
|
|
||||||
\n As far as the intersection of two objects can produce any type of
|
\n As far as the intersection of two objects can produce any type of
|
||||||
geometrical objects, <b>Resulting type</b> box allows choosing the
|
geometrical objects, <b>Resulting type</b> box allows choosing the
|
||||||
preferrable result, i.e. a solid, a shell, a list of faces, etc.
|
preferrable result, i.e. a solid, a shell, a list of faces, etc.
|
||||||
\n <b>TUI Command:</b> <em>geompy.MakePartition(ListOfShapes,
|
\n<b>Resulting type</b> has to be equal or lower than the type of the
|
||||||
ListOfTools, ListOfKeepInside, ListOfRemoveInside, Limit, RemoveWebs,
|
\em Objects. In other words, if the \em Objects don't contain any
|
||||||
ListOfMaterials),</em> where where \em ListOfShapes is a list of shapes to
|
shape of this type, Partition fails.
|
||||||
be intersected and \em ListOfTools is a list of shapes to intersect the
|
|
||||||
shapes from ListOfShapes.
|
<b>Keep shapes of lower type</b> checkbox manages standalone shapes of
|
||||||
\n Since the implementation of a new version of PartitionAlgo other
|
type other than the \em Limit. If it is checked, lower dimension
|
||||||
parameters are ignored by the current functionality and remain there
|
objects will be preserved, else they will be lost.
|
||||||
only to support the old scripts.
|
\n For example, you do a partition of a box (Solid) and a face (Face)
|
||||||
\n <b>Arguments:</b> Name + 2 lists of shapes (the shapes from the
|
without any tool. If you choose Resulting Type "Solid", you will
|
||||||
first list will be intersected with the shapes from the second list) +
|
obtain a compound of two solids (let's the box will be splitted by the
|
||||||
reconstruction limit.
|
face on two parts), but if you will also check <b>Keep shapes of lower
|
||||||
|
type</b> checkbox, you will obtain a compound of two solids and one
|
||||||
|
face (the face will have a hole where the original face lays inside
|
||||||
|
the box, see corresponding \ref partition_picture_3 "picture" below).
|
||||||
|
|
||||||
\n <b>Advanced option:</b>
|
\n <b>Advanced option:</b>
|
||||||
\ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
|
\ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
|
||||||
|
|
||||||
\image html partition1.png
|
\n <b>TUI Command:</b> <em>geompy.MakePartition(ListOfShapes,
|
||||||
|
ListOfTools, ListOfKeepInside, ListOfRemoveInside, Limit, RemoveWebs,
|
||||||
|
ListOfMaterials, KeepNonlimitShapes),</em> where where \em
|
||||||
|
ListOfShapes is a list of shapes to be intersected, \em ListOfTools is
|
||||||
|
a list of shapes to intersect the shapes from ListOfShapes, \em Limit
|
||||||
|
is a Type of resulting shapes and \em KeepNonlimitShapes is a flag
|
||||||
|
that allows to preserve standalone shapes of low dimension (than
|
||||||
|
Limit) in the result.
|
||||||
|
|
||||||
<b>Keep shapes of lower type</b> checkbox allows building geometrical objects.
|
\n Since the implementation of a new version of PartitionAlgo other
|
||||||
Only lower type objects will be preserved without the upper ones.
|
parameters are ignored by the current functionality and remain there
|
||||||
|
only to support the old scripts.
|
||||||
|
|
||||||
|
|
||||||
<br><h2>Intersection of a Shape and a Plane.</h2>
|
<br><h2>Intersection of a Shape and a Plane.</h2>
|
||||||
|
|
||||||
\n <b>TUI Command:</b> <em> geompy.MakeHalfPartition(Shapes,
|
\image html partition2.png
|
||||||
Plane),</em> where \em Shapes are a list of Shapes to be intersected
|
|
||||||
and \em Plane is a Tool shape, to intersect the \em Shapes.
|
|
||||||
\n <b>Arguments:</b> Name + a list of shapes which will be intersected
|
\n <b>Arguments:</b> Name + a list of shapes which will be intersected
|
||||||
+ 1 cutting plane.
|
+ 1 cutting plane.
|
||||||
|
|
||||||
\n <b>Advanced option:</b>
|
\n <b>Advanced option:</b>
|
||||||
\ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
|
\ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
|
||||||
|
|
||||||
\image html partition2.png
|
\n <b>TUI Command:</b> <em> geompy.MakeHalfPartition(Shapes,
|
||||||
|
Plane),</em> where \em Shapes are a list of Shapes to be intersected
|
||||||
|
and \em Plane is a Tool shape, to intersect the \em Shapes.
|
||||||
|
|
||||||
\n <b>Example:</b>
|
\n <b>Example:</b>
|
||||||
|
|
||||||
@ -50,6 +71,9 @@ and \em Plane is a Tool shape, to intersect the \em Shapes.
|
|||||||
|
|
||||||
\image html partitionsn2.png "Result of intersection"
|
\image html partitionsn2.png "Result of intersection"
|
||||||
|
|
||||||
|
\anchor partition_picture_3
|
||||||
|
\image html partitionsn3.png "Result of intersection of a box and a plane (both as \em Objects, no tools) with Resulting type \em Solid and checked \em Keep \em shapes \em of \em lower \em type"
|
||||||
|
|
||||||
Our <b>TUI Scripts</b> provide you with useful examples of the use of
|
Our <b>TUI Scripts</b> provide you with useful examples of the use of
|
||||||
\ref tui_partition "Basic Operations".
|
\ref tui_partition "Basic Operations".
|
||||||
|
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
/*!
|
/*!
|
||||||
|
|
||||||
\page restore_presentation_parameters_page Restore presentation parameters and a tree of subshapes
|
\page restore_presentation_parameters_page Advanced Transformation Options
|
||||||
|
|
||||||
\n This functionality allows the operation result to inherit colour
|
<br><center><b>Set presentation parameters and subshapes from arguments</b></center>
|
||||||
|
|
||||||
|
\n This option allows the operation result to inherit colour
|
||||||
and subshapes from its arguments.
|
and subshapes from its arguments.
|
||||||
|
|
||||||
\n To activate this functionality, check in "Set
|
\n To activate this functionality, check in "Set
|
||||||
@ -38,7 +40,7 @@ operation arguments and their published subshapes. The resulting shape
|
|||||||
has a default colour, but its subshapes inherit colors corresponding
|
has a default colour, but its subshapes inherit colors corresponding
|
||||||
to arguments and their subshapes.
|
to arguments and their subshapes.
|
||||||
|
|
||||||
\image html restore-ss-viewer-after.png "Thev resulting shape"
|
\image html restore-ss-viewer-after.png "The resulting shape"
|
||||||
|
|
||||||
|
|
||||||
Please, note that when the resulting shape corresponds to one
|
Please, note that when the resulting shape corresponds to one
|
||||||
@ -51,12 +53,13 @@ inherited subshapes depend on the arguments.
|
|||||||
|
|
||||||
\image html restore-ss-OB.png
|
\image html restore-ss-OB.png
|
||||||
|
|
||||||
<br><center><b>Add prefix to names of restored subshapes</b></center>
|
|
||||||
Add prefix "from_" to names of restored sub-shapes, and prefix "from_subshapes_of_" to names of partially restored subshapes.
|
|
||||||
By default this option is On.
|
|
||||||
|
|
||||||
|
|
||||||
\n You can also call this functionality from your python scripts.
|
\n You can also call this functionality from your python scripts.
|
||||||
See our <b>TUI Scripts</b> for \ref tui_restore_prs_params "example".
|
See our <b>TUI Scripts</b> for \ref tui_restore_prs_params "example".
|
||||||
|
|
||||||
|
<br><center><b>Add prefix to names of restored subshapes</b></center>
|
||||||
|
This option allows adding the prefix "from_" to the names of
|
||||||
|
restored sub-shapes, and the prefix "from_subshapes_of_" to the names of partially restored subshapes.
|
||||||
|
By default this option is On.
|
||||||
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@ -28,7 +28,7 @@ transparency of geometrical objects.</li>
|
|||||||
<li>\subpage isolines_page "Isos" - allows to change the number of
|
<li>\subpage isolines_page "Isos" - allows to change the number of
|
||||||
isolines displayed within a shape.</li>
|
isolines displayed within a shape.</li>
|
||||||
<li>\subpage deflection_page "Deflection" - allows to change the
|
<li>\subpage deflection_page "Deflection" - allows to change the
|
||||||
deviation coefficient of a shape.</li>
|
deflection coefficient of a shape.</li>
|
||||||
<li>\subpage point_marker_page "Point Marker" - allows to change the
|
<li>\subpage point_marker_page "Point Marker" - allows to change the
|
||||||
representation of geometrical vertices.</li>
|
representation of geometrical vertices.</li>
|
||||||
<li><b>Auto color</b> / <b>Disable auto color</b> - activates the auto color
|
<li><b>Auto color</b> / <b>Disable auto color</b> - activates the auto color
|
||||||
|
@ -2180,10 +2180,10 @@ module GEOM
|
|||||||
* \note Each compound from ListShapes and ListTools will be exploded in order
|
* \note Each compound from ListShapes and ListTools will be exploded in order
|
||||||
* to avoid possible intersection between shapes from this compound.
|
* to avoid possible intersection between shapes from this compound.
|
||||||
* \param theLimit Type of resulting shapes (corresponding to TopAbs_ShapeEnum).
|
* \param theLimit Type of resulting shapes (corresponding to TopAbs_ShapeEnum).
|
||||||
# \param KeepNonlimitShapes: if this parameter == 0 - only shapes with
|
* \param KeepNonlimitShapes: if this parameter == 0, then only shapes of
|
||||||
# type <= Limit are kept in the result,
|
* target type (equal to Limit) are kept in the result,
|
||||||
# else - shapes with type > Limit are kept
|
* else standalone shapes of lower dimension
|
||||||
# also (if they exist)
|
* are kept also (if they exist).
|
||||||
*
|
*
|
||||||
* After implementation new version of PartitionAlgo (October 2006)
|
* After implementation new version of PartitionAlgo (October 2006)
|
||||||
* other parameters are ignored by current functionality. They are kept
|
* other parameters are ignored by current functionality. They are kept
|
||||||
|
@ -379,7 +379,7 @@ void AdvancedGUI_PipeTShapeDlg::SetPosition(bool isChecked) {
|
|||||||
//=================================================================================
|
//=================================================================================
|
||||||
void AdvancedGUI_PipeTShapeDlg::ValueChangedInSpinBox(double newValue)
|
void AdvancedGUI_PipeTShapeDlg::ValueChangedInSpinBox(double newValue)
|
||||||
{
|
{
|
||||||
if (myOkPoint1 && myOkPoint2 && myOkPoint3)
|
if (JunctionPointsSel->GroupBox1->isChecked() && myOkPoint1 && myOkPoint2 && myOkPoint3)
|
||||||
CheckCompatiblePosition(myPoint1, myPoint2, myPoint3, 0.01);
|
CheckCompatiblePosition(myPoint1, myPoint2, myPoint3, 0.01);
|
||||||
DisplayPreview();
|
DisplayPreview();
|
||||||
}
|
}
|
||||||
|
@ -57,6 +57,8 @@
|
|||||||
|
|
||||||
#include <gp_Pln.hxx>
|
#include <gp_Pln.hxx>
|
||||||
|
|
||||||
|
#include <Basics_Utils.hxx>
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
// class : EntityGUI_SketcherDlg()
|
// class : EntityGUI_SketcherDlg()
|
||||||
// purpose : Constructs a EntityGUI_SketcherDlg which is a child of 'parent', with the
|
// purpose : Constructs a EntityGUI_SketcherDlg which is a child of 'parent', with the
|
||||||
@ -1418,6 +1420,9 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
|
|||||||
//Test if the current point is the same as the last one
|
//Test if the current point is the same as the last one
|
||||||
TopoDS_Shape myShape1, myShape2;
|
TopoDS_Shape myShape1, myShape2;
|
||||||
|
|
||||||
|
// Set "C" numeric locale
|
||||||
|
Kernel_Utils::Localizer loc;
|
||||||
|
|
||||||
//Last Shape
|
//Last Shape
|
||||||
QString Command1 = myCommand.join( "" );
|
QString Command1 = myCommand.join( "" );
|
||||||
Sketcher_Profile aProfile1( Command1.toAscii() );
|
Sketcher_Profile aProfile1( Command1.toAscii() );
|
||||||
@ -1660,15 +1665,15 @@ void EntityGUI_SketcherDlg::initSpinBox( SalomeApp_DoubleSpinBox* spinBox,
|
|||||||
int aPrecision = resMgr->integerValue( "Geometry", quantity, 6 );
|
int aPrecision = resMgr->integerValue( "Geometry", quantity, 6 );
|
||||||
|
|
||||||
spinBox->setPrecision( aPrecision );
|
spinBox->setPrecision( aPrecision );
|
||||||
spinBox->setDecimals( aPrecision ); // it's necessary to set decimals before the range setting,
|
spinBox->setDecimals( qAbs( aPrecision ) ); // it's necessary to set decimals before the range setting,
|
||||||
// by default Qt rounds boundaries to 2 decimals at setRange
|
// by default Qt rounds boundaries to 2 decimals at setRange
|
||||||
spinBox->setRange( min, max );
|
spinBox->setRange( min, max );
|
||||||
spinBox->setSingleStep( step );
|
spinBox->setSingleStep( step );
|
||||||
|
|
||||||
// Add a hint for the user saying how to tune precision
|
// Add a hint for the user saying how to tune precision
|
||||||
QString userPropName = QObject::tr( QString( "PREF_%1" ).arg( quantity ).toLatin1().constData() );
|
QString userPropName = QObject::tr( QString( "GEOM_PREF_%1" ).arg( quantity ).toLatin1().constData() );
|
||||||
spinBox->setProperty( "validity_tune_hint",
|
spinBox->setProperty( "validity_tune_hint",
|
||||||
QVariant( QObject::tr( "PRECISION_HINT" ).arg( userPropName ) ) );
|
QVariant( QObject::tr( "GEOM_PRECISION_HINT" ).arg( userPropName ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
|
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
|
|
||||||
|
#include <Basics_Utils.hxx>
|
||||||
|
|
||||||
#include <TDF_Tool.hxx>
|
#include <TDF_Tool.hxx>
|
||||||
#include <TDF_Data.hxx>
|
#include <TDF_Data.hxx>
|
||||||
#include <TDF_Reference.hxx>
|
#include <TDF_Reference.hxx>
|
||||||
@ -528,6 +530,9 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
|
|||||||
bool isPublished,
|
bool isPublished,
|
||||||
bool& aValidScript)
|
bool& aValidScript)
|
||||||
{
|
{
|
||||||
|
// Set "C" numeric locale to save numbers correctly
|
||||||
|
Kernel_Utils::Localizer loc;
|
||||||
|
|
||||||
TCollection_AsciiString aScript;
|
TCollection_AsciiString aScript;
|
||||||
Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
|
Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
|
||||||
|
|
||||||
|
@ -1475,8 +1475,8 @@ void GeometryGUI::createPreferences()
|
|||||||
|
|
||||||
// Set property for precision value for spinboxes
|
// Set property for precision value for spinboxes
|
||||||
for ( ii = 0; ii < nbQuantities; ii++ ){
|
for ( ii = 0; ii < nbQuantities; ii++ ){
|
||||||
setPreferenceProperty( prec[ii], "min", -10 );
|
setPreferenceProperty( prec[ii], "min", -14 );
|
||||||
setPreferenceProperty( prec[ii], "max", 10 );
|
setPreferenceProperty( prec[ii], "max", 14 );
|
||||||
setPreferenceProperty( prec[ii], "precision", 2 );
|
setPreferenceProperty( prec[ii], "precision", 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -438,13 +438,14 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
|
|||||||
//}
|
//}
|
||||||
|
|
||||||
//Alternative case to check shape result Mantis 0020604: EDF 1172
|
//Alternative case to check shape result Mantis 0020604: EDF 1172
|
||||||
TopoDS_Iterator It (aShape, Standard_True, Standard_True);
|
/* TopoDS_Iterator It (aShape, Standard_True, Standard_True);
|
||||||
int nbSubshapes=0;
|
int nbSubshapes=0;
|
||||||
for (; It.More(); It.Next())
|
for (; It.More(); It.Next())
|
||||||
nbSubshapes++;
|
nbSubshapes++;
|
||||||
if (!nbSubshapes)
|
if (!nbSubshapes)
|
||||||
Standard_ConstructionError::Raise("Boolean operation aborted : result object is empty compound");
|
Standard_ConstructionError::Raise("Boolean operation aborted : result object is empty compound");*/
|
||||||
//end of 0020604: EDF 1172
|
//end of 0020604: EDF 1172
|
||||||
|
//! the changes temporary commented because of customer needs (see the same mantis bug)
|
||||||
|
|
||||||
aFunction->SetValue(aShape);
|
aFunction->SetValue(aShape);
|
||||||
|
|
||||||
|
@ -17,12 +17,11 @@
|
|||||||
#
|
#
|
||||||
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||||
#
|
#
|
||||||
|
|
||||||
# GEOM GEOM_SWIG : binding of C++ omplementaion with Python
|
# GEOM GEOM_SWIG : binding of C++ omplementaion with Python
|
||||||
# File : geompy.py
|
# File : geompy.py
|
||||||
# Author : Paul RASCLE, EDF
|
# Author : Paul RASCLE, EDF
|
||||||
# Module : GEOM
|
# Module : GEOM
|
||||||
#
|
|
||||||
"""
|
"""
|
||||||
\namespace geompy
|
\namespace geompy
|
||||||
\brief Module geompy
|
\brief Module geompy
|
||||||
@ -2122,6 +2121,9 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
# Example: see GEOM_TestHealing.py
|
# Example: see GEOM_TestHealing.py
|
||||||
theValues,Parameters = ParseList(theValues)
|
theValues,Parameters = ParseList(theValues)
|
||||||
anObj = self.HealOp.ProcessShape(theShape, theOperators, theParameters, theValues)
|
anObj = self.HealOp.ProcessShape(theShape, theOperators, theParameters, theValues)
|
||||||
|
# To avoid script failure in case of good argument shape
|
||||||
|
if self.HealOp.GetErrorCode() == "ShHealOper_NotError_msg":
|
||||||
|
return theShape
|
||||||
RaiseIfFailed("ProcessShape", self.HealOp)
|
RaiseIfFailed("ProcessShape", self.HealOp)
|
||||||
for string in (theOperators + theParameters):
|
for string in (theOperators + theParameters):
|
||||||
Parameters = ":" + Parameters
|
Parameters = ":" + Parameters
|
||||||
@ -2375,10 +2377,10 @@ class geompyDC(GEOM._objref_GEOM_Gen):
|
|||||||
# in order to avoid possible intersection between shapes from
|
# in order to avoid possible intersection between shapes from
|
||||||
# this compound.
|
# this compound.
|
||||||
# @param Limit Type of resulting shapes (corresponding to TopAbs_ShapeEnum).
|
# @param Limit Type of resulting shapes (corresponding to TopAbs_ShapeEnum).
|
||||||
# @param KeepNonlimitShapes: if this parameter == 0 - only shapes with
|
# @param KeepNonlimitShapes: if this parameter == 0, then only shapes of
|
||||||
# type <= Limit are kept in the result,
|
# target type (equal to Limit) are kept in the result,
|
||||||
# else - shapes with type > Limit are kept
|
# else standalone shapes of lower dimension
|
||||||
# also (if they exist)
|
# are kept also (if they exist).
|
||||||
#
|
#
|
||||||
# After implementation new version of PartitionAlgo (October 2006)
|
# After implementation new version of PartitionAlgo (October 2006)
|
||||||
# other parameters are ignored by current functionality. They are kept
|
# other parameters are ignored by current functionality. They are kept
|
||||||
|
@ -19,11 +19,10 @@
|
|||||||
//
|
//
|
||||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||||
//
|
//
|
||||||
|
|
||||||
// GEOM GEOMGUI : GUI for Geometry component
|
// GEOM GEOMGUI : GUI for Geometry component
|
||||||
// File : RepairGUI_SuppressFacesDlg.cxx
|
// File : RepairGUI_SuppressFacesDlg.cxx
|
||||||
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
|
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
|
||||||
//
|
|
||||||
#include "RepairGUI_SuppressFacesDlg.h"
|
#include "RepairGUI_SuppressFacesDlg.h"
|
||||||
|
|
||||||
#include <DlgRef.h>
|
#include <DlgRef.h>
|
||||||
@ -207,6 +206,8 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (aMap.IsEmpty() && aSelList.Extent() > 0) { // try to detect selected published sub-shape
|
if (aMap.IsEmpty() && aSelList.Extent() > 0) { // try to detect selected published sub-shape
|
||||||
|
TColStd_MapOfInteger anIds;
|
||||||
|
|
||||||
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(myGeomGUI->getApp()->activeStudy());
|
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(myGeomGUI->getApp()->activeStudy());
|
||||||
if (!appStudy) return;
|
if (!appStudy) return;
|
||||||
_PTR(Study) aStudy = appStudy->studyDS();
|
_PTR(Study) aStudy = appStudy->studyDS();
|
||||||
@ -232,11 +233,30 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
|
|||||||
int anIndex = aMainMap.FindIndex(aSubShape);
|
int anIndex = aMainMap.FindIndex(aSubShape);
|
||||||
if (anIndex >= 0) {
|
if (anIndex >= 0) {
|
||||||
aMap.Add(anIndex);
|
aMap.Add(anIndex);
|
||||||
|
anIds.Add(anIndex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!aMap.IsEmpty()) {
|
||||||
|
// highlight local faces, correspondent to OB selection
|
||||||
|
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
|
||||||
|
|
||||||
|
aSelMgr->clearSelected();
|
||||||
|
|
||||||
|
Standard_Boolean isOk;
|
||||||
|
char* objIOR = GEOMBase::GetIORFromObject(myObject);
|
||||||
|
Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape(objIOR, isOk, true);
|
||||||
|
free(objIOR);
|
||||||
|
if (!isOk || aSh.IsNull())
|
||||||
|
return;
|
||||||
|
|
||||||
|
aSelMgr->AddOrRemoveIndex(aSh->getIO(), anIds, false);
|
||||||
|
|
||||||
|
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
|
||||||
|
this, SLOT(SelectionIntoArgument()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const int n = aMap.Extent();
|
const int n = aMap.Extent();
|
||||||
|
Loading…
Reference in New Issue
Block a user