STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
#
import os, sys, string
-from salome_utils import getTmpDir, generateFileName, uniteFiles
+from salome_utils import getLogDir, generateFileName, uniteFiles
from setenv import add_path, get_lib_dir, salome_subdir
# -----------------------------------------------------------------------------
"""Add to the PATH-variables modules specific paths"""
psep = os.pathsep
python_version="python%d.%d" % sys.version_info[0:2]
-
- tmp_dir = getTmpDir()
+
+ tmp_dir = getLogDir()
env_dir = generateFileName( tmp_dir, prefix="env", with_port=True )
res_dir = os.path.join( os.getenv( "GEOM_ROOT_DIR" ), "share", salome_subdir, "resources", "geom" )
min_distance.py
normal_face.py
notebook_geom.py
+ polyline.py
point_coordinates.py
primitives_ex01.py
primitives_ex02.py
to change the order (ascending / descending) by clicking the corresponding title bar of the objects list.
</li>
-<li>\ref dependency_tree_page "Show dependency tree" - shows dependency tree of selected objects
-in new 2D View Window.</li>
+<li>\ref dependency_tree_page "Show dependency tree" - shows the dependency tree with parents and children of the selected object
+in a new 2D View Window.</li>
-<li>\ref reduce_study_page "Reduce study" - allows to reduce study
-by automatic removing objects according to user's options.</li>
+<li>\ref reduce_study_page "Reduce study" - allows reducing the study by removing objects from it.</li>
</ul>
<h2> Folders </h2>
To be considered as a compound of blocks, the given shape must satisfy the
following conditions:
-- Each element of the compound should be a Block (6 faces and 12 edges);
+- Each element of the compound should be a Block (6 quadrangle faces);
+- Each quadrangle face is a face that has 1 wire with 4 edges. If there are
+more than 4 edges in a single wire and C1 continuity mode is switched on,
+a face is quadrangular if it has 4 bounds of C1 continuity.
- Blocks can be connected only via an entire quadrangle face or an entire edge;
- The compound should be connected;
- Each couple of connecting quadrangle faces should be glued.
In this dialog:
-- \b Object - the checked object. \b Selection button allows picking it in the viewer or in the object browser.
-- \b Errors list informs of possible errors, for example:.
+- \b Object - the checked object. \b Selection button allows picking it in the viewer or in the object browser.
+- <b>Use C1 criterion</b> - option that shitches on/off the C1 continuity mode.
+- <b>Angular Tolerance</b> - angular tolerance to check C1 continuity between neighbor edges in a wire.
+- \b Errors list informs of possible errors, for example:
- Not a block;
- Not glued;
- Not connected;
\n <b>TUI Command:</b>
-<em>geompy.CheckCompoundOfBlocks(Compound).</em> Checks if the shape
+<em>geompy.CheckCompoundOfBlocks(Compound, theIsUseC1 = False, theAngTolerance = 1.e-12).</em> Checks if the shape
is a valid compound of blocks. If it is true, then the validity flag
is returned, and encountered errors are printed in the python console.
\n Firstly, you can define a \b Cylinder by the <b>Base Point</b> (the central
point of the cylinder base), the \b Vector (the axis of the cylinder),
-and its dimensions: the \b Radius and the \b Height. Also, you can optionally specify
-the \b Angle in order to create a portion of cylinder.
+and its dimensions: the \b Radius and the \b Height. You can optionally specify
+the \b Angle to create a portion of cylinder.
\n <b>TUI Command:</b> <em>geompy.MakeCylinder(Point, Axis, Radius, Height)</em>
\n <b>Arguments:</b> Name + 1 vertex + 1 vector + 2 values
\n Secondly, you can define a \b Cylinder by the given \b Radius and
\b Height at the origin of coordinate system. The axis of the cylinder
will be collinear to the OZ axis of the coordinate system.
-Similarly to first constructor, you can optionally specify the \b Angle
-in order to create a portion of cylinder.
+Similarly to the first constructor, you can optionally specify the \b Angle
+to create a portion of cylinder.
\n <b>TUI Command:</b> <em>geompy.MakeCylinderRH(Radius, Height)</em>
\n <b>Arguments:</b> Name + 2 values (Dimensions at origin: radius and
sub-shapes.
- <em>geompy.SubShapeAllSortedCentres(Shape, Type)</em> explodes a
shape on sub-shapes of a given type and sorts them taking into account
- their gravity centers, to provide stable order of sub-shapes.
+ their gravity centers, to provide a stable order of sub-shapes.
It returns a list of sub-shapes.
- <em>geompy.SubShapeAllSortedCentresIDs(Shape, Type)</em> explodes
a shape on sub-shapes of a given type and sorts them taking into
- account their gravity centers, to provide stable order of sub-shapes.
+ account their gravity centers, to provide a stable order of sub-shapes.
It returns a List of IDs of sub-shapes.
- <em>geompy.SubShape(Shape, Type, ListOfInd)</em> allows to obtain
a compound of sub-shapes of the Shape, selected by they indices in a
\image html polyline_dlg.png
A polyline represents a section or a set of sections. Each section is constructed from a sequence of 2D points
-connected either by linear setgments or an interpolation curve. Every section has its own attributes:
+connected by either linear segments or an interpolation curve. Every section has its own attributes:
- \b Name,
- \b Type (Polyline or Spline),
- \b Closed flag.
-A Polyline created represents a shape that lies on the XOY plane. It can have the following types:
+A created Polyline represents a shape that lies on the XOY plane. Its type can be one of the following:
- \b Vertex for a single section with only 1 point.
-- \b Wire for a single section with 2 or more points. A Wire can have multiple edges for more then 2 points if the section type is Polyline.
-A single edge in the result wire is obtained for a Spline or Polyline with 2 points.
+- \b Wire for a single section with 2 or more points. A Wire can have multiple edges for more then 2 points if the section type is Polyline. A single edge in the resulting wire is obtained for a Spline or Polyline with 2 points.
- \b Compound of Wires and/or Vertices if there are several sections.
-For the moment only one reference coordinate system for polyline creation is supported. The XOY plane of the <b>Global coordinate system</b>
-is suggested. Implementation of another reference coordinate system is a subject of further development of this functionality.
-Restore button orientates the viewer correspondingly to the chosen working plane and fits the scene to show all objects.
+For the moment only one reference coordinate system for polyline creation is supported, which is the XOY plane of the <b>Global coordinate system</b>.
+\b Restore button orientates the viewer correspondingly to the chosen working plane and fits the scene to show all objects.
For the moment this button works with only one plane.
-It is possible to import a shape in this dialog using <b>Import polyline</b> selection button. To do it an imported object should satisfy conditions
-for polyline shapes mentioned above. If a valid shape is selected, when dialog is opened, it is initialized by this shape.
-Though the shape can be on any plane, an imported polyline will be defined on XOY plane only due to the limitation.
+It is possible to import a shape in this dialog using <b>Import polyline</b> selection button. An imported object should meet the conditions for polyline shapes mentioned above. If a valid shape is selected, when the dialog is opened, it is initialized by this shape.
+Though the shape can be on any plane, the imported polyline will be defined on XOY plane only due to the limitation.
-The group \b Sections in this dialog represents the Polyline construction framework. Its toolbar has the following operations:
-- \b Undo
-- \b Redo
-- <b>Insert new section</b>
-- <b>Addition mode</b>
-- <b>Modification mode</b> - not implemented
-- <b>Detection mode</b> - not implemented
-- \b Remove
-- <b>Join selected sections</b>
+The group \b Sections in this dialog represents the Polyline construction framework.
-<b>Undo/Redo</b> buttons allows to undo/redo changes of the polyline.
+The buttons <b>Undo</b> and <b>Redo</b> allow to undo or redo the changes of the polyline.
-<b>Insert new section</b> button opens a dialog that allows to add a new section:
+<b>Insert new section</b> button opens the corresponding dialog:
\image html polyline_dlg_add_section.png
In this dialog it is possible to choose:
-- \b Name of section
-- \b Type of section
-- \b Closed flag
+- \b Name of section;
+- \b Type of section;
+- Set \b Closed flag.
-To create a new section \b Add button should be clicked. \b Cancel button is used to cancel this operation.
-After clicking \b Add button a new section is appeared on the list. Its name supplemented by its type and closedness
-information (see icon) and the number of points (equal to 0 after creation).
+To create a new section, click \b Add button. \b Cancel button is used to cancel this operation.
+After clicking \b Add button a new section appears in the list. Its name is generated automatically depending on its type, closed or opened state and the number of points (equal to 0 after creation).
-To modify section parameters it is possible to double-click on a section in the list. In this case the following dialog appears:
+To modify section parameters, double-click on a section in the list. In this case the following dialog appears:
\image html polyline_dlg_edit_section.png
-To apply modifications the button \b Ok should be clicked.
+To apply the modifications, click \b Ok button.
-<b>Addition mode</b> allows to add points to a section. It is necessary to select a particular section in a list of sections
-and make some mouse clicks in the viewer. A section preview is recomputed after each click.
+<b>Addition mode</b> allows adding points to a section. Select a particular section in the list of sections
+and left-click in the viewer to add new nodes to the section. A section preview is recomputed after each click.
<b>Modification mode</b> and <b>Detection mode</b> are not implemented for the moment.
-\b Remove button allows to remove a section. It is available if all modes are deactivated and one section is selected.
+\b Remove button allows removing a section. It is available if all modes are deactivated and one section is selected.
<b>Join selected sections</b> button is available in modification mode if two or more sections are selected. It is used to
-merge several sections into the first one from selection list. Joined section has parameters of the first selected one. Points of
-the other sections are appended at the end of the list of the first section points.
+merge several sections into the first one from the selection list. The points of the merged sections are appended at the end of the list of points of the first section.
-Some actions are available via popup menu by right mouse button click.
+Some actions are available via the context menu activated by right mouse button click.
+- <b>Join all sections</b> - joins all defined sections into the first one.
+- \b Join - joins two or more selected sections.
+- <b>Clear all</b> - removes all selected sections.
+- <b>Set closed</b> - sets \b Closed flag for all selected section.
+- <b>Set open</b> - unset \b Closed flag for all selected sections.
+- <b>Set polyline</b> - sets the type of all selected sections to Polyline.
+- <b>Set spline</b> - set the type of all selected sections to Spline.
-If all modes are deactivated:
-- <b>Join all sections</b> - join all defined sections into the first one.
-- \b Join - join sections. Available if two or more sections are selected.
-
-In <b>Addition mode</b>:
-- <b>Join all sections</b> - join all defined sections into the first one.
-
-In <b>Modification mode</b>:
-- <b>Join all sections</b> - join all defined sections into the first one.
-- \b Join - join sections. Available if two or more sections are selected.
-- <b>Clear all</b> - remove all sections. Available if at least one section is selected.
-- <b>Set closed</b> - set all selected section's Closed flag. Available if at least one section is selected.
-- <b>Set open</b> - reset all selected section's Closed flag. Available if at least one section is selected.
-- <b>Set polyline</b> - set all selected section's type to Polyline. Available if at least one section is selected.
-- <b>Set spline</b> - set all selected section's type to Spline. Available if at least one section is selected.
-
-In <b>Detection mode</b>:
-- <b>Join all sections</b> - join all defined sections into the first one.
-- \b Join - join sections. Available if two or more sections are selected.
+Different actions are available depending on the mode and selection.
<h2>TUI Commands</h2>
-
To create the 2D polyline in TUI Polyline2D interface is used.
<em>pl = geompy.Polyline2D()</em> - returns an instance of Polyline2D interface <i>pl</i>.
See the \ref gsketcher.Polyline2D "Polyline2D" interface documentation for more information.
Our <b>TUI Scripts</b> provide you with useful examples of the use of
-\ref tui_polyline_page "2D Polyline".
+\ref tui_creation_polyline "2D Polyline".
*/
- <b>Max BSpline surface degree</b> of the resulting BSpline surface;
- <b>3D tolerance of initial approximation</b>
-\note <b>3D tolerance of initial approximation</b> represents a tolerance of
+\note <b>3D tolerance of the initial approximation</b> represents the tolerance of
initial plate surface approximation. If this parameter is equal to 0 (default),
its value is automatically computed as <em> max(0.0001, 10*error)</em>,
-where <em>error</em> is a 3D tolerance of the surface representing a maximal
-distance between computed plate surface and given points.
+where <em>error</em> is the 3D tolerance of the surface representing the maximal
+distance between the computed plate surface and given points.
<b>Advanced options:</b> \ref preview_anchor "Preview"
- \em thelPoints is a list of points or compounds of points;
- \em theNbMax maximum number of Bezier pieces in the resulting surface;
- \em theDegMax maximum degree;
-- \em theDMax specifies 3D tolerance of initial approximation
+- \em theDMax specifies 3D tolerance of the initial approximation.
Example:
\anchor dependency_tree_general_description_anchor <h2>General description</h2>
-In order to better understand the relations between the %GEOM
-objects in a study the user has a possibility to display the
-ascendants and descendant of the object(s) in a family tree.
-
-User can build the dependency tree by selecting desirable object
-in Object Browser or OCC Viewer and calling "Show dependency tree"
-popup item. It will open a new or clear the existing "Dependency
-Tree" view window (only one view is supported) and display a
-dependency tree for the selected object or objects (multiple
-selection is supported). Also user can rebuild the tree if to select
-some object(s) right in the "Dependency Tree" view and call
-"Rebuild the tree" popup menu item.
+You can display the ascendants and descendants of object(s) in a tree structure to better understand the relations between the %GEOM
+objects in a study .
+
+To build the dependency tree, select the necessary object or objects (multiple
+selection is supported) in the Object Browser or OCC Viewer and call "Show dependency tree" context menu item.
\image html tree_example.png
-User can change all necessary parameters of Dependency Tree Viewer
-in \ref pref_dependency_tree "Preferences".
+
+"Dependency Tree" view window will display the dependency tree for the selected object.
+It is also possible to select an object(s) directly in the "Dependency Tree" view and to rebuild the tree by selecting
+"Rebuild the tree" context menu item.
+
+All necessary parameters of Dependency Tree Viewer can be edited in the \ref pref_dependency_tree "Preferences".
<hr>
\anchor dependency_tree_nodes_anchor <h2>Nodes</h2>
Tree nodes in the Dependency Viewer are named according to the study
names of the corresponding objects.
-Non-published objects are shown in the tree as "unpublished" and
-colored in special color.
-
-All nodes have the fixed size, so the long names are cut and shown
-with ellipsis; full name of the object can be seen in the tooltip
-if to keep the cursor over the node.
+All nodes have fixed size, so long names are cut; the full object name can be seen in the tooltip
+when the cursor is hovered over the node.
"Dependency Tree" view supports the following states of nodes:
-<ul><li><b>Main node</b> - node of main object(s), which were selected in Object
-Browser, OCC Viewer or Dependency Tree Viewer in order to build the
-dependency tree;</li></ul>
+<ul><li><b>Main node</b> - corresponds to the main object(s) selected in Object
+Browser, OCC Viewer or Dependency Tree Viewer;</li></ul>
\image html tree_main_node.png
-<ul><li><b>Default node</b> - node of published in study object, which participate in building of
-dependency tree as ascendant or descendant;</li></ul>
+<ul><li><b>Default node</b> - ascendant or descendant node of the dependency tree corresponding to an object published in the study;</li></ul>
\image html tree_default_node.png
-<ul><li><b>Unpublished node</b> - the same as "Default node", but
-corresponding object was not published in study;</li></ul>
+<ul><li><b>Unpublished node</b> - corresponds to an object that was not published in the study;</li></ul>
\image html tree_unpublished_node.png
-<ul><li><b>Highlighted node</b> - the state of node when mouse
-cursor is over it;</li></ul>
+<ul><li><b>Highlighted node</b> - the state of a node when the mouse cursor is hovered over it;</li></ul>
\image html tree_highlighted_node.png
-<ul><li><b>Selected node</b> - the state of node when user
-clicks the left mouse button on node.</li></ul>
+<ul><li><b>Selected node</b> - the state of node when the user clicks the left mouse button it.</li></ul>
\image html tree_selected_node.png
<hr>
\anchor dependency_tree_links_anchor <h2>Links</h2>
Dependency Tree Viewer shows oriented links between nodes to
-represent dependency direction. Viewer supports the following states
-of links:
+represent the dependency direction. The viewer supports the following states of links:
-<ul><li><b>Unidirectional link</b> - shows that A object depends on
-B object;</li></ul>
+<ul><li><b>Unidirectional link</b> - shows that object B depends on object A;</li></ul>
\image html tree_unidir_link.png
-<ul><li><b>Bidirectional link</b> - shows that A object depends on
-B object and, at the same time, B object depends on
-A object;</li></ul>
+<ul><li><b>Bidirectional link</b> - shows that object B depends on
+object A and, at the same time, object A depends on object B;</li></ul>
\image html tree_bidir_link.png
-<ul><li><b>Self-dependency link</b> - shows that object depends on
-itself;</li></ul>
+<ul><li><b>Self-dependency link</b> - shows that an object depends on itself;</li></ul>
\image html tree_selfdep_link.png
-<ul><li><b>Cyclic dependency links</b> - shows cyclic dependency of
-some nodes.</li></ul>
+<ul><li><b>Cyclic dependency links</b> - shows cyclic dependency of some nodes.</li></ul>
\image html tree_cycldep_link.png
<hr>
-\anchor dependency_tree_operations_anchor <h2>Operations</h2>
+\anchor dependency_tree_operations_anchor <h2>Viewer Operations</h2>
The dependency tree of a chosen %GEOM object is displayed in
the dedicated 2D view window.
\image html tree_tool_bar.png
-<b>Dump View</b> - exports an object from the viewer in bmp, png or
-jpeg image format.
+<b>Dump View</b> - exports the current scene in bmp, png or jpeg image format.
\image html tree_view_dump.png
<b>Fit all</b> - scales the presentation so that it could fit within
<ul>
<li>Level 1 corresponds to the parents and children of the selected
object(s);</li>
-<li>Level 2 is Level 1 plus the grand-parents and grand-children
+<li>Level 2 adds the grand-parents and grand-children
of the selected object(s);</li>
<li>etc...</li>
</ul>
-<b>Display ascendants</b> - allows user to control the displaying
-of ascendants.
+<b>Display ascendants</b> - allows showing/hiding the ascendants.
\image html tree_disp_ascendants.png
-<b>Display descendants</b> - allows user to control the displaying
-of descendants.
+<b>Display descendants</b> - allows showing/hiding the descendants.
\image html tree_disp_descendants.png
-<b>Move nodes</b> - enables/disables of moving the nodes.
+<b>Move nodes</b> -if checked, it is possible to move nodes in the viewer.
\image html tree_move_nodes.png
-<b>Update</b> - allows user to update a dependency tree model and the view.
+<b>Update</b> - updates the dependency tree view, reflecting changes introduced in the hierarchy.
\image html tree_button_update.png
<hr>
-\anchor dependency_tree_navigation_anchor <h2>Navigation</h2>
-
-Dependency Tree 2D Viewer supports the following navigation mode:
+\anchor dependency_tree_navigation_anchor <h2>Selection and Shortcuts</h2>
<ul>
-<li>rectangle selection in this mode is performed by the left mouse
-button</li>;
-<li>multiple selection is available when \b Shift button
+<li>It is possible to select multiple nodes in the view by rectangle selection or by clicking nodes when \b Shift button
is pressed.</li>
</ul>
-Also, holding \b Ctrl key with pressed mouse buttons performs
+Holding \b Ctrl key with pressed mouse buttons performs
the following view transformations:
<ul>
<li>Ctrl + left mouse button - zooming;</li>
</ul>
<hr>
-\anchor dependency_tree_popup_menu_anchor <h2>Popup Menu</h2>
+\anchor dependency_tree_popup_menu_anchor <h2>Context Menu</h2>
-After the object has appeared in the Dependency Tree 2D Viewer,
-user can select it with left mouse click to change its presentation
-parameters and get access to other useful options by right-clicking on
-the selected object.
+The following operations are available from the context menu of the selected object.
\image html tree_popup_menu1.png
<ul>
-<li>\b Show - allows to show selected object(s) in OCC 3D Viewer;</li>
-<li><b> Show Only</b> - allows to show only selected object(s)
-in OCC 3D Viewer;</li>
-<li><b> Rebuild the tree</b> - allows to rebuild the dependency tree
+<li>\b Show - shows the selected object(s) in OCC 3D Viewer;</li>
+<li><b> Show Only</b> - shows only the selected object(s) in OCC 3D Viewer;</li>
+<li><b> Rebuild the tree</b> - rebuilds the dependency tree
for selected object(s);</li>
-<li>\ref reduce_study_page "Reduce study" - allows to reduce study.</li>
-</ul>
-
-Some functionalities are available through right-clicking on
-the viewer background:
+<li>\ref reduce_study_page "Reduce study" - allows reducing the study.</li>
\image html tree_popup_menu2.png
-Dependency Tree 2D Viewer background can be customized using the
-"Change background" popup menu command that opens standard
-"Select Color" dialog box:
-
-\image html selectcolor.png
+<li>It is also possible to customize the background of Dependency Tree 2D Viewer using the
+corresponding context menu command.</li>
+</ul>
*/
\anchor pref_settings <h2>Settings</h2>
-In the \b Geometry module you can set preferences for visualisation of
+In the \b Geometry module you can set preferences for visualization of
geometrical figures, which can be used in later sessions with this module.
-There is also a special group of preferences controlling input
-precision for floating-point data.
+
\image html pref15.png
</ul>
<ul>
-<li><b>Dimensions (Measurements)</b></li>
+<li><b>Dimensions (Measurements)</b> - a group of preferences controlling the presentation of dimensions.</li>
<ul>
<li><b>Color</b> - allows to define color for persistent dimension presentations.</li>
<li><b>Line width</b> - allows to define pixel width of dimension lines.</li>
</ul>
<ul>
-<li><b>Input fields precision</b></li>
+<li><b>Input fields precision</b> - a group of preferences controlling input
+precision for floating-point data.</li>
<ul>
<li><b>Length precision</b> - allows to adjust input precision of coordinates and dimensions.</li>
<li><b>Angular precision</b> - allows to adjust input precision of angles.</li>
\anchor pref_dependency_tree <h2>Dependency Tree</h2>
-Also user can set preferences for visualisation of <b>Dependency Tree</b> in 2D Viewer.
+This tab groups preferences for visualization of <b>Dependency Tree</b> in the 2D Viewer.
\image html pref_dep_tree.png
<ul>
<li><b>General</b></li>
<ul>
-<li><b>Hierarchy type</b> - allows to choose default displaying mode of dependency tree.</li>
-<li><b>Possibility to move nodes</b> - enable/disable the possibility of moving nodes by default.</li>
+<li><b>Hierarchy type</b> - allows to choose the default display mode of the dependency tree.</li>
+<li><b>Possibility to move nodes</b> - enables/disables the possibility of moving nodes by default.</li>
</ul>
</ul>
<ul>
<li><b>Color</b></li>
<ul>
-<li><b>Background color</b> - allows to select default background color.</li>
-<li><b>Default node color</b> - allows to select default node color.</li>
-<li><b>Main node color</b> - allows to select default main node color.</li>
-<li><b>Unpublished node color</b> - allows to select default node color
-for unpublished objects.</li>
-<li><b>Selected node color</b> - allows to select default selected node color.</li>
-<li><b>Default arrow color</b> - allows to select default arrow color.</li>
-<li><b>Highlighted arrow color</b> - allows to select default highlighted
-arrow color.</li>
-<li><b>Selected arrow color</b> - allows to select default selected
-arrow color.</li>
+<li><b>Background color</b> - allows to select the default background color.</li>
+<li><b>Default node color</b> - allows to select the default node color.</li>
+<li><b>Main node color</b> - allows to select the default main node color.</li>
+<li><b>Unpublished node color</b> - allows to select the default node color for unpublished objects.</li>
+<li><b>Selected node color</b> - allows to select the default selected node color.</li>
+<li><b>Default arrow color</b> - allows to select the default arrow color.</li>
+<li><b>Highlighted arrow color</b> - allows to select the default highlighted arrow color.</li>
+<li><b>Selected arrow color</b> - allows to select the default selected arrow color.</li>
</ul>
</ul>
<li>\ref tui_working_with_groups_page</li>
<li>\ref tui_building_by_blocks_page</li>
<li>\ref tui_sketcher_page</li>
+ <li>\ref tui_3dsketcher_page</li>
<li>\ref tui_advanced_geom_objs_page</li>
</ul>
<li>\subpage tui_viewing_geom_objs_page</li>
This operation retrieves all non-block solids and non-quadrangular faces from the selected shape.
-A non-block solid is a solid that does not have 6 faces, or has 6 faces, but some of them are not quadrangular.
+A block solid is a solid that has 6 quadrangular faces.
+
+A quadrangular face is a face that has 1 wire with 4 edges. If there are
+more than 4 edges in a single wire and C1 continuity mode is switched on,
+a face is quadrangular if it has 4 bounds of C1 continuity.
+
+All solids and faces from a shape that do not satisfy these conditions are
+returned by this operation.
\image html measures2.png
-\b Preview option shows non block solids and faces in the viewer.
+It is possible to select an \b Object to be explored, to check or uncheck
+<b>Use C1 criterion</b> option and to set the <b>Angular Tolerance</b>
+to check C1 continuity between neighbor edges in a wire.
-Press \b Apply or <b>Apply and Close</b> button to publish non block solids and faces in the Object
-Browser under the processed object. Solids and faces are published separately in two groups.
+\b Preview option shows non-block solids and non-quadrangular faces in the viewer.
+
+Press \b Apply or <b>Apply and Close</b> button to publish non-block solids
+and non-quadrangular faces in the Object Browser under the processed object.
+Solids and faces are published separately in two groups.
If no bad sub-shapes have been found, the corresponding warning is shown.
\image html measures2a.png
\n <b>TUI Command:</b>
-<em>geompy.GetNonBlocks(Compound).</em> Returns a tuple of two GEOM_Objects.
-
-The first object is a group of all non block solids; the second object is a group of all non
-quadrangular faces.
+<em>geompy.GetNonBlocks(theShape, theIsUseC1 = False, theAngTolerance = 1.e-12).</em> \n
+where \n
+\em theShape is the shape to explore, \n
+\em theIsUseC1 is the flag to check if there are 4 bounds on a face
+ taking into account C1 continuity, \n
+\em theAngTolerance the angular tolerance to check if two neighbor edges are
+ codirectional in the common vertex with this tolerance. This parameter is
+ used only if \em theIsUseC1 is set to True.
+
+This command returns a tuple of two GEOM_Objects.
+
+The first object is a group of all non-block solids; the second object is a group
+of all non-quadrangular faces.
See also a \ref tui_get_non_blocks_page "TUI example".
\page reduce_study_page Reduce Study
-The user sometimes needs to keep in the study only some objects that
+It can be sometimes necessary to keep in the study only the objects that
present the final result(s) of the design operations and to delete all
-other objects which do not contribute to these results.
+other objects, which do not contribute to these results.
-The feature is especially useful when the user designs the whole model
-through the GUI and wants to generate simplified "clean" Python dump only
-at the end of the model construction with no "useless" objects in the
-%GEOM module.
+This is especially useful when the model is designed using the GUI
+and it is necessary to generate a simplified "clean" Python dump without "useless" objects
+at the end of the model construction.
-User can open dialog box by selecting desirable object(s) in Object
-Browser or OCC Viewer and calling "Reduce study" popup item.
+This feature can be activated by selecting the desirable object(s) in Object
+Browser or OCC Viewer and calling "Reduce study" context item.
\image html reduce_study_dialog.png
<ul>
<li><b> Objects to be kept</b> - objects that will be kept in the study after
-applying operation of reduce study. The list of objects being selected by
+applying reduce study operation. The objects selected by
the user are highlighted in bold font.</li>
<li><b> Objects to be removed</b> - objects that will be deleted.</li>
-\note Mentioned views provide possibility to show/hide object(s) in
-current Viewer using "eye" icon near each item of tree. Also user can
-show/hide ALL objects in tree by clicking "eye" icon in the head of tree view.
+\note It is possible to show/hide object(s) in the
+current Viewer using "eye" icon next to each tree item.
+ALL objects in the tree can be shown/hidden by clicking the "eye" icon in the head of the tree view.
+
+<li><b> Intermediate objects</b> group box allows choosing what should be done with the objects that are used to produce the selected object(s):
+<li><b> Sub-objects</b> group box allows choosing the same operations for
+sub-objects of the selected object(s).</li>
-<li><b> Intermediate objects</b> group box allows to choose an action
-that will be performed with the objects that took part in the operations
-chain to produce the selected object(s):
<ul>
<li>Keep - object(s) will be kept in the study;</li>
<li>Unpublish - object(s) will be unpublished (hidden) from the study;</li>
<li>Remove - object(s) will be removed from the study. \note Since use of
-this option can lead to the broken Dump Python script, the warning message
-will be shown at the operation commiting to confirm/reject removing
-intermediate objects.</li>
+this option can cause a broken Dump Python script, the warning message
+is shown confirm/reject removing intermediate objects.</li>
</ul>
</li>
-<li><b> Sub-objects</b> group box allows to choose the same operations for
-sub-objects of selected item(s): keep, unpublish or remove.</li>
-<li><b> Remove empty folders</b> - if this option is checked, then all folders,
+<li><b> Remove empty folders</b> - if this option is checked, all folders,
which will become empty after removing unused objects from the study,
will be also removed; otherwise, empty folders will be kept.</li>
-<li><b> Soft removal</b> - if this option is checked, operation will just
-unpublish the redundant objects from the study instead of their hard delete.
-\n Soft removal would keep all the data in the study to give the user a
+<li><b> Soft removal</b> - if this option is checked, the operation will
+unpublish the redundant objects from the study instead of deleting them.
+\n So, soft removal keeps all data in the study to give the user a
chance to revert this operation using \ref publish_hidden_objects
"Publish Objects" dialog box.</li>
<br><h2>Creation of a Surface From Face</h2>
\tui_script{basic_geom_objs_ex10.py}
+\anchor tui_creation_polyline
+<br><h2>Creation of 2D Polyline</h2>
+\tui_script{polyline.py}
+
*/
+++ /dev/null
-/*!
-
-\page tui_polyline_page 2D Polyline
-\tui_script{polyline.py}
-
-*/
\until Scale4
\anchor swig_all_trsf_more
-\until MakeOffset
+\until MakeProjectionOnWire
\anchor swig_ChangeOrientation
\until ChangeOrientation
+\anchor swig_ExtendFaceEdge
+\until ExtendFace
+
+\anchor swig_SurfaceFromFace
+\until MakeSurfaceFromFace
+
\anchor swig_ExtractShapes
\until prism_edges
+\until IDlist_f
+
\anchor swig_FilletChamfer
\until End of Local operations
\anchor swig_all_patterns
-\until MultiRot2D
+\until MultiRot2Ds
\anchor swig_all_measure
\until "CheckShape(Prism) = "
\until nameS
\anchor swig_all_decompose
+\until geompy.RestoreSubShapes(Partition1)
+
+\anchor swig_GetSubShapeEdgeSorted
\until print "DONE"
*/
<li><b>Show all dimensions</b> - shows all of the persistent dimensions created for the selected geometrical object.</li>
<li><b>Hide all dimensions</b> - hides all of the persistent dimensions created for the selected geometrical object.</li>
-<li>\subpage dependency_tree_page "Show dependency tree" - shows dependency tree of selected objects
-in new 2D View Window.</li>
-<li>\subpage reduce_study_page "Reduce study" - allows to reduce study
-by automatic removing objects according to user's options.</li>
+<li>\subpage dependency_tree_page "Show dependency tree" - shows the dependency tree with parents and children of the selected object
+in a new 2D View Window.</li>
+<li>\subpage reduce_study_page "Reduce study" - allows reducing the study by removing objects from it.</li>
<li><b>Dump view</b> - exports an object from the viewer in bmp, png,
jpg or jpeg image format.</li>
<li><b>Change background</b> - allows to redefine the background
*/
GEOM_Object MakeSurfaceFromFace(in GEOM_Object theFace);
+ /*!
+ * \brief Explode a shape into edges sorted in a row from a starting point.
+ * \param theShape - the shape to be exploded on edges.
+ * \param theStartPoint - the starting point.
+ * \return Ordered list of edges sorted in a row from a starting point.
+ */
+ ListOfGO GetSubShapeEdgeSorted (in GEOM_Object theShape,
+ in GEOM_Object theStartPoint);
+
};
// # GEOM_IBlocksOperations:
* - The glue between two quadrangle faces should be applied.
* \note Single block is also accepted as a valid compound of blocks.
* \param theCompound The compound to check.
+ * \param theToleranceC1 the tolerance to check if two neighbor edges are
+ * collinear in the common vertex with this tolerance. Negative
+ * value means that C1 criterion is not used (old implementation).
* \param theErrors Structure, containing discovered errors and incriminated sub-shapes.
* \return TRUE, if the given shape is a compound of blocks.
*/
boolean CheckCompoundOfBlocks (in GEOM_Object theCompound,
+ in double theToleranceC1,
out BCErrors theErrors);
/*!
* \brief Retrieve all non blocks solids and faces from a shape.
*
* \param theShape The shape to explore.
+ * \param theToleranceC1 the tolerance to check if two neighbor edges are
+ * collinear in the common vertex with this tolerance. Negative
+ * value means that C1 criterion is not used (old implementation).
* \param theNonQuads Output parameter. Group of all non quadrangular faces.
*
* \return Group of all non block solids (= not 6 faces, or with 6
* faces, but with the presence of non-quadrangular faces).
*/
- GEOM_Object GetNonBlocks (in GEOM_Object theShape, out GEOM_Object theNonQuads);
+ GEOM_Object GetNonBlocks (in GEOM_Object theShape,
+ in double theToleranceC1,
+ out GEOM_Object theNonQuads);
/*!
* \brief Remove all seam and degenerated edges from \a theShape.
<!-- Geom data types -->
<type-list>
<!-- From GEOM_Gen.idl -->
+ <objref name="CORBA/Object" id="" />
<objref name="GEOM/GEOM_Gen" id="IDL:GEOM/GEOM_Gen:1.0" />
<objref name="GEOM/GEOM_BaseObject" id="IDL:GEOM/GEOM_BaseObject:1.0" />
<objref name="GEOM/GEOM_Object" id="IDL:GEOM/GEOM_Object:1.0">
</inParameter>
<inParameter>
<inParameter-name>theObject</inParameter-name>
- <inParameter-type>Object</inParameter-type>
+ <inParameter-type>CORBA/Object</inParameter-type>
<inParameter-comment>unknown</inParameter-comment>
</inParameter>
</inParameter-list>
#define FIND_GROUPS_BY_POINTS 1
+// Undefine below macro to enable workaround about fillet problem in MakePipeTShapeFillet
+// VSR 30/12/2014: macro enabled
+#define FILLET_FIX_TOLERANCE
+
//=============================================================================
/*!
* Constructor
// Last verification: result should be a block
std::list<GEOMImpl_IBlocksOperations::BCError> errList;
- if (!myBlocksOperations->CheckCompoundOfBlocks(Te3,errList)) {
+ if (!myBlocksOperations->CheckCompoundOfBlocks(Te3, -1, errList)) {
SetErrorCode("TShape is not a compound of block");
return false;
}
aFillet->GetLastFunction()->SetDescription("");
TopoDS_Shape aFilletShape = aFillet->GetValue();
+
+#ifdef FILLET_FIX_TOLERANCE
+ // VSR: 30/12/2014: temporary workaround about Fillet problem
+ if (theHexMesh) {
+ GEOMUtils::FixShapeTolerance(aFilletShape, TopAbs_FACE);
+ }
+ else {
+ GEOMUtils::FixShapeCurves(aFilletShape);
+ }
+#endif
+
aFunction->SetValue(aFilletShape);
// END of fillet
aFillet->GetLastFunction()->SetDescription("");
TopoDS_Shape aFilletShape = aFillet->GetValue();
+
+#ifdef FILLET_FIX_TOLERANCE
+ // VSR: 30/12/2014: temporary workaround about Fillet problem
+ if (theHexMesh) {
+ GEOMUtils::FixShapeTolerance(aFilletShape, TopAbs_FACE);
+ }
+ else {
+ GEOMUtils::FixShapeCurves(aFilletShape);
+ }
+#endif
+
aFunction->SetValue(aFilletShape);
// END of fillet
#include <vector>
+// Undefine below macro to enable workaround about problem with wrong
+// tolerances of intersection curves in MakePipeTShape and MakeQuarterPipeTShape
+// VSR 30/12/2014: macro enabled
+#define FIX_CURVES_TOLERANCES
+
//=======================================================================
//function : GetID
//purpose :
//purpose :
//=======================================================================
TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakePipeTShape (const double r1, const double w1, const double l1,
- const double r2, const double w2, const double l2) const
+ const double r2, const double w2, const double l2) const
{
double r1Ext = r1 + w1;
double r2Ext = r2 + w2;
StdFail_NotDone::Raise("Coudn't cut cylinders");
}
- return Te.Shape();
+ TopoDS_Shape aShape = Te.Shape();
+
+ // VSR: 30/12/2014: temporary workaround about intersection curves problem
+#ifdef FIX_CURVES_TOLERANCES
+ GEOMUtils::FixShapeCurves(aShape);
+#endif
+
+ return aShape;
}
//=======================================================================
//purpose :
//=======================================================================
TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakeQuarterPipeTShape (const double r1, const double w1, const double l1,
- const double r2, const double w2, const double l2) const
+ const double r2, const double w2, const double l2) const
{
TopoDS_Shape Te = MakePipeTShape(r1, w1, l1, r2, w2, l2);
if (Te.IsNull())
StdFail_NotDone::Raise("Couldn't cut Pipe Tshape with box");
}
+ TopoDS_Shape aShape = Te4.Shape();
+
+ // VSR: 30/12/2014: temporary workaround about intersection curves problem
+#ifdef FIX_CURVES_TOLERANCES
+ GEOMUtils::FixShapeCurves(aShape);
+#endif
+
return Te4.Shape();
}
</message>
<message>
<source>GEOM_DIVIDEDDISK</source>
- <translation>Divided_Disk</translation>
+ <translation>分割ディスク</translation>
</message>
<message>
<source>GEOM_DIVIDEDDISK_TITLE</source>
</message>
<message>
<source>GEOM_DIVIDEDCYLINDER</source>
- <translation>Divided_Cylinder</translation>
+ <translation>分割シリンダー</translation>
</message>
<message>
<source>GEOM_DIVIDEDCYLINDER_TITLE</source>
</message>
<message>
<source>JUNCTION_FACE_1</source>
- <translation>Junction 1</translation>
+ <translation>継手面1</translation>
</message>
<message>
<source>JUNCTION_FACE_2</source>
- <translation>Junction 2</translation>
+ <translation>継手面2</translation>
</message>
<message>
<source>JUNCTION_FACE_3</source>
- <translation>Junction 3</translation>
+ <translation>継手面3</translation>
</message>
<message>
<source>INTERNAL_FACES</source>
</message>
<message>
<source>GEOM_PIPE_TSHAPE</source>
- <translation>PipeTShape</translation>
+ <translation>T型パイプ</translation>
</message>
<message>
<source>GEOM_PIPE_TSHAPE_MPIPE</source>
</message>
<message>
<source>GEOM_PIPE_TSHAPE_POSITION_LBL_L1</source>
- <translation>New L1</translation>
+ <translation>T型パイプの位置 L1</translation>
</message>
<message>
<source>GEOM_PIPE_TSHAPE_POSITION_LBL_L2</source>
- <translation>New L2</translation>
+ <translation>T型パイプの位置 L2</translation>
</message>
<message>
<source>GEOM_PIPE_TSHAPE_LEFT_TR</source>
</message>
<message>
<source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_L</source>
- <translation type="unfinished">メインパイプの半径は、左側薄型化（rL）と等しくすることはできません！</translation>
+ <translation>メインパイプの半径は、左側薄型化（rL）と等しくすることはできません！</translation>
</message>
<message>
<source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_L</source>
- <translation type="unfinished">メインパイプの外半径（半径+幅）は、左側薄型化外半径（rL+wL）と等しくすることはできません！</translation>
+ <translation>メインパイプの外半径（半径+幅）は、左側薄型化外半径（rL+wL）と等しくすることはできません！</translation>
</message>
<message>
<source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_R</source>
- <translation type="unfinished">メインパイプの半径は、右側薄型化半径（rR）と同じにすることはできません！</translation>
+ <translation>メインパイプの半径は、右側薄型化半径（rR）と同じにすることはできません！</translation>
</message>
<message>
<source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_R</source>
- <translation type="unfinished">メインパイプの外半径（半径+幅）は、右側薄型化外半径（rR+wR）と等しくすることはできません！</translation>
+ <translation>メインパイプの外半径（半径+幅）は、右側薄型化外半径（rR+wR）と等しくすることはできません！</translation>
</message>
<message>
<source>GEOM_PIPETSHAPE_ERR_EQUAL_RADII_I</source>
- <translation type="unfinished">インシデントパイプの半径は、インシデントパイプ薄肉化半径（rl）と等しくすることはできません！</translation>
+ <translation>インシデントパイプの半径は、インシデントパイプ薄肉化半径（rl）と等しくすることはできません！</translation>
</message>
<message>
<source>GEOM_PIPETSHAPE_ERR_EQUAL_EXT_RADII_I</source>
- <translation type="unfinished">インシデントパイプの外半径（半径+厚さ）は、インシデントパイプの薄肉化外半径（rI+wI）と等しくすることはできません！</translation>
+ <translation>インシデントパイプの外半径（半径+厚さ）は、インシデントパイプの薄肉化外半径（rI+wI）と等しくすることはできません！</translation>
</message>
</context>
<context>
</message>
<message>
<source>GEOM_SMOOTHINGSURFACE_ARG_NB_MAX</source>
- <translation>ベジェパッチの最大数</translation>
+ <translation>ベジェパッチの最大数<</translation>
</message>
<message>
<source>GEOM_SMOOTHINGSURFACE_ARG_DEG_MAX</source>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ja" sourcelanguage="en">
-<context>
+ <context>
<name>@default</name>
<message>
- <source>MEN_EXPORTBREP</source>
- <translation type="unfinished">BREP</translation>
+ <source>MEN_EXPORTBREP</source>
+ <translation>BREPエキスポート</translation>
</message>
<message>
- <source>TOP_EXPORTBREP</source>
- <translation type="unfinished">Export BREP</translation>
+ <source>TOP_EXPORTBREP</source>
+ <translation>BREPエキスポート</translation>
</message>
<message>
- <source>STB_EXPORTBREP</source>
- <translation type="unfinished">Export BREP</translation>
+ <source>STB_EXPORTBREP</source>
+ <translation>BREPエキスポート</translation>
</message>
<message>
- <source>MEN_IMPORTBREP</source>
- <translation type="unfinished">BREP</translation>
+ <source>MEN_IMPORTBREP</source>
+ <translation>BREPインポート</translation>
</message>
<message>
- <source>TOP_IMPORTBREP</source>
- <translation type="unfinished">Import BREP</translation>
+ <source>TOP_IMPORTBREP</source>
+ <translation>BREPインポート</translation>
</message>
<message>
- <source>STB_IMPORTBREP</source>
- <translation type="unfinished">Import BREP</translation>
+ <source>STB_IMPORTBREP</source>
+ <translation>BREPインポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>BREPPlugin_GUI</name>
<message>
- <source>BREP_FILES</source>
- <translation type="unfinished">BREP files( *.brep )</translation>
+ <source>BREP_FILES</source>
+ <translation>BREPファイル</translation>
</message>
<message>
- <source>EXPORT_TITLE</source>
- <translation type="unfinished">Export BREP</translation>
+ <source>EXPORT_TITLE</source>
+ <translation>BREPエキスポート</translation>
</message>
<message>
- <source>IMPORT_TITLE</source>
- <translation type="unfinished">Import BREP</translation>
+ <source>IMPORT_TITLE</source>
+ <translation>BREPインポート</translation>
</message>
-</context>
+ </context>
</TS>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
+#include "utilities.h"
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopoDS_Shape.hxx>
#include <BRep_Tool.hxx>
+#include <Geom_Curve.hxx>
+
+#include <gp_Pnt.hxx>
+#include <gp_Vec.hxx>
+
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Solid.hxx>
#include <TopoDS_Shape.hxx>
+#include <TopoDS_Vertex.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
BlockFix_CheckTool::BlockFix_CheckTool( )
{
myHasCheck = Standard_False;
+ myAngTolerance = -1.;
myPossibleBlocks.Clear();
}
myPossibleBlocks.Clear();
}
+//=======================================================================
+//function : SetAngTolerance
+//purpose :
+//=======================================================================
+void BlockFix_CheckTool::SetAngTolerance(const Standard_Real theTolerance)
+{
+ myHasCheck = Standard_False;
+ myAngTolerance = theTolerance;
+ myPossibleBlocks.Clear();
+}
+
//=======================================================================
//function : Perform
//purpose :
if (nbe < 12)
IsBlock = Standard_False;
if (nbe > 12) {
- IsBlock = Standard_False;
// check edges unification
// creating map of edge faces
TopTools_IndexedDataMapOfShapeListOfShape aMapEdgeFaces;
Standard_Integer i = 1;
for (; i <= aMapFacesEdges.Extent(); i++) {
const TopTools_ListOfShape& ListEdges = aMapFacesEdges.FindFromIndex(i);
- if (ListEdges.Extent() > 1) break;
+ if (ListEdges.Extent() > 1) {
+ if (myAngTolerance < 0.) {
+ break;
+ }
+
+ // Check if edges have C1 continuity.
+ if (!isC1(ListEdges)) {
+ break;
+ }
+ }
}
if (i <= aMapFacesEdges.Extent()) {
+ IsBlock = Standard_False;
MayBeUE = Standard_True;
break;
}
S<<" number of impossible blocks = "<<nbtmp<<endl;
}
}
+
+//=======================================================================
+//function : isC1
+//purpose :
+//=======================================================================
+Standard_Boolean BlockFix_CheckTool::isC1
+ (const TopTools_ListOfShape &theEdges) const
+{
+ // Fill the map vertex - list of ancestor edges
+ TopTools_IndexedDataMapOfShapeListOfShape aMapVE;
+ TopTools_ListIteratorOfListOfShape anIter(theEdges);
+ TopTools_MapOfShape aMapFence;
+ Standard_Integer i;
+ Standard_Integer aNbVtx;
+
+ for (; anIter.More(); anIter.Next()) {
+ TopTools_IndexedMapOfShape aMapVtx;
+ const TopoDS_Shape &anEdge = anIter.Value();
+
+ if (aMapFence.Add(anEdge)) {
+ TopExp::MapShapes(anEdge, TopAbs_VERTEX, aMapVtx);
+ aNbVtx = aMapVtx.Extent();
+
+ for (i = 1; i <= aNbVtx; ++i) {
+ const TopoDS_Shape &aVtx = aMapVtx.FindKey(i);
+
+ if (!aMapVE.Contains(aVtx)) {
+ aMapVE.Add(aVtx, TopTools_ListOfShape());
+ }
+
+ aMapVE.ChangeFromKey(aVtx).Append(anEdge);
+ }
+ }
+ }
+
+ // Check C1 continuity.
+ Standard_Integer aNbEnds = 0;
+
+ for (i = 1, aNbVtx = aMapVE.Extent(); i <= aNbVtx; ++i) {
+ const TopTools_ListOfShape &anEdges = aMapVE.FindFromIndex(i);
+ Standard_Integer aNbEdges = anEdges.Extent();
+
+ if (aNbEdges == 1) {
+ ++aNbEnds;
+ } else if (aNbEdges == 2) {
+ TopoDS_Vertex aCommonVtx = TopoDS::Vertex(aMapVE.FindKey(i));
+ TopoDS_Edge anEdge1 = TopoDS::Edge(anEdges.First());
+ TopoDS_Edge anEdge2 = TopoDS::Edge(anEdges.Last());
+ Standard_Real aParam1 = BRep_Tool::Parameter(aCommonVtx, anEdge1);
+ Standard_Real aParam2 = BRep_Tool::Parameter(aCommonVtx, anEdge2);
+ Standard_Real aPar[2];
+ Handle(Geom_Curve) aCurve1 =
+ BRep_Tool::Curve(anEdge1, aPar[0], aPar[1]);
+ Handle(Geom_Curve) aCurve2 =
+ BRep_Tool::Curve(anEdge2, aPar[0], aPar[1]);
+ gp_Pnt aPnt;
+ gp_Vec aVec1;
+ gp_Vec aVec2;
+
+ aCurve1->D1(aParam1, aPnt, aVec1);
+ aCurve2->D1(aParam2, aPnt, aVec2);
+
+ if (anEdge1.Orientation() != anEdge2.Orientation()) {
+ // Orientations are different. One vector should be reversed.
+ aVec1.Reverse();
+ }
+
+ const Standard_Real anAngle = aVec1.Angle(aVec2);
+
+ if (anAngle > myAngTolerance) {
+ // There is no C1 continuity.
+ break;
+ }
+ } else {
+ // Non-manifold case.
+ break;
+ }
+ }
+
+ return (i > aNbVtx && aNbEnds == 2);
+}
#include <Standard_OStream.hxx>
class TopoDS_Shape;
+class TopTools_ListOfShape;
#include <Standard.hxx>
#include <Standard_Macro.hxx>
public:
Standard_EXPORT BlockFix_CheckTool();
- Standard_EXPORT void SetShape(const TopoDS_Shape& aShape) ;
+ Standard_EXPORT void SetShape(const TopoDS_Shape& aShape);
+ Standard_EXPORT void SetAngTolerance(const Standard_Real theTolerance);
Standard_EXPORT void Perform() ;
Standard_EXPORT Standard_Integer NbPossibleBlocks() const;
Standard_EXPORT TopoDS_Shape PossibleBlock(const Standard_Integer num) const;
Standard_EXPORT void DumpCheckResult(Standard_OStream& S) const;
private:
- TopoDS_Shape myShape;
+
+ Standard_Boolean isC1(const TopTools_ListOfShape &theEdges) const;
+
+private:
+ TopoDS_Shape myShape;
+ Standard_Real myAngTolerance;
Standard_Boolean myHasCheck;
Standard_Integer myNbSolids;
Standard_Integer myNbBlocks;
<!DOCTYPE TS>
<TS version="2.0" language="fr_FR">
<context>
- <name>DependencyTree_View</name>
+ <name>DependencyTree_View</name>
<message>
- <source>DEPENDENCY_TREE</source>
- <translation type="unfinished">Dependency Tree</translation>
+ <source>DEPENDENCY_TREE</source>
+ <translation>Arbre des dépendances</translation>
</message>
<message>
- <source>MOVE_NODES</source>
- <translation type="unfinished">Move nodes</translation>
+ <source>MOVE_NODES</source>
+ <translation>Déplacer les noeuds</translation>
</message>
<message>
- <source>HIERARCHY_DEPTH</source>
- <translation type="unfinished">Hierarchy depth </translation>
+ <source>HIERARCHY_DEPTH</source>
+ <translation>Niveau hiérarchique</translation>
</message>
<message>
- <source>DISPLAY_ASCENDANTS</source>
- <translation type="unfinished">Display ascendants</translation>
+ <source>DISPLAY_ASCENDANTS</source>
+ <translation>Montrer les liens ascendants</translation>
</message>
<message>
- <source>DISPLAY_DESCENDANTS</source>
- <translation type="unfinished">Display descendants</translation>
+ <source>DISPLAY_DESCENDANTS</source>
+ <translation>Montrer les liens descendants</translation>
</message>
<message>
- <source>SHOW_ALL</source>
- <translation type="unfinished">Show all</translation>
+ <source>SHOW_ALL</source>
+ <translation>Montrer tout</translation>
</message>
<message>
- <source>UPDATE</source>
- <translation type="unfinished">Update</translation>
+ <source>UPDATE</source>
+ <translation>Mise à jour</translation>
</message>
- <name>DependencyTree_ViewModel</name>
+</context>
+<context>
+ <name>DependencyTree_ViewModel</name>
<message>
- <source>MEN_REBUILD_THE_TREE</source>
- <translation type="unfinished">Rebuild the tree</translation>
+ <source>MEN_REBUILD_THE_TREE</source>
+ <translation type="unfinished">Rebuild the tree</translation>
</message>
<message>
- <source>MEN_REDUCE_STUDY</source>
- <translation type="unfinished">Reduce study</translation>
+ <source>MEN_REDUCE_STUDY</source>
+ <translation type="unfinished">Reduce study</translation>
</message>
</context>
</TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS>
-<context>
- <name>DependencyTree_View</name>
+<TS version="2.0" language="ja" sourcelanguage="en">
+ <context>
+ <name>DependencyTree_View</name>
<message>
<source>DEPENDENCY_TREE</source>
<translation type="unfinished">Dependency Tree</translation>
<source>UPDATE</source>
<translation type="unfinished">Update</translation>
</message>
- <name>DependencyTree_ViewModel</name>
+ <name>DependencyTree_ViewModel</name>
<message>
<source>MEN_REBUILD_THE_TREE</source>
<translation type="unfinished">Rebuild the tree</translation>
<source>MEN_REDUCE_STUDY</source>
<translation type="unfinished">Reduce study</translation>
</message>
-</context>
-</TS>
\ No newline at end of file
+ </context>
+</TS>
#include <SUIT_ViewWindow.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
+#include "utilities.h"
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
+#include "utilities.h"
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>
#include <GeometryGUI.h>
#include <GEOMBase.h>
+#include "utilities.h"
+
#include <OCCViewer_ViewManager.h>
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SalomeApp_Tools.h>
+#include "utilities.h"
#include <gp_Pln.hxx>
+ ":TT " + QString::number( myX2, Format, DigNum) + " " + QString::number( myY1, Format, DigNum)
+ ":WW";
- theParameters = myX1Str + ":" + myY1Str + ":" + myX2Str + ":" + myY2Str ;
+ theParameters = myX1Str + ":" + myY1Str + ":" + myX1Str + ":" + myY2Str + ":" + myX2Str + ":" + myY2Str + ":" + myX2Str + ":" + myY1Str;
}
return myNewCommand;
}
#include <SALOME_ListIO.hxx>
#include <SALOME_Prs.h>
+#include "utilities.h"
#include <OCCViewer_ViewModel.h>
#include <SVTK_ViewModel.h>
#include <SALOME_ListIO.hxx>
#include <SALOME_Prs.h>
+#include "utilities.h"
#include <SOCC_Prs.h>
#include <SOCC_ViewModel.h>
// Hard-coded value of shape deflection coefficient for VTK viewer
const double VTK_MIN_DEFLECTION = 0.001;
+// If the next macro is defined, the deflection coefficient for VTK presentation
+// is limited by VTK_MIN_DEFLECTION
+//#define LIMIT_DEFLECTION_FOR_VTK
// Pixmap caching support
namespace
myHasDisplayMode = false;
int aType = resMgr->integerValue("Geometry", "type_of_marker", (int)Aspect_TOM_PLUS);
- myWidth = resMgr->integerValue("Geometry", "edge_width", -1);
- myIsosWidth = resMgr->integerValue("Geometry", "isolines_width", -1);
- myTransparency = resMgr->integerValue("Geometry", "transparency", 0) / 100.;
- myHasTransparency = false;
-
myTypeOfMarker = (Aspect_TypeOfMarker)(std::min((int)Aspect_TOM_RING3, std::max((int)Aspect_TOM_POINT, aType)));
myScaleOfMarker = (resMgr->integerValue("Geometry", "marker_scale", 1)-(int)GEOM::MS_10)*0.5 + 1.0;
myScaleOfMarker = std::min(7.0, std::max(1., myScaleOfMarker));
+ // Next properties provide a way to customize displaying of presentations;
+ // for instance, this is useful for preview
myColor = -1;
- // This color is used for shape displaying. If it is equal -1 then
- // default color is used.
myTexture = "";
-
+ myNbIsos = -1;
myWidth = -1;
+ myTransparency = -1;
myType = -1;
+ myIsosColor = -1;
+ myIsosWidth = -1;
+
+ // This parameter is used for activisation/deactivisation (selection) of objects to be displayed
myToActivate = true;
- // This parameter is used for activisation/deactivisation of objects to be displayed
// Activate parallel vizualisation only for testing purpose
// and if the corresponding env variable is set to 1
int isosWidth = propMap.value( GEOM::propertyName( GEOM::IsosWidth ) ).toInt();
Handle(Prs3d_IsoAspect) uIsoAspect = AISShape->Attributes()->UIsoAspect();
Handle(Prs3d_IsoAspect) vIsoAspect = AISShape->Attributes()->VIsoAspect();
- uIsoAspect->SetColor( isosColor );
- uIsoAspect->SetWidth( isosWidth );
- uIsoAspect->SetNumber( uIsos );
- vIsoAspect->SetColor( isosColor );
- vIsoAspect->SetWidth( isosWidth );
- vIsoAspect->SetNumber( vIsos );
+
+ if ( HasIsosColor() ) {
+ uIsoAspect->SetColor( (Quantity_NameOfColor)GetIsosColor() );
+ vIsoAspect->SetColor( (Quantity_NameOfColor)GetIsosColor() );
+ }
+ else {
+ uIsoAspect->SetColor( isosColor );
+ vIsoAspect->SetColor( isosColor );
+ }
+
+ if ( HasIsosWidth() ) {
+ uIsoAspect->SetWidth( GetIsosWidth() );
+ vIsoAspect->SetWidth( GetIsosWidth() );
+ }
+ else {
+ uIsoAspect->SetWidth( isosWidth );
+ vIsoAspect->SetWidth( isosWidth );
+ }
+
+ if ( HasNbIsos() ) {
+ uIsoAspect->SetNumber( GetNbIsos() );
+ vIsoAspect->SetNumber( GetNbIsos() );
+ }
+ else {
+ uIsoAspect->SetNumber( uIsos );
+ vIsoAspect->SetNumber( vIsos );
+ }
+
AISShape->Attributes()->SetUIsoAspect( uIsoAspect );
AISShape->Attributes()->SetVIsoAspect( vIsoAspect );
// actor->SetShape(myShape,aDefPropMap.value(GEOM::propertyName( GEOM::Deflection )).toDouble(),myType == GEOM_VECTOR);
/////////////////////////////////////////////////////////////////////////
if ( !actor->getTopo().IsSame( myShape ) )
+#ifdef LIMIT_DEFLECTION_FOR_VTK
actor->SetShape( myShape, VTK_MIN_DEFLECTION, myType == GEOM_VECTOR );
+#else
+ actor->SetShape( myShape, qMax( propMap.value( GEOM::propertyName( GEOM::Deflection ) ).toDouble(), GEOM::minDeflection() ), myType == GEOM_VECTOR );
+#endif
// set material
Material_Model material;
// - set number of iso-lines
int nbIsos[2]= { 1, 1 };
- QStringList isos = propMap.value( GEOM::propertyName( GEOM::NbIsos ) ).toString().split( GEOM::subSectionSeparator() );
- nbIsos[0] = isos[0].toInt();
- nbIsos[1] = isos[1].toInt();
+ if ( HasNbIsos() ) {
+ nbIsos[0] = GetNbIsos();
+ nbIsos[1] = GetNbIsos();
+ }
+ else {
+ QStringList isos = propMap.value( GEOM::propertyName( GEOM::NbIsos ) ).toString().split( GEOM::subSectionSeparator() );
+ nbIsos[0] = isos[0].toInt();
+ nbIsos[1] = isos[1].toInt();
+ }
actor->SetNbIsos( nbIsos );
// - set iso-lines width
- actor->SetIsosWidth( propMap.value( GEOM::propertyName( GEOM::IsosWidth ) ).toInt() );
+ actor->SetIsosWidth( HasIsosWidth() ? GetIsosWidth() : propMap.value( GEOM::propertyName( GEOM::IsosWidth ) ).toInt() );
// - set iso-lines color
- c = propMap.value( GEOM::propertyName( GEOM::IsosColor ) ).value<QColor>();
+ if ( HasIsosColor() )
+ c = SalomeApp_Tools::color( Quantity_Color((Quantity_NameOfColor)GetIsosColor()) );
+ else
+ c = propMap.value( GEOM::propertyName( GEOM::IsosColor ) ).value<QColor>();
actor->SetIsosColor( c.redF(), c.greenF(), c.blueF() );
// set colors
//=================================================================
double GEOM_Displayer::SetTransparency( const double transparency )
{
- double aPrevTransparency = myTransparency;
- if ( transparency < 0 ) {
- UnsetTransparency();
- }
- else {
- myTransparency = transparency;
- myHasTransparency = true;
- }
- return aPrevTransparency;
+ double prevTransparency = myTransparency;
+ myTransparency = transparency;
+ return prevTransparency;
}
//=================================================================
//=================================================================
bool GEOM_Displayer::HasTransparency() const
{
- return myHasTransparency;
+ return myTransparency >= 0;
}
//=================================================================
//=================================================================
double GEOM_Displayer::UnsetTransparency()
{
- double aPrevTransparency = myTransparency;
- SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
- myTransparency = resMgr->integerValue("Geometry", "transparency", 0) / 100.;
- myHasTransparency = false;
- return aPrevTransparency;
+ return SetTransparency( -1 );
}
-
//=================================================================
/*!
* GEOM_Displayer::SetTexture
- * Set color for shape displaying. If it is equal -1 then default color is used.
- * Available values are from Quantity_NameOfColor enumeration
*/
//=================================================================
void GEOM_Displayer::SetTexture( const std::string& texureFileName )
{
- if(texureFileName!="")
- {
- myTexture = texureFileName;
- }
+ myTexture = texureFileName;
}
bool GEOM_Displayer::HasTexture() const
myWidth = -1;
}
-
int GEOM_Displayer::GetIsosWidth() const
{
return myIsosWidth;
return myIsosWidth != -1;
}
+int GEOM_Displayer::SetNbIsos( const int nbIsos )
+{
+ int prevNbIsos = myNbIsos;
+ myNbIsos = nbIsos;
+ return prevNbIsos;
+}
+
+int GEOM_Displayer::UnsetNbIsos()
+{
+ return SetNbIsos( -1 );
+}
+
+int GEOM_Displayer::GetNbIsos() const
+{
+ return myNbIsos;
+}
+
+bool GEOM_Displayer::HasNbIsos() const
+{
+ return myNbIsos >= 0;
+}
+
+int GEOM_Displayer::SetIsosColor( const int color )
+{
+ int prevColor = myIsosColor;
+ myIsosColor = color;
+ return prevColor;
+}
+
+int GEOM_Displayer::GetIsosColor() const
+{
+ return myIsosColor;
+}
+
+bool GEOM_Displayer::HasIsosColor() const
+{
+ return myIsosColor != -1;
+}
+
+int GEOM_Displayer::UnsetIsosColor()
+{
+ return SetIsosColor( -1 );
+}
//=================================================================
/*!
void SetIsosWidth ( const int );
int GetIsosWidth () const;
bool HasIsosWidth () const;
+
+ /* Set nb iso-libes for displaying. Use -1 to set default values. */
+ int SetNbIsos( const int );
+ int UnsetNbIsos();
+ int GetNbIsos() const;
+ bool HasNbIsos() const;
+ /* Set color for iso-lines displaying. If it is equal -1 then default color is used.
+ Available values are from Quantity_NameOfColor enumeration */
+ int SetIsosColor ( const int );
+ int UnsetIsosColor();
+ int GetIsosColor () const;
+ bool HasIsosColor () const;
+
/* Set display mode shape displaying. If it is equal -1 then display mode is used. */
int SetDisplayMode( const int );
int GetDisplayMode() const;
int myColor;
double myWidth;
int myIsosWidth;
+ int myNbIsos;
+ int myIsosColor;
bool myToActivate;
int myDisplayMode;
bool myHasDisplayMode;
Aspect_TypeOfMarker myTypeOfMarker;
double myScaleOfMarker;
double myTransparency;
- bool myHasTransparency;
private:
SalomeApp_Application* myApp;
<source>GEOM_NONBLOCKS</source>
<translation>NonBlocksGroup</translation>
</message>
+ <message>
+ <source>GEOM_USE_C1_CRITERION</source>
+ <translation>Use C1 criterion</translation>
+ </message>
<message>
<source>GEOM_CHECK_INFOS</source>
<translation>Object And Its Topological Information</translation>
</message>
<message>
<source>GEOM_SUPRESSFACE</source>
- <translation>Supress Face</translation>
+ <translation>Suppress Face</translation>
</message>
<message>
<source>GEOM_SUPRESSFACE_SELECT</source>
</message>
<message>
<source>REMOVE_HOLES_NEW_OBJ_NAME</source>
- <translation>SupressHoles</translation>
+ <translation>SuppressHoles</translation>
</message>
<message>
<source>REMOVE_INT_WIRES_NEW_OBJ_NAME</source>
</message>
<message>
<source>SUPRESS_FACE_NEW_OBJ_NAME</source>
- <translation>SupressFaces</translation>
+ <translation>SuppressFaces</translation>
</message>
<message>
<source>ShHealOper_ErrorExecution_msg</source>
<message>
<source>DEP_OBJECT</source>
<translation>L'objet choisi a été utilisé pour créer un autre objet ou est référencé par un autre module.
-La suppression de cet objet peut entrainer un export python invalide.
+La suppression de cet objet peut entrainer un export python invalide.
Voulez-vous tout de même supprimer ces objets ?</translation>
</message>
</message>
<message>
<source>GEOM_BEZIER</source>
- <translation>Bezier</translation>
+ <translation>Bézier</translation>
</message>
<message>
<source>GEOM_BINORMAL</source>
</message>
<message>
<source>GEOM_BNDBOX_TITLE</source>
- <translation>Boîte englobante</translation>
+ <translation>Informations sur la Boîte englobante</translation>
</message>
<message>
<source>GEOM_BOX</source>
- <translation>Boite</translation>
+ <translation>Boîte</translation>
</message>
<message>
<source>GEOM_BOX_OBJ</source>
</message>
<message>
<source>GEOM_BSplineRestriction</source>
- <translation>Limitation BSpline</translation>
+ <translation>LimitationB-Spline</translation>
</message>
<message>
<source>GEOM_BUT_APPLY</source>
</message>
<message>
<source>GEOM_CHAMFER_FACES</source>
- <translation>Chanfrein sur des faces</translation>
+ <translation>Chanfrein sur les faces sélectionnées</translation>
</message>
<message>
<source>GEOM_CHAMFER_TITLE</source>
</message>
<message>
<source>GEOM_GETNONBLOCKS_TITLE</source>
- <translation>Récupérer les solides non-hexahédres et les faces non-quadrangles</translation>
+ <translation>Récupérer les solides qui ne sontpas des hexahédres et les faces qui ne sont pas des quadrangles</translation>
</message>
<message>
<source>GEOM_GETNONBLOCKS</source>
- <translation>Récupérer les solides non blocs</translation>
+ <translation>Récupérer les solides qui ne sont pas des blocs</translation>
</message>
<message>
<source>GEOM_NONBLOCKS</source>
</message>
<message>
<source>GEOM_CHECK_INFOS</source>
- <translation>Objet et son information topologique</translation>
+ <translation>Objet et ses informations topologiques</translation>
</message>
<message>
<source>GEOM_CHECK_SHAPE</source>
</message>
<message>
<source>GEOM_CYLINDER_ANGLE_ERR</source>
- <translation>Les valeurs de l'angle 0 et 360 sont à éviter pour construire des volumes sains. Veuillez décocher la case "Angle" pour utiliser le constructeur de cylindre complet.</translation>
+ <translation>Les valeurs de l'angle 0 et 360 sont à éviter pour construire des volumes sains. Veuillez décocher la case "Angle" pour utiliser le constructeur de cylindre complet.</translation>
</message>
<message>
<source>GEOM_D1</source>
</message>
<message>
<source>MEN_POP_VERTICES</source>
- <translation type="unfinished">Show Vertices</translation>
+ <translation>Montrer les sommets</translation>
</message>
<message>
<source>MEN_PREFERENCES</source>
</message>
<message>
<source>MEN_VERTICES_MODE_ON</source>
- <translation type="unfinished">Show Vertices</translation>
+ <translation>Montrer les sommets</translation>
</message>
<message>
<source>MEN_VERTICES_MODE_OFF</source>
- <translation type="unfinished">Hide Vertices</translation>
+ <translation>Cacher les sommets</translation>
</message>
<message>
<source>MEN_WIREFRAME</source>
</message>
<message>
<source>STB_POP_VERTICES</source>
- <translation type="unfinished">Show Vertices</translation>
+ <translation>Montrer les sommets</translation>
</message>
<message>
<source>STB_POP_SETTEXTURE</source>
</message>
<message>
<source>MEN_POP_SHOW_DEPENDENCY_TREE</source>
- <translation type="unfinished">Show dependency tree</translation>
+ <translation>Montrer l'arbre des dépendances</translation>
</message>
<message>
<source>MEN_POP_SHOW_REDUCE_STUDY</source>
- <translation type="unfinished">Reduce study</translation>
+ <translation>Etude réduite</translation>
</message>
<message>
<source>MEN_POP_SHOW_ALL_DIMENSIONS</source>
</message>
<message>
<source>PREF_TAB_DEPENDENCY_VIEW</source>
- <translation type="unfinished">Dependency Tree</translation>
+ <translation>Arbre des dépendances</translation>
</message>
<message>
<source>PREF_HIERARCHY_TYPE</source>
- <translation type="unfinished">Hierarchy type</translation>
+ <translation>Type de hiérarchie</translation>
</message>
<message>
<source>MEN_ONLY_ASCENDANTS</source>
- <translation type="unfinished">Display only ascendants tree</translation>
+ <translation>Montrer seulement les liens ascendants</translation>
</message>
<message>
<source>MEN_ONLY_DESCENDANTS</source>
- <translation type="unfinished">Display only descendants tree</translation>
+ <translation>Montrer seulement les liens descendants</translation>
</message>
<message>
<source>MEN_BOTH_ASCENDANTS_DESCENDANTS</source>
- <translation type="unfinished">Display both ascendants and descendants trees</translation>
+ <translation>Montrer les liens ascendants et descendants</translation>
</message>
<message>
<source>GEOM_MOVE_POSSIBILITY</source>
- <translation type="unfinished">Possibility to move nodes</translation>
+ <translation>Possibilité de déplacer des noeuds</translation>
</message>
<message>
<source>PREF_GROUP_DEPENDENCY_VIEW_COLOR</source>
- <translation type="unfinished">Color</translation>
+ <translation>Couleur</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_BACKGROUND_COLOR</source>
- <translation type="unfinished">Background color</translation>
+ <translation>Couleur du fond</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_NODE_COLOR</source>
- <translation type="unfinished">Default node color</translation>
+ <translation>Couleur des noeuds par défaut</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_MAIN_NODE_COLOR</source>
- <translation type="unfinished">Main node color</translation>
+ <translation>Couleur des noeuds principaux</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_UNPUBLISH_NODE_COLOR</source>
- <translation type="unfinished">Unpublished node color</translation>
+ <translation>Couleur des noeuds non publiés</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_SELECT_NODE_COLOR</source>
- <translation type="unfinished">Selected node color</translation>
+ <translation>Couleurs des noeuds sélectionnés</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_ARROW_COLOR</source>
- <translation type="unfinished">Arrow color</translation>
+ <translation>Couleur des flèches par défaut</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_HIGHLIGHT_ARROW_COLOR</source>
- <translation type="unfinished">Highlighted arrow color</translation>
+ <translation>Couleur des flèches en surbrillance</translation>
</message>
<message>
<source>PREF_DEPENDENCY_VIEW_SELECT_ARROW_COLOR</source>
- <translation type="unfinished">Selected arrow color</translation>
+ <translation>Couleur des flèches sélectionnées</translation>
</message>
<message>
<source>GEOM_ALL_IMPORT_FILES</source>
<name>GEOMToolsGUI_ReduceStudyDlg</name>
<message>
<source>GEOM_REDUCE_STUDY_TITLE</source>
- <translation type="unfinished">Reduce study</translation>
+ <translation>Etude réduite</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_KEPT_OBJECTS</source>
- <translation type="unfinished">Objects to be kept</translation>
+ <translation>Objets à conserver</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_REMOVE_OBJECTS</source>
- <translation type="unfinished">Objects to be removed</translation>
+ <translation>Objets à enlever</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_NAME</source>
- <translation type="unfinished">Name</translation>
+ <translation>Nom</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_OPTIONS</source>
- <translation type="unfinished">Options</translation>
+ <translation>Options</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_INTERMEDIATES</source>
- <translation type="unfinished">Intermediate objects</translation>
+ <translation>Objets intermédiaires</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_SUB_OBJECTS</source>
- <translation type="unfinished">Sub-objects</translation>
+ <translation>Sous-objets</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_KEEP</source>
- <translation type="unfinished">Keep</translation>
+ <translation>Conserver</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_UNPUBLISH</source>
- <translation type="unfinished">Unpublish</translation>
+ <translation>Dépublier</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_REMOVE</source>
- <translation type="unfinished">Remove</translation>
+ <translation>Enlever</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_REMOVE_EMPTY_FOLDER</source>
- <translation type="unfinished">Remove empty folders</translation>
+ <translation>Enlever les dossiers vide</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_SOFT_REMOVAL</source>
- <translation type="unfinished">Soft removal</translation>
+ <translation>Dépublication seulement</translation>
</message>
<message>
<source>GEOM_REDUCE_STUDY_WARNING_DELETE</source>
- <translation type="unfinished">Do you really want to delete intermediate objects? After applying this operation study will be broken.</translation>
+ <translation>Voulez-vous vraiment supprimer les objets intermédiaires ? Après la confirmation de cette opération, l'étude sera cassée.</translation>
</message>
</context>
<context>
<source>GEOM_CYLINDER_TITLE</source>
<translation>円柱の作成</translation>
</message>
+ <message>
+ <source>GEOM_CYLINDER_ANGLE_ERR</source>
+ <translation type="unfinished">Angle values 0 and 360 are unsafe to build proper volumes. Please uncheck the "Angle" box to use the regular cylinder constructor.</translation>
+ </message>
<message>
<source>GEOM_D1</source>
<translation>D1 を：</translation>
</message>
<message>
<source>GEOM_PRP_EXPORT</source>
- <translation>ジオメトリを %1 にエクスポート</translation>
+ <translation>ジオメトリを %1 にエクスポート...</translation>
</message>
<message>
<source>GEOM_PRP_LOADING</source>
<source>MEN_CURVE_CREATOR</source>
<translation>カーブの作成</translation>
</message>
+ <message>
+ <source>TOP_CURVE_CREATOR</source>
+ <translation type="unfinished">Create 2D polyline</translation>
+ </message>
+ <message>
+ <source>STB_CURVE_CREATOR</source>
+ <translation type="unfinished">Create 2D polyline</translation>
+ </message>
<message>
<source>MEN_ALL_SEL_ONLY</source>
<translation>全選択</translation>
</message>
<message>
<source>MEN_IMPORT</source>
- <translation>インポート</translation>
+ <translation>インポート...</translation>
</message>
<message>
<source>MEN_INERTIA</source>
<translation>表示モード</translation>
</message>
<message>
- <source>PREF_TRANSPARENCY</source>
- <translation>透明度</translation>
+ <source>PREF_TRANSPARENCY</source>
+ <translation>透明度</translation>
</message>
<message>
<source>PREF_FREE_BOUND_COLOR</source>
</message>
<message>
<source>REMOVE_HOLES_NEW_OBJ_NAME</source>
- <translation>SupressHoles</translation>
+ <translation>SuppressHoles</translation>
</message>
<message>
<source>REMOVE_INT_WIRES_NEW_OBJ_NAME</source>
</message>
<message>
<source>SUPRESS_FACE_NEW_OBJ_NAME</source>
- <translation>SupressFaces</translation>
+ <translation>SuppressFaces</translation>
</message>
<message>
<source>ShHealOper_ErrorExecution_msg</source>
<translation>オブジェクトの基準寸法を管理</translation>
</message>
<message>
- <source>MEN_POP_SHOW_DEPENDENCY_TREE</source>
- <translation type="unfinished">Show dependency tree</translation>
+ <source>MEN_POP_SHOW_DEPENDENCY_TREE</source>
+ <translation type="unfinished">Show dependency tree</translation>
</message>
<message>
- <source>MEN_POP_SHOW_REDUCE_STUDY</source>
- <translation type="unfinished">Reduce study</translation>
+ <source>MEN_POP_REDUCE_STUDY</source>
+ <translation type="unfinished">Reduce study</translation>
</message>
<message>
<source>MEN_POP_SHOW_ALL_DIMENSIONS</source>
<translation>プレビュー</translation>
</message>
<message>
- <source>PREF_TAB_DEPENDENCY_VIEW</source>
- <translation type="unfinished">Dependency Tree</translation>
+ <source>PREF_TAB_DEPENDENCY_VIEW</source>
+ <translation type="unfinished">Dependency Tree</translation>
</message>
<message>
- <source>PREF_HIERARCHY_TYPE</source>
- <translation type="unfinished">Hierarchy type</translation>
+ <source>PREF_HIERARCHY_TYPE</source>
+ <translation type="unfinished">Hierarchy type</translation>
</message>
<message>
- <source>MEN_ONLY_ASCENDANTS</source>
- <translation type="unfinished">Display only ascendants tree</translation>
+ <source>MEN_ONLY_ASCENDANTS</source>
+ <translation type="unfinished">Display only ascendants tree</translation>
</message>
<message>
- <source>MEN_ONLY_DESCENDANTS</source>
- <translation type="unfinished">Display only descendants tree</translation>
+ <source>MEN_ONLY_DESCENDANTS</source>
+ <translation type="unfinished">Display only descendants tree</translation>
</message>
<message>
- <source>MEN_BOTH_ASCENDANTS_DESCENDANTS</source>
- <translation type="unfinished">Display both ascendants and descendants trees</translation>
+ <source>MEN_BOTH_ASCENDANTS_DESCENDANTS</source>
+ <translation type="unfinished">Display both ascendants and descendants trees</translation>
</message>
<message>
- <source>GEOM_MOVE_POSSIBILITY</source>
- <translation type="unfinished">Possibility to move nodes</translation>
+ <source>GEOM_MOVE_POSSIBILITY</source>
+ <translation type="unfinished">Possibility to move nodes</translation>
</message>
<message>
- <source>PREF_GROUP_DEPENDENCY_VIEW_COLOR</source>
- <translation type="unfinished">Color</translation>
+ <source>PREF_GROUP_DEPENDENCY_VIEW_COLOR</source>
+ <translation type="unfinished">Color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_BACKGROUND_COLOR</source>
- <translation type="unfinished">Background color</translation>
+ <source>PREF_DEPENDENCY_VIEW_BACKGROUND_COLOR</source>
+ <translation type="unfinished">Background color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_NODE_COLOR</source>
- <translation type="unfinished">Default node color</translation>
+ <source>PREF_DEPENDENCY_VIEW_NODE_COLOR</source>
+ <translation type="unfinished">Default node color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_MAIN_NODE_COLOR</source>
- <translation type="unfinished">Main node color</translation>
+ <source>PREF_DEPENDENCY_VIEW_MAIN_NODE_COLOR</source>
+ <translation type="unfinished">Main node color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_UNPUBLISH_NODE_COLOR</source>
- <translation type="unfinished">Unpublished node color</translation>
+ <source>PREF_DEPENDENCY_VIEW_UNPUBLISH_NODE_COLOR</source>
+ <translation type="unfinished">Unpublished node color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_SELECT_NODE_COLOR</source>
- <translation type="unfinished">Selected node color</translation>
+ <source>PREF_DEPENDENCY_VIEW_SELECT_NODE_COLOR</source>
+ <translation type="unfinished">Selected node color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_ARROW_COLOR</source>
- <translation type="unfinished">Arrow color</translation>
+ <source>PREF_DEPENDENCY_VIEW_ARROW_COLOR</source>
+ <translation type="unfinished">Default arrow color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_HIGHLIGHT_ARROW_COLOR</source>
- <translation type="unfinished">Highlighted arrow color</translation>
+ <source>PREF_DEPENDENCY_VIEW_HIGHLIGHT_ARROW_COLOR</source>
+ <translation type="unfinished">Highlighted arrow color</translation>
</message>
<message>
- <source>PREF_DEPENDENCY_VIEW_SELECT_ARROW_COLOR</source>
- <translation type="unfinished">Selected arrow color</translation>
+ <source>PREF_DEPENDENCY_VIEW_SELECT_ARROW_COLOR</source>
+ <translation type="unfinished">Selected arrow color</translation>
</message>
<message>
<source>GEOM_ALL_IMPORT_FILES</source>
<name>GeometryGUI</name>
<message>
<source>TOOL_BASIC</source>
- <translation>基礎オブジェクト</translation>
+ <translation type="unfinished">Basic</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
- <translation>ブロック分割</translation>
+ <translation type="unfinished">Blocks</translation>
</message>
<message>
<source>TOOL_BOOLEAN</source>
- <translation>ブーリアン操作</translation>
+ <translation type="unfinished">Boolean operations</translation>
</message>
<message>
<source>TOOL_FEATURES</source>
- <translation>フィーチャー</translation>
+ <translation type="unfinished">Modification</translation>
</message>
<message>
<source>TOOL_GENERATION</source>
- <translation>押し出し/回転</translation>
+ <translation type="unfinished">Generation</translation>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
- <translation>基本図形</translation>
+ <translation type="unfinished">Primitives</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
- <translation>変形/移動/回転</translation>
+ <translation type="unfinished">Transformation</translation>
</message>
<message>
<source>TOOL_BUILD</source>
- <translation>構築</translation>
+ <translation type="unfinished">Build</translation>
</message>
<message>
<source>TOOL_OPERATIONS</source>
- <translation>操作</translation>
+ <translation type="unfinished">Operations</translation>
</message>
<message>
<source>TOOL_PICTURES</source>
- <translation>画像</translation>
+ <translation type="unfinished">Pictures</translation>
</message>
<message>
<source>TOOL_ADVANCED</source>
- <translation>高度なツール</translation>
+ <translation type="unfinished">Advanced</translation>
</message>
<message>
<source>TOOL_MEASURES</source>
- <translation>情報/測定</translation>
+ <translation type="unfinished">Measures</translation>
</message>
<message>
<source>TOOL_IMPORTEXPORT</source>
- <translation>インポート/エクスポート</translation>
+ <translation type="unfinished">Import / Export XAO</translation>
+ </message>
+ <message>
+ <source>TABLE_SECTION</source>
+ <translation type="unfinished">Section</translation>
+ </message>
+ <message>
+ <source>TABLE_INDEX</source>
+ <translation type="unfinished">Index</translation>
+ </message>
+ <message>
+ <source>TABLE_X</source>
+ <translation type="unfinished">X</translation>
+ </message>
+ <message>
+ <source>TABLE_Y</source>
+ <translation type="unfinished">Y</translation>
</message>
</context>
<context>
<translation>フェース 2 V</translation>
</message>
</context>
- <context>
- <name>CurveCreator_NewPointDlg</name>
- <message>
- <source>ADD_NEW_POINT</source>
- <translation>新しい点の追加</translation>
- </message>
- <message>
- <source>X_COORD</source>
- <translation>X</translation>
- </message>
- <message>
- <source>Y_COORD</source>
- <translation>Y</translation>
- </message>
- <message>
- <source>Z_COORD</source>
- <translation>Z</translation>
- </message>
- <message>
- <source>ADD_BTN</source>
- <translation>追加</translation>
- </message>
- <message>
- <source>ADD_CONTINUE_BTN</source>
- <translation>追加して継続</translation>
- </message>
- <message>
- <source>ADD_NEW_POINT_TO_%1</source>
- <translation>新しい点を%1に追加</translation>
- </message>
- <message>
- <source>SET_POINT_COORDINATES</source>
- <translation>点座標の設定</translation>
- </message>
- </context>
<context>
<name>CurveCreator_NewSectionDlg</name>
<message>
- <source>NAME</source>
- <translation>名前</translation>
+ <source>SECTION_NAME</source>
+ <translation type="unfinished">Name</translation>
</message>
<message>
- <source>LINE_TYPE</source>
- <translation>ライン</translation>
+ <source>SECTION_LINE_TYPE</source>
+ <translation type="unfinished">Type</translation>
</message>
<message>
- <source>POLYLINE_TYPE</source>
- <translation>ポリライン</translation>
+ <source>SECTION_POLYLINE_TYPE</source>
+ <translation type="unfinished">Polyline</translation>
</message>
<message>
- <source>SPLINE_TYPE</source>
- <translation>スプライン</translation>
+ <source>SECTION_SPLINE_TYPE</source>
+ <translation type="unfinished">Spline</translation>
</message>
<message>
- <source>LINE_CLOSED</source>
- <translation>閉じたライン</translation>
+ <source>SECTION_LINE_CLOSED</source>
+ <translation type="unfinished">Closed</translation>
</message>
<message>
- <source>OK</source>
- <translation>Ok</translation>
+ <source>SECTION_ADD_BTN</source>
+ <translation type="unfinished">Add</translation>
</message>
<message>
- <source>ADD_BTN</source>
- <translation>追加</translation>
+ <source>SECTION_OK_BTN</source>
+ <translation type="unfinished">Ok</translation>
</message>
<message>
- <source>ADD_CONTINUE_BTN</source>
- <translation>追加して継続</translation>
+ <source>SECTION_CANCEL_BTN</source>
+ <translation type="unfinished">Cancel</translation>
</message>
<message>
<source>ADD_NEW_SECTION</source>
<name>CurveCreator_TreeViewModel</name>
<message>
<source>X=%1, Y=%2</source>
- <translation>X=%1, Y=%2</translation>
+ <translation type="unfinished">X=%1, Y=%2</translation>
</message>
<message>
<source>X=%1, Y=%2, Z=%3</source>
- <translation>X=%1, Y=%2, Z=%3</translation>
+ <translation type="unfinished">X=%1, Y=%2, Z=%3</translation>
</message>
</context>
<context>
<name>CurveCreator_Widget</name>
<message>
- <source>CURVE_NAME_TLT</source>
- <translation>カーブの名前</translation>
- </message>
- <message>
- <source>SECTION_GROUP_TLT</source>
- <translation>断面グループ</translation>
+ <source>SECTION_GROUP_TITLE</source>
+ <translation type="unfinished">Sections</translation>
</message>
<message>
<source>UNDO</source>
<source>NEW_SECTION_TLT</source>
<translation>新しい断面の挿入</translation>
</message>
- <message>
- <source>INSERT_SECTION_BEFORE</source>
- <translation>前に断面を挿入</translation>
- </message>
- <message>
- <source>INSERT_SECTION_BEFORE_TLT</source>
- <translation>前に断面を挿入</translation>
- </message>
- <message>
- <source>INSERT_SECTION_AFTER</source>
- <translation>後に断面の挿入</translation>
- </message>
- <message>
- <source>INSERT_SECTION_AFTER_TLT</source>
- <translation>後に断面の挿入</translation>
- </message>
<message>
<source>ADDITION_MODE</source>
<translation>追加モード</translation>
<source>DETECTION_MODE_TLT</source>
<translation>検出モード</translation>
</message>
- <message>
- <source>INSERT_POINT_BEFORE</source>
- <translation>前に点の挿入</translation>
- </message>
- <message>
- <source>INSERT_POINT_BEFORE_TLT</source>
- <translation>前に点の挿入</translation>
- </message>
- <message>
- <source>INSERT_POINT_AFTER</source>
- <translation>後に点の挿入</translation>
- </message>
<message>
<source>CLOSE_SECTIONS</source>
<translation>断面を閉じる</translation>
<source>JOIN_TLT</source>
<translation>選択した断面を結合</translation>
</message>
- <message>
- <source>STEP_UP</source>
- <translation>上昇</translation>
- </message>
- <message>
- <source>STEP_UP_TLT</source>
- <translation>選択したオブジェクトを上昇</translation>
- </message>
- <message>
- <source>STEP_DOWN</source>
- <translation>下降</translation>
- </message>
- <message>
- <source>STEP_DOWN_TLT</source>
- <translation>選択したオブジェクトを下降</translation>
- </message>
<message>
<source>CLEAR_ALL</source>
<translation>すべて消去</translation>
<translation>すべての断面を結合</translation>
</message>
</context>
+ <context>
+ <name>EntityGUI_PolylineDlg</name>
+ <message>
+ <source>POLYLINE_DLG_TITLE</source>
+ <translation type="unfinished">Polyline Construction</translation>
+ </message>
+ <message>
+ <source>POLYLINE_TITLE</source>
+ <translation type="unfinished">Polyline</translation>
+ </message>
+ <message>
+ <source>POLYLINE_NAME</source>
+ <translation type="unfinished">Polyline</translation>
+ </message>
+ <message>
+ <source>POLYLINE_IMPORT</source>
+ <translation type="unfinished">Import polyline</translation>
+ </message>
+ <message>
+ <source>POLYLINE_ADD_SECTION</source>
+ <translation type="unfinished">Add section</translation>
+ </message>
+ <message>
+ <source>POLYLINE_EDIT_SECTION</source>
+ <translation type="unfinished">Edit section</translation>
+ </message>
+ </context>
<context>
<name>EntityGUI_SketcherDlg</name>
<message>
</message>
<message>
<source>X</source>
- <translation>X</translation>
+ <translation type="unfinished">X</translation>
</message>
<message>
<source>Y</source>
- <translation>Y</translation>
+ <translation type="unfinished">Y</translation>
</message>
<message>
<source>Z</source>
- <translation>Z</translation>
+ <translation type="unfinished">Z</translation>
</message>
</context>
<context>
<name>OperationGUI_ChamferDlg</name>
<message>
<source>D</source>
- <translation>D</translation>
+ <translation type="unfinished">D</translation>
</message>
<message>
<source>FACE_1</source>
<context>
<name>GEOMToolsGUI_ReduceStudyDlg</name>
<message>
- <source>GEOM_REDUCE_STUDY_TITLE</source>
- <translation type="unfinished">Reduce study</translation>
+ <source>GEOM_REDUCE_STUDY_TITLE</source>
+ <translation type="unfinished">Reduce study</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_KEPT_OBJECTS</source>
- <translation type="unfinished">Objects to be kept</translation>
+ <source>GEOM_REDUCE_STUDY_KEPT_OBJECTS</source>
+ <translation type="unfinished">Objects to be kept</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_REMOVE_OBJECTS</source>
- <translation type="unfinished">Objects to be removed</translation>
+ <source>GEOM_REDUCE_STUDY_REMOVE_OBJECTS</source>
+ <translation type="unfinished">Objects to be removed</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_NAME</source>
- <translation type="unfinished">Name</translation>
+ <source>GEOM_REDUCE_STUDY_NAME</source>
+ <translation type="unfinished">Name</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_OPTIONS</source>
- <translation type="unfinished">Options</translation>
+ <source>GEOM_REDUCE_STUDY_OPTIONS</source>
+ <translation type="unfinished">Options</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_INTERMEDIATES</source>
- <translation type="unfinished">Intermediate objects</translation>
+ <source>GEOM_REDUCE_STUDY_INTERMEDIATES</source>
+ <translation type="unfinished">Intermediate objects</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_SUB_OBJECTS</source>
- <translation type="unfinished">Sub-objects</translation>
+ <source>GEOM_REDUCE_STUDY_SUB_OBJECTS</source>
+ <translation type="unfinished">Sub-objects</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_KEEP</source>
- <translation type="unfinished">Keep</translation>
+ <source>GEOM_REDUCE_STUDY_KEEP</source>
+ <translation type="unfinished">Keep</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_UNPUBLISH</source>
- <translation type="unfinished">Unpublish</translation>
+ <source>GEOM_REDUCE_STUDY_UNPUBLISH</source>
+ <translation type="unfinished">Unpublish</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_REMOVE</source>
- <translation type="unfinished">Remove</translation>
+ <source>GEOM_REDUCE_STUDY_REMOVE</source>
+ <translation type="unfinished">Remove</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_REMOVE_EMPTY_FOLDER</source>
- <translation type="unfinished">Remove empty folders</translation>
+ <source>GEOM_REDUCE_STUDY_REMOVE_EMPTY_FOLDER</source>
+ <translation type="unfinished">Remove empty folders</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_SOFT_REMOVAL</source>
- <translation type="unfinished">Soft removal</translation>
+ <source>GEOM_REDUCE_STUDY_SOFT_REMOVAL</source>
+ <translation type="unfinished">Soft removal</translation>
</message>
<message>
- <source>GEOM_REDUCE_STUDY_WARNING_DELETE</source>
- <translation type="unfinished">Do you really want to delete intermediate objects? After applying this operation study will be broken.</translation>
+ <source>GEOM_REDUCE_STUDY_WARNING_DELETE</source>
+ <translation type="unfinished">Do you really want to delete intermediate objects? After applying this operation study will be broken.</translation>
</message>
</context>
<context>
#define PLANAR_FACE_MAX_TOLERANCE 1e-06
+// The following macro, when enabled, causes pcurves upgrade after MakeFilling algorithm
+// in MakeAnyFace function;
+// WARNING: it may lead to extra vertices generation by partition algorithm
+// in some cases, for example when fillet is made on a PipeTShape -
+// see issues 0021568 and 0021550
+// VSR (15/05/2012): macro commented out (disabled) to avoid extra vertices!
+//#define MAKE_FACE_UPGRADE_PCURVES
+
+// The following macro, when enabled, causes fixing tolerance for pcurves
+// after BRepBuilderAPI_MakeFace + ShHealOper_ShapeProcess in MakeAnyFace function;
+// This sometimes allows to fix problems of extra vertices generation
+// see issue 0022706
+// VSR (17/11/2014): macro enabled
+#define MAKE_FACE_PCURVES_FIX_TOLERANCE
+
+#ifdef MAKE_FACE_PCURVES_FIX_TOLERANCE
+#include <BOPTools_AlgoTools.hxx>
+#include <NCollection_DataMap.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
+#endif
+
static Standard_Integer mod4 (Standard_Integer nb)
{
if (nb <= 0) return nb + 4;
// 12.04.2006 for PAL12149 begin
Handle(Geom_Surface) aGS = BRep_Tool::Surface(TopoDS::Face(aFace));
-// VSR: debug issues 0021568 and 0021550 (15/05/2012) - BEGIN
-// the following block, when enabled, leads to extra vertices generation by partition algorithm
-// in some cases, for example when fillet is made on a PipeTShape
-#if 0
-// VSR: debug issues 0021568 and 0021550 (15/05/2012) - END
+#ifdef MAKE_FACE_UPGRADE_PCURVES
BRep_Builder BB;
TopoDS_Iterator itw(theWire);
for (; itw.More(); itw.Next())
}
// 12.04.2006 for PAL12149 end
- if (theResult.IsNull()) { // try to deal with pure result of filling
+ if (!theResult.IsNull()) {
+ // try to deal with result of BRepBuilderAPI_MakeFace + ShHealOper_ShapeProcess
+#if OCC_VERSION_LARGE >= 0x06080000
+#ifdef MAKE_FACE_PCURVES_FIX_TOLERANCE
+ // check and fix pcurves, if necessary
+ Standard_Real aT, aTolE, aD, aDMax;
+ TopExp_Explorer aExpF, aExpE;
+ NCollection_DataMap<TopoDS_Shape, Standard_Real, TopTools_ShapeMapHasher> aDMETol;
+ aExpF.Init(theResult, TopAbs_FACE);
+ for (; aExpF.More(); aExpF.Next()) {
+ const TopoDS_Face& aF = *(TopoDS_Face*)&aExpF.Current();
+ aExpE.Init(aF, TopAbs_EDGE);
+ for (; aExpE.More(); aExpE.Next()) {
+ const TopoDS_Edge& aE = *(TopoDS_Edge*)&aExpE.Current();
+ if (!BOPTools_AlgoTools::ComputeTolerance(aF, aE, aDMax, aT)) continue;
+ aTolE = BRep_Tool::Tolerance(aE);
+ if (aDMax < aTolE) continue;
+ if (aDMETol.IsBound(aE)) {
+ aD = aDMETol.Find(aE);
+ if (aDMax > aD) {
+ aDMETol.UnBind(aE);
+ aDMETol.Bind(aE, aDMax);
+ }
+ }
+ else {
+ aDMETol.Bind(aE, aDMax);
+ }
+ }
+ }
+ NCollection_DataMap<TopoDS_Shape, Standard_Real, TopTools_ShapeMapHasher>::Iterator aDMETolIt(aDMETol);
+ ShapeFix_ShapeTolerance sat;
+ for (; aDMETolIt.More(); aDMETolIt.Next()) {
+ sat.LimitTolerance(aDMETolIt.Key(), aDMETolIt.Value());
+ }
+#endif
+#endif
+ }
+ else {
+ // try to deal with pure result of BRepOffsetAPI_MakeFilling
+
// Update tolerance
Standard_Real aTol = MF.G0Error();
#include <TNaming_CopyShape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
#include <BRep_Builder.hxx>
-#include <BRepAlgo.hxx>
#include <BRepAlgoAPI_Common.hxx>
#include <BRepAlgoAPI_Cut.hxx>
#include <BRepAlgoAPI_Fuse.hxx>
#include <BRepAlgoAPI_Section.hxx>
-#include <BRepCheck_Analyzer.hxx>
#include <BOPAlgo_CheckerSI.hxx>
#include <BOPDS_DS.hxx>
{
TopoDS_Shape aResult;
- if (theShape.IsNull() == Standard_False) {
+ if (!theShape.IsNull()) {
BlockFix_BlockFixAPI aTool;
aTool.OptimumNbFaces() = 0;
aTool.SetShape(theShape);
aTool.Perform();
- aResult = aTool.Shape();
-
- // Repair result
- BRepCheck_Analyzer anAna (aResult, false);
- Standard_Boolean isValid = anAna.IsValid();
+ TopoDS_Shape aShape = aTool.Shape();
- if (!isValid) {
+ if (GEOMUtils::CheckShape(aShape)) {
+ aResult = aShape;
+ }
+ else {
TopoDS_Shape aFixed;
ShHealOper_ShapeProcess aHealer;
-
aHealer.Perform(aResult, aFixed);
-
- if (aHealer.isDone()) {
+ if (aHealer.isDone() && GEOMUtils::CheckShape(aFixed))
aResult = aFixed;
- anAna.Init(aResult, false);
- isValid = anAna.IsValid();
- }
- }
-
- if (!isValid) {
- aResult.Nullify();
}
}
if (!aShape1.IsNull() && !aShape2.IsNull()) {
// check arguments for Mantis issue 0021019
- BRepCheck_Analyzer ana (aShape1, Standard_True);
- if (!ana.IsValid())
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
- ana.Init(aShape2);
- if (!ana.IsValid())
+ if (!GEOMUtils::CheckShape(aShape1, true) || !GEOMUtils::CheckShape(aShape2, true))
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
if (isCheckSelfInte) {
aShape = aRefShape->GetValue();
if (!aShape.IsNull()) {
- BRepCheck_Analyzer anAna (aShape, Standard_True);
- if (!anAna.IsValid()) {
+ // check arguments for Mantis issue 0021019
+ if (!GEOMUtils::CheckShape(aShape, true))
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
- }
BOPAlgo_CheckerSI aCSI; // checker of self-interferences
for (i = 2; i <= nbShapes; i++) {
aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(i));
aShape2 = aRefShape->GetValue();
- anAna.Init(aShape2);
-
- if (!anAna.IsValid()) {
+
+ if (!GEOMUtils::CheckShape(aShape2, true))
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
- }
if (isCheckSelfInte) {
BOPCol_ListOfShape aList2;
if (!aShape.IsNull()) {
// check arguments for Mantis issue 0021019
- BRepCheck_Analyzer anAna (aShape, Standard_True);
-
- if (!anAna.IsValid()) {
+ if (!GEOMUtils::CheckShape(aShape, true))
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
- }
BOPAlgo_CheckerSI aCSI; // checker of self-interferences
for (i = 1; i <= nbShapes; i++) {
aRefTool = Handle(GEOM_Function)::DownCast(aTools->Value(i));
aTool = aRefTool->GetValue();
- anAna.Init(aTool);
- if (!anAna.IsValid()) {
+ if (!GEOMUtils::CheckShape(aTool, true))
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
- }
if (isCheckSelfInte) {
BOPCol_ListOfShape aList2;
}
// 08.07.2008 skl for bug 19761 from Mantis
- BRepCheck_Analyzer ana (aShape, Standard_True);
- ana.Init(aShape);
- if (!ana.IsValid()) {
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape, Precision::Confusion(),
- Precision::Confusion(), TopAbs_SHAPE);
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->Perform();
- aShape = aSfs->Shape();
- ana.Init(aShape);
- if (!ana.IsValid())
- Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
- }
+ if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) )
+ Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
// BEGIN: Mantis issue 0021060: always limit tolerance of BOP result
// 1. Get shape parameters for comparison
TopoDS_Shape aShapeCopy;
TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
TNaming_CopyShape::CopyTool(aShape, aMapTShapes, aShapeCopy);
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShapeCopy, Precision::Confusion(), Precision::Confusion(), TopAbs_SHAPE);
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape (aShapeCopy);
- aSfs->Perform();
- aShapeCopy = aSfs->Shape();
-
- // 3. Check parameters
- ana.Init(aShapeCopy);
- if (ana.IsValid()) {
+
+ if ( GEOMUtils::FixShapeTolerance(aShapeCopy, true) ) {
int iType, nbTypesCopy [TopAbs_SHAPE];
for (iType = 0; iType < TopAbs_SHAPE; ++iType)
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_ChamferDriver.hxx>
#include <GEOMImpl_IChamfer.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
#include <GEOMImpl_Block6Explorer.hxx>
-
+#include <GEOMUtils.hxx>
#include <GEOM_Function.hxx>
#include <BRepLib.hxx>
#include <BRepTools.hxx>
#include <BRepFilletAPI_MakeChamfer.hxx>
-#include <ShapeFix_Shape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-
#include <TopAbs.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Iterator.hxx>
-#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <Precision.hxx>
-#include <gp_Pnt.hxx>
#include <StdFail_NotDone.hxx>
//=======================================================================
return aChamferDriver;
}
-
//=======================================================================
//function : GEOMImpl_ChamferDriver
//purpose :
if (aShape.IsNull()) return 0;
// reduce tolerances
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape, Precision::Confusion(),
- Precision::Confusion(), TopAbs_SHAPE);
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->Perform();
- aShape = aSfs->Shape();
+ GEOMUtils::FixShapeTolerance( aShape );
// fix SameParameter flag
BRepLib::SameParameter(aShape, 1.E-5, Standard_True);
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_Fillet2dDriver.hxx>
#include <GEOMImpl_IFillet2d.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
#include <GEOMImpl_Block6Explorer.hxx>
#include <GEOM_Function.hxx>
+#include <GEOMUtils.hxx>
#include <BRepFilletAPI_MakeFillet2d.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopAbs.hxx>
-#include <TopExp_Explorer.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
-#include <Precision.hxx>
-#include <gp_Pnt.hxx>
#include <StdFail_NotDone.hxx>
//=======================================================================
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_FilletDriver.hxx>
#include <GEOMImpl_IFillet.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
+#include <GEOMUtils.hxx>
#include <GEOM_Function.hxx>
#include <BRepFilletAPI_MakeFillet.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRep_Tool.hxx>
-
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
#include <TopAbs.hxx>
#include <TopExp_Explorer.hxx>
-
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
-#include <Precision.hxx>
-#include <gp_Pnt.hxx>
#include <StdFail_NotDone.hxx>
+// Debug PipeTShape function: uncomment the macro below to correct tolerance
+// of resulting face after fillet creation
+// VSR 30/12/2014: macro disabled
+//#define FIX_FACE_TOLERANCE
+// Debug PipeTShape function: uncomment the macro below to correct tolerance
+// of resulting curves after fillet creation
+// VSR 30/12/2014: macro disabled
+//#define FIX_CURVES_TOLERANCES
+
//=======================================================================
//function : GetID
//purpose :
if (aShape.IsNull()) return 0;
- // Check shape validity
- BRepCheck_Analyzer ana (aShape, false);
- if (!ana.IsValid()) {
- // 08.07.2008 added by skl during fixing bug 19761 from Mantis
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape, Precision::Confusion(),
- Precision::Confusion(), TopAbs_SHAPE);
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->Perform();
- aShape = aSfs->Shape();
- ana.Init(aShape);
- if (!ana.IsValid())
- StdFail_NotDone::Raise("Fillet algorithm have produced an invalid shape result");
- }
+#if defined(FIX_CURVES_TOLERANCES)
+ bool isOk = GEOMUtils::FixShapeCurves(aShape);
+#elif defined(FIX_FACE_TOLERANCE)
+ bool isOk = GEOMUtils::FixShapeTolerance(aShape, TopAbs_FACE);
+#else
+ // 08.07.2008 added by skl during fixing bug 19761 from Mantis
+ bool isOk = GEOMUtils::CheckShape(aShape) || GEOMUtils::FixShapeTolerance(aShape);
+#endif
+ if ( !isOk )
+ StdFail_NotDone::Raise("Fillet algorithm have produced an invalid shape result");
aFunction->SetValue(aShape);
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_HealingDriver.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_IHealing.hxx>
#include <TNaming_CopyShape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
#include <BRep_Builder.hxx>
#include <BRepAdaptor_Curve.hxx>
-#include <BRepCheck_Analyzer.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <TopExp.hxx>
TopoDS_Shape& theOutShape) const
{
Standard_Real aTol = theHI->GetTolerance();
+ TopAbs_ShapeEnum aType = theHI->GetType();
+
if (aTol < Precision::Confusion())
aTol = Precision::Confusion();
TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
TNaming_CopyShape::CopyTool(theOriginalShape, aMapTShapes, aShapeCopy);
}
- // 2. Limit tolerance.
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShapeCopy, aTol, aTol, TopAbs_SHAPE);
- // 3. Fix obtained shape.
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape (aShapeCopy);
- aSfs->Perform();
- theOutShape = aSfs->Shape();
-
- BRepCheck_Analyzer ana (theOutShape, Standard_True);
- if (!ana.IsValid())
+ // 2. Limit tolerance.
+ if (!GEOMUtils::FixShapeTolerance(aShapeCopy, aType, aTol))
StdFail_NotDone::Raise("Non valid shape result");
+ // 3. Set the result
+ theOutShape = aShapeCopy;
+
// 4. Collect statistics
{
ShHealOper_Tool tool;
}
theOutShape = aFinalWire;
- BRepCheck_Analyzer ana (theOutShape, Standard_True);
- if (!ana.IsValid())
+ if (!GEOMUtils::CheckShape(theOutShape, true))
StdFail_NotDone::Raise("Non valid shape result");
}
theOperationName = "LIMIT_TOLERANCE";
AddParam( theParams, "Selected shape", aCI.GetOriginal() );
AddParam( theParams, "Tolerance", aCI.GetTolerance() );
+ AddParam( theParams, "Type", aCI.GetType() );
break;
case FUSE_COLLINEAR_EDGES:
theOperationName = "FUSE_EDGES";
#include <Bnd_Box.hxx>
#include <GProp_GProps.hxx>
+#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <ShapeAnalysis_Surface.hxx>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
+
+/**
+ * This function returns Standard_True if the face is quadrangular. It means
+ * that it has only 1 wire with 4 edges. If there are more then 4 edges in
+ * the wire and theToleranceC1 is not negative the new implementation is used.
+ * According to it the face is quadrangular if it is quadrangular according to
+ * an old implementation or if it has a single wire with more then 4 edges
+ * that form exactly 4 bounds of C1 continuity with the given tolerance.
+ *
+ * \param theFace the face to be checked
+ * \param theToleranceC1 if negative, it is not used; otherwise it is used
+ * to check if two neighbor edges of face have C1 continuity.
+ * \return Standard_True if the face is quadrangular; Standard_False otherwise.
+ */
+static Standard_Boolean IsQuadrangle(const TopoDS_Face &theFace,
+ const Standard_Real theToleranceC1)
+{
+ TopExp_Explorer aFExp (theFace, TopAbs_WIRE);
+
+ if (!aFExp.More()) {
+ // no wire in the face
+ return Standard_False;
+ }
+
+ TopoDS_Shape aWire = aFExp.Current();
+
+ aFExp.Next();
+
+ if (aFExp.More()) {
+ // multiple wires in the face
+ return Standard_False;
+ }
+
+ // Check number of edges in the face
+ Standard_Integer aNbEdges = 0;
+ TopTools_MapOfShape aMapEdges;
+ TopExp_Explorer aWExp(aWire, TopAbs_EDGE);
+
+ for (; aWExp.More(); aWExp.Next()) {
+ if (aMapEdges.Add(aWExp.Current())) {
+ aNbEdges++;
+
+ if (aNbEdges > 4) {
+ break;
+ }
+ }
+ }
+
+ if (aNbEdges < 4) {
+ return Standard_False;
+ }
+
+ if (aNbEdges > 4) {
+ if (theToleranceC1 < 0.) {
+ return Standard_False;
+ }
+
+ // Check if a wire has 4 bounds of C1 continuity.
+ BRepTools_WireExplorer aWireExp(TopoDS::Wire(aWire), theFace);
+ TopTools_ListOfShape anEdges;
+
+ for (aNbEdges = 0; aWireExp.More(); aWireExp.Next()) {
+ const TopoDS_Edge &anEdge = aWireExp.Current();
+
+ // Skip degenerated edges.
+ if (!BRep_Tool::Degenerated(anEdge)) {
+ anEdges.Append(anEdge);
+ ++aNbEdges;
+ }
+ }
+
+ if (aNbEdges < 4) {
+ return Standard_False;
+ }
+
+ // Compute number of sharp corners.
+ anEdges.Append(anEdges.First()); // To make a loop.
+
+ TopTools_ListIteratorOfListOfShape anIter(anEdges);
+ Standard_Real aPar[2];
+ Standard_Integer aNbCorners = 0;
+ TopoDS_Edge anEdge1 = TopoDS::Edge(anEdges.First());
+ Handle(Geom_Curve) aCurve1 = BRep_Tool::Curve(anEdge1, aPar[0], aPar[1]);
+ Handle(Geom_Curve) aCurve2;
+ TopoDS_Edge anEdge2;
+ TopoDS_Vertex aCommonVtx;
+ gp_Pnt aPnt;
+ gp_Vec aVec1;
+ gp_Vec aVec2;
+ Standard_Boolean isReversed1 = (anEdge1.Orientation() == TopAbs_REVERSED);
+ Standard_Boolean isReversed2;
+
+ for (anIter.Next(); anIter.More(); anIter.Next()) {
+ TopoDS_Edge anEdge2 = TopoDS::Edge(anIter.Value());
+
+ if (!TopExp::CommonVertex(anEdge1, anEdge2, aCommonVtx)) {
+ // NEVERREACHED
+ return Standard_False;
+ }
+
+ // Check the angle between tangent vectors of 2 curves at this point.
+ Standard_Real aParam1 = BRep_Tool::Parameter(aCommonVtx, anEdge1);
+ Standard_Real aParam2 = BRep_Tool::Parameter(aCommonVtx, anEdge2);
+
+ aCurve2 = BRep_Tool::Curve(anEdge2, aPar[0], aPar[1]);
+ isReversed2 = (anEdge2.Orientation() == TopAbs_REVERSED);
+ aCurve1->D1(aParam1, aPnt, aVec1);
+ aCurve2->D1(aParam2, aPnt, aVec2);
+
+ if (isReversed1) {
+ aVec1.Reverse();
+ }
+
+ if (isReversed2) {
+ aVec2.Reverse();
+ }
+ const Standard_Real anAngle = aVec1.Angle(aVec2);
+
+ if (anAngle > theToleranceC1) {
+ ++aNbCorners;
+
+ if (aNbCorners > 4) {
+ break;
+ }
+ }
+
+ // Go to the next couple of edges.
+ anEdge1 = anEdge2;
+ aCurve1 = aCurve2;
+ isReversed1 = isReversed2;
+ }
+
+ // Check the total number of corners.
+ if (aNbCorners != 4) {
+ return Standard_False;
+ }
+ }
+
+ return Standard_True;
+}
+
//=============================================================================
/*!
* constructor:
TopTools_ListOfShape& BLO,
TopTools_ListOfShape& NOT,
TopTools_ListOfShape& EXT,
- TopTools_ListOfShape& NOQ)
+ TopTools_ListOfShape& NOQ,
+ const Standard_Real theToleranceC1)
{
TopAbs_ShapeEnum aType = theShape.ShapeType();
switch (aType) {
{
TopoDS_Iterator It (theShape);
for (; It.More(); It.Next()) {
- AddBlocksFrom(It.Value(), BLO, NOT, EXT, NOQ);
+ AddBlocksFrom(It.Value(), BLO, NOT, EXT, NOQ, theToleranceC1);
}
}
break;
// Check, if there are seam or degenerated edges
BlockFix_CheckTool aTool;
aTool.SetShape(theShape);
+ aTool.SetAngTolerance(theToleranceC1);
aTool.Perform();
if (aTool.NbPossibleBlocks() > 0) {
EXT.Append(theShape);
TopExp_Explorer expF (theShape, TopAbs_FACE);
for (; expF.More(); expF.Next()) {
- if (mapFaces.Add(expF.Current())) {
- nbFaces++;
- //0021483//if (nbFaces > 6) break;
+ TopoDS_Face aF = TopoDS::Face(expF.Current());
- // get wire
- TopoDS_Shape aF = expF.Current();
- TopExp_Explorer wires (aF, TopAbs_WIRE);
- if (!wires.More()) {
- // no wire in the face
- hasNonQuadr = Standard_True;
- NOQ.Append(aF);//0021483
- //0021483//break;
- continue;
- }
- TopoDS_Shape aWire = wires.Current();
- wires.Next();
- if (wires.More()) {
- // multiple wires in the face
- hasNonQuadr = Standard_True;
- NOQ.Append(aF);//0021483
- //0021483//break;
- continue;
- }
+ if (mapFaces.Add(aF)) {
+ nbFaces++;
- // Check number of edges in the face
- Standard_Integer nbEdges = 0;
- TopTools_MapOfShape mapEdges;
- TopExp_Explorer expW (aWire, TopAbs_EDGE);
- for (; expW.More(); expW.Next()) {
- if (mapEdges.Add(expW.Current())) {
- nbEdges++;
- if (nbEdges > 4) break;
- }
- }
- if (nbEdges != 4) {
+ if (!IsQuadrangle(aF, theToleranceC1)) {
hasNonQuadr = Standard_True;
NOQ.Append(aF);//0021483
}
TopTools_MapOfShape mapFaces;
TopExp_Explorer expF (theShape, TopAbs_FACE);
for (; expF.More(); expF.Next()) {
- if (mapFaces.Add(expF.Current())) {
- // get wire
- TopoDS_Shape aF = expF.Current();
- TopExp_Explorer wires (aF, TopAbs_WIRE);
- if (!wires.More()) {
- // no wire in the face
- NOQ.Append(aF);//0021483
- continue;
- }
- TopoDS_Shape aWire = wires.Current();
- wires.Next();
- if (wires.More()) {
- // multiple wires in the face
- NOQ.Append(aF);//0021483
- continue;
- }
+ TopoDS_Face aF = TopoDS::Face(expF.Current());
- // Check number of edges in the face
- Standard_Integer nbEdges = 0;
- TopTools_MapOfShape mapEdges;
- TopExp_Explorer expW (aWire, TopAbs_EDGE);
- for (; expW.More(); expW.Next()) {
- if (mapEdges.Add(expW.Current())) {
- nbEdges++;
- if (nbEdges > 4) break;
- }
- }
- if (nbEdges != 4) {
+ if (mapFaces.Add(aF)) {
+ if (!IsQuadrangle(aF, theToleranceC1)) {
NOQ.Append(aF);//0021483
}
}
}
}
-void AddBlocksFromOld (const TopoDS_Shape& theShape,
- TopTools_ListOfShape& BLO,
- TopTools_ListOfShape& NOT,
- TopTools_ListOfShape& DEG,
- TopTools_ListOfShape& SEA)
-{
- TopAbs_ShapeEnum aType = theShape.ShapeType();
- switch (aType) {
- case TopAbs_COMPOUND:
- case TopAbs_COMPSOLID:
- {
- TopoDS_Iterator It (theShape);
- for (; It.More(); It.Next()) {
- AddBlocksFromOld(It.Value(), BLO, NOT, DEG, SEA);
- }
- }
- break;
- case TopAbs_SOLID:
- {
- TopTools_MapOfShape mapFaces;
- TopExp_Explorer expF (theShape, TopAbs_FACE);
- Standard_Integer nbFaces = 0;
- Standard_Boolean hasNonQuadr = Standard_False;
- Standard_Boolean hasDegenerated = Standard_False;
- Standard_Boolean hasSeam = Standard_False;
- for (; expF.More(); expF.Next()) {
- if (mapFaces.Add(expF.Current())) {
- nbFaces++;
- if (nbFaces > 6) break;
-
- // Check number of edges in the face
- Standard_Integer nbEdges = 0;
- TopTools_MapOfShape mapEdges;
-
- // get wire
- TopoDS_Shape aF = expF.Current();
- TopExp_Explorer wires (aF, TopAbs_WIRE);
- if (!wires.More()) {
- // no wire in the face
- hasNonQuadr = Standard_True;
- break;
- }
- TopoDS_Shape aWire = wires.Current();
- wires.Next();
- if (wires.More()) {
- // multiple wires in the face
- hasNonQuadr = Standard_True;
- break;
- }
-
- // iterate on wire
- BRepTools_WireExplorer aWE (TopoDS::Wire(aWire), TopoDS::Face(aF));
- for (; aWE.More(); aWE.Next(), nbEdges++) {
- if (BRep_Tool::Degenerated(aWE.Current())) {
- // degenerated edge found
- hasDegenerated = Standard_True;
-// break;
- }
- if (mapEdges.Contains(aWE.Current())) {
- // seam edge found
- hasSeam = Standard_True;
-// break;
- }
- mapEdges.Add(aWE.Current());
- }
- if (nbEdges != 4) {
- hasNonQuadr = Standard_True;
- }
- }
- }
- if (nbFaces == 6) {
- if (hasDegenerated || hasSeam) {
- if (hasDegenerated) {
- DEG.Append(theShape);
- }
- if (hasSeam) {
- SEA.Append(theShape);
- }
- } else if (hasNonQuadr) {
- NOT.Append(theShape);
- } else {
- BLO.Append(theShape);
- }
- } else {
- NOT.Append(theShape);
- }
- }
- break;
- default:
- NOT.Append(theShape);
- }
-}
-
#define REL_NOT_CONNECTED 0
#define REL_OK 1
#define REL_NOT_GLUED 2
return Standard_False;
}
-//=============================================================================
-/*!
- * CheckCompoundOfBlocksOld
- */
-//=============================================================================
-Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocksOld
- (Handle(GEOM_Object) theCompound,
- std::list<BCError>& theErrors)
-{
- SetErrorCode(KO);
-
- if (theCompound.IsNull()) return Standard_False;
- TopoDS_Shape aBlockOrComp = theCompound->GetValue();
-
- Standard_Boolean isCompOfBlocks = Standard_True;
-
- // Map sub-shapes and their indices
- TopTools_IndexedMapOfShape anIndices;
- TopExp::MapShapes(aBlockOrComp, anIndices);
-
- // 1. Report non-blocks
- TopTools_ListOfShape NOT; // Not blocks
- TopTools_ListOfShape DEG; // Hexahedral solids, having degenerated edges
- TopTools_ListOfShape SEA; // Hexahedral solids, having seam edges
- TopTools_ListOfShape BLO; // All blocks from the given compound
- AddBlocksFromOld(aBlockOrComp, BLO, NOT, DEG, SEA);
-
- if (NOT.Extent() > 0) {
- isCompOfBlocks = Standard_False;
- BCError anErr;
- anErr.error = NOT_BLOCK;
- TopTools_ListIteratorOfListOfShape it (NOT);
- for (; it.More(); it.Next()) {
- anErr.incriminated.push_back(anIndices.FindIndex(it.Value()));
- }
- theErrors.push_back(anErr);
- }
-
- if (DEG.Extent() > 0 || SEA.Extent() > 0) {
- isCompOfBlocks = Standard_False;
- BCError anErr;
- anErr.error = EXTRA_EDGE;
-
- TopTools_ListIteratorOfListOfShape itDEG (DEG);
- for (; itDEG.More(); itDEG.Next()) {
- anErr.incriminated.push_back(anIndices.FindIndex(itDEG.Value()));
- }
-
- TopTools_ListIteratorOfListOfShape itSEA (SEA);
- for (; itSEA.More(); itSEA.Next()) {
- anErr.incriminated.push_back(anIndices.FindIndex(itSEA.Value()));
- }
-
- theErrors.push_back(anErr);
- }
-
- Standard_Integer nbBlocks = BLO.Extent();
- if (nbBlocks == 0) {
- isCompOfBlocks = Standard_False;
- SetErrorCode(OK);
- return isCompOfBlocks;
- }
- if (nbBlocks == 1) {
- SetErrorCode(OK);
- return isCompOfBlocks;
- }
-
- // Convert list of blocks into array for easy and fast access
- Standard_Integer ibl = 1;
- TopTools_Array1OfShape aBlocks (1, nbBlocks);
- TopTools_ListIteratorOfListOfShape BLOit (BLO);
- for (; BLOit.More(); BLOit.Next(), ibl++) {
- aBlocks.SetValue(ibl, BLOit.Value());
- }
-
- // 2. Find relations between all blocks,
- // report connection errors (NOT_GLUED and INVALID_CONNECTION)
- TColStd_Array2OfInteger aRelations (1, nbBlocks, 1, nbBlocks);
- aRelations.Init(REL_NOT_CONNECTED);
-
- Standard_Integer row = 1;
- for (row = 1; row <= nbBlocks; row++) {
- TopoDS_Shape aBlock = aBlocks.Value(row);
-
- Standard_Integer col = row + 1;
- for (; col <= nbBlocks; col++) {
- Standard_Integer aRel = BlocksRelation(aBlock, aBlocks.Value(col));
- if (aRel != REL_NOT_CONNECTED) {
- aRelations.SetValue(row, col, aRel);
- aRelations.SetValue(col, row, aRel);
- if (aRel == REL_NOT_GLUED) {
- // report connection error
- isCompOfBlocks = Standard_False;
- BCError anErr;
- anErr.error = NOT_GLUED;
- anErr.incriminated.push_back(anIndices.FindIndex(aBlocks.Value(row)));
- anErr.incriminated.push_back(anIndices.FindIndex(aBlocks.Value(col)));
- theErrors.push_back(anErr);
- } else if (aRel == REL_COLLISION_VV ||
- aRel == REL_COLLISION_FF ||
- aRel == REL_COLLISION_EE ||
- aRel == REL_UNKNOWN) {
- // report connection error
- isCompOfBlocks = Standard_False;
- BCError anErr;
- anErr.error = INVALID_CONNECTION;
- anErr.incriminated.push_back(anIndices.FindIndex(aBlocks.Value(row)));
- anErr.incriminated.push_back(anIndices.FindIndex(aBlocks.Value(col)));
- theErrors.push_back(anErr);
- } else {
- }
- }
- }
- }
-
- // 3. Find largest set of connected (good connection or not glued) blocks
- TColStd_MapOfInteger aProcessedMap;
- TColStd_MapOfInteger aLargestSet;
- TColStd_MapOfInteger aCurrentSet;
- for (ibl = 1; ibl <= nbBlocks; ibl++) {
- if (!aProcessedMap.Contains(ibl)) {
- aCurrentSet.Clear();
- FindConnected(ibl, aRelations, aProcessedMap, aCurrentSet);
- if (aCurrentSet.Extent() > aLargestSet.Extent()) {
- aLargestSet = aCurrentSet;
- }
- }
- }
-
- // 4. Report all blocks, isolated from <aLargestSet>
- BCError anErr;
- anErr.error = NOT_CONNECTED;
- Standard_Boolean hasIsolated = Standard_False;
- for (ibl = 1; ibl <= nbBlocks; ibl++) {
- if (!aLargestSet.Contains(ibl)) {
- aProcessedMap.Clear();
- if (!HasAnyConnection(ibl, aLargestSet, aRelations, aProcessedMap)) {
- // report connection absence
- hasIsolated = Standard_True;
- anErr.incriminated.push_back(anIndices.FindIndex(aBlocks.Value(ibl)));
- }
- }
- }
- if (hasIsolated) {
- isCompOfBlocks = Standard_False;
- theErrors.push_back(anErr);
- }
-
- SetErrorCode(OK);
- return isCompOfBlocks;
-}
-
//=============================================================================
/*!
* PrintBCErrors
//=============================================================================
Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks
(Handle(GEOM_Object) theCompound,
+ const Standard_Real theToleranceC1,
std::list<BCError>& theErrors)
{
SetErrorCode(KO);
TopTools_ListOfShape EXT; // Hexahedral solids, having degenerated and/or seam edges
TopTools_ListOfShape BLO; // All blocks from the given compound
TopTools_ListOfShape NOQ; // All non-quadrangular faces
- AddBlocksFrom(aBlockOrComp, BLO, NOT, EXT, NOQ);
+ AddBlocksFrom(aBlockOrComp, BLO, NOT, EXT, NOQ, theToleranceC1);
// Report non-blocks
if (NOT.Extent() > 0) {
*/
//=============================================================================
Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetNonBlocks
- (Handle(GEOM_Object) theShape,
+ (Handle(GEOM_Object) theShape,
+ const Standard_Real theToleranceC1,
Handle(GEOM_Object)& theNonQuads)
{
SetErrorCode(KO);
TopTools_ListOfShape NOT; // Not blocks
TopTools_ListOfShape EXT; // Hexahedral solids, having degenerated and/or seam edges
TopTools_ListOfShape NOQ; // All non-quadrangular faces
- AddBlocksFrom(aShape, BLO, NOT, EXT, NOQ);
+ AddBlocksFrom(aShape, BLO, NOT, EXT, NOQ, theToleranceC1);
if (NOT.IsEmpty() && EXT.IsEmpty() && NOQ.IsEmpty()) {
SetErrorCode("NOT_FOUND_ANY");
std::list<int> incriminated;
};
- Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
- std::list<BCError>& theErrors);
-
Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
+ const Standard_Real theToleranceC1,
std::list<BCError>& theErrors);
Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound,
const std::list<BCError>& theErrors);
- Standard_EXPORT Handle(GEOM_Object) GetNonBlocks (Handle(GEOM_Object) theShape,
+ Standard_EXPORT Handle(GEOM_Object) GetNonBlocks (Handle(GEOM_Object) theShape,
+ const Standard_Real theToleranceC1,
Handle(GEOM_Object)& theNonQuads);
Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape,
TopTools_ListOfShape& BLO,
TopTools_ListOfShape& NOT,
TopTools_ListOfShape& EXT,
- TopTools_ListOfShape& NOQ);
+ TopTools_ListOfShape& NOQ,
+ const Standard_Real theToleranceC1 = -1.);
// Extract blocks from blocks compounds
Standard_EXPORT Handle(TColStd_HSequenceOfTransient) ExplodeCompoundOfBlocks
#include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_HArray1OfExtendedString.hxx>
-#include "TColStd_HSequenceOfTransient.hxx"
+#include <TColStd_HSequenceOfTransient.hxx>
+#include <TopAbs.hxx>
#include <ShHealOper_ModifStats.hxx>
class GEOMImpl_IHealing
ARG_IS_BY_PARAMETER = 9,
ARG_SUBSHAPE_INDEX = 10,
ARG_LIST_SHAPES = 11,
- ARG_STATISTICS = 4
+ ARG_TYPE = 12
};
GEOMImpl_IHealing(Handle(GEOM_Function) theFunction): _func(theFunction) {}
void SetTolerance( Standard_Real val ) { _func->SetReal(ARG_TOLERANCE, val); }
Standard_Real GetTolerance() { return _func->GetReal(ARG_TOLERANCE); }
+ void SetType( TopAbs_ShapeEnum val ) { _func->SetInteger(ARG_TYPE, (Standard_Integer)val); }
+ TopAbs_ShapeEnum GetType() { TopAbs_ShapeEnum type = (TopAbs_ShapeEnum)(_func->GetInteger(ARG_TYPE)); return _func->IsDone() ? type : TopAbs_SHAPE; }
+
void SetDevideEdgeValue( Standard_Real val ) { _func->SetReal(ARG_DEV_EDGE_VALUE, val); }
Standard_Real GetDevideEdgeValue() { return _func->GetReal(ARG_DEV_EDGE_VALUE); }
return funs;
}
- void SetStatistics( ShHealOper_ModifStats * ms )
+ void SetStatistics( ShHealOper_ModifStats* ms )
{
if ( ms ) ms->Clear();
_func->SetCallBackData( (void*) ms );
}
- ShHealOper_ModifStats * GetStatistics()
+ ShHealOper_ModifStats* GetStatistics()
{
return (ShHealOper_ModifStats*) _func->GetCallBackData();
}
*/
//=============================================================================
Handle(GEOM_Object) GEOMImpl_IHealingOperations::LimitTolerance (Handle(GEOM_Object) theObject,
- double theTolerance)
+ double theTolerance,
+ TopAbs_ShapeEnum theType)
{
// Set error code, check parameters
SetErrorCode(KO);
GEOMImpl_IHealing HI (aFunction);
HI.SetOriginal(aLastFunction);
HI.SetTolerance(theTolerance);
+ HI.SetType(theType);
HI.SetStatistics( myModifStats );
// Compute
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
+#include <TopAbs.hxx>
#include <TColStd_HArray1OfExtendedString.hxx>
#include <TColStd_HArray1OfInteger.hxx>
Standard_EXPORT Handle(GEOM_Object) ChangeOrientationCopy( Handle(GEOM_Object) theObject);
Standard_EXPORT Handle(GEOM_Object) LimitTolerance( Handle(GEOM_Object) theObject,
- double theTolerance );
+ double theTolerance,
+ TopAbs_ShapeEnum theType = TopAbs_SHAPE );
const ShHealOper_ModifStats* GetStatistics() { return myModifStats; }
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+#include <Basics_OCCTVersion.hxx>
+
#include <GEOMImpl_IMeasureOperations.hxx>
#include <GEOMImpl_IMeasure.hxx>
#include <GEOMImpl_MeasureDriver.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
#include <BRepClass_FaceClassifier.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
+#if OCC_VERSION_LARGE > 0x06080000
#include <BRepExtrema_ShapeProximity.hxx>
+#endif
#include <BRepGProp.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
SetErrorCode(KO);
bool isGood = false;
+#if OCC_VERSION_LARGE > 0x06080000
+
if (theIntersections1.IsNull())
theIntersections1 = new TColStd_HSequenceOfInteger;
else
if (aBSP.IsDone())
SetErrorCode(OK);
+#endif // OCC_VERSION_LARGE > 0x06080000
+
return isGood;
}
+
//=============================================================================
/*!
* IsGoodForSolid
}
}
+namespace
+{
+ const double MAX_TOLERANCE = 1.e-7;
+
+ /**
+ * \brief Returns the vertex from theWhere shape that is coincident with
+ * theVertex.
+ *
+ * \param theWhere the shape where the coinsident vertex is searched.
+ * \param theVertex the vertex to be searched.
+ * \return the coincident vertex if it is found. Otherwise null object.
+ */
+ static TopoDS_Vertex getSameVertex(const TopoDS_Shape &theWhere,
+ const TopoDS_Vertex &theVertex)
+ {
+ TopoDS_Vertex aResult;
+ gp_Pnt aPoint = BRep_Tool::Pnt(theVertex);
+ TopExp_Explorer anExp(theWhere, TopAbs_VERTEX);
+ TopTools_MapOfShape aMap;
+
+ for(; anExp.More(); anExp.Next()) {
+ const TopoDS_Shape &aLocalShape = anExp.Current();
+
+ if(!aMap.Add(aLocalShape)) {
+ continue;
+ }
+
+ TopoDS_Vertex aVertex = TopoDS::Vertex(aLocalShape);
+ gp_Pnt aPoint2 = BRep_Tool::Pnt(aVertex);
+
+ if(aPoint.Distance(aPoint2) <= MAX_TOLERANCE) {
+ aResult = aVertex;
+ break;
+ }
+ }
+
+ return aResult;
+ }
+} // end of namespace
+
//=============================================================================
/*!
* constructor:
return aRes;
}
+//=============================================================================
+/*!
+ * GetSubShapeEdgeSorted
+ */
+//=============================================================================
+Handle(TColStd_HSequenceOfTransient)
+ GEOMImpl_IShapesOperations::GetSubShapeEdgeSorted
+ (const Handle(GEOM_Object) &theShape,
+ const Handle(GEOM_Object) &theStartPoint)
+{
+ // Get the sorted edges indices.
+ Handle(TColStd_HSequenceOfInteger) aSortedIDs =
+ getSubShapeEdgeSortedIDs(theShape, theStartPoint);
+
+ // Get object by indices.
+ TCollection_AsciiString anAsciiList;
+ Handle(TColStd_HSequenceOfTransient) aSeq =
+ getObjectsShapesOn(theShape, aSortedIDs, anAsciiList);
+
+ if (aSeq.IsNull() || aSeq->IsEmpty()) {
+ SetErrorCode("Empty sequence of edges");
+ return NULL;
+ }
+
+ // Make a Python command
+ Handle(GEOM_Object) anObj =
+ Handle(GEOM_Object)::DownCast(aSeq->Value(1));
+ Handle(GEOM_Function) aFunction = anObj->GetLastFunction();
+
+ GEOM::TPythonDump(aFunction)
+ << "[" << anAsciiList.ToCString() << "] = geompy.GetSubShapeEdgeSorted("
+ << theShape << ", " << theStartPoint << ")";
+
+ SetErrorCode(OK);
+
+ return aSeq;
+}
+
//=======================================================================
//function : getShapesOnSurfaceIDs
/*!
return aSeq;
}
+//=============================================================================
+/*!
+ * getSubShapeEdgeSortedIDs
+ */
+//=============================================================================
+Handle(TColStd_HSequenceOfInteger)
+ GEOMImpl_IShapesOperations::getSubShapeEdgeSortedIDs
+ (const Handle(GEOM_Object) &theShape,
+ const Handle(GEOM_Object) &theStartPoint)
+{
+ Handle(TColStd_HSequenceOfInteger) aResult;
+
+ if (theShape.IsNull() || theStartPoint.IsNull()) {
+ SetErrorCode("NULL GEOM object");
+ return aResult;
+ }
+
+ const TopoDS_Shape aShape = theShape->GetValue();
+ const TopoDS_Shape aStartPoint = theStartPoint->GetValue();
+
+ if (aShape.IsNull() || aStartPoint.IsNull()) {
+ SetErrorCode("NULL Shape");
+ return aResult;
+ }
+
+ if (aStartPoint.ShapeType() != TopAbs_VERTEX) {
+ SetErrorCode("Starting point is not a vertex");
+ return aResult;
+ }
+
+ TopExp_Explorer anExp(aShape, TopAbs_EDGE);
+ TopTools_MapOfShape aMapFence;
+ TopTools_ListOfShape anEdges;
+
+ for (; anExp.More(); anExp.Next()) {
+ const TopoDS_Shape &anEdge = anExp.Current();
+
+ if (aMapFence.Add(anEdge)) {
+ anEdges.Append(anEdge);
+ }
+ }
+
+ if (anEdges.IsEmpty()) {
+ SetErrorCode("Shape doesn't contain edges");
+ return aResult;
+ }
+
+ // Step 1: Sort edges
+ GEOMUtils::SortShapes(anEdges, Standard_False);
+
+ TopTools_ListIteratorOfListOfShape anIter(anEdges);
+ TopoDS_Vertex aV[2];
+ TopTools_DataMapOfShapeListOfShape aMapVE;
+
+ // Step 2: Fill the map vertex - list of edges.
+ for (; anIter.More(); anIter.Next()) {
+ TopoDS_Edge anEdge = TopoDS::Edge(anIter.Value());
+
+ TopExp::Vertices(anEdge, aV[0], aV[1]);
+
+ const Standard_Integer aNbV = aV[0].IsSame(aV[1]) ? 1 : 2;
+ Standard_Integer i;
+
+ for (i = 0; i < aNbV; ++i) {
+ if (aV[i].IsNull() == Standard_False) {
+ if (!aMapVE.IsBound(aV[i])) {
+ // There is no this vertex in the map.
+ aMapVE.Bind(aV[i], TopTools_ListOfShape());
+ }
+
+ // Add the edge to the list bound with the vertex aV[i].
+ TopTools_ListOfShape &aLEdges = aMapVE.ChangeFind(aV[i]);
+
+ aLEdges.Append(anEdge);
+ }
+ }
+ }
+
+ // Step 3: Find starting point in aMapVE.
+ TopoDS_Vertex aStartVtx = TopoDS::Vertex(aStartPoint);
+
+ if (!aMapVE.IsBound(aStartVtx)) {
+ aStartVtx = getSameVertex(aShape, aStartVtx);
+
+ if (aStartVtx.IsNull()) {
+ SetErrorCode("Invalid Starting point");
+ return aResult;
+ }
+ }
+
+ TopTools_IndexedMapOfShape anIndices;
+ TopTools_MapOfShape aMapVFence;
+ TopoDS_Shape aCurVtx = aStartVtx;
+ TopoDS_Edge aCurEdge =
+ TopoDS::Edge(aMapVE.Find(aCurVtx).First());
+
+ aResult = new TColStd_HSequenceOfInteger;
+ TopExp::MapShapes(aShape, anIndices);
+
+ // Step 4: Fill the list of sorted edges.
+ while (aMapVFence.Add(aCurVtx)) {
+ // Append the ID of the current edge to the list of sorted.
+ aResult->Append(anIndices.FindIndex(aCurEdge));
+ TopExp::Vertices(aCurEdge, aV[0], aV[1]);
+
+ // Get the next vertex.
+ if (aCurVtx.IsSame(aV[0])) {
+ if (aCurVtx.IsSame(aV[1])) {
+ // There is no next vertex.
+ break;
+ } else {
+ aCurVtx = aV[1];
+ }
+ } else {
+ aCurVtx = aV[0];
+ }
+
+ if (aCurVtx.IsNull()) {
+ // There is no next vertex.
+ break;
+ }
+
+ // Get the next edge.
+ const TopTools_ListOfShape &aLEdges = aMapVE.Find(aCurVtx);
+ TopTools_ListIteratorOfListOfShape anEIter(aLEdges);
+
+ for (; anEIter.More(); anEIter.Next()) {
+ const TopoDS_Shape &aLocalEdge = anEIter.Value();
+
+ if (aLocalEdge.IsNull() == Standard_False) {
+ if (!aCurEdge.IsSame(aLocalEdge)) {
+ aCurEdge = TopoDS::Edge(aLocalEdge);
+ break;
+ }
+ }
+ }
+
+ if (!anEIter.More()) {
+ // There is no next edge.
+ break;
+ }
+ }
+
+ return aResult;
+}
+
//=======================================================================
//function : getShapesOnSurface
/*!
return aResult;
}
-#define MAX_TOLERANCE 1.e-7
-
//=======================================================================
//function : isSameEdge
//purpose : Returns True if two edges coincide
switch (aWhat.ShapeType()) {
case TopAbs_VERTEX: {
- gp_Pnt P = BRep_Tool::Pnt(TopoDS::Vertex(aWhat));
- TopExp_Explorer E(aWhere, TopAbs_VERTEX);
- for(; E.More(); E.Next()) {
- if(!aMap.Add(E.Current())) continue;
- gp_Pnt P2 = BRep_Tool::Pnt(TopoDS::Vertex(E.Current()));
- if(P.Distance(P2) <= MAX_TOLERANCE) {
- isFound = true;
- aSubShape = E.Current();
- break;
- }
- }
+ aSubShape = getSameVertex(aWhere, TopoDS::Vertex(aWhat));
+ isFound = !aSubShape.IsNull();
break;
}
case TopAbs_EDGE: {
const Standard_Integer theShapeType,
GEOMAlgo_State theState);
+ /*!
+ * \brief Resize the input edge with the new Min and Max parameters.
+ * The input edge parameters range is [0, 1]. If theMin parameter is
+ * negative, the input edge is extended, otherwise it is shrinked by
+ * theMin parameter. If theMax is greater than 1, the edge is extended,
+ * otherwise it is shrinked by theMax parameter
+ * \param theEdge the input edge to be resized
+ * \param theMin the minimal parameter value
+ * \param theMax the maximal parameter value
+ * \retval Handle(GEOM_Object) - newly created edge
+ */
Standard_EXPORT Handle(GEOM_Object)
- ExtendEdge(const Handle(GEOM_Object) &theEdge,
+ ExtendEdge(const Handle(GEOM_Object)& theEdge,
const Standard_Real theMin,
const Standard_Real theMax);
+ /*!
+ * \brief Resize the input face with the new UMin, UMax, VMin and VMax
+ * parameters. The input face U and V parameters range is [0, 1]. If
+ * theUMin parameter is negative, the input face is extended, otherwise
+ * it is shrinked along U direction by theUMin parameter. If theUMax is
+ * greater than 1, the face is extended, otherwise it is shrinked along
+ * U direction by theUMax parameter. So as for theVMin, theVMax and
+ * V direction of the input face.
+ * \param theFace the input face to be resized
+ * \param theUMin the minimal U parameter value
+ * \param theUMax the maximal U parameter value
+ * \param theVMin the minimal V parameter value
+ * \param theVMax the maximal V parameter value
+ * \retval Handle(GEOM_Object) - newly created face
+ */
Standard_EXPORT Handle(GEOM_Object)
- ExtendFace(const Handle(GEOM_Object) &theFace,
+ ExtendFace(const Handle(GEOM_Object)& theFace,
const Standard_Real theUMin,
const Standard_Real theUMax,
const Standard_Real theVMin,
const Standard_Real theVMax);
-
+
+ /*!
+ * \brief Make a surface from a face. This function takes some face as
+ * input parameter and creates new GEOM_Object, i.e. topological shape
+ * by extracting underlying surface of the source face and limiting it
+ * by the Umin, Umax, Vmin, Vmax parameters of the source face (in the
+ * parametrical space).
+ * \param theFace the input face
+ * \retval Handle(GEOM_Object) - newly created face
+ */
Standard_EXPORT Handle(GEOM_Object)
MakeSurfaceFromFace(const Handle(GEOM_Object) &theFace);
+ /*!
+ * \brief Explode a shape into edges sorted in a row from a starting point.
+ * \param theShape - the shape to be exploded on edges.
+ * \param theStartPoint - the starting point.
+ * \return Ordered list of edges sorted in a row from a starting point.
+ */
+ Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+ GetSubShapeEdgeSorted (const Handle(GEOM_Object) &theShape,
+ const Handle(GEOM_Object) &theStartPoint);
+
private:
Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)> theShapes,
const Standard_Integer theObjectType,
const Handle(TColStd_HSequenceOfInteger)& theShapeIDs,
TCollection_AsciiString & theShapeEntries);
+ /*!
+ * \brief Explode a shape into edges sorted in a row from a starting point.
+ * \param theShape - the shape to be exploded on edges.
+ * \param theStartPoint - the starting point.
+ * \return Ordered list of edges sorted in a row from a starting point.
+ */
+ Handle(TColStd_HSequenceOfInteger) getSubShapeEdgeSortedIDs
+ (const Handle(GEOM_Object) &theShape,
+ const Handle(GEOM_Object) &theStartPoint);
+
/*!
* \brief Select the object created last
* \param theObj1 - Object 1
#include <GEOMImpl_IOffset.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOM_Function.hxx>
+#include <GEOMUtils.hxx>
#include <BRepOffsetAPI_MakeOffsetShape.hxx>
-#include <BRep_Tool.hxx>
-#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
#include <TopAbs.hxx>
-#include <TopExp.hxx>
-
#include <BRepClass3d_SolidClassifier.hxx>
-
#include <Precision.hxx>
-#include <gp_Pnt.hxx>
-
-#include <BRepCheck_Analyzer.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
#include <Standard_ConstructionError.hxx>
#include <StdFail_NotDone.hxx>
-#include "utilities.h"
-
//=======================================================================
//function : GetID
//purpose :
return aOffsetDriver;
}
-
//=======================================================================
//function : GEOMImpl_OffsetDriver
//purpose :
aTol);
if (MO.IsDone()) {
aShape = MO.Shape();
- // 23.04.2010 skl for bug 21699 from Mantis
- BRepCheck_Analyzer ana (aShape, Standard_True);
- ana.Init(aShape);
- if (!ana.IsValid()) {
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape, Precision::Confusion(),
- Precision::Confusion(), TopAbs_SHAPE);
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->Perform();
- aShape = aSfs->Shape();
- ana.Init(aShape);
- if (!ana.IsValid())
- Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
- }
+ if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) )
+ Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
}
else {
StdFail_NotDone::Raise("Offset construction failed");
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_PartitionDriver.hxx>
#include <GEOMImpl_IPartition.hxx>
#include <GEOMImpl_Types.hxx>
-
+#include <GEOMUtils.hxx>
#include <GEOM_Object.hxx>
#include <GEOM_Function.hxx>
-
#include <GEOMAlgo_Splitter.hxx>
#include <TDataStd_IntegerArray.hxx>
#include <TNaming_CopyShape.hxx>
-//#include <BRepBuilderAPI_Copy.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAlgo.hxx>
-#include <BRepTools.hxx>
-
#include <TopAbs.hxx>
#include <TopExp.hxx>
-#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeFix_Shape.hxx>
-
#include <TColStd_IndexedDataMapOfTransientTransient.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TColStd_ListOfInteger.hxx>
#include <Standard_NullObject.hxx>
#include <StdFail_NotDone.hxx>
-#include <Precision.hxx>
-#include <gp_Pnt.hxx>
#include <BOPAlgo_CheckerSI.hxx>
#include <BOPCol_IndexedDataMapOfShapeListOfShape.hxx>
#include <BOPCol_ListOfShape.hxx>
Standard_ConstructionError::Raise("Partition aborted : non valid shape result");
//end of IPAL21418
- if (!BRepAlgo::IsValid(aShape)) {
- // 08.07.2008 added by skl during fixing bug 19761 from Mantis
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape, Precision::Confusion(),
- Precision::Confusion(), TopAbs_SHAPE);
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->Perform();
- aShape = aSfs->Shape();
- if (!BRepAlgo::IsValid(aShape))
- Standard_ConstructionError::Raise("Partition aborted : non valid shape result");
- }
+ if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) )
+ Standard_ConstructionError::Raise("Partition aborted : non valid shape result");
aFunction->SetValue(aShape);
#include <ShapeAnalysis_Edge.hxx>
#include <ShapeFix_Face.hxx>
#include <ShapeFix_Shell.hxx>
-#include <ShapeFix_Shape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepBuilderAPI_Sewing.hxx>
-#include <BRepCheck_Analyzer.hxx>
#include <BRepGProp.hxx>
#include <GeomFill_Trihedron.hxx>
#include <GeomFill_CorrectedFrenet.hxx>
if (aShape.IsNull()) return 0;
- BRepCheck_Analyzer ana (aShape, Standard_False);
- if (!ana.IsValid()) {
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->SetPrecision(Precision::Confusion());
- aSfs->Perform();
- aShape = aSfs->Shape();
-
- ana.Init(aShape, Standard_False);
- if (!ana.IsValid())
- Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
- }
+ if ( !GEOMUtils::CheckShape(aShape) && !GEOMUtils::FixShapeTolerance(aShape) )
+ Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
if (aType != PIPE_BASE_PATH &&
aType != PIPE_SHELLS_WITHOUT_PATH) {
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
-#include <Basics_OCCTVersion.hxx>
-
#include <GEOMImpl_PipePathDriver.hxx>
-
-#include <GEOMImpl_IShapesOperations.hxx>
#include <GEOMImpl_ShapeDriver.hxx>
#include <GEOMImpl_IPipePath.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOM_Function.hxx>
-#include <ShapeAnalysis_FreeBounds.hxx>
-#include <ShapeAnalysis_Edge.hxx>
-#include <ShapeFix_Face.hxx>
-#include <ShapeFix_Shell.hxx>
-#include <ShapeFix_Shape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-
-#include <BRep_Tool.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_Sewing.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepGProp.hxx>
-#include <BRepOffsetAPI_MakePipe.hxx>
-#include <BRepOffsetAPI_MakePipeShell.hxx>
-
#include <BRepOffsetAPI_MiddlePath.hxx>
-
-#include <TopAbs.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopTools_SequenceOfShape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-
-#include <GProp_GProps.hxx>
-
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GeomAPI_Interpolate.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Conic.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <GeomFill_BSplineCurves.hxx>
-#include <GeomConvert_ApproxCurve.hxx>
-#include <GeomConvert.hxx>
-
-#include <TColgp_SequenceOfPnt.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TColgp_Array2OfPnt.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
-
#include <Precision.hxx>
-
#include <Standard_NullObject.hxx>
-#include <Standard_TypeMismatch.hxx>
-#include <Standard_ConstructionError.hxx>
-
-#include "utilities.h"
//=======================================================================
//function : GetID
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_ScaleDriver.hxx>
#include <GEOMImpl_IScale.hxx>
#include <GEOMImpl_Types.hxx>
+#include <GEOMUtils.hxx>
#include <GEOM_Function.hxx>
-#include <ShapeFix_Shape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-
#include <BRepBuilderAPI_Transform.hxx>
#include <BRepBuilderAPI_GTransform.hxx>
#include <BRep_Tool.hxx>
-#include <BRepAlgo.hxx>
-#include <BRepCheck_Analyzer.hxx>
#include <TopAbs.hxx>
#include <TopExp.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <Precision.hxx>
if (aShape.IsNull()) return 0;
- BRepCheck_Analyzer ana (aShape, Standard_False);
- if (!ana.IsValid()) {
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->SetPrecision(Precision::Confusion());
- aSfs->Perform();
- aShape = aSfs->Shape();
-
- ana.Init(aShape, Standard_False);
- if (!ana.IsValid())
- Standard_ConstructionError::Raise("Scaling aborted : algorithm has produced an invalid shape result");
- }
+ if ( !GEOMUtils::CheckShape(aShape) && !GEOMUtils::FixShapeTolerance(aShape) )
+ Standard_ConstructionError::Raise("Scaling aborted : algorithm has produced an invalid shape result");
aFunction->SetValue(aShape);
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_ThruSectionsDriver.hxx>
#include <GEOMImpl_IThruSections.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOM_Function.hxx>
+#include <GEOMUtils.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
#include <Precision.hxx>
-#include <BRepCheck_Analyzer.hxx>
#include <BRepOffsetAPI_ThruSections.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
-#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopAbs.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Shape.hxx>
-#include <Standard_NullObject.hxx>
#include <Standard_TypeMismatch.hxx>
#include <Standard_ConstructionError.hxx>
-#include <ShapeFix_Shape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <Precision.hxx>
+
//=======================================================================
//function : GetID
//purpose :
return 0;
}
- BRepCheck_Analyzer ana (aShape, Standard_False);
- if (!ana.IsValid()) {
+ if ( !GEOMUtils::CheckShape(aShape) && !GEOMUtils::FixShapeTolerance(aShape) ) {
//algoritm thru section creats on the arcs invalid shapes gka
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->SetPrecision(Precision::Confusion());
- aSfs->Perform();
- aShape = aSfs->Shape();
- //ana.Init(aShape, Standard_False);
- //if (!ana.IsValid())
// Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
}
-
aFunction->SetValue(aShape);
log.SetTouched(Label());
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_TranslateDriver.hxx>
#include <GEOMImpl_ITranslate.hxx>
-#include <GEOMImpl_ITransformOperations.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOM_Function.hxx>
#include <GEOMUtils.hxx>
-#include <ShapeFix_Shape.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-
#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Compound.hxx>
#include <TopAbs.hxx>
#include <TopExp.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
#include <gp_Trsf.hxx>
#include <gp_Pnt.hxx>
B.Add(aCompound, anOriginal.Located(aLocRes));
}
aShape = aCompound;
- //aShape = GEOMImpl_ITransformOperations::TranslateShape1D(anOriginal, &TI);
}
else if (aType == TRANSLATE_2D) {
Standard_Integer nbtimes1 = TI.GetNbIter1(), nbtimes2 = TI.GetNbIter2();
}
}
aShape = aCompound;
- //aShape = GEOMImpl_ITransformOperations::TranslateShape2D(anOriginal, &TI);
}
else return 0;
if (aShape.IsNull()) return 0;
- BRepCheck_Analyzer ana (aShape, Standard_True);
- if (!ana.IsValid()) {
- ShapeFix_ShapeTolerance aSFT;
- aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
- Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
- aSfs->SetPrecision(Precision::Confusion());
- aSfs->Perform();
- aShape = aSfs->Shape();
-
- ana.Init(aShape, Standard_False);
- if (!ana.IsValid())
- Standard_ConstructionError::Raise("Scaling aborted : algorithm has produced an invalid shape result");
- }
+ if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) )
+ Standard_ConstructionError::Raise("Scaling aborted : algorithm has produced an invalid shape result");
aFunction->SetValue(aShape);
#include <Standard_ConstructionError.hxx>
+namespace
+{
+ Handle(GEOM_Object) GetOwner( const TDF_Label& l )
+ {
+ TDF_Label label = l;
+ // object is stored on a grandfather label of a driver label
+ if ( !label.IsNull() )
+ label = label.Father();
+ if ( !label.IsNull() )
+ label = label.Father();
+
+ return GEOM_Object::GetObject( label );
+ }
+}
+
//=======================================================================
//function : GetID
//purpose :
AddParam( theParams, "Dz", aCI.GetDZ() );
break;
case VECTOR_TWO_PNT: {
- TDF_Label label = Label();
- Handle(GEOM_Object) obj = GEOM_Object::GetObject( label );
+ Handle(GEOM_Object) obj = GetOwner( Label() );
if ( !obj.IsNull() && obj->GetType() == GEOM_EDGE )
theOperationName = "EDGE";
else
${CAS_TKG3d}
${CAS_TKV3d}
${CAS_TKGeomBase}
+ ${CAS_TKBO}
${LIBXML2_LIBRARIES}
${KERNEL_SALOMELocalTrace}
)
#include <Basics_OCCTVersion.hxx>
-#include <utilities.h>
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBuilderAPI_Sewing.hxx>
+
+#include <BRepCheck_Analyzer.hxx>
#include <Bnd_Box.hxx>
+#include <BOPTools_AlgoTools.hxx>
+
#include <TopAbs.hxx>
#include <TopExp.hxx>
#include <TopoDS.hxx>
#include <ShapeAnalysis.hxx>
#include <ShapeFix_Shape.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
#include <ProjLib.hxx>
#include <ElSLib.hxx>
#include <vector>
#include <sstream>
+#include <algorithm>
#include <Standard_Failure.hxx>
#include <Standard_NullObject.hxx>
#define STD_SORT_ALGO 1
+// When the following macro is defined, ShapeFix_ShapeTolerance function is used to set max tolerance of curve
+// in GEOMUtils::FixShapeCurves function; otherwise less restrictive BRep_Builder::UpdateEdge/UpdateVertex
+// approach is used
+// VSR (29/12/2014): macro disabled
+//#define USE_LIMIT_TOLERANCE
+
namespace
{
/**
TopoDS_Shape &theModifiedShape,
Standard_Real &theAddDist)
{
- Standard_Boolean isModified = Standard_False;
TopExp_Explorer anExp;
int nbf = 0;
const Standard_Boolean isShell =
(sh.ShapeType()==TopAbs_SHELL || sh.ShapeType()==TopAbs_FACE);
- if( isShell || S->IsUPeriodic() ) {
- // non solid case or any periodic surface (Mantis 22454).
- double U1,U2,V1,V2;
- // changes for 0020677: EDF 1219 GEOM: MinDistance gives 0 instead of 20.88
- //S->Bounds(U1,U2,V1,V2); changed by
- ShapeAnalysis::GetFaceUVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
- // end of changes for 020677 (dmv)
- Handle(Geom_RectangularTrimmedSurface) TrS1 =
- new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
- Handle(Geom_RectangularTrimmedSurface) TrS2 =
- new Geom_RectangularTrimmedSurface(S,(U1+U2)/2.,U2,V1,V2);
+ if ( !isShell && S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) {
+ Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(S);
+ gp_Pnt PC = SS->Location();
BRep_Builder B;
- TopoDS_Face F1,F2;
- TopoDS_Shape aMShape;
-
- if (isShell) {
- B.MakeCompound(TopoDS::Compound(aMShape));
- } else {
- B.MakeShell(TopoDS::Shell(aMShape));
- }
-
- B.MakeFace(F1,TrS1,1.e-7);
- B.Add(aMShape,F1);
- B.MakeFace(F2,TrS2,1.e-7);
- B.Add(aMShape,F2);
- Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
-
- if (!isShell) {
- // The original shape is a solid.
- TopoDS_Solid aSolid;
-
- B.MakeSolid(aSolid);
- B.Add(aSolid, aMShape);
- aMShape = aSolid;
- }
-
- sfs->Init(aMShape);
- sfs->SetPrecision(1.e-6);
- sfs->SetMaxTolerance(1.0);
- sfs->Perform();
- theModifiedShape = sfs->Shape();
- isModified = Standard_True;
+ TopoDS_Vertex V;
+ B.MakeVertex(V,PC,1.e-7);
+ theModifiedShape = V;
+ theAddDist = SS->Radius();
+ return Standard_True;
}
- else {
- if( S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) {
- Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(S);
- gp_Pnt PC = SS->Location();
- BRep_Builder B;
- TopoDS_Vertex V;
- B.MakeVertex(V,PC,1.e-7);
- theModifiedShape = V;
- theAddDist = SS->Radius();
- isModified = Standard_True;
- }
- else {
- Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(S);
- gp_Ax3 ax3 = TS->Position();
- Handle(Geom_Circle) C = new Geom_Circle(ax3.Ax2(),TS->MajorRadius());
- BRep_Builder B;
- TopoDS_Edge E;
- B.MakeEdge(E,C,1.e-7);
- theModifiedShape = E;
- theAddDist = TS->MinorRadius();
- isModified = Standard_True;
- }
+ if ( !isShell && S->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
+ Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(S);
+ gp_Ax3 ax3 = TS->Position();
+ Handle(Geom_Circle) C = new Geom_Circle(ax3.Ax2(),TS->MajorRadius());
+ BRep_Builder B;
+ TopoDS_Edge E;
+ B.MakeEdge(E,C,1.e-7);
+ theModifiedShape = E;
+ theAddDist = TS->MinorRadius();
+ return Standard_True;
}
- } else {
- theModifiedShape = theShape;
+
+ // non solid case or any periodic surface (Mantis 22454).
+ double U1,U2,V1,V2;
+ // changes for 0020677: EDF 1219 GEOM: MinDistance gives 0 instead of 20.88
+ //S->Bounds(U1,U2,V1,V2); changed by
+ ShapeAnalysis::GetFaceUVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
+ // end of changes for 020677 (dmv)
+ Handle(Geom_RectangularTrimmedSurface) TrS1 =
+ new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
+ Handle(Geom_RectangularTrimmedSurface) TrS2 =
+ new Geom_RectangularTrimmedSurface(S,(U1+U2)/2.,U2,V1,V2);
+ TopoDS_Shape aMShape;
+
+ TopoDS_Face F1 = BRepBuilderAPI_MakeFace(TrS1, Precision::Confusion());
+ TopoDS_Face F2 = BRepBuilderAPI_MakeFace(TrS2, Precision::Confusion());
+
+ if (isShell) {
+ BRep_Builder B;
+ B.MakeCompound(TopoDS::Compound(aMShape));
+ B.Add(aMShape, F1);
+ B.Add(aMShape, F2);
+ } else {
+ // The original shape is a solid.
+ BRepBuilderAPI_Sewing aSewing (Precision::Confusion()*10.0);
+ aSewing.Add(F1);
+ aSewing.Add(F2);
+ aSewing.Perform();
+ aMShape = aSewing.SewedShape();
+ BRep_Builder B;
+ TopoDS_Solid aSolid;
+ B.MakeSolid(aSolid);
+ B.Add(aSolid, aMShape);
+ aMShape = aSolid;
+ }
+
+ Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
+ sfs->Init(aMShape);
+ sfs->SetPrecision(1.e-6);
+ sfs->SetMaxTolerance(1.0);
+ sfs->Perform();
+ theModifiedShape = sfs->Shape();
+ return Standard_True;
}
}
- else
- theModifiedShape = theShape;
-
- return isModified;
+
+ theModifiedShape = theShape;
+ return Standard_False;
}
void parseWard( const GEOMUtils::LevelsList &theLevelList, std::string &treeStr )
// function : ConvertTreeToString()
// purpose : Returns the string representation of dependency tree
//=======================================================================
-void GEOMUtils::ConvertTreeToString( const TreeModel &tree,
- std::string &treeStr )
+void GEOMUtils::ConvertTreeToString( const TreeModel& tree,
+ std::string& dependencyStr )
{
TreeModel::const_iterator i;
for ( i = tree.begin(); i != tree.end(); ++i ) {
- treeStr.append( i->first );
- treeStr.append( "-" );
+ dependencyStr.append( i->first );
+ dependencyStr.append( "-" );
std::vector<LevelInfo> upLevelList = i->second.first;
- treeStr.append( "upward" );
- parseWard( upLevelList, treeStr );
+ dependencyStr.append( "upward" );
+ parseWard( upLevelList, dependencyStr );
std::vector<LevelInfo> downLevelList = i->second.second;
- treeStr.append( "downward" );
- parseWard( downLevelList, treeStr );
+ dependencyStr.append( "downward" );
+ parseWard( downLevelList, dependencyStr );
}
}
// function : ConvertStringToTree()
// purpose : Returns the dependency tree
//=======================================================================
-void GEOMUtils::ConvertStringToTree( const std::string &theData,
- TreeModel &tree )
+void GEOMUtils::ConvertStringToTree( const std::string& dependencyStr,
+ TreeModel& tree )
{
std::size_t cursor = 0;
- while( theData.find('-',cursor) != std::string::npos ) //find next selected object
+ while( dependencyStr.find('-',cursor) != std::string::npos ) //find next selected object
{
- std::size_t objectIndex = theData.find( '-', cursor );
- std::string objectEntry = theData.substr( cursor, objectIndex - cursor );
+ std::size_t objectIndex = dependencyStr.find( '-', cursor );
+ std::string objectEntry = dependencyStr.substr( cursor, objectIndex - cursor );
cursor = objectIndex;
- std::size_t upwardIndexBegin = theData.find("{",cursor) + 1;
- std::size_t upwardIndexFinish = theData.find("}",upwardIndexBegin);
- LevelsList upwardList = parseWard( theData, cursor );
+ std::size_t upwardIndexBegin = dependencyStr.find("{",cursor) + 1;
+ std::size_t upwardIndexFinish = dependencyStr.find("}",upwardIndexBegin);
+ LevelsList upwardList = parseWard( dependencyStr, cursor );
- LevelsList downwardList = parseWard( theData, cursor );
+ LevelsList downwardList = parseWard( dependencyStr, cursor );
tree[objectEntry] = std::pair<LevelsList,LevelsList>( upwardList, downwardList );
}
}
+
+bool GEOMUtils::CheckShape( TopoDS_Shape& shape,
+ bool checkGeometry )
+{
+ BRepCheck_Analyzer analyzer( shape, checkGeometry );
+ return analyzer.IsValid();
+}
+
+bool GEOMUtils::FixShapeTolerance( TopoDS_Shape& shape,
+ TopAbs_ShapeEnum type,
+ Standard_Real tolerance,
+ bool checkGeometry )
+{
+ ShapeFix_ShapeTolerance aSft;
+ aSft.LimitTolerance( shape, tolerance, tolerance, type );
+ Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape( shape );
+ aSfs->Perform();
+ shape = aSfs->Shape();
+ return CheckShape( shape, checkGeometry );
+}
+
+bool GEOMUtils::FixShapeTolerance( TopoDS_Shape& shape,
+ Standard_Real tolerance,
+ bool checkGeometry )
+{
+ return FixShapeTolerance( shape, TopAbs_SHAPE, tolerance, checkGeometry );
+}
+
+bool GEOMUtils::FixShapeTolerance( TopoDS_Shape& shape,
+ bool checkGeometry )
+{
+ return FixShapeTolerance( shape, Precision::Confusion(), checkGeometry );
+}
+
+bool GEOMUtils::FixShapeCurves( TopoDS_Shape& shape )
+{
+ Standard_Real aT, aTolE, aD, aDMax;
+ TopExp_Explorer aExpF, aExpE;
+ NCollection_DataMap<TopoDS_Edge, Standard_Real, TopTools_ShapeMapHasher> aDMETol;
+ aExpF.Init(shape, TopAbs_FACE);
+ for (; aExpF.More(); aExpF.Next()) {
+ const TopoDS_Face& aF = *(TopoDS_Face*)&aExpF.Current();
+ aExpE.Init(aF, TopAbs_EDGE);
+ for (; aExpE.More(); aExpE.Next()) {
+ const TopoDS_Edge& aE = *(TopoDS_Edge*)&aExpE.Current();
+ try {
+ if (!BOPTools_AlgoTools::ComputeTolerance(aF, aE, aDMax, aT)) {
+ continue;
+ }
+ }
+ catch(...) {
+ continue;
+ }
+ aTolE = BRep_Tool::Tolerance(aE);
+ if (aDMax < aTolE) continue;
+ if (aDMETol.IsBound(aE)) {
+ aD = aDMETol.Find(aE);
+ if (aDMax > aD) {
+ aDMETol.UnBind(aE);
+ aDMETol.Bind(aE, aDMax);
+ }
+ }
+ else {
+ aDMETol.Bind(aE, aDMax);
+ }
+ }
+ }
+ NCollection_DataMap<TopoDS_Edge, Standard_Real, TopTools_ShapeMapHasher>::Iterator aDMETolIt(aDMETol);
+#ifdef USE_LIMIT_TOLERANCE
+ ShapeFix_ShapeTolerance sat;
+#else
+ BRep_Builder b;
+#endif
+ for (; aDMETolIt.More(); aDMETolIt.Next()) {
+#ifdef USE_LIMIT_TOLERANCE
+ sat.LimitTolerance(aDMETolIt.Key(), aDMETolIt.Value()*1.001);
+#else
+ TopoDS_Iterator itv(aDMETolIt.Key());
+ for (; itv.More(); itv.Next())
+ b.UpdateVertex(TopoDS::Vertex(itv.Value()), aDMETolIt.Value()*1.001);
+ b.UpdateEdge(aDMETolIt.Key(), aDMETolIt.Value()*1.001);
+#endif
+ }
+ return CheckShape( shape );
+}
+
+bool GEOMUtils::Write( const TopoDS_Shape& shape, const char* fileName )
+{
+ return BRepTools::Write( shape, fileName );
+}
*/
Standard_EXPORT gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) theView );
- Standard_EXPORT void ConvertTreeToString( const TreeModel &theTree,
- std::string &DependencyStr );
+ /*!
+ * \brief Convert dependency tree data to the string representation
+ *
+ * \param tree dependency tree data
+ * \param dependencyStr output string
+ */
+ Standard_EXPORT void ConvertTreeToString( const TreeModel& tree,
+ std::string& dependencyStr );
+
+ /*!
+ * \brief Restore dependency tree data from the string representation
+ *
+ * \param dependencyStr string representation of tree data
+ * \param tree output dependency tree data
+ */
+ Standard_EXPORT void ConvertStringToTree( const std::string& dependencyStr,
+ TreeModel& tree );
- Standard_EXPORT void ConvertStringToTree( const std::string &theDependencyStr,
- TreeModel &tree );
+ /*!
+ * \brief Check shape
+ *
+ * \param shape input shape object
+ * \param checkGeometry when set to \c true, causes check of underlying geometry
+ * in addition to the topology
+ * \return \c true if shape is valid or \c false otherwise
+ */
+ Standard_EXPORT bool CheckShape( TopoDS_Shape& shape, bool checkGeometry = false );
+
+ /*!
+ * \brief Limit shape tolerance to the given value
+ *
+ * \param shape shape being fixed
+ * \param type topology type which tolerance is to be limited; TopAbs_SHAPE means
+ * all types of topology
+ * \param tolerance expected tolerance value (1e-7 by default)
+ * \param checkGeometry check geometry validity of result
+ * \return \c true if resulting shape is valid
+ *
+ * \note Resulting tolerance of the shape is not mandatory equal to requested value
+ * as it might be changed by fixshape operation in order to get valid shape where possible
+ * \note By default, result only checked for topology validity; check of geometry can be done by
+ * passing \c true to \a checkGeometry parameter
+ */
+ Standard_EXPORT bool FixShapeTolerance( TopoDS_Shape& shape,
+ TopAbs_ShapeEnum type,
+ Standard_Real tolerance = Precision::Confusion(),
+ bool checkGeometry = false );
+ /*!
+ * \brief Limit shape tolerance to the given value
+ * This is overloaded function, it behaves exactly as previous one
+ */
+ Standard_EXPORT bool FixShapeTolerance( TopoDS_Shape& shape,
+ Standard_Real tolerance = Precision::Confusion(),
+ bool checkGeometry = false );
+
+ /*!
+ * \brief Limit shape tolerance to the given value
+ * This is overloaded function, it behaves exactly as previous one
+ */
+ Standard_EXPORT bool FixShapeTolerance( TopoDS_Shape& shape,
+ bool checkGeometry );
+
+ /*!
+ * \brief Fix curves of the given shape
+ *
+ * The function checks each curve of the input shape in the following way:
+ * - compute deviation of the curve from the underlying surface in a set of points
+ * computed with the certain discretization step value
+ * - find maximum tolerance between computed deviation values
+ * - limit tolerance of the curve with the computed maximum value
+ *
+ * \param shape shape being fixed
+ * \return \c true if resulting shape is valid
+ */
+ Standard_EXPORT bool FixShapeCurves( TopoDS_Shape& shape );
+
+ /*!
+ * \brief Write shape to the BREP file
+ *
+ * \param source shape
+ * \return \c true if file was written or \c false otherwise
+ */
+ Standard_EXPORT bool Write( const TopoDS_Shape& shape,
+ const char* fileName );
};
#endif
//=============================================================================
CORBA::Boolean GEOM_IBlocksOperations_i::CheckCompoundOfBlocks
(GEOM::GEOM_Object_ptr theCompound,
+ const CORBA::Double theToleranceC1,
GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors)
{
CORBA::Boolean isComp = false;
//Check
std::list<GEOMImpl_IBlocksOperations::BCError> errList;
- isComp = GetOperations()->CheckCompoundOfBlocks(aCompound, errList);
+ isComp = GetOperations()->CheckCompoundOfBlocks
+ (aCompound, theToleranceC1, errList);
if (!GetOperations()->IsDone())
return isComp;
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetNonBlocks
(GEOM::GEOM_Object_ptr theShape,
+ const CORBA::Double theToleranceC1,
GEOM::GEOM_Object_out theNonQuads)
{
GEOM::GEOM_Object_var aGEOMObject;
//Get the result
Handle(GEOM_Object) aFaces;
- Handle(GEOM_Object) anObject = GetOperations()->GetNonBlocks(aShape, aFaces);
+ Handle(GEOM_Object) anObject =
+ GetOperations()->GetNonBlocks(aShape, theToleranceC1, aFaces);
if (!GetOperations()->IsDone())
return aGEOMObject._retn();
CORBA::Long& theNbBlocks);
CORBA::Boolean CheckCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompound,
+ const CORBA::Double theToleranceC1,
GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors);
char* PrintBCErrors (GEOM::GEOM_Object_ptr theCompound,
const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors);
GEOM::GEOM_Object_ptr GetNonBlocks (GEOM::GEOM_Object_ptr theShape,
+ const CORBA::Double theToleranceC1,
GEOM::GEOM_Object_out theNonQuads);
GEOM::GEOM_Object_ptr RemoveExtraEdges (GEOM::GEOM_Object_ptr theShape,
return GetObject(aNewFace);
}
+
+//=============================================================================
+/*!
+ * GetSubShapeEdgeSorted
+ */
+//=============================================================================
+GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapeEdgeSorted
+ (GEOM::GEOM_Object_ptr theShape,
+ GEOM::GEOM_Object_ptr theStartPoint)
+{
+ GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
+
+ //Set a not done flag
+ GetOperations()->SetNotDone();
+
+ //Get the reference objects
+ Handle(GEOM_Object) aShape = GetObjectImpl(theShape);
+ Handle(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint);
+
+ if (aShape.IsNull() || aStartPoint.IsNull()) {
+ return aSeq._retn();
+ }
+
+ //Get Shapes On Shape
+ Handle(TColStd_HSequenceOfTransient) aHSeq =
+ GetOperations()->GetSubShapeEdgeSorted(aShape, aStartPoint);
+
+ if (!GetOperations()->IsDone() || aHSeq.IsNull())
+ return aSeq._retn();
+
+ const Standard_Integer aLength = aHSeq->Length();
+ Standard_Integer i;
+
+ aSeq->length(aLength);
+
+ for (i = 1; i <= aLength; i++) {
+ aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+ }
+
+ return aSeq._retn();
+}
GEOM::GEOM_Object_ptr MakeSurfaceFromFace(GEOM::GEOM_Object_ptr theFace);
+ GEOM::ListOfGO* GetSubShapeEdgeSorted (GEOM::GEOM_Object_ptr theShape,
+ GEOM::GEOM_Object_ptr theStartPoint);
+
::GEOMImpl_IShapesOperations* GetOperations()
{ return (::GEOMImpl_IShapesOperations*)GetImpl(); }
};
return !_impl->GetValue().IsNull() && _impl->GetType() != GEOM_MARKER;
}
-bool GEOM_Object_i::IsSame(GEOM::GEOM_Object_ptr other)
+bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other)
{
- TopoDS_Shape thisShape = _impl->GetValue();
- TopoDS_Shape otherShape;
- if ( !CORBA::is_nil( other ) ) {
+ bool result = false;
+
+ GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other );
+ if ( !CORBA::is_nil( shapePtr ) ) {
Handle(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast
- ( GEOM_Engine::GetEngine()->GetObject( other->GetStudyID(), other->GetEntry(), false ));
- if ( !otherObject.IsNull() )
- otherShape = otherObject->GetValue();
+ ( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), shapePtr->GetEntry(), false ));
+ if ( !otherObject.IsNull() ) {
+ TopoDS_Shape thisShape = _impl->GetValue();
+ TopoDS_Shape otherShape = otherObject->GetValue();
+ result = !thisShape.IsNull() && !otherShape.IsNull() && thisShape.IsSame( otherShape );
+ }
}
- return thisShape.IsSame( otherShape );
+ return result;
}
virtual GEOM::GEOM_Object_ptr GetMainShape();
- virtual bool IsSame(GEOM::GEOM_Object_ptr other);
+ virtual bool IsSame(GEOM::GEOM_BaseObject_ptr other);
virtual bool IsShape();
beginService( " GEOM_Superv_i::CheckCompoundOfBlocks" );
MESSAGE("GEOM_Superv_i::CheckCompoundOfBlocks");
getBlocksOp();
- CORBA::Boolean aRes = myBlocksOp->CheckCompoundOfBlocks(theCompound, theErrors);
+ CORBA::Boolean aRes = myBlocksOp->CheckCompoundOfBlocks(theCompound, -1., theErrors);
endService( " GEOM_Superv_i::CheckCompoundOfBlocks" );
return aRes;
}
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
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
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
+ Copy = geompy.MakeCopy(Box) #(GEOM_Object)->GEOM_Object
#Transform objects
Translation = geompy.MakeTranslationTwoPoints(Box, px, pz) #(3 GEOM_Object)->GEOM_Object
Position = geompy.MakePosition(Box, cs1, cs2) #(3 GEOM_Object)->GEOM_Object
Position2 = geompy.PositionAlongPath(Box, Arc, 0.5, 1, 0) #(2 GEOM_Object, 1 Double, 2 Bool)->GEOM_Object
Offset = geompy.MakeOffset(Box, 10.) #(GEOM_Object, Double)->GEOM_Object
- Orientation = geompy.ChangeOrientation(Box)
ProjOnWire = geompy.MakeProjectionOnWire(p0, Wire)
+ Orientation = geompy.ChangeOrientation(Box)
ExtEdge = geompy.ExtendEdge(Edge1, -0.3, 1.3)
ExtFace = geompy.ExtendFace(Face5, -0.3, 1.3, -0.1, 1.1)
Surface = geompy.MakeSurfaceFromFace(Face5)
geompy.RestoreSubShapes(Partition, [Box])
geompy.RestoreSubShapes(Partition1)
+ # GetSubShapeEdgeSorted
+ p1 = geompy.GetFirstVertex(Sketcher)
+ p2 = geompy.GetFirstVertex(Sketcher3d_1)
+ p3 = geompy.GetFirstVertex(Sketcher3d_2)
+ geompy.GetSubShapeEdgeSorted(Sketcher, p1, "OrderedEdges")
+ geompy.GetSubShapeEdgeSorted(Sketcher3d_1, p2, "OrderedEdges")
+ geompy.GetSubShapeEdgeSorted(Sketcher3d_2, p3, "OrderedEdges")
+
+
print "DONE"
## # create and publish cylinder
## cyl = geompy.MakeCylinderRH(100, 100, "cylinder")
## # get non blocks from cylinder
-## g1, g2 = geompy.GetNonBlocks(cyl, "nonblock")
+## g1, g2 = geompy.GetNonBlocks(cyl, theName="nonblock")
## @endcode
##
## Above example will publish both result compounds (first with non-hexa solids and
## However, if second command is invoked as
##
## @code
-## g1, g2 = geompy.GetNonBlocks(cyl, ("nonhexa", "nonquad"))
+## g1, g2 = geompy.GetNonBlocks(cyl, theName=("nonhexa", "nonquad"))
## @endcode
##
## ... the first compound will be published with "nonhexa" name, and second will be named "nonquad".
self._autoPublish(ListObj, theName, "subshape")
return ListObj
+ ## Explode a shape into edges sorted in a row from a starting point.
+ # @param theShape the shape to be exploded on edges.
+ # @param theStartPoint the starting point.
+ # @param theName Object name; when specified, this parameter is used
+ # for result publication in the study. Otherwise, if automatic
+ # publication is switched on, default value is used for result name.
+ # @return List of GEOM.GEOM_Object that is actually an ordered list
+ # of edges sorted in a row from a starting point.
+ #
+ # @ref swig_GetSubShapeEdgeSorted "Example"
+ @ManageTransactions("ShapesOp")
+ def GetSubShapeEdgeSorted(self, theShape, theStartPoint, theName=None):
+ """
+ Explode a shape into edges sorted in a row from a starting point.
+
+ Parameters:
+ theShape the shape to be exploded on edges.
+ theStartPoint the starting point.
+ theName Object name; when specified, this parameter is used
+ for result publication in the study. Otherwise, if automatic
+ publication is switched on, default value is used for result name.
+
+ Returns:
+ List of GEOM.GEOM_Object that is actually an ordered list
+ of edges sorted in a row from a starting point.
+ """
+ # Example: see GEOM_TestAll.py
+ ListObj = self.ShapesOp.GetSubShapeEdgeSorted(theShape, theStartPoint)
+ RaiseIfFailed("GetSubShapeEdgeSorted", self.ShapesOp)
+ self._autoPublish(ListObj, theName, "SortedEdges")
+ return ListObj
+
## Check if the object is a sub-object of another GEOM object.
# @param aSubObject Checked sub-object (or its parent object, in case if
# \a theSubObjectIndex is non-zero).
## Check, if the compound of blocks is given.
# To be considered as a compound of blocks, the
# given shape must satisfy the following conditions:
- # - Each element of the compound should be a Block (6 faces and 12 edges).
+ # - Each element of the compound should be a Block (6 faces).
+ # - Each face should be a quadrangle, i.e. it should have only 1 wire
+ # with 4 edges. If <VAR>theIsUseC1</VAR> is set to True and
+ # there are more than 4 edges in the only wire of a face,
+ # this face is considered to be quadrangle if it has 4 bounds
+ # (1 or more edge) of C1 continuity.
# - A connection between two Blocks should be an entire quadrangle face or an entire edge.
# - The compound should be connexe.
# - The glue between two quadrangle faces should be applied.
# @param theCompound The compound to check.
+ # @param theIsUseC1 Flag to check if there are 4 bounds on a face
+ # taking into account C1 continuity.
+ # @param theAngTolerance the angular tolerance to check if two neighbor
+ # edges are codirectional in the common vertex with this
+ # tolerance. This parameter is used only if
+ # <VAR>theIsUseC1</VAR> is set to True.
# @return TRUE, if the given shape is a compound of blocks.
# If theCompound is not valid, prints all discovered errors.
#
# @ref tui_check_compound_of_blocks_page "Example 1"
# \n @ref swig_CheckCompoundOfBlocks "Example 2"
@ManageTransactions("BlocksOp")
- def CheckCompoundOfBlocks(self,theCompound):
+ def CheckCompoundOfBlocks(self,theCompound, theIsUseC1 = False,
+ theAngTolerance = 1.e-12):
"""
Check, if the compound of blocks is given.
To be considered as a compound of blocks, the
given shape must satisfy the following conditions:
- - Each element of the compound should be a Block (6 faces and 12 edges).
+ - Each element of the compound should be a Block (6 faces).
+ - Each face should be a quadrangle, i.e. it should have only 1 wire
+ with 4 edges. If theIsUseC1 is set to True and
+ there are more than 4 edges in the only wire of a face,
+ this face is considered to be quadrangle if it has 4 bounds
+ (1 or more edge) of C1 continuity.
- A connection between two Blocks should be an entire quadrangle face or an entire edge.
- The compound should be connexe.
- The glue between two quadrangle faces should be applied.
Parameters:
theCompound The compound to check.
+ theIsUseC1 Flag to check if there are 4 bounds on a face
+ taking into account C1 continuity.
+ theAngTolerance the angular tolerance to check if two neighbor
+ edges are codirectional in the common vertex with this
+ tolerance. This parameter is used only if
+ theIsUseC1 is set to True.
Returns:
TRUE, if the given shape is a compound of blocks.
If theCompound is not valid, prints all discovered errors.
"""
# Example: see GEOM_Spanner.py
- (IsValid, BCErrors) = self.BlocksOp.CheckCompoundOfBlocks(theCompound)
+ aTolerance = -1.0
+ if theIsUseC1:
+ aTolerance = theAngTolerance
+ (IsValid, BCErrors) = self.BlocksOp.CheckCompoundOfBlocks(theCompound, aTolerance)
RaiseIfFailed("CheckCompoundOfBlocks", self.BlocksOp)
if IsValid == 0:
Descr = self.BlocksOp.PrintBCErrors(theCompound, BCErrors)
## Retrieve all non blocks solids and faces from \a theShape.
# @param theShape The shape to explore.
+ # @param theIsUseC1 Flag to check if there are 4 bounds on a face
+ # taking into account C1 continuity.
+ # @param theAngTolerance the angular tolerance to check if two neighbor
+ # edges are codirectional in the common vertex with this
+ # tolerance. This parameter is used only if
+ # <VAR>theIsUseC1</VAR> is set to True.
# @param theName Object name; when specified, this parameter is used
# for result publication in the study. Otherwise, if automatic
# publication is switched on, default value is used for result name.
# @return 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 quadrangular faces.
+ # group of all non quadrangular faces (= faces with more then
+ # 1 wire or, if <VAR>theIsUseC1</VAR> is set to True, faces
+ # with 1 wire with not 4 edges that do not form 4 bounds of
+ # C1 continuity).
#
# @ref tui_get_non_blocks_page "Example 1"
# \n @ref swig_GetNonBlocks "Example 2"
@ManageTransactions("BlocksOp")
- def GetNonBlocks (self, theShape, theName=None):
+ def GetNonBlocks (self, theShape, theIsUseC1 = False,
+ theAngTolerance = 1.e-12, theName=None):
"""
Retrieve all non blocks solids and faces from theShape.
Parameters:
theShape The shape to explore.
+ theIsUseC1 Flag to check if there are 4 bounds on a face
+ taking into account C1 continuity.
+ theAngTolerance the angular tolerance to check if two neighbor
+ edges are codirectional in the common vertex with this
+ tolerance. This parameter is used only if
+ theIsUseC1 is set to True.
theName Object name; when specified, this parameter is used
for result publication in the study. Otherwise, if automatic
publication is switched on, default value is used for result name.
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 quadrangular faces.
+ group of all non quadrangular faces (= faces with more then
+ 1 wire or, if <VAR>theIsUseC1</VAR> is set to True, faces
+ with 1 wire with not 4 edges that do not form 4 bounds of
+ C1 continuity).
Usage:
(res_sols, res_faces) = geompy.GetNonBlocks(myShape1)
"""
# Example: see GEOM_Spanner.py
- aTuple = self.BlocksOp.GetNonBlocks(theShape)
+ aTolerance = -1.0
+ if theIsUseC1:
+ aTolerance = theAngTolerance
+ aTuple = self.BlocksOp.GetNonBlocks(theShape, aTolerance)
RaiseIfFailed("GetNonBlocks", self.BlocksOp)
self._autoPublish(aTuple, theName, ("groupNonHexas", "groupNonQuads"))
return aTuple
if self.closed:
self.myCommand = self.myCommand + ":WW"
+ from salome.geom.geomBuilder import ParseSketcherCommand, RaiseIfFailed
+ Command,Parameters = ParseSketcherCommand(self.myCommand)
+
import GEOM
- if isinstance(WorkingPlane, list): wire = self.geompyD.CurvesOp.MakeSketcher(self.myCommand, WorkingPlane)
- if isinstance(WorkingPlane, GEOM._objref_GEOM_Object): wire = self.geompyD.CurvesOp.MakeSketcherOnPlane(self.myCommand, WorkingPlane)
+ if isinstance(WorkingPlane, list): wire = self.geompyD.CurvesOp.MakeSketcher(Command, WorkingPlane)
+ if isinstance(WorkingPlane, GEOM._objref_GEOM_Object): wire = self.geompyD.CurvesOp.MakeSketcherOnPlane(Command, WorkingPlane)
self.myCommand = "Sketcher"
+ RaiseIfFailed("Sketcher", self.geompyD.CurvesOp)
+ wire.SetParameters(Parameters)
self.geompyD._autoPublish(wire, theName, "wire")
return wire
else:
raise RuntimeError, "Sketcher2D.close() : can't build face on unclosed wire"
+ from salome.geom.geomBuilder import ParseSketcherCommand, RaiseIfFailed
+ Command,Parameters = ParseSketcherCommand(self.myCommand)
+
import GEOM
- if isinstance(WorkingPlane, list): face = self.geompyD.CurvesOp.MakeSketcher(self.myCommand, WorkingPlane)
- if isinstance(WorkingPlane, GEOM._objref_GEOM_Object): face = self.geompyD.CurvesOp.MakeSketcherOnPlane(self.myCommand, WorkingPlane)
+ if isinstance(WorkingPlane, list): face = self.geompyD.CurvesOp.MakeSketcher(Command, WorkingPlane)
+ if isinstance(WorkingPlane, GEOM._objref_GEOM_Object): face = self.geompyD.CurvesOp.MakeSketcherOnPlane(Command, WorkingPlane)
self.myCommand = "Sketcher"
+ RaiseIfFailed("Sketcher", self.geompyD.CurvesOp)
+ face.SetParameters(Parameters)
self.geompyD._autoPublish(face, theName, "face")
return face
#include <SVTK_ViewModel.h>
#include <SALOME_Prs.h>
#include <SALOME_ListIO.hxx>
+#include "utilities.h"
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ja" sourcelanguage="en">
-<context>
+ <context>
<name>@default</name>
<message>
- <source>MEN_EXPORTIGES</source>
- <translation type="unfinished">IGES</translation>
+ <source>MEN_EXPORTIGES</source>
+ <translation>IGESエクスポート</translation>
</message>
<message>
- <source>TOP_EXPORTIGES</source>
- <translation type="unfinished">Export IGES</translation>
+ <source>TOP_EXPORTIGES</source>
+ <translation>IGESエクスポート</translation>
</message>
<message>
- <source>STB_EXPORTIGES</source>
- <translation type="unfinished">Export IGES</translation>
+ <source>STB_EXPORTIGES</source>
+ <translation>IGESエクスポート</translation>
</message>
<message>
- <source>MEN_IMPORTIGES</source>
- <translation type="unfinished">IGES</translation>
+ <source>MEN_IMPORTIGES</source>
+ <translation>IGESインポート</translation>
</message>
<message>
- <source>TOP_IMPORTIGES</source>
- <translation type="unfinished">Import IGES</translation>
+ <source>TOP_IMPORTIGES</source>
+ <translation>IGESインポート</translation>
</message>
<message>
- <source>STB_IMPORTIGES</source>
- <translation type="unfinished">Import IGES</translation>
+ <source>STB_IMPORTIGES</source>
+ <translation>IGESインポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>IGESPlugin_GUI</name>
<message>
- <source>IGES_FILES</source>
- <translation type="unfinished">IGES Files ( *.iges *.igs )</translation>
+ <source>IGES_FILES</source>
+ <translation>IGESファイル</translation>
</message>
<message>
- <source>EXPORT_TITLE</source>
- <translation type="unfinished">Export IGES</translation>
+ <source>EXPORT_TITLE</source>
+ <translation>IGESエクスポート</translation>
</message>
<message>
- <source>IMPORT_TITLE</source>
- <translation type="unfinished">Import IGES</translation>
+ <source>IMPORT_TITLE</source>
+ <translation>IGESインポート</translation>
</message>
<message>
- <source>SCALE_DIMENSIONS</source>
- <translation>インポートしたファイルの単位をミリメートルからメートルに変換しますか？いいえを選んだ場合、メートル単位として解釈します。</translation>
+ <source>SCALE_DIMENSIONS</source>
+ <translation>インポートしたファイルの単位をミリメートルからメートルに変換しますか？いいえを選んだ場合、メートル単位として解釈します。</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>IGESPlugin_ExportDlg</name>
<message>
- <source>IGES_VERSION</source>
- <translation type="unfinished">Version</translation>
+ <source>IGES_VERSION</source>
+ <translation>IGESバージョン</translation>
</message>
-</context>
+ </context>
</TS>
//
#include "MeasureGUI.h"
#include "MeasureGUI_CheckCompoundOfBlocksDlg.h"
-#include "MeasureGUI_Widgets.h"
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <GEOMBase.h>
#include <GEOMImpl_Types.hxx>
+#include <QListWidget>
+
#define TEXTEDIT_FONT_FAMILY "Courier"
#define TEXTEDIT_FONT_SIZE 11
// true to construct a modal dialog.
//=================================================================================
MeasureGUI_CheckCompoundOfBlocksDlg::MeasureGUI_CheckCompoundOfBlocksDlg( GeometryGUI* GUI, QWidget* parent )
- : GEOMBase_Skeleton( GUI, parent, false )
+ : GEOMBase_Skeleton(GUI, parent, false),
+ myObjectName (0),
+ mySelButton (0),
+ myUseC1Check (0),
+ myTolLbl (0),
+ mySpinTol (0),
+ myTextView (0),
+ myListBox1 (0),
+ myListBox2 (0)
{
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
QPixmap image0( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_CHECK_COMPOUND_OF_BLOCKS" ) ) );
mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
mainFrame()->RadioButton3->close();
- myGrp = new MeasureGUI_1Sel1TextView2ListBox( centralWidget() );
- myGrp->GroupBox1->setTitle( tr( "GEOM_CHECK_INFOS" ) );
- myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
-
- myGrp->TextView1->setReadOnly( true );
- QFont aFont( TEXTEDIT_FONT_FAMILY, TEXTEDIT_FONT_SIZE );
- aFont.setStyleHint( QFont::TypeWriter, QFont::PreferAntialias );
- myGrp->TextView1->setFont( aFont );
-
- myGrp->PushButton1->setIcon( image1 );
- myGrp->LineEdit1->setReadOnly( true );
-
- myGrp->TextLabel2->setText( tr( "GEOM_CHECK_BLOCKS_COMPOUND_ERRORS" ) );
- myGrp->TextLabel3->setText( tr( "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES" ) );
-
- myGrp->ListBox2->setSelectionMode( QAbstractItemView::ExtendedSelection );
+ QGroupBox *aGrpParams =
+ new QGroupBox(tr("GEOM_CHECK_INFOS"), centralWidget());
+ QGridLayout *aParamsLayout = new QGridLayout(aGrpParams);
+ QLabel *anObjLbl = new QLabel(tr("GEOM_OBJECT"), aGrpParams);
+ QLabel *anErrorsLbl =
+ new QLabel(tr("GEOM_CHECK_BLOCKS_COMPOUND_ERRORS"), aGrpParams);
+ QLabel *aNonBlocksLbl =
+ new QLabel(tr("GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES"), aGrpParams);
+
+ myObjectName = new QLineEdit(aGrpParams);
+ mySelButton = new QPushButton(aGrpParams);
+ myUseC1Check = new QCheckBox(tr("GEOM_USE_C1_CRITERION"), aGrpParams);
+ myTolLbl = new QLabel(tr("GEOM_ANGULAR_TOLERANCE"), aGrpParams);
+ mySpinTol = new SalomeApp_DoubleSpinBox(aGrpParams);
+ myTextView = new QTextBrowser(aGrpParams);
+ myListBox1 = new QListWidget(aGrpParams);
+ myListBox2 = new QListWidget(aGrpParams);
+
+ myObjectName->setReadOnly(true);
+ mySelButton->setIcon(image1);
+ mySelButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ myUseC1Check->setText(tr("GEOM_USE_C1_CRITERION"));
+ myUseC1Check->setChecked(true);
+ myTextView->setReadOnly(true);
+ myListBox2->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+ // Set text view font.
+ QFont aFont(TEXTEDIT_FONT_FAMILY, TEXTEDIT_FONT_SIZE);
+
+ aFont.setStyleHint(QFont::TypeWriter, QFont::PreferAntialias);
+ myTextView->setFont(aFont);
+
+ aParamsLayout->setMargin(9);
+ aParamsLayout->setSpacing(6);
+ aParamsLayout->addWidget(anObjLbl, 0, 0);
+ aParamsLayout->addWidget(mySelButton, 0, 1);
+ aParamsLayout->addWidget(myObjectName, 0, 2);
+ aParamsLayout->addWidget(myUseC1Check, 1, 0, 1, 3);
+ aParamsLayout->addWidget(myTolLbl, 2, 0);
+ aParamsLayout->addWidget(mySpinTol, 2, 1, 1, 2);
+ aParamsLayout->addWidget(myTextView, 3, 0, 1, 3);
+ aParamsLayout->addWidget(anErrorsLbl, 4, 0);
+ aParamsLayout->addWidget(myListBox1, 5, 0, 1, 2);
+ aParamsLayout->addWidget(aNonBlocksLbl, 4, 2);
+ aParamsLayout->addWidget(myListBox2, 5, 2);
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
- layout->addWidget( myGrp );
-
- connect( myGrp->ListBox1, SIGNAL( itemSelectionChanged() ), SLOT( onErrorsListSelectionChanged() ) );
- connect( myGrp->ListBox2, SIGNAL( itemSelectionChanged() ), SLOT( onSubShapesListSelectionChanged() ) );
+ layout->addWidget( aGrpParams );
/***************************************************************/
//=================================================================================
void MeasureGUI_CheckCompoundOfBlocksDlg::Init()
{
- myEditCurrentArgument = myGrp->LineEdit1;
+ /* init variables */
+ double SpecificStep = 0.0001;
+ double aDefaultTol = Precision::Angular();
+
+ initSpinBox(mySpinTol, aDefaultTol, MAX_NUMBER, SpecificStep, "ang_tol_precision");
+ mySpinTol->setValue(aDefaultTol);
+ myEditCurrentArgument = myObjectName;
// signals and slots connections
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
- connect( myGrp->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
- connect( myGrp->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect(myObjectName, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect(mySelButton, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+ connect(myListBox1, SIGNAL(itemSelectionChanged()), this, SLOT(onErrorsListSelectionChanged()));
+ connect(myListBox2, SIGNAL(itemSelectionChanged()), this, SLOT(onSubShapesListSelectionChanged()));
+ connect(myUseC1Check, SIGNAL(clicked()), this, SLOT(SetUseC1Tolerance()));
+ connect(mySpinTol, SIGNAL(valueChanged(double)), this, SLOT(processObject()));
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
this, SLOT( SelectionIntoArgument() ) );
aSelMgr->selectedObjects(aSelList);
if (aSelList.Extent() != 1) {
- myGrp->LineEdit1->setText( "" );
+ myObjectName->setText( "" );
processObject();
return;
}
GEOMBase::ConvertIOinGEOMObject( aSelList.First() );
if ( aSelectedObject->_is_nil() ) {
- myGrp->LineEdit1->setText( "" );
+ myObjectName->setText( "" );
processObject();
return;
}
myObj = aSelectedObject;
- myGrp->LineEdit1->setText( GEOMBase::GetName( myObj ) );
+ myObjectName->setText( GEOMBase::GetName( myObj ) );
processObject();
DISPLAY_PREVIEW_MACRO;
}
//=================================================================================
void MeasureGUI_CheckCompoundOfBlocksDlg::SetEditCurrentArgument()
{
- myGrp->LineEdit1->setFocus();
- myEditCurrentArgument = myGrp->LineEdit1;
+ myObjectName->setFocus();
+ myEditCurrentArgument = myObjectName;
SelectionIntoArgument();
}
+//=================================================================================
+// function : SetUseC1Tolerance()
+// purpose :
+//=================================================================================
+void MeasureGUI_CheckCompoundOfBlocksDlg::SetUseC1Tolerance()
+{
+ myTolLbl->setEnabled(myUseC1Check->isChecked());
+ mySpinTol->setEnabled(myUseC1Check->isChecked());
+ processObject();
+}
+
//=================================================================================
// function : LineEditReturnPressed()
// purpose :
void MeasureGUI_CheckCompoundOfBlocksDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
- if ( send == myGrp->LineEdit1 ) {
- myEditCurrentArgument = myGrp->LineEdit1;
+ if ( send == myObjectName ) {
+ myEditCurrentArgument = myObjectName;
GEOMBase_Skeleton::LineEditReturnPressed();
}
}
GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() );
try {
GEOM::GEOM_IBlocksOperations::BCErrors_var aErrs;
- theIsCompoundOfBlocks = anOper->CheckCompoundOfBlocks( myObj, aErrs );
+ double aC1Tol = -1.;
+
+ if (myUseC1Check->isChecked()) {
+ aC1Tol = mySpinTol->value();
+ }
+
+ theIsCompoundOfBlocks = anOper->CheckCompoundOfBlocks( myObj, aC1Tol, aErrs );
if (anOper->IsDone() && aErrs->length() > 0)
//if (anOper->IsDone() && !aErrs._is_nil())
theErrors = aErrs;
GEOM::GEOM_IBlocksOperations::BCErrors aErrs;
if ( !getBCErrors( isCompoundOfBlocks, aErrs ) ) {
aMsg += tr( "GEOM_CHECK_BLOCKS_COMPOUND_FAILED" );
- myGrp->TextView1->setText( aMsg );
- myGrp->ListBox1->clear();
- myGrp->ListBox2->clear();
+ myTextView->setText( aMsg );
+ myListBox1->clear();
+ myListBox2->clear();
erasePreview();
return;
}
buttonOk()->setEnabled( true );
buttonApply()->setEnabled( true );
}
- myGrp->TextView1->setText( aMsg );
+ myTextView->setText( aMsg );
QStringList aErrList;
QString aErrStr( "" );
aErrList.append( aErrStr );
}
- myGrp->ListBox1->clear();
- myGrp->ListBox2->clear();
- myGrp->ListBox1->addItems( aErrList );
+ myListBox1->clear();
+ myListBox2->clear();
+ myListBox1->addItems( aErrList );
}
//=================================================================================
void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged()
{
erasePreview();
- int aCurItem = myGrp->ListBox1->currentRow();
+ int aCurItem = myListBox1->currentRow();
if ( aCurItem < 0 )
return;
bool isCompoundOfBlocks;
GEOM::GEOM_IBlocksOperations::BCErrors aErrs;
if ( !getBCErrors( isCompoundOfBlocks, aErrs ) ) {
- myGrp->TextView1->setText( "" );
- myGrp->ListBox1->clear();
- myGrp->ListBox2->clear();
+ myTextView->setText( "" );
+ myListBox1->clear();
+ myListBox2->clear();
return;
}
- myGrp->ListBox2->clear();
+ myListBox2->clear();
if (aCurItem < aErrs.length()) {
GEOM::GEOM_IBlocksOperations::BCError aErr = aErrs[aCurItem];
aSubShapeList.append( QString( "%1_%2" ).arg( aType ).arg( aObjLst[i] ) );
}
}
- myGrp->ListBox2->addItems( aSubShapeList );
+ myListBox2->addItems( aSubShapeList );
}
}
void MeasureGUI_CheckCompoundOfBlocksDlg::onSubShapesListSelectionChanged()
{
erasePreview();
- int aErrCurItem = myGrp->ListBox1->currentRow();
+ int aErrCurItem = myListBox1->currentRow();
if ( aErrCurItem < 0 )
return;
QList<int> aIds;
- for ( int i = 0, n = myGrp->ListBox2->count(); i < n; i++ ) {
- if ( myGrp->ListBox2->item( i )->isSelected() )
+ for ( int i = 0, n = myListBox2->count(); i < n; i++ ) {
+ if ( myListBox2->item( i )->isSelected() )
aIds.append( i );
}
if ( aIds.count() < 1 )
bool isCompoundOfBlocks;
GEOM::GEOM_IBlocksOperations::BCErrors aErrs;
if ( !getBCErrors( isCompoundOfBlocks, aErrs ) ) {
- myGrp->TextView1->setText( "" );
- myGrp->ListBox1->clear();
- myGrp->ListBox2->clear();
+ myTextView->setText( "" );
+ myListBox1->clear();
+ myListBox2->clear();
return;
}
}
}
+//=================================================================================
+// function : onDisplayPreview
+// purpose :
+//=================================================================================
+void MeasureGUI_CheckCompoundOfBlocksDlg::onDisplayPreview()
+{
+ DISPLAY_PREVIEW_MACRO;
+}
+
//=================================================================================
// function : activateSelection
// purpose : activate selection of faces, shells, and solids
// function : isValid
// purpose :
//=================================================================================
-bool MeasureGUI_CheckCompoundOfBlocksDlg::isValid( QString& )
+bool MeasureGUI_CheckCompoundOfBlocksDlg::isValid( QString &msg)
{
- return !myObj->_is_nil();
+ return !myObj->_is_nil() && mySpinTol->isValid(msg, !IsPreview());
}
//=================================================================================
#include <GEOMBase_Skeleton.h>
-class MeasureGUI_1Sel1TextView2ListBox;
+class QCheckBox;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QTextBrowser;
+class SalomeApp_DoubleSpinBox;
//=================================================================================
// class : MeasureGUI_CheckCompoundOfBlocksDlg
protected:
// redefined from GEOMBase_Helper and GEOMBase_Skeleton
virtual GEOM::GEOM_IOperations_ptr createOperation();
- virtual bool isValid( QString& );
+ virtual bool isValid( QString &msg );
virtual bool execute( ObjectList& );
virtual void processObject();
void onErrorsListSelectionChanged();
void onSubShapesListSelectionChanged();
+ void SetUseC1Tolerance();
+ void onDisplayPreview();
private:
void Init();
private:
GEOM::GEOM_Object_var myObj;
- MeasureGUI_1Sel1TextView2ListBox* myGrp;
+ QLineEdit *myObjectName;
+ QPushButton *mySelButton;
+ QCheckBox *myUseC1Check;
+ QLabel *myTolLbl;
+ SalomeApp_DoubleSpinBox *mySpinTol;
+ QTextBrowser *myTextView;
+ QListWidget *myListBox1;
+ QListWidget *myListBox2;
};
#endif // MEASUREGUI_CHECKCOMPOUNDOFBLOCKSDLG_H
#include "MeasureGUI_GetNonBlocksDlg.h"
-#include <DlgRef.h>
#include <GEOMBase.h>
#include <GeometryGUI.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
+#include <SalomeApp_DoubleSpinBox.h>
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Tools.h>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QVBoxLayout>
+
//=================================================================================
// class : MeasureGUI_GetNonBlocksDlg()
// purpose : Constructs a MeasureGUI_GetNonBlocksDlg which is a child of 'parent',
// true to construct a modal dialog.
//=================================================================================
MeasureGUI_GetNonBlocksDlg::MeasureGUI_GetNonBlocksDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
- : GEOMBase_Skeleton(theGeometryGUI, parent, false)
+ : GEOMBase_Skeleton(theGeometryGUI, parent, false),
+ myObjectName (0),
+ mySelButton (0),
+ myUseC1Check (0),
+ myTolLbl (0),
+ mySpinTol (0)
{
QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_GETNONBLOCKS")));
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
mainFrame()->RadioButton2->close();
mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
mainFrame()->RadioButton3->close();
-
- myGrp = new DlgRef_1Sel (centralWidget());
- myGrp->GroupBox1->setTitle(tr("GEOM_GETNONBLOCKS"));
- myGrp->TextLabel1->setText(tr("GEOM_OBJECT"));
- myGrp->PushButton1->setIcon(image1);
- myGrp->LineEdit1->setReadOnly(true);
+
+ QGroupBox *aGrpParams =
+ new QGroupBox(tr("GEOM_GETNONBLOCKS"), centralWidget());
+ QGridLayout *aParamsLayout = new QGridLayout(aGrpParams);
+ QLabel *anObjLbl = new QLabel(tr("GEOM_OBJECT"), aGrpParams);
+
+ myObjectName = new QLineEdit(aGrpParams);
+ mySelButton = new QPushButton(aGrpParams);
+ myUseC1Check = new QCheckBox(tr("GEOM_USE_C1_CRITERION"), aGrpParams);
+ myTolLbl = new QLabel(tr("GEOM_ANGULAR_TOLERANCE"), aGrpParams);
+ mySpinTol = new SalomeApp_DoubleSpinBox(aGrpParams);
+
+ myObjectName->setReadOnly(true);
+ mySelButton->setIcon(image1);
+ mySelButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ myUseC1Check->setText(tr("GEOM_USE_C1_CRITERION"));
+ myUseC1Check->setChecked(true);
+
+ aParamsLayout->setMargin(9);
+ aParamsLayout->setSpacing(6);
+ aParamsLayout->addWidget(anObjLbl, 0, 0);
+ aParamsLayout->addWidget(mySelButton, 0, 1);
+ aParamsLayout->addWidget(myObjectName, 0, 2);
+ aParamsLayout->addWidget(myUseC1Check, 1, 0, 1, 3);
+ aParamsLayout->addWidget(myTolLbl, 2, 0);
+ aParamsLayout->addWidget(mySpinTol, 2, 1, 1, 2);
QVBoxLayout* layout = new QVBoxLayout(centralWidget());
layout->setMargin(0); layout->setSpacing(6);
- layout->addWidget(myGrp);
+ layout->addWidget(aGrpParams);
/***************************************************************/
showOnlyPreviewControl();
/* init variables */
- myEditCurrentArgument = myGrp->LineEdit1;
+ double SpecificStep = 0.0001;
+ double aDefaultTol = Precision::Angular();
- /* signals and slots connections */
- connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+ initSpinBox(mySpinTol, aDefaultTol, MAX_NUMBER, SpecificStep, "ang_tol_precision");
+ mySpinTol->setValue(aDefaultTol);
+ myEditCurrentArgument = myObjectName;
- connect(myGrp->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(myGrp->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+ /* signals and slots connections */
+ connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+ connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+ connect(myUseC1Check, SIGNAL(clicked()), this, SLOT(SetUseC1Tolerance()));
+ connect(mySpinTol, SIGNAL(valueChanged(double)), this, SLOT(processPreview()));
+ connect(myObjectName, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect(mySelButton, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
//=================================================================================
void MeasureGUI_GetNonBlocksDlg::SetEditCurrentArgument()
{
- myGrp->LineEdit1->setFocus();
- myEditCurrentArgument = myGrp->LineEdit1;
+ myObjectName->setFocus();
+ myEditCurrentArgument = myObjectName;
SelectionIntoArgument();
}
+//=================================================================================
+// function : SetUseC1Tolerance()
+// purpose :
+//=================================================================================
+void MeasureGUI_GetNonBlocksDlg::SetUseC1Tolerance()
+{
+ myTolLbl->setEnabled(myUseC1Check->isChecked());
+ mySpinTol->setEnabled(myUseC1Check->isChecked());
+ processPreview();
+}
+
//=================================================================================
// function : LineEditReturnPressed()
// purpose :
void MeasureGUI_GetNonBlocksDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
- if (send == myGrp->LineEdit1) {
- myEditCurrentArgument = myGrp->LineEdit1;
+ if (send == myObjectName) {
+ myEditCurrentArgument = myObjectName;
GEOMBase_Skeleton::LineEditReturnPressed();
}
}
void MeasureGUI_GetNonBlocksDlg::processObject()
{
if (myObj->_is_nil()) {
+ myObjectName->setText("");
erasePreview();
}
else {
- myGrp->LineEdit1->setText(GEOMBase::GetName(myObj));
+ myObjectName->setText(GEOMBase::GetName(myObj));
processPreview();
}
// function : isValid
// purpose :
//=================================================================================
-bool MeasureGUI_GetNonBlocksDlg::isValid (QString&)
+bool MeasureGUI_GetNonBlocksDlg::isValid (QString &msg)
{
- return !myObj->_is_nil();
+ return !myObj->_is_nil() && mySpinTol->isValid(msg, !IsPreview());
}
//=================================================================================
{
GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation());
GEOM::GEOM_Object_var aNonQuads;
- GEOM::GEOM_Object_var anObj = anOper->GetNonBlocks(myObj, aNonQuads);
+ double aC1Tol = -1.;
+
+ if (myUseC1Check->isChecked()) {
+ aC1Tol = mySpinTol->value();
+ }
+
+ GEOM::GEOM_Object_var anObj = anOper->GetNonBlocks(myObj, aC1Tol, aNonQuads);
//mainFrame()->ResultName->setText(tr("GEOM_NONBLOCKS"));
if (!anObj->_is_nil())
#include <GEOMBase_Skeleton.h>
-class DlgRef_1Sel;
+class QCheckBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class SalomeApp_DoubleSpinBox;
//=================================================================================
// class : MeasureGUI_GetNonBlocksDlg
protected:
// redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation();
- virtual bool isValid (QString&);
+ virtual bool isValid (QString &msg);
virtual bool execute (ObjectList&);
virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr);
void LineEditReturnPressed();
void SelectionIntoArgument();
void SetEditCurrentArgument();
+ void SetUseC1Tolerance();
private:
void Init();
private:
GEOM::GEOM_Object_var myObj;
- DlgRef_1Sel* myGrp;
+ QLineEdit *myObjectName;
+ QPushButton *mySelButton;
+ QCheckBox *myUseC1Check;
+ QLabel *myTolLbl;
+ SalomeApp_DoubleSpinBox *mySpinTol;
};
#endif // MEASUREGUI_GETNONBLOCKSDLG_H
#include <TopoDS.hxx>
#include <TopTools_ListOfShape.hxx>
+
+#include <TopExp.hxx>
+#include <vtkAppendPolyData.h>
+#include <vtkPolyData.h>
+#include <BRepBuilderAPI_Copy.hxx>
+
#define MAX2(X, Y) (Abs(X) > Abs(Y) ? Abs(X) : Abs(Y))
#define MAX3(X, Y, Z) (MAX2(MAX2(X,Y), Z))
}
}
}
+
+ vtkPolyData* GetData(const TopoDS_Shape& theShape, float theDeflection) {
+ BRepBuilderAPI_Copy aCopy(theShape);
+ if(!aCopy.IsDone()) {
+ return 0;
+ }
+
+ TopoDS_Shape aShape = aCopy.Shape();
+
+ try {
+ GEOM_VertexSource* myVertexSource = GEOM_VertexSource::New();
+ GEOM_EdgeSource* myIsolatedEdgeSource = GEOM_EdgeSource::New();
+ GEOM_EdgeSource* myOneFaceEdgeSource = GEOM_EdgeSource::New();
+ GEOM_EdgeSource* mySharedEdgeSource = GEOM_EdgeSource::New();
+ GEOM_WireframeFace* myWireframeFaceSource = GEOM_WireframeFace::New();
+ GEOM_ShadingFace* myShadingFaceSource = GEOM_ShadingFace::New();
+
+ vtkAppendPolyData* myAppendFilter = vtkAppendPolyData::New();
+ myAppendFilter->AddInputConnection( myVertexSource->GetOutputPort() );
+ myAppendFilter->AddInputConnection( myIsolatedEdgeSource->GetOutputPort() );
+ myAppendFilter->AddInputConnection( myOneFaceEdgeSource->GetOutputPort() );
+ myAppendFilter->AddInputConnection( mySharedEdgeSource->GetOutputPort() );
+ myAppendFilter->AddInputConnection( myShadingFaceSource->GetOutputPort() );
+
+ bool anIsVector = false;
+
+ GEOM::MeshShape( aShape, theDeflection );
+ TopExp_Explorer aVertexExp( aShape, TopAbs_VERTEX );
+ for( ; aVertexExp.More(); aVertexExp.Next() ) {
+ const TopoDS_Vertex& aVertex = TopoDS::Vertex( aVertexExp.Current() );
+ myVertexSource->AddVertex( aVertex );
+ }
+
+ TopTools_IndexedDataMapOfShapeListOfShape anEdgeMap;
+ TopExp::MapShapesAndAncestors( aShape, TopAbs_EDGE, TopAbs_FACE, anEdgeMap );
+
+ GEOM::SetShape( aShape,
+ anEdgeMap,
+ anIsVector,
+ 0,
+ myIsolatedEdgeSource,
+ myOneFaceEdgeSource,
+ mySharedEdgeSource,
+ myWireframeFaceSource,
+ myShadingFaceSource );
+
+ myAppendFilter->Update();
+
+ myVertexSource->Delete();
+ myIsolatedEdgeSource->Delete();
+ myOneFaceEdgeSource->Delete();
+ mySharedEdgeSource->Delete();
+ myWireframeFaceSource->Delete();
+ myShadingFaceSource->Delete();
+
+ vtkPolyData* ret = vtkPolyData::New();
+ ret->ShallowCopy(myAppendFilter->GetOutput());
+ myAppendFilter->Delete();
+ return ret;
+ }
+ catch(Standard_Failure) {
+ return 0;
+ }
+ }
}
class GEOM_EdgeSource;
class GEOM_WireframeFace;
class GEOM_ShadingFace;
-
+class vtkPolyData;
namespace GEOM
{
// moved from GEOM_AssemblyBuilder
GEOM_EdgeSource* theSharedEdgeSource,
GEOM_WireframeFace* theWireframeFaceSource,
GEOM_ShadingFace* theShadingFaceSource);
+
+ OCC2VTK_EXPORT vtkPolyData* GetData(const TopoDS_Shape& theShape, float theDeflection);
}
#endif // OCC2VTK_TOOLS_H
aFace = anIndices.FindKey( aFaceLst[i] );
try {
getDisplayer()->SetColor( Quantity_NOC_RED );
- getDisplayer()->SetToActivate( false );
getDisplayer()->SetTransparency( transparency );
+ getDisplayer()->SetWidth( 2 );
+ getDisplayer()->SetNbIsos( 1 );
+ getDisplayer()->SetIsosWidth( 1 );
+ getDisplayer()->SetIsosColor( Quantity_NOC_RED );
+ getDisplayer()->SetDisplayMode( 0 );
+ getDisplayer()->SetToActivate( false );
aPrs = !aFace.IsNull() ? getDisplayer()->BuildPrs( aFace ) : 0;
if ( aPrs )
displayPreview( aPrs, true );
#include <GeometryGUI.h>
#include <GEOMBase.h>
#include <SalomeApp_DoubleSpinBox.h>
+#include "utilities.h"
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
bool aLocked = aStudy->GetProperties()->IsLocked();
if (aLocked) {
- MESSAGE("GEOMBase_Helper::onAccept - ActiveStudy is locked");
SUIT_MessageBox::warning(this, tr("WRN_WARNING"), tr("WRN_STUDY_LOCKED"), tr("BUT_OK"));
return false;
}
#include <SALOME_ListIO.hxx>
#include <Basics_Utils.hxx>
+#include "utilities.h"
#include <TCollection_AsciiString.hxx>
#include <TColStd_MapOfInteger.hxx>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ja" sourcelanguage="en">
-<context>
+ <context>
<name>@default</name>
<message>
- <source>MEN_EXPORTSTEP</source>
- <translation type="unfinished">STEP</translation>
+ <source>MEN_EXPORTSTEP</source>
+ <translation>STEPエクスポート</translation>
</message>
<message>
- <source>TOP_EXPORTSTEP</source>
- <translation type="unfinished">Export STEP</translation>
+ <source>TOP_EXPORTSTEP</source>
+ <translation>STEPエクスポート</translation>
</message>
<message>
- <source>STB_EXPORTSTEP</source>
- <translation type="unfinished">Export STEP</translation>
+ <source>STB_EXPORTSTEP</source>
+ <translation>STEPエクスポート</translation>
</message>
<message>
- <source>MEN_IMPORTSTEP</source>
- <translation type="unfinished">STEP</translation>
+ <source>MEN_IMPORTSTEP</source>
+ <translation>STEPインポート</translation>
</message>
<message>
- <source>TOP_IMPORTSTEP</source>
- <translation type="unfinished">Import STEP</translation>
+ <source>TOP_IMPORTSTEP</source>
+ <translation>STEPインポート</translation>
</message>
<message>
- <source>STB_IMPORTSTEP</source>
- <translation type="unfinished">Import STEP</translation>
+ <source>STB_IMPORTSTEP</source>
+ <translation>STEPインポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>STEPPlugin_GUI</name>
<message>
- <source>STEP_FILES</source>
- <translation type="unfinished">STEP Files ( *.step *.stp )</translation>
+ <source>STEP_FILES</source>
+ <translation>STEPファイル</translation>
</message>
<message>
- <source>EXPORT_TITLE</source>
- <translation type="unfinished">Export STEP</translation>
+ <source>EXPORT_TITLE</source>
+ <translation>STEPエクスポート</translation>
</message>
<message>
- <source>IMPORT_TITLE</source>
- <translation type="unfinished">Import STEP</translation>
+ <source>IMPORT_TITLE</source>
+ <translation>STEPインポート</translation>
</message>
<message>
- <source>SCALE_DIMENSIONS</source>
- <translation>インポートしたファイルの単位をミリメートルからメートルに変換しますか？いいえを選んだ場合、メートル単位として解釈します。</translation>
+ <source>SCALE_DIMENSIONS</source>
+ <translation>インポートしたファイルの単位をミリメートルからメートルに変換しますか？いいえを選んだ場合、メートル単位として解釈します。</translation>
</message>
-</context>
+ </context>
</TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="fr_US">
+<TS version="2.0" language="fr_FR">
<context>
<name>@default</name>
<message>
<name>STLPlugin_ExportDlg</name>
<message>
<source>ASCII</source>
- <translation type="unfinished">Save as ASCII</translation>
+ <translation>Sauver au format ASCII</translation>
</message>
<message>
<source>RELATIVE</source>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ja" sourcelanguage="en">
-<context>
+ <context>
<name>@default</name>
<message>
- <source>MEN_EXPORTSTL</source>
- <translation type="unfinished">STL</translation>
+ <source>MEN_EXPORTSTL</source>
+ <translation>STLエクスポート</translation>
</message>
<message>
- <source>TOP_EXPORTSTL</source>
- <translation type="unfinished">Export STL</translation>
+ <source>TOP_EXPORTSTL</source>
+ <translation>STLエクスポート</translation>
</message>
<message>
- <source>STB_EXPORTSTL</source>
- <translation type="unfinished">Export STL</translation>
+ <source>STB_EXPORTSTL</source>
+ <translation>STLエクスポート</translation>
</message>
<message>
- <source>MEN_IMPORTSTL</source>
- <translation type="unfinished">STL</translation>
+ <source>MEN_IMPORTSTL</source>
+ <translation>STLインポート</translation>
</message>
<message>
- <source>TOP_IMPORTSTL</source>
- <translation type="unfinished">Import STL</translation>
+ <source>TOP_IMPORTSTL</source>
+ <translation>STLインポート</translation>
</message>
<message>
- <source>STB_IMPORTSTL</source>
- <translation type="unfinished">Import STL</translation>
+ <source>STB_IMPORTSTL</source>
+ <translation>STLインポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>STLPlugin_GUI</name>
<message>
- <source>STL_FILES</source>
- <translation type="unfinished">STL files( *.stl )</translation>
+ <source>STL_FILES</source>
+ <translation>STLファイル</translation>
</message>
<message>
- <source>EXPORT_TITLE</source>
- <translation type="unfinished">Export STL</translation>
+ <source>EXPORT_TITLE</source>
+ <translation>STLエクスポート</translation>
</message>
<message>
- <source>IMPORT_TITLE</source>
- <translation type="unfinished">Import STL</translation>
+ <source>IMPORT_TITLE</source>
+ <translation>STLインポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>STLPlugin_ExportDlg</name>
<message>
- <source>ASCII</source>
- <translation type="unfinished">Save as ASCII</translation>
+ <source>ASCII</source>
+ <translation>アスキーテキスト</translation>
</message>
<message>
- <source>RELATIVE</source>
- <translation type="unfinished">Relative</translation>
+ <source>RELATIVE</source>
+ <translation type="unfinished">Relative</translation>
</message>
<message>
- <source>DEFLECTION</source>
- <translation type="unfinished">Deflection</translation>
+ <source>DEFLECTION</source>
+ <translation type="unfinished">Deflection</translation>
</message>
-</context>
+ </context>
</TS>
MESSAGE( "Export VTK into file " << aFileName );
try
{
- GEOM_VertexSource* myVertexSource = GEOM_VertexSource::New();
- GEOM_EdgeSource* myIsolatedEdgeSource = GEOM_EdgeSource::New();
- GEOM_EdgeSource* myOneFaceEdgeSource = GEOM_EdgeSource::New();
- GEOM_EdgeSource* mySharedEdgeSource = GEOM_EdgeSource::New();
- GEOM_WireframeFace* myWireframeFaceSource = GEOM_WireframeFace::New();
- GEOM_ShadingFace* myShadingFaceSource = GEOM_ShadingFace::New();
-
- vtkAppendPolyData* myAppendFilter = vtkAppendPolyData::New();
- myAppendFilter->AddInputConnection( myVertexSource->GetOutputPort() );
- myAppendFilter->AddInputConnection( myIsolatedEdgeSource->GetOutputPort() );
- myAppendFilter->AddInputConnection( myOneFaceEdgeSource->GetOutputPort() );
- myAppendFilter->AddInputConnection( mySharedEdgeSource->GetOutputPort() );
- //myAppendFilter->AddInputConnection( myWireframeFaceSource->GetOutputPort() ); // iso-lines are unnecessary
- myAppendFilter->AddInputConnection( myShadingFaceSource->GetOutputPort() );
-
- bool anIsVector = false;
-
- // Is shape triangulated?
- bool wasMeshed = true;
- TopExp_Explorer ex;
- TopLoc_Location aLoc;
- for (ex.Init(aShape, TopAbs_FACE); ex.More(); ex.Next()) {
- const TopoDS_Face& aFace = TopoDS::Face(ex.Current());
- Handle(Poly_Triangulation) aPoly = BRep_Tool::Triangulation(aFace,aLoc);
- if(aPoly.IsNull()) {
- wasMeshed = false;
- break;
- }
- }
-
- GEOM::MeshShape( aShape, aDeflection );
-
- TopExp_Explorer aVertexExp( aShape, TopAbs_VERTEX );
- for( ; aVertexExp.More(); aVertexExp.Next() )
- {
- const TopoDS_Vertex& aVertex = TopoDS::Vertex( aVertexExp.Current() );
- myVertexSource->AddVertex( aVertex );
- }
-
- TopTools_IndexedDataMapOfShapeListOfShape anEdgeMap;
- TopExp::MapShapesAndAncestors( aShape, TopAbs_EDGE, TopAbs_FACE, anEdgeMap );
-
- GEOM::SetShape( aShape,
- anEdgeMap,
- anIsVector,
- 0,
- myIsolatedEdgeSource,
- myOneFaceEdgeSource,
- mySharedEdgeSource,
- myWireframeFaceSource,
- myShadingFaceSource );
-
- myAppendFilter->Update();
-
// Set "C" numeric locale to save numbers correctly
Kernel_Utils::Localizer loc;
- vtkPolyDataWriter* aWriter = vtkPolyDataWriter::New();
- aWriter->SetInputConnection( myAppendFilter->GetOutputPort() );
+ vtkPolyData* pd = GEOM::GetData( aShape, aDeflection );
+ vtkPolyDataWriter* aWriter = vtkPolyDataWriter::New();
+ aWriter->SetInputData( pd );
aWriter->SetFileName( aFileName.ToCString() );
aWriter->Write();
aWriter->Delete();
-
- myVertexSource->Delete();
- myIsolatedEdgeSource->Delete();
- myOneFaceEdgeSource->Delete();
- mySharedEdgeSource->Delete();
- myWireframeFaceSource->Delete();
- myShadingFaceSource->Delete();
-
- myAppendFilter->Delete();
-
- if(!wasMeshed)
- BRepTools::Clean(aShape);
+ pd->Delete(); //instanciated by the GEOM::GetData(...) method
return 1;
}
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ja" sourcelanguage="en">
-<context>
+ <context>
<name>@default</name>
<message>
- <source>MEN_EXPORTVTK</source>
- <translation type="unfinished">VTK</translation>
+ <source>MEN_EXPORTVTK</source>
+ <translation>VTKエクスポート</translation>
</message>
<message>
- <source>TOP_EXPORTVTK</source>
- <translation type="unfinished">Export VTK</translation>
+ <source>TOP_EXPORTVTK</source>
+ <translation>VTKエクスポート</translation>
</message>
<message>
- <source>STB_EXPORTVTK</source>
- <translation type="unfinished">Export VTK</translation>
+ <source>STB_EXPORTVTK</source>
+ <translation>VTKエクスポート</translation>
</message>
<message>
- <source>MEN_IMPORTVTK</source>
- <translation type="unfinished">VTK</translation>
+ <source>MEN_IMPORTVTK</source>
+ <translation>VTKインポート</translation>
</message>
<message>
- <source>TOP_IMPORTVTK</source>
- <translation type="unfinished">Import VTK</translation>
+ <source>TOP_IMPORTVTK</source>
+ <translation>VTKインポート</translation>
</message>
<message>
- <source>STB_IMPORTVTK</source>
- <translation type="unfinished">Import VTK</translation>
+ <source>STB_IMPORTVTK</source>
+ <translation>VTKインポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>VTKPlugin_GUI</name>
<message>
- <source>VTK_FILES</source>
- <translation type="unfinished">VTK files( *.vtk )</translation>
+ <source>VTK_FILES</source>
+ <translation>VTKファイル</translation>
</message>
<message>
- <source>EXPORT_TITLE</source>
- <translation type="unfinished">Export VTK</translation>
+ <source>EXPORT_TITLE</source>
+ <translation>VTKエクスポート</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>VTKPlugin_ExportDlg</name>
<message>
- <source>DEFLECTION</source>
- <translation type="unfinished">Deflection</translation>
+ <source>DEFLECTION</source>
+ <translation type="unfinished">Deflection</translation>
</message>
-</context>
+ </context>
</TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ja" sourcelanguage="en">
-<context>
+ <context>
<name>@default</name>
<message>
<source>MEN_EXPORTXAO</source>
<translation>エクスポートしました。</translation>
</message>
<message>
- <source>TOP_EXPORTXAO</source>
- <translation>エクスポートしました。</translation>
+ <source>TOP_EXPORTXAO</source>
+ <translation>エクスポートしました。</translation>
</message>
<message>
<source>STB_EXPORTXAO</source>
<source>XAOPLUGIN_FILES</source>
<translation>ファイルした (*.xao)</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>XAOPlugin_ExportDlg</name>
<message>
<source>XAOPLUGIN_EXPORT_TITLE</source>
<source>XAOPLUGIN_EXPORT_LFIELDS</source>
<translation>フィールド</translation>
</message>
-</context>
-<context>
+ </context>
+ <context>
<name>XAOPlugin_ImportDlg</name>
<message>
<source>XAOPLUGIN_IMPORT_TITLE</source>
<source>XAOPLUGIN_STEP</source>
<translation>Step</translation>
</message>
-</context>
-</TS>
\ No newline at end of file
+ </context>
+</TS>
