From 1c97ae08b2a06f98e1aad293b86819574c150264 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 13 Dec 2011 13:40:23 +0000 Subject: [PATCH] 0021209: Bug GetInPlace with faces. Integrate self-intersections checker. --- doc/salome/gui/GEOM/images/measures11.png | Bin 0 -> 20884 bytes .../gui/GEOM/input/tui_measurement_tools.doc | 14 + .../GEOM/input/using_measurement_tools.doc | 420 +++++++++--------- idl/GEOM_Gen.idl | 9 + resources/Makefile.am | 4 +- resources/check_self_intersections.png | Bin 0 -> 575 bytes src/GEOMGUI/GEOM_images.ts | 8 + src/GEOMGUI/GEOM_msg_en.ts | 28 ++ src/GEOMGUI/GeometryGUI.cxx | 16 +- src/GEOMGUI/GeometryGUI_Operations.h | 1 + src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 91 ++++ src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx | 4 +- src/GEOMImpl/Makefile.am | 1 + src/GEOM_I/GEOM_IMeasureOperations_i.cc | 40 +- src/GEOM_I/GEOM_IMeasureOperations_i.hh | 4 +- src/GEOM_SWIG/GEOM_TestMeasures.py | 9 +- src/GEOM_SWIG/geompyDC.py | 11 + src/MeasureGUI/Makefile.am | 8 +- src/MeasureGUI/MeasureGUI.cxx | 7 +- .../MeasureGUI_1Sel1TextView2ListBox_QTD.ui | 9 +- .../MeasureGUI_CheckSelfIntersectionsDlg.cxx | 249 +++++++++++ .../MeasureGUI_CheckSelfIntersectionsDlg.h | 62 +++ src/NMTDS/NMTDS_Tools.cxx | 49 +- 23 files changed, 804 insertions(+), 240 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/measures11.png create mode 100644 resources/check_self_intersections.png create mode 100644 src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx create mode 100644 src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h diff --git a/doc/salome/gui/GEOM/images/measures11.png b/doc/salome/gui/GEOM/images/measures11.png new file mode 100644 index 0000000000000000000000000000000000000000..85af6f187502f209f551313aaf1f40888065dd65 GIT binary patch literal 20884 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/tui_measurement_tools.doc b/doc/salome/gui/GEOM/input/tui_measurement_tools.doc index f8dbcd38c..c36edc455 100644 --- a/doc/salome/gui/GEOM/input/tui_measurement_tools.doc +++ b/doc/salome/gui/GEOM/input/tui_measurement_tools.doc @@ -385,6 +385,20 @@ else: print "\nBox is valid" \endcode +

Detect Self-intersections

+ +\code +import geompy + +# create a box +box = geompy.MakeBoxDXDYDZ(100,30,100) +IsValid = geompy.CheckSelfIntersections(box) +if IsValid == 0: + raise RuntimeError, "Box with self-intersections created" +else: + print "\nBox is valid" +\endcode +

Check Compound of Blocks

\code diff --git a/doc/salome/gui/GEOM/input/using_measurement_tools.doc b/doc/salome/gui/GEOM/input/using_measurement_tools.doc index 13765941c..489c22862 100644 --- a/doc/salome/gui/GEOM/input/using_measurement_tools.doc +++ b/doc/salome/gui/GEOM/input/using_measurement_tools.doc @@ -1,59 +1,60 @@ -/*! - -\page using_measurement_tools_page Using measurement tools - -\n Measurement tools in GEOM are necessary for getting different data -concerning created or imported geometrical objects. They are: - -
    -
  • \ref point_coord_anchor "Point coordinates"
    • -
  • \ref basic_prop_anchor "Basic properties"
    • +/*! + +\page using_measurement_tools_page Using measurement tools + +\n Measurement tools in GEOM are necessary for getting different data +concerning created or imported geometrical objects. They are: + +
      +
    • \ref point_coord_anchor "Point coordinates"
      • +
    • \ref basic_prop_anchor "Basic properties"
    • \ref center_mass_anchor "Center of mass"
    • \ref vertex_by_index "Get Vertex By Index"
      • -
    • \ref inertia_anchor "Inertia"
      • -
    • \ref normale_anchor "Normal to a Face"
      • -
    • \ref boundaries_anchor "Check Free Boundaries"
      • -
    • \ref faces_anchor "Check Faces"
      • -
    • \ref bounding_box_anchor "Bounding box"
      • -
    • \ref min_distance_anchor "Min. distance"
      • -
    • \ref angle_anchor "Angle"
      • -
    • \ref tolerance_anchor "Tolerance"
      • -
    • \ref whatis_anchor "WhatIs"
      • -
    • \ref check_anchor "Check"
      • -
    • \ref check_compound_anchor "Check compound of blocks"
      • -
    - -\n Our TUI Scripts show how to use -\ref tui_measurement_tools_page "Measurement Tools" with TUI -commands. - -\n To use measurement tools: -\par -In the Main menu select \b Measures submenu. - -\anchor point_coord_anchor -

    Point coordinates

    - -\n Returns the coordinates of a point. - -\n Result: Point coordinates (X, Y, Z) in 3D space in the form of Python Tuple. -\n TUI Command: geompy.PointCoordinates(Point), -where \em Point is a point whose coordinates are inquired. - -\image html measures1.png - -\anchor basic_prop_anchor -

    Basic properties

    - -\n Returns the properties (Length, Surface & Volume) for the selected -geometrical object. - -\n Result: Display Length, Surface & Volume in the form of -Python Tuple. -\n TUI Command: geompy.BasicProperties(Shape), where -\em Shape is a shape whose properties are inquired. - -\image html neo-basicprop.png +
  • \ref inertia_anchor "Inertia"
    • +
  • \ref normale_anchor "Normal to a Face"
    • +
  • \ref boundaries_anchor "Check Free Boundaries"
    • +
  • \ref faces_anchor "Check Faces"
    • +
  • \ref bounding_box_anchor "Bounding box"
    • +
  • \ref min_distance_anchor "Min. distance"
    • +
  • \ref angle_anchor "Angle"
    • +
  • \ref tolerance_anchor "Tolerance"
    • +
  • \ref whatis_anchor "WhatIs"
    • +
  • \ref check_anchor "Check"
    • +
  • \ref check_compound_anchor "Check compound of blocks"
    • +
  • \ref check_self_intersections_anchor "Detect Self-intersections"
    • +
+ +\n Our TUI Scripts show how to use +\ref tui_measurement_tools_page "Measurement Tools" with TUI +commands. + +\n To use measurement tools: +\par +In the Main menu select \b Measures submenu. + +\anchor point_coord_anchor +

Point coordinates

+ +\n Returns the coordinates of a point. + +\n Result: Point coordinates (X, Y, Z) in 3D space in the form of Python Tuple. +\n TUI Command: geompy.PointCoordinates(Point), +where \em Point is a point whose coordinates are inquired. + +\image html measures1.png + +\anchor basic_prop_anchor +

Basic properties

+ +\n Returns the properties (Length, Surface & Volume) for the selected +geometrical object. + +\n Result: Display Length, Surface & Volume in the form of +Python Tuple. +\n TUI Command: geompy.BasicProperties(Shape), where +\em Shape is a shape whose properties are inquired. + +\image html neo-basicprop.png \anchor center_mass_anchor

Center of mass

@@ -99,44 +100,44 @@ returned. \anchor normale_anchor

Normal to a Face

-\n Calculates the normal vector to the selected \b Face. The \b Point -is a point of the \b Face, where the Normal should be calculated. - -\image html normaletoface.png - -\anchor boundaries_anchor -

Check Free Boundaries

- -\n Detects and highlights wires and edges that are not shared between -two faces and are considered a shape's boundary. - -\n TUI Command: (NoError, ClosedWires, OpenWires) = -geompy.GetFreeBoundary(Shape), where \em Shape is a shape to be -checked, \em NoError is false if an error occurred while checking free -boundaries, \em ClosedWires is a list of closed free boundary wires, -\em OpenWires is a list of open free boundary wires. - -\image html repair9.png - -\anchor faces_anchor -

Check Free Faces

- -\n Highlights all free faces of a given shape. A free -face is a face which is not shared between two objects of the shape. - -\n \b NOTE: This functionality works only in VTK viewer. - -\n \b Result: a list of IDs of all free faces, containing in the shape. -\n TUI Command: GetFreeFacesIDs(Shape), where \em Shape is -a shape to be checked. - -\image html repair10.png - -\anchor bounding_box_anchor -

Bounding box

- -Returns the dimensions of the bounding box for the selected -geometrical object. +\n Calculates the normal vector to the selected \b Face. The \b Point +is a point of the \b Face, where the Normal should be calculated. + +\image html normaletoface.png + +\anchor boundaries_anchor +

Check Free Boundaries

+ +\n Detects and highlights wires and edges that are not shared between +two faces and are considered a shape's boundary. + +\n TUI Command: (NoError, ClosedWires, OpenWires) = +geompy.GetFreeBoundary(Shape), where \em Shape is a shape to be +checked, \em NoError is false if an error occurred while checking free +boundaries, \em ClosedWires is a list of closed free boundary wires, +\em OpenWires is a list of open free boundary wires. + +\image html repair9.png + +\anchor faces_anchor +

Check Free Faces

+ +\n Highlights all free faces of a given shape. A free +face is a face which is not shared between two objects of the shape. + +\n \b NOTE: This functionality works only in VTK viewer. + +\n \b Result: a list of IDs of all free faces, containing in the shape. +\n TUI Command: GetFreeFacesIDs(Shape), where \em Shape is +a shape to be checked. + +\image html repair10.png + +\anchor bounding_box_anchor +

Bounding box

+ +Returns the dimensions of the bounding box for the selected +geometrical object. \b NOTE: In order to take into account any possible distortion of a shape that affects the resulting bounding box, the algorithm enlarges @@ -145,114 +146,127 @@ faces (by iterating through all faces of a shape). This functionallity is implemented in such a way in order to have satisfactory performance. -Result: Displays the dimensions of the bounding box of a -geometrical object in the form of Python Tuple (Xmin, Xmax, Ymin, -Ymax, Zmin, Zmax). -\n TUI Command: geompy.BoundingBox(Shape), where \em Shape -is a shape for which a bounding box is computed. - -\image html measures5.png - -\anchor min_distance_anchor -

Min. distance

- -\n Returns the minimum distance between two geometrical objects and -the coordinates of the vector of distance and shows the vector in the viewer. - -\n TUI Command: geompy.MinDistance(Shape1, Shape2), -where \em Shape1 and \em Shape2 are shapes between which the minimal -distance is computed. - -\image html distance.png - -\anchor angle_anchor -

Angle

- -\n Returns the angle between two lines or linear edges in degrees -\n TUI Command: geompy.GetAngle(shape1, shape2), where -Shape1 and Shape2 are shapes between which the angle is computed. -Another TUI command is geompy.GetAngleRadians(shape1,shape2), -which returns the value of angle in radians. - -\image html angle.png - -\anchor tolerance_anchor -

Tolerance

- -\n Returns the maximum and the minimum tolerance for the selected -geometrical object. - -\n Result: Displays the tolerance values (FaceMinTol, -FaceMaxTol, EgdeMinTol, EgdeMaxTol, VertexMinTol, VertexMaxTol). -\n TUI Command: geompy.Tolerance(Shape), where \em Shape -is a shape for which minimal and maximal tolerances are returned. - -\image html new-tolerance.png - -\anchor whatis_anchor -

WhatIs

- -\n General information about the selected geometrical object is the -list of types and quantities of all topological entities, composing -the shape. - -\n TUI Command: geompy.WhatIs(Shape), where \em Shape is a -shape from which a description is returned. - -\image html measures8.png - -\n Kind of Shape field characterises the -whole shape. If there is no additional information available for the -shape, Basic Properties button will be disabled, otherwise it -will show a dialog with information about -dimensions, position, orientation and other parameters of the shape. - -\n TUI Command: geompy.KindOfShape(Shape), where \em Shape is a -shape from which a description is returned. - -\image html measures8a.png - -\anchor check_anchor -

Check

- -\n Checks the topology of the selected geometrical object and returns -True if it is valid. Check also geometry checkbox allows to test the -geometry as well. - -\n Result: Boolean. -\n TUI Command: geompy.CheckShape(theShape, theIsCheckGeom = 0), -where \em theShape is the shape checked for validity. - -\image html measures9.png - -\anchor check_compound_anchor -

Check compound of blocks

- -\n Checks whether a shape is a compound of glued blocks. To be -considered as a compound of blocks, the given shape must satisfy the -following conditions: -
    -
  • Each element of the compound should be a Block (6 faces and 12 edges);
    • -
  • A connection between two Blocks should be an entire quadrangle face or an entire edge;
    • -
  • The compound should be connected;
    • -
  • Two quadrangle faces should be glued.
    • -
- -\n Informs of the following possible errors: -
    -
  • not a block;
    • -
  • not glued;
    • -
  • not connected;
    • -
  • extra or degenerated edge.
    • -
- -\n Result: Boolean; highlight in the viewer. -\n TUI Command: -geompy.CheckCompoundOfBlocks(Compound). Checks if the shape -is a valid compound of blocks. If it is true, then the validity flag -is returned, and encountered errors are printed in the python console. - -\image html measures10.png - -*/ - +Result: Displays the dimensions of the bounding box of a +geometrical object in the form of Python Tuple (Xmin, Xmax, Ymin, +Ymax, Zmin, Zmax). +\n TUI Command: geompy.BoundingBox(Shape), where \em Shape +is a shape for which a bounding box is computed. + +\image html measures5.png + +\anchor min_distance_anchor +

Min. distance

+ +\n Returns the minimum distance between two geometrical objects and +the coordinates of the vector of distance and shows the vector in the viewer. + +\n TUI Command: geompy.MinDistance(Shape1, Shape2), +where \em Shape1 and \em Shape2 are shapes between which the minimal +distance is computed. + +\image html distance.png + +\anchor angle_anchor +

Angle

+ +\n Returns the angle between two lines or linear edges in degrees +\n TUI Command: geompy.GetAngle(shape1, shape2), where +Shape1 and Shape2 are shapes between which the angle is computed. +Another TUI command is geompy.GetAngleRadians(shape1,shape2), +which returns the value of angle in radians. + +\image html angle.png + +\anchor tolerance_anchor +

Tolerance

+ +\n Returns the maximum and the minimum tolerance for the selected +geometrical object. + +\n Result: Displays the tolerance values (FaceMinTol, +FaceMaxTol, EgdeMinTol, EgdeMaxTol, VertexMinTol, VertexMaxTol). +\n TUI Command: geompy.Tolerance(Shape), where \em Shape +is a shape for which minimal and maximal tolerances are returned. + +\image html new-tolerance.png + +\anchor whatis_anchor +

WhatIs

+ +\n General information about the selected geometrical object is the +list of types and quantities of all topological entities, composing +the shape. + +\n TUI Command: geompy.WhatIs(Shape), where \em Shape is a +shape from which a description is returned. + +\image html measures8.png + +\n Kind of Shape field characterises the +whole shape. If there is no additional information available for the +shape, Basic Properties button will be disabled, otherwise it +will show a dialog with information about +dimensions, position, orientation and other parameters of the shape. + +\n TUI Command: geompy.KindOfShape(Shape), where \em Shape is a +shape from which a description is returned. + +\image html measures8a.png + +\anchor check_anchor +

Check

+ +\n Checks the topology of the selected geometrical object and returns +True if it is valid. Check also geometry checkbox allows to test the +geometry as well. + +\n Result: Boolean. +\n TUI Command: geompy.CheckShape(theShape, theIsCheckGeom = 0), +where \em theShape is the shape checked for validity. + +\image html measures9.png + +\anchor check_compound_anchor +

Check compound of blocks

+ +\n Checks whether a shape is a compound of glued blocks. To be +considered as a compound of blocks, the given shape must satisfy the +following conditions: +
    +
  • Each element of the compound should be a Block (6 faces and 12 edges);
    • +
  • A connection between two Blocks should be an entire quadrangle face or an entire edge;
    • +
  • The compound should be connected;
    • +
  • Two quadrangle faces should be glued.
    • +
+ +\n Informs of the following possible errors: +
    +
  • not a block;
    • +
  • not glued;
    • +
  • not connected;
    • +
  • extra or degenerated edge.
    • +
+ +\n Result: Boolean; highlight in the viewer. +\n TUI Command: +geompy.CheckCompoundOfBlocks(Compound). Checks if the shape +is a valid compound of blocks. If it is true, then the validity flag +is returned, and encountered errors are printed in the python console. + +\image html measures10.png + +\anchor check_self_intersections_anchor +

Detect Self-intersections

+ +\n Checks the topology of the selected shape to detect self-intersections. + Returns True if there are no self-intersections. Reports pairs of + intersected sub shapes, if there are any. + +\n Result: Boolean. +\n TUI Command: geompy.CheckSelfIntersections(theShape), +where \em theShape is the shape checked for validity. + +\image html measures11.png + +*/ + diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index e1ce70642..136310506 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -3287,6 +3287,15 @@ module GEOM boolean CheckShapeWithGeometry (in GEOM_Object theShape, out string theDescription); + /*! + * Check a topology of the given shape on self-intersections presence. + * \param theShape Shape to check validity of. + * \param theIntersections Output. List of intersected sub shapes IDs, it contains pairs of IDs. + * \return TRUE, if the shape does not have any self-intersections. + */ + boolean CheckSelfIntersections (in GEOM_Object theShape, + out ListOfLong theIntersections); + /*! * Check if the given shape can be an argument for MakeSolid operation * \param theShape Shape to be described. diff --git a/resources/Makefile.am b/resources/Makefile.am index 6313fd6c7..bb376f509 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -15,13 +15,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 # Modified by : Alexander BORODIN (OCN) - autotools usage -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_salomeres_DATA = \ @@ -221,6 +220,7 @@ group_new.png \ group_edit.png \ glue.png \ check_blocks_compound.png \ +check_self_intersections.png \ free_faces.png \ propagate.png \ redo.png \ diff --git a/resources/check_self_intersections.png b/resources/check_self_intersections.png new file mode 100644 index 0000000000000000000000000000000000000000..0330d6a48ded29240dac560aab957ead231dcf56 GIT binary patch literal 575 zcmV-F0>J%=P)a&`5l!|PDC3&a1Y#c zWI|@|WW4~h;ik?pjn|^+1KTiFTo936RaF3aFS5wgq;3Km z)^+V7H6?Hp*?Cl!(eW9w4MN#NvGGVb;XkFKDXg7UHFJUVM7ui*3)&Kr7%mz<}0xBBI~_{8JIp$aeuc2ICON_DLG_CHECK_COMPOUND_OF_BLOCKS check_blocks_compound.png + + ICON_DLG_CHECK_SELF_INTERSECTIONS + check_self_intersections.png + ICON_DLG_CIRCLE_PNTS circle3points.png @@ -719,6 +723,10 @@ ICO_CHECK_COMPOUND check_blocks_compound.png + + ICO_CHECK_SELF_INTERSECTIONS + check_self_intersections.png + ICO_CHECK_FREE_BNDS free_bound.png diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index b55baeb18..33f6a4986 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -357,6 +357,22 @@ Please, select face, shell or solid and try again GEOM_CHECK_TITLE Check Shape Information + + GEOM_CHECK_SELF_INTERSECTIONS + Detect Self-intersections + + + GEOM_CHECK_SELF_INTERSECTIONS_FAILED + Detection of self-intersections failed + + + GEOM_NO_SELF_INTERSECTIONS + There are no self-intersections in the shape + + + GEOM_SELF_INTERSECTIONS_FOUND + Some self-intersections detected + GEOM_CIRCLE Circle @@ -2213,6 +2229,10 @@ Please, select face, shell or solid and try again MEN_CHECK_COMPOUND Check Compound of Blocks + + MEN_CHECK_SELF_INTERSECTIONS + Detect Self-intersections + MEN_CHECK_FREE_BNDS Check Free Boundaries @@ -2905,6 +2925,10 @@ Please, select face, shell or solid and try again STB_CHECK_COMPOUND Check compound of blocks + + STB_CHECK_SELF_INTERSECTIONS + Detect Self-intersections + STB_CHECK_FREE_BNDS Check free boundaries @@ -3465,6 +3489,10 @@ Please, select face, shell or solid and try again TOP_CHECK_COMPOUND Check compound of blocks + + TOP_CHECK_SELF_INTERSECTIONS + Detect Self-intersections + TOP_CHECK_FREE_BNDS Check free boundaries diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 59670b4cc..60d773472 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -535,6 +535,7 @@ void GeometryGUI::OnGUIEvent( int id ) case GEOMOp::OpCheckShape: // MENU MEASURE - CHECK case GEOMOp::OpCheckCompound: // MENU MEASURE - CHECK COMPOUND OF BLOCKS case GEOMOp::OpPointCoordinates: // MENU MEASURE - POINT COORDINATES + case GEOMOp::OpCheckSelfInters: // MENU MEASURE - CHECK SELF INTERSECTIONS libName = "MeasureGUI"; break; case GEOMOp::OpGroupCreate: // MENU GROUP - CREATE @@ -796,6 +797,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::OpWhatIs, "WHAT_IS" ); createGeomAction( GEOMOp::OpCheckShape, "CHECK" ); createGeomAction( GEOMOp::OpCheckCompound, "CHECK_COMPOUND" ); + createGeomAction( GEOMOp::OpCheckSelfInters, "CHECK_SELF_INTERSECTIONS" ); #ifdef _DEBUG_ // PAL16821 createGeomAction( GEOMOp::OpCheckGeom, "CHECK_GEOMETRY" ); @@ -1007,12 +1009,13 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpMinDistance, dimId, -1 ); createMenu( GEOMOp::OpAngle, dimId, -1 ); - createMenu( separator(), measurId, -1 ); - createMenu( GEOMOp::OpTolerance, measurId, -1 ); - createMenu( separator(), measurId, -1 ); - createMenu( GEOMOp::OpWhatIs, measurId, -1 ); - createMenu( GEOMOp::OpCheckShape, measurId, -1 ); - createMenu( GEOMOp::OpCheckCompound, measurId, -1 ); + createMenu( separator(), measurId, -1 ); + createMenu( GEOMOp::OpTolerance, measurId, -1 ); + createMenu( separator(), measurId, -1 ); + createMenu( GEOMOp::OpWhatIs, measurId, -1 ); + createMenu( GEOMOp::OpCheckShape, measurId, -1 ); + createMenu( GEOMOp::OpCheckCompound, measurId, -1 ); + createMenu( GEOMOp::OpCheckSelfInters, measurId, -1 ); #ifdef _DEBUG_ // PAL16821 int toolsId = createMenu( tr( "MEN_TOOLS" ), -1, -1, 50 ); @@ -1140,6 +1143,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpWhatIs, measureTbId ); createTool( GEOMOp::OpCheckShape, measureTbId ); createTool( GEOMOp::OpCheckCompound, measureTbId ); + createTool( GEOMOp::OpCheckSelfInters, measureTbId ); int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); createTool( GEOMOp::OpPipeTShape, advancedTbId ); diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index cabc0e9f3..1731c1772 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -160,6 +160,7 @@ namespace GEOMOp { OpCheckShape = 5009, // MENU MEASURES - CHECK OpCheckCompound = 5010, // MENU MEASURES - CHECK COMPOUND OF BLOCKS OpPointCoordinates = 5011, // MENU MEASURES - POINT COORDINATES + OpCheckSelfInters = 5012, // MENU MEASURES - CHECK SELF INTERSECTIONS // GroupGUI ------------------//-------------------------------- OpGroupCreate = 6000, // MENU GROUP - CREATE OpGroupEdit = 6001, // MENU GROUP - EDIT diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index 9dbdcf6be..4a24fd2c4 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -34,6 +34,15 @@ #include #include +#include + +#include +#include +#include +#include +#include +#include + #include #include @@ -1310,6 +1319,88 @@ bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object) theShape, return isValid; } +//============================================================================= +/*! + * CheckSelfIntersections + */ +//============================================================================= +bool GEOMImpl_IMeasureOperations::CheckSelfIntersections + (Handle(GEOM_Object) theShape, + Handle(TColStd_HSequenceOfInteger)& theIntersections) +{ + SetErrorCode(KO); + bool isGood = false; + + if (theIntersections.IsNull()) + theIntersections = new TColStd_HSequenceOfInteger; + else + theIntersections->Clear(); + + if (theShape.IsNull()) + return isGood; + + Handle(GEOM_Function) aRefShape = theShape->GetLastFunction(); + if (aRefShape.IsNull()) return isGood; + + TopoDS_Shape aShape = aRefShape->GetValue(); + if (aShape.IsNull()) return isGood; + + // 0. Prepare data + BRep_Builder aBB; + TopoDS_Compound aCS; + TopoDS_Shape aScopy; + NMTDS_Tools::CopyShape(aShape, aScopy); + + // Map sub-shapes and their indices + TopTools_IndexedMapOfShape anIndices; + TopExp::MapShapes(aScopy, anIndices); + + aBB.MakeCompound(aCS); + aBB.Add(aCS, aScopy); + + NMTTools_CheckerSI aCSI; // checker of self-interferences + aCSI.SetCompositeShape(aCS); + + // 1. Launch the checker + aCSI.Perform(); + Standard_Integer iErr = aCSI.StopStatus(); + if (iErr) { + return false; // Error + } + + isGood = true; + + // 2. Take the shapes from DS + const NMTDS_ShapesDataStructure& aDS = *(aCSI.DS()); + Standard_Integer aNbS = aDS.NumberOfShapesOfTheObject(); + + // 3. Get the pairs of interfered shapes + NMTDS_PInterfPool pIP = aCSI.IP(); + const NMTDS_ListOfPassKeyBoolean& aLPKB = pIP->Get(); + + Standard_Integer n1, n2; + NMTDS_ListIteratorOfListOfPassKeyBoolean aIt; + + aIt.Initialize(aLPKB); + for (; aIt.More(); aIt.Next()) { + const NMTDS_PassKeyBoolean& aPKB = aIt.Value(); + aPKB.Ids(n1, n2); + + if (n1 > aNbS || n2 > aNbS) + return false; // Error + + const TopoDS_Shape& aS1 = aDS.Shape(n1); + const TopoDS_Shape& aS2 = aDS.Shape(n2); + + theIntersections->Append(anIndices.FindIndex(aS1)); + theIntersections->Append(anIndices.FindIndex(aS2)); + isGood = false; + } + + SetErrorCode(OK); + return isGood; +} + //============================================================================= /*! * IsGoodForSolid diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index 6f99d77b9..5a3966ddc 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifndef _GEOMImpl_IMeasureOperations_HXX_ #define _GEOMImpl_IMeasureOperations_HXX_ @@ -127,6 +126,9 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations { const Standard_Boolean theIsCheckGeom, TCollection_AsciiString& theDump); + Standard_EXPORT bool CheckSelfIntersections (Handle(GEOM_Object) theShape, + Handle(TColStd_HSequenceOfInteger)& theIntersections); + Standard_EXPORT TCollection_AsciiString IsGoodForSolid (Handle(GEOM_Object) theShape); Standard_EXPORT TCollection_AsciiString WhatIs (Handle(GEOM_Object) theShape); diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am index cfe3b0f1c..a0ec6a7fd 100644 --- a/src/GEOMImpl/Makefile.am +++ b/src/GEOMImpl/Makefile.am @@ -241,6 +241,7 @@ libGEOMimpl_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ $(PYTHON_INCLUDES) \ -I$(srcdir)/../ShHealOper \ + -I$(srcdir)/../NMTDS \ -I$(srcdir)/../NMTTools \ -I$(srcdir)/../GEOM \ -I$(srcdir)/../GEOMAlgo \ diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 800a072c2..80126995a 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #include @@ -367,6 +366,45 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry (GEOM::GEOM_Obj return 0; } +//============================================================================= +/*! + * CheckSelfIntersections + */ +//============================================================================= +CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Object_ptr theShape, + GEOM::ListOfLong_out theIntersections) +{ + // Set a not done flag + GetOperations()->SetNotDone(); + + bool isGood = false; + + // Allocate the CORBA arrays + GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); + + // Get the reference shape + Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + + if (!aShape.IsNull()) { + Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger; + + // Detect self-intersections + isGood = GetOperations()->CheckSelfIntersections(aShape, anIntegers); + + int nbInts = anIntegers->Length(); + + anIntegersArray->length(nbInts); + + for (int ii = 0; ii < nbInts; ii++) { + anIntegersArray[ii] = anIntegers->Value(ii + 1); + } + } + + // Initialize out-parameters with local arrays + theIntersections = anIntegersArray._retn(); + return isGood; +} + //============================================================================= /*! * IsGoodForSolid diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh index bd9d1b7ce..344a9def0 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifndef _GEOM_IMeasureOperations_i_HeaderFile #define _GEOM_IMeasureOperations_i_HeaderFile @@ -86,6 +85,9 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i : CORBA::Boolean CheckShapeWithGeometry (GEOM::GEOM_Object_ptr theShape, CORBA::String_out theDescription); + CORBA::Boolean CheckSelfIntersections (GEOM::GEOM_Object_ptr theShape, + GEOM::ListOfLong_out theIntersections); + char* IsGoodForSolid (GEOM::GEOM_Object_ptr theShape); char* WhatIs (GEOM::GEOM_Object_ptr theShape); diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py index e153beb8b..14a3f5743 100644 --- a/src/GEOM_SWIG/GEOM_TestMeasures.py +++ b/src/GEOM_SWIG/GEOM_TestMeasures.py @@ -19,7 +19,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# def TestMeasureOperations (geompy, math): @@ -47,6 +46,14 @@ def TestMeasureOperations (geompy, math): else: print "\nBox is valid" + ####### Detect Self-intersections ####### + + [Face_1,Face_2] = geompy.SubShapes(box, [33, 23]) + Translation_1 = geompy.MakeTranslation(Face_1, 5, -15, -40) + Compound_1 = geompy.MakeCompound([Face_2, Translation_1]) + if geompy.CheckSelfIntersections(Compound_1) == True: + raise RuntimeError, "Existing self-intersection is not detected" + ####### WhatIs ####### Descr = geompy.WhatIs(box) diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 1e0903119..5936e3b29 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -3755,6 +3755,17 @@ class geompyDC(GEOM._objref_GEOM_Gen): print Status return IsValid + ## Detect self-intersections in the given shape. + # @param theShape Shape to check. + # @return TRUE, if the shape contains no self-intersections. + # + # @ref tui_measurement_tools_page "Example" + def CheckSelfIntersections (self, theShape): + # Example: see GEOM_TestMeasures.py + (IsValid, Pairs) = self.MeasuOp.CheckSelfIntersections(theShape) + RaiseIfFailed("CheckSelfIntersections", self.MeasuOp) + return IsValid + ## Get position (LCS) of theShape. # # Origin of the LCS is situated at the shape's center of mass. diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am index f14cc4a88..766128d86 100644 --- a/src/MeasureGUI/Makefile.am +++ b/src/MeasureGUI/Makefile.am @@ -15,13 +15,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # GEOM MEASUREGUI : # File : Makefile.am # Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) # Package : MeasureGUI -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files @@ -40,6 +39,7 @@ salomeinclude_HEADERS = \ MeasureGUI_WhatisDlg.h \ MeasureGUI_CheckShapeDlg.h \ MeasureGUI_CheckCompoundOfBlocksDlg.h \ + MeasureGUI_CheckSelfIntersectionsDlg.h \ MeasureGUI_PointDlg.h # Libraries targets @@ -59,7 +59,8 @@ dist_libMeasureGUI_la_SOURCES = \ MeasureGUI_MaxToleranceDlg.cxx \ MeasureGUI_WhatisDlg.cxx \ MeasureGUI_CheckShapeDlg.cxx \ - MeasureGUI_CheckCompoundOfBlocksDlg.cxx \ + MeasureGUI_CheckCompoundOfBlocksDlg.cxx \ + MeasureGUI_CheckSelfIntersectionsDlg.cxx \ MeasureGUI_PointDlg.cxx MOC_FILES = \ @@ -76,6 +77,7 @@ MOC_FILES = \ MeasureGUI_WhatisDlg_moc.cxx \ MeasureGUI_CheckShapeDlg_moc.cxx \ MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx \ + MeasureGUI_CheckSelfIntersectionsDlg_moc.cxx \ MeasureGUI_PointDlg_moc.cxx nodist_libMeasureGUI_la_SOURCES = \ diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx index 60d7d56a4..7b21bcb05 100644 --- a/src/MeasureGUI/MeasureGUI.cxx +++ b/src/MeasureGUI/MeasureGUI.cxx @@ -18,12 +18,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // GEOM GEOMGUI : GUI for Geometry component // File : MeasureGUI.cxx // Author : Damien COQUERET, Open CASCADE S.A.S. -// + #include "MeasureGUI.h" #include @@ -42,6 +41,7 @@ #include "MeasureGUI_WhatisDlg.h" // Method WHATIS #include "MeasureGUI_CheckShapeDlg.h" // Method CHECKSHAPE #include "MeasureGUI_CheckCompoundOfBlocksDlg.h" // Method CHECKCOMPOUND +#include "MeasureGUI_CheckSelfIntersectionsDlg.h" // Method CHECK SELF INTERSCTIONS #include "MeasureGUI_PointDlg.h" // Method POINTCOORDINATES #include @@ -109,6 +109,9 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case GEOMOp::OpCheckCompound: dlg = new MeasureGUI_CheckCompoundOfBlocksDlg( getGeometryGUI(), parent ); break; // CHECKCOMPOUND + case GEOMOp::OpCheckSelfInters: + dlg = new MeasureGUI_CheckSelfIntersectionsDlg( getGeometryGUI(), parent ); + break; // CHECK SELF INTERSCTIONS case GEOMOp::OpPointCoordinates: dlg = new MeasureGUI_PointDlg( getGeometryGUI(), parent ); break; // POINT COORDINATES diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui index eb01d0230..380f868ce 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui +++ b/src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui @@ -72,7 +72,14 @@ - + + + + 300 + 0 + + + diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx new file mode 100644 index 000000000..886549598 --- /dev/null +++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.cxx @@ -0,0 +1,249 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// GEOM GEOMGUI : GUI for Geometry component +// File : MeasureGUI_CheckSelfIntersectionsDlg.cxx +// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com) + +#include "MeasureGUI_CheckSelfIntersectionsDlg.h" +#include "MeasureGUI_Widgets.h" + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#define TEXTEDIT_FONT_FAMILY "Courier" +#define TEXTEDIT_FONT_SIZE 11 + +//================================================================================= +// class : MeasureGUI_CheckSelfIntersectionsDlg() +// purpose : Constructs a MeasureGUI_CheckSelfIntersectionsDlg which is a child of 'parent', with the +// name 'name' and widget flags set to 'f'. +// The dialog will by default be modeless, unless you set 'modal' to +// true to construct a modal dialog. +//================================================================================= +MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (GeometryGUI* GUI, QWidget* parent) + : MeasureGUI_Skeleton(GUI, parent, false) +{ + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHECK_SELF_INTERSECTIONS"))); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); + + setWindowTitle(tr("GEOM_CHECK_SELF_INTERSECTIONS")); + + /***************************************************************/ + mainFrame()->GroupConstructors->setTitle(tr("GEOM_CHECK_SELF_INTERSECTIONS")); + mainFrame()->RadioButton1->setIcon(image0); + + 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); + + QVBoxLayout* layout = new QVBoxLayout (centralWidget()); + layout->setMargin(0); layout->setSpacing(6); + layout->addWidget(myGrp); + + /***************************************************************/ + + myHelpFileName = "using_measurement_tools_page.html#check_self_intersections_anchor"; + + /* Initialisation */ + Init(); +} + +//================================================================================= +// function : ~MeasureGUI_CheckSelfIntersectionsDlg() +// purpose : Destroys the object and frees any allocated resources +//================================================================================= +MeasureGUI_CheckSelfIntersectionsDlg::~MeasureGUI_CheckSelfIntersectionsDlg() +{ +} + +//================================================================================= +// function : Init() +// purpose : +//================================================================================= +void MeasureGUI_CheckSelfIntersectionsDlg::Init() +{ + mySelBtn = myGrp->PushButton1; + mySelEdit = myGrp->LineEdit1; + MeasureGUI_Skeleton::Init(); + + connect(myGrp->ListBox1, SIGNAL(itemSelectionChanged()), SLOT(onErrorsListSelectionChanged())); + connect(myGrp->ListBox2, SIGNAL(itemSelectionChanged()), SLOT(onSubShapesListSelectionChanged())); +} + +//================================================================================= +// function : processObject +// purpose : +//================================================================================= +void MeasureGUI_CheckSelfIntersectionsDlg::processObject() +{ + myGrp->ListBox1->clear(); + myGrp->ListBox2->clear(); + erasePreview(); + + if (myObj->_is_nil()) + return; + + QString aMsg (""); + GEOM::GEOM_IMeasureOperations_var anOper = GEOM::GEOM_IMeasureOperations::_narrow(getOperation()); + bool isGood = false, isFailed = false; + int nbPairs = 0; + try { + isGood = anOper->CheckSelfIntersections(myObj, myInters); + nbPairs = myInters->length()/2; + if (nbPairs*2 != myInters->length()) { + isFailed = true; + } + } + catch (const SALOME::SALOME_Exception& e) { + SalomeApp_Tools::QtCatchCorbaException(e); + isFailed = true; + } + if (isFailed) { + aMsg += tr("GEOM_CHECK_SELF_INTERSECTIONS_FAILED"); + myGrp->TextView1->setText(aMsg); + return; + } + + // Status + if (isGood) { + aMsg += tr("GEOM_NO_SELF_INTERSECTIONS"); + } + else { + aMsg += tr("GEOM_SELF_INTERSECTIONS_FOUND"); + } + myGrp->TextView1->setText(aMsg); + + // Pairs + QStringList aErrList; + QString aErrStr (""); + for (int i = 1; i <= nbPairs; i++) { + aErrStr = "Intersection # "; + aErrStr += QString::number(i); + aErrList.append(aErrStr); + } + + myGrp->ListBox1->addItems(aErrList); +} + +//================================================================================= +// function : onErrorsListSelectionChanged +// purpose : +//================================================================================= +void MeasureGUI_CheckSelfIntersectionsDlg::onErrorsListSelectionChanged() +{ + erasePreview(); + int aCurItem = myGrp->ListBox1->currentRow(); + if (aCurItem < 0) + return; + + //int nbPairs = myInters->length()/2; + + QStringList aSubShapeList; + TopoDS_Shape aSelShape; + if (!myObj->_is_nil() && GEOMBase::GetShape(myObj, aSelShape)) { + TopTools_IndexedMapOfShape anIndices; + TopExp::MapShapes(aSelShape, anIndices); + + TopoDS_Shape aSubShape = anIndices.FindKey(myInters[aCurItem*2]); + QString aType = GEOMBase::GetShapeTypeString(aSubShape); + if (!aType.isEmpty()) + aSubShapeList.append(QString("%1_%2").arg(aType).arg(myInters[aCurItem*2])); + aSubShape = anIndices.FindKey(myInters[aCurItem*2 + 1]); + aType = GEOMBase::GetShapeTypeString(aSubShape); + if (!aType.isEmpty()) + aSubShapeList.append(QString("%1_%2").arg(aType).arg(myInters[aCurItem*2 + 1])); + } + myGrp->ListBox2->clear(); + myGrp->ListBox2->addItems(aSubShapeList); +} + +//================================================================================= +// function : onSubShapesListSelectionChanged +// purpose : +//================================================================================= +void MeasureGUI_CheckSelfIntersectionsDlg::onSubShapesListSelectionChanged() +{ + erasePreview(); + + // Current pair + int aErrCurItem = myGrp->ListBox1->currentRow(); + if (aErrCurItem < 0) + return; + + // Selected IDs + QList aIds; + for (int i = 0, n = myGrp->ListBox2->count(); i < n; i++) { + if (myGrp->ListBox2->item(i)->isSelected()) + aIds.append(i); + } + if (aIds.count() < 1) + return; + + TopoDS_Shape aSelShape; + TopoDS_Shape aSubShape; + TopTools_IndexedMapOfShape anIndices; + if (!myObj->_is_nil() && GEOMBase::GetShape(myObj, aSelShape)) { + SALOME_Prs* aPrs = 0; + TopExp::MapShapes(aSelShape, anIndices); + QList::iterator it; + for (it = aIds.begin(); it != aIds.end(); ++it) { + aSubShape = anIndices.FindKey(myInters[aErrCurItem*2 + (*it)]); + try { + getDisplayer()->SetColor(Quantity_NOC_RED); + getDisplayer()->SetWidth(3); + getDisplayer()->SetToActivate(false); + aPrs = !aSubShape.IsNull() ? getDisplayer()->BuildPrs(aSubShape) : 0; + if (aPrs) + displayPreview(aPrs, true); + } + catch (const SALOME::SALOME_Exception& e) { + SalomeApp_Tools::QtCatchCorbaException(e); + } + } + } +} diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h new file mode 100644 index 000000000..c98ec1365 --- /dev/null +++ b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h @@ -0,0 +1,62 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// GEOM GEOMGUI : GUI for Geometry component +// File : MeasureGUI_CheckSelfIntersectionsDlg.h + +#ifndef MEASUREGUI_CHECKSELFINTERDLG_H +#define MEASUREGUI_CHECKSELFINTERDLG_H + +#include + +class MeasureGUI_1Sel1TextView2ListBox; + +//================================================================================= +// class : MeasureGUI_CheckSelfIntersectionsDlg +// purpose : +//================================================================================= + +class MeasureGUI_CheckSelfIntersectionsDlg : public MeasureGUI_Skeleton +{ + Q_OBJECT + +public: + MeasureGUI_CheckSelfIntersectionsDlg(GeometryGUI*, QWidget*); + ~MeasureGUI_CheckSelfIntersectionsDlg(); + +protected: + // redefined from GEOMBase_Helper and MeasureGUI_Skeleton + virtual void processObject(); + +private slots: + void onErrorsListSelectionChanged(); + void onSubShapesListSelectionChanged(); + +private: + void Init(); + +private: + MeasureGUI_1Sel1TextView2ListBox* myGrp; + + GEOM::ListOfLong_var myInters; +}; + +#endif // MEASUREGUI_CHECKSELFINTERDLG_H diff --git a/src/NMTDS/NMTDS_Tools.cxx b/src/NMTDS/NMTDS_Tools.cxx index 5c4a25d07..03755e6dd 100644 --- a/src/NMTDS/NMTDS_Tools.cxx +++ b/src/NMTDS/NMTDS_Tools.cxx @@ -15,13 +15,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // File: NMTDS_Tools.cxx // Created: Tue Feb 20 14:57:28 2007 // Author: Peter KURNEV -// -// + #include #include #include @@ -32,15 +30,15 @@ #include #include -void CopySource(const TopoDS_Shape& aS, - TopTools_IndexedDataMapOfShapeShape& aMapSS, +void CopySource(const TopoDS_Shape& aS, + TopTools_IndexedDataMapOfShapeShape& aMapSS, TopoDS_Shape& aSC); //======================================================================= //function : CopyShape -//purpose : +//purpose : //======================================================================= - void NMTDS_Tools::CopyShape(const TopoDS_Shape& aS, + void NMTDS_Tools::CopyShape(const TopoDS_Shape& aS, TopoDS_Shape& aSC) { TopTools_IndexedDataMapOfShapeShape aMapSS; @@ -49,9 +47,9 @@ void CopySource(const TopoDS_Shape& aS, } //======================================================================= //function : CopyShape -//purpose : +//purpose : //======================================================================= - void NMTDS_Tools::CopyShape(const TopoDS_Shape& aS, + void NMTDS_Tools::CopyShape(const TopoDS_Shape& aS, TopoDS_Shape& aSC, TopTools_IndexedDataMapOfShapeShape& aMapSS) { @@ -59,15 +57,16 @@ void CopySource(const TopoDS_Shape& aS, } //======================================================================= //function : CopySource -//purpose : +//purpose : //======================================================================= -void CopySource(const TopoDS_Shape& aS, - TopTools_IndexedDataMapOfShapeShape& aMapSS, +void CopySource(const TopoDS_Shape& aS, + TopTools_IndexedDataMapOfShapeShape& aMapSS, TopoDS_Shape& aSC) { Standard_Boolean bFree; TopAbs_ShapeEnum aT; TopoDS_Iterator aIt; + TopoDS_Shape aSF; BRep_Builder BB; // aT=aS.ShapeType(); @@ -84,13 +83,25 @@ void CopySource(const TopoDS_Shape& aS, // bFree=aSC.Free(); aSC.Free(Standard_True); - aIt.Initialize(aS); + //modified by NIZNHY-PKV Fri Nov 25 10:10:03 2011f + aSF=aS; + if (aT==TopAbs_EDGE){ + TopAbs_Orientation aOr; + // + aOr=aS.Orientation(); + if(aOr==TopAbs_INTERNAL) { + aSF.Orientation(TopAbs_FORWARD); + } + } + aIt.Initialize(aSF); + //aIt.Initialize(aS); + //modified by NIZNHY-PKV Fri Nov 25 10:10:05 2011t for (; aIt.More(); aIt.Next()) { TopoDS_Shape aSCx; // const TopoDS_Shape& aSx=aIt.Value(); // - CopySource (aSx, aMapSS, aSCx); + CopySource (aSx, aMapSS, aSCx); // aSCx.Orientation(aSx.Orientation()); BB.Add(aSC, aSCx); @@ -99,9 +110,9 @@ void CopySource(const TopoDS_Shape& aS, } //======================================================================= // function: ComputeVV -// purpose: +// purpose: //======================================================================= - Standard_Integer NMTDS_Tools::ComputeVV(const TopoDS_Vertex& aV1, + Standard_Integer NMTDS_Tools::ComputeVV(const TopoDS_Vertex& aV1, const TopoDS_Vertex& aV2) { Standard_Real aTolV1, aTolV2, aTolSum, aTolSum2, aD2; @@ -123,7 +134,7 @@ void CopySource(const TopoDS_Shape& aS, } //======================================================================= // function: HasBRep -// purpose: +// purpose: //======================================================================= Standard_Boolean NMTDS_Tools::HasBRep(const TopAbs_ShapeEnum aTi) { @@ -131,7 +142,7 @@ void CopySource(const TopoDS_Shape& aS, } //======================================================================= //function : TypeToInteger -//purpose : +//purpose : //======================================================================= Standard_Integer NMTDS_Tools::TypeToInteger(const TopAbs_ShapeEnum aType1, const TopAbs_ShapeEnum aType2) @@ -168,5 +179,5 @@ void CopySource(const TopoDS_Shape& aS, default: break; } - return iRet; + return iRet; } -- 2.39.2