From 8a7faf3ee59656292ab87845df7bf01032f30d26 Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 15 Aug 2012 10:34:21 +0000 Subject: [PATCH] Mantis issue 0021483: EDF 1638 GEOM: Retrieve non blocks solids and faces from a shape. --- doc/salome/gui/GEOM/images/measures2.png | Bin 0 -> 21135 bytes doc/salome/gui/GEOM/input/get_non_blocks.doc | 23 ++ .../gui/GEOM/input/tui_get_non_blocks.doc | 32 ++ .../gui/GEOM/input/tui_measurement_tools.doc | 1 + .../gui/GEOM/input/tui_test_spanner.doc | 5 + .../GEOM/input/using_measurement_tools.doc | 3 +- idl/GEOM_Gen.idl | 11 + resources/Makefile.am | 1 + resources/get_non_blocks.png | Bin 0 -> 1004 bytes src/GEOMGUI/GEOM_images.ts | 8 + src/GEOMGUI/GEOM_msg_en.ts | 24 ++ src/GEOMGUI/GeometryGUI.cxx | 4 + src/GEOMGUI/GeometryGUI_Operations.h | 38 +-- src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 3 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 155 +++++++++- src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 13 +- src/GEOM_I/GEOM_IBlocksOperations_i.cc | 34 ++- src/GEOM_I/GEOM_IBlocksOperations_i.hh | 4 +- src/GEOM_SWIG/GEOM_Spanner.py | 10 +- src/GEOM_SWIG/GEOM_TestOthers.py | 5 + src/GEOM_SWIG/geompyDC.py | 30 ++ src/MeasureGUI/Makefile.am | 4 +- src/MeasureGUI/MeasureGUI.cxx | 5 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx | 2 +- src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx | 277 ++++++++++++++++++ src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h | 69 +++++ 26 files changed, 720 insertions(+), 41 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/measures2.png create mode 100644 doc/salome/gui/GEOM/input/get_non_blocks.doc create mode 100644 doc/salome/gui/GEOM/input/tui_get_non_blocks.doc create mode 100644 resources/get_non_blocks.png create mode 100644 src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx create mode 100644 src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h diff --git a/doc/salome/gui/GEOM/images/measures2.png b/doc/salome/gui/GEOM/images/measures2.png new file mode 100644 index 0000000000000000000000000000000000000000..21e5218a40ea5f27255b8b25ccf88bde62af74ef GIT binary patch literal 21135 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

!>ppD`ycB)$;_JS?M%p8#Y$vf+ zd^`Y6ziMXZ7Ukv^feY2oWVQl!R@Sf!9=eyBRy;mlu_XzRPigqPW{j$wwXqWSD6-4L_yGiztGNsBh9Wwz&O8WP>c__Q@GLj`749ME z@9US~SHN0$#pfHNN)3iYEsPkk)h`;+b$%8oB>(!L<5AAWL)nnPTnQcATqiCG%on*o zO(s5VF7%Tn-I~{X>#oflOB=P<|NP@2a0|DH4osdsVaOO>TLtE!+&hiM`nGkG!hp$~ z)6JTRr_ri_Z}ad70%8+>CN!k0-Zc8FzUK3H=<7o^fxC#TKHXRel?sXEQSN=%#pR!& zr%LEw7k9bdaida!_g{pt1DPy}T}PHe*C2Y+c)B<{yFP62p;Rh;@xrCo7pVW&(vb5$JS#fK9;ktd{g}}m#%81n$s3-U_tU7smXNL zi%V|JNemGT0C!`g21rZ+`vRm*ch=Y~ypQR5X8L|?a4dMUt%`%l<`heR4ZP{X#@Y=I zdY})HV<~>Nbv%{BQ$&Ds@B>|3Oa8UGczSkr=Jz6ZDH(}C1ZYb25GghHA@2WW%imqzlFZ$BfGaDq*Mj2>Gri>c zLs|Cmc~}G@Ph}i}Uw_}g|K1>Wb{n9 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/get_non_blocks.doc b/doc/salome/gui/GEOM/input/get_non_blocks.doc new file mode 100644 index 000000000..8df0e324c --- /dev/null +++ b/doc/salome/gui/GEOM/input/get_non_blocks.doc @@ -0,0 +1,23 @@ +/*! + +\page get_non_blocks_page Get Non Blocks + +\image html measures2.png + +Retrieve all non blocks solids and faces from the given shape. +Collect them in two groups: solids and faces separately. + +\n Result: Two or less groups are published in the Object + Browser under the processed object. Reports error if + no bad sub-shapes (solids and faces) have been found. + +\n TUI Command: +geompy.GetNonBlocks(Compound). Returns a tuple of two + GEOM_Objects. The first object is a group of all non block solids + (= not 6 faces, or with 6 faces, but with the presence of + non-quadrangular faces). The second object is a group of all non + quadrangular faces. + +See also a \ref tui_get_non_blocks_page "TUI example". + +*/ diff --git a/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc b/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc new file mode 100644 index 000000000..6f648f9a0 --- /dev/null +++ b/doc/salome/gui/GEOM/input/tui_get_non_blocks.doc @@ -0,0 +1,32 @@ +/*! + +\page tui_get_non_blocks_page Get Non Blocks + +\code +import geompy +import salome + +# create solids +box = geompy.MakeBoxDXDYDZ(100, 100, 100) +cyl = geompy.MakeCylinderRH(100, 200) + +geompy.addToStudy(box, 'box') +geompy.addToStudy(cyl, 'cyl') + +# make a compound +compound = geompy.MakeCompound([box1, box2]) +geompy.addToStudy(compound, 'compound') + +# explore the compound +pair = geompy.GetNonBlocks(compound) + +if pair[0] is not None: + geompy.addToStudyInFather(compound, pair[0], "GrNonBlocks") + pass + +if pair[1] is not None: + geompy.addToStudyInFather(compound, pair[1], "GrNonQuads") + pass +\endcode + +*/ diff --git a/doc/salome/gui/GEOM/input/tui_measurement_tools.doc b/doc/salome/gui/GEOM/input/tui_measurement_tools.doc index 4ce9b4239..583f3de0f 100644 --- a/doc/salome/gui/GEOM/input/tui_measurement_tools.doc +++ b/doc/salome/gui/GEOM/input/tui_measurement_tools.doc @@ -17,6 +17,7 @@

  • \subpage tui_free_faces_page
  • \subpage tui_check_shape_page
  • \subpage tui_check_compound_of_blocks_page
    • +
  • \subpage tui_get_non_blocks_page
  • \subpage tui_check_self_intersections_page
    • diff --git a/doc/salome/gui/GEOM/input/tui_test_spanner.doc b/doc/salome/gui/GEOM/input/tui_test_spanner.doc index 5c9df4651..81b212de6 100644 --- a/doc/salome/gui/GEOM/input/tui_test_spanner.doc +++ b/doc/salome/gui/GEOM/input/tui_test_spanner.doc @@ -35,6 +35,11 @@ \anchor swig_GetOppositeFace \until id_face41 +\until id_glueALL + +\anchor swig_GetNonBlocks +\until Spanner is a + \anchor spanner_continue \until return Spanner diff --git a/doc/salome/gui/GEOM/input/using_measurement_tools.doc b/doc/salome/gui/GEOM/input/using_measurement_tools.doc index 7e18a1ddf..513f6077f 100644 --- a/doc/salome/gui/GEOM/input/using_measurement_tools.doc +++ b/doc/salome/gui/GEOM/input/using_measurement_tools.doc @@ -25,6 +25,7 @@ concerning created or imported geometrical objects :
  • \subpage free_faces_page "Check Free Faces"
  • \subpage check_shape_page "Check Shape"
  • \subpage check_compound_of_blocks_page "Check compound of blocks"
    • +
  • \subpage get_non_blocks_page "Get non blocks"
  • \subpage check_self_intersections_page "Detect Self-intersections"
    • @@ -32,4 +33,4 @@ concerning created or imported geometrical objects : \ref tui_measurement_tools_page "Measurement Tools" with TUI commands. -*/ \ No newline at end of file +*/ diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index f3a41ad16..209ac2bd3 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -2403,6 +2403,17 @@ module GEOM string PrintBCErrors (in GEOM_Object theCompound, in BCErrors theErrors); + /*! + * \brief Retrieve all non blocks solids and faces from a shape. + * + * \param theShape The shape to explore. + * \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); + /*! * \brief Remove all seam and degenerated edges from \a theShape. * diff --git a/resources/Makefile.am b/resources/Makefile.am index d5aab779c..57c92dd2d 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -232,6 +232,7 @@ group_new.png \ group_edit.png \ glue.png \ check_blocks_compound.png \ +get_non_blocks.png \ check_self_intersections.png \ free_faces.png \ propagate.png \ diff --git a/resources/get_non_blocks.png b/resources/get_non_blocks.png new file mode 100644 index 0000000000000000000000000000000000000000..b13b294f21933b19b982b85add00ee6b12bc2d7f GIT binary patch literal 1004 zcmVz@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZGPUI82S=kI^8fxmwL zW2jwp1}vA8lf%Hu%F4jZ%naA~>(?)aFJHbeeE9Hz;mw;j3@={1V7PhnCL=%qfo%WZ zy!<=^D>Ea5#J39!fByVo`1$iE!|&g}86I+3FtD*OF&vp&$l#heiGhiU5o7@KWw&Ga|Mw5b84QfT@KXADh~bp5KZBOmYlfH7p$v@BMD`!3m+SW*hDS5w z7=8i``~B@B11voQ1P}`-7C{03HGMXN!mG_-n^;&_!1%h5Hv2C z_lpByahMAM0*D1I?|ubRcR_41F)@ZeKfW+XK3~UhliP;j&%bX#1AYL*@ejja#vcrS z7{3Df#~5BR$uYdXu?>`r4uJFl1P}|ZJPER0^zkZ&+Z<*Le?Gim`1A8C!(UL~1HJqg z=;eREATE4$aVx|3@83a&eF5nM2p~pW<)M&}(0`By7>21sSC3@a1)y9lKmg%%Autyh z0I38ZHXu;IfDHrU9Uu-s0I?8Ic!!7*3lxb*poTI41Q1Ry17n;Ulzc!jPJ|0zKqHg^ aAiw|{nb#QiH{cck0000ICON_DLG_CHECK_COMPOUND_OF_BLOCKS check_blocks_compound.png + + ICON_DLG_GETNONBLOCKS + get_non_blocks.png + ICON_DLG_CHECK_SELF_INTERSECTIONS check_self_intersections.png @@ -739,6 +743,10 @@ ICO_CHECK_COMPOUND check_blocks_compound.png + + ICO_GET_NON_BLOCKS + get_non_blocks.png + ICO_CHECK_SELF_INTERSECTIONS check_self_intersections.png diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index cf4c13db2..4f503aae2 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -357,6 +357,18 @@ Please, select face, shell or solid and try again GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES Incriminated Sub-shapes + + GEOM_GETNONBLOCKS_TITLE + Get non-hexahedral solids and non-quadrangular faces + + + GEOM_GETNONBLOCKS + Get non blocks + + + GEOM_NONBLOCKS + NonBlocksGroup + GEOM_CHECK_INFOS Object And Its Topological Information @@ -2310,6 +2322,10 @@ Please, select face, shell or solid and try again MEN_CHECK_COMPOUND Check Compound of Blocks + + MEN_GET_NON_BLOCKS + Get Non Blocks + MEN_CHECK_SELF_INTERSECTIONS Detect Self-intersections @@ -3154,6 +3170,10 @@ Please, select face, shell or solid and try again STB_CHECK_COMPOUND Check compound of blocks + + STB_GET_NON_BLOCKS + Get non blocks + STB_CHECK_SELF_INTERSECTIONS Detect Self-intersections @@ -3762,6 +3782,10 @@ Please, select face, shell or solid and try again TOP_CHECK_COMPOUND Check compound of blocks + + TOP_GET_NON_BLOCKS + Get non blocks + TOP_CHECK_SELF_INTERSECTIONS Detect Self-intersections diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 23694246d..6ae6b95e6 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -549,6 +549,7 @@ void GeometryGUI::OnGUIEvent( int id ) case GEOMOp::OpWhatIs: // MENU MEASURE - WHATIS case GEOMOp::OpCheckShape: // MENU MEASURE - CHECK case GEOMOp::OpCheckCompound: // MENU MEASURE - CHECK COMPOUND OF BLOCKS + case GEOMOp::OpGetNonBlocks: // MENU MEASURE - Get NON BLOCKS case GEOMOp::OpPointCoordinates: // MENU MEASURE - POINT COORDINATES case GEOMOp::OpCheckSelfInters: // MENU MEASURE - CHECK SELF INTERSECTIONS libName = "MeasureGUI"; @@ -829,6 +830,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::OpWhatIs, "WHAT_IS" ); createGeomAction( GEOMOp::OpCheckShape, "CHECK" ); createGeomAction( GEOMOp::OpCheckCompound, "CHECK_COMPOUND" ); + createGeomAction( GEOMOp::OpGetNonBlocks, "GET_NON_BLOCKS" ); createGeomAction( GEOMOp::OpCheckSelfInters, "CHECK_SELF_INTERSECTIONS" ); #ifdef _DEBUG_ // PAL16821 @@ -1059,6 +1061,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpWhatIs, measurId, -1 ); createMenu( GEOMOp::OpCheckShape, measurId, -1 ); createMenu( GEOMOp::OpCheckCompound, measurId, -1 ); + createMenu( GEOMOp::OpGetNonBlocks, measurId, -1 ); createMenu( GEOMOp::OpCheckSelfInters, measurId, -1 ); #ifdef _DEBUG_ // PAL16821 @@ -1196,6 +1199,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpWhatIs, measureTbId ); createTool( GEOMOp::OpCheckShape, measureTbId ); createTool( GEOMOp::OpCheckCompound, measureTbId ); + createTool( GEOMOp::OpGetNonBlocks, measureTbId ); createTool( GEOMOp::OpCheckSelfInters, measureTbId ); int picturesTbId = createTool( tr( "TOOL_PICTURES" ) ); diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index 3d8a41d4e..9cb259b5d 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -24,7 +24,7 @@ namespace GEOMOp { enum { - // ToolsGUI ------------------//-------------------------------- + // ToolsGUI --------------------//-------------------------------- OpImport = 1000, // MENU FILE - IMPORT OpExport = 1001, // MENU FILE - EXPORT OpDelete = 1020, // MENU EDIT - DELETE @@ -57,7 +57,7 @@ namespace GEOMOp { OpEdgeWidth = 1260, // POPUP MENU - LINE WIDTH - EDGE WIDTH OpIsosWidth = 1261, // POPUP MENU - LINE WIDTH - ISOS WIDTH - // DisplayGUI ----------------//-------------------------------- + // DisplayGUI ------------------//-------------------------------- OpSwitchVectors = 2001, // MENU VIEW - DISPLAY MODE - SHOW/HIDE EDGE DIRECTION OpShowAll = 2002, // MENU VIEW - SHOW ALL OpHideAll = 2003, // MENU VIEW - HIDE ALL @@ -74,7 +74,7 @@ namespace GEOMOp { OpTexture = 2204, // POPUP MENU - DISPLAY MODE - TEXTURE OpBringToFront = 2205, // POPUP MENU - BRING TO FRONT OpClsBringToFront = 2206, - // BasicGUI ------------------//-------------------------------- + // BasicGUI --------------------//-------------------------------- OpPoint = 3000, // MENU NEW ENTITY - BASIC - POINT OpLine = 3001, // MENU NEW ENTITY - BASIC - LINE OpCircle = 3002, // MENU NEW ENTITY - BASIC - CIRCLE @@ -85,7 +85,7 @@ namespace GEOMOp { OpCurve = 3007, // MENU NEW ENTITY - BASIC - CURVE OpLCS = 3008, // MENU NEW ENTITY - BASIC - LOCAL COORDINATE SYSTEM OpOriginAndVectors = 3009, // MENU NEW ENTITY - BASIC - ORIGIN AND BASE VECTORS - // PrimitiveGUI --------------//-------------------------------- + // PrimitiveGUI ----------------//-------------------------------- OpBox = 3100, // MENU NEW ENTITY - PRIMITIVES - BOX OpCylinder = 3101, // MENU NEW ENTITY - PRIMITIVES - CYLINDER OpSphere = 3102, // MENU NEW ENTITY - PRIMITIVES - SPHERE @@ -93,12 +93,12 @@ namespace GEOMOp { OpCone = 3104, // MENU NEW ENTITY - PRIMITIVES - CONE OpRectangle = 3105, // MENU NEW ENTITY - PRIMITIVES - FACE OpDisk = 3106, // MENU NEW ENTITY - PRIMITIVES - DISK - // GenerationGUI -------------//-------------------------------- + // GenerationGUI ---------------//-------------------------------- OpPrism = 3200, // MENU NEW ENTITY - GENERATION - EXTRUSION OpRevolution = 3201, // MENU NEW ENTITY - GENERATION - REVOLUTION OpFilling = 3202, // MENU NEW ENTITY - GENERATION - FILLING OpPipe = 3203, // MENU NEW ENTITY - GENERATION - EXTRUSION ALONG PATH - // EntityGUI -----------------//-------------------------------- + // EntityGUI -------------------//-------------------------------- Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER OpExplode = 3302, // MENU NEW ENTITY - EXPLODE @@ -106,20 +106,19 @@ namespace GEOMOp { OpFeatureDetect = 3303, // MENU NEW ENTITY - FEATURE DETECTION #endif OpPictureImport = 3304, // MENU NEW ENTITY - IMPORT PICTURE IN VIEWER - - // BuildGUI ------------------//-------------------------------- + // BuildGUI --------------------//-------------------------------- OpEdge = 3400, // MENU NEW ENTITY - BUILD - EDGE OpWire = 3401, // MENU NEW ENTITY - BUILD - WIRE OpFace = 3402, // MENU NEW ENTITY - BUILD - FACE OpShell = 3403, // MENU NEW ENTITY - BUILD - SHELL OpSolid = 3404, // MENU NEW ENTITY - BUILD - SOLID OpCompound = 3405, // MENU NEW ENTITY - BUILD - COMPOUND - // BooleanGUI ----------------//-------------------------------- + // BooleanGUI ------------------//-------------------------------- OpFuse = 3500, // MENU OPERATIONS - BOOLEAN - FUSE OpCommon = 3501, // MENU OPERATIONS - BOOLEAN - COMMON OpCut = 3502, // MENU OPERATIONS - BOOLEAN - CUT OpSection = 3503, // MENU OPERATIONS - BOOLEAN - SECTION - // TransformationGUI ---------//-------------------------------- + // TransformationGUI -----------//-------------------------------- OpTranslate = 3600, // MENU OPERATIONS - TRANSFORMATION - TRANSLATION OpRotate = 3601, // MENU OPERATIONS - TRANSFORMATION - ROTATION OpChangeLoc = 3602, // MENU OPERATIONS - TRANSFORMATION - LOCATION @@ -130,7 +129,7 @@ namespace GEOMOp { OpMultiRotate = 3607, // MENU OPERATIONS - TRANSFORMATION - MULTI-ROTATION OpReimport = 3608, // POPUP MENU - RELOAD IMPORTED OpProjection = 3609, // MENU OPERATIONS - TRANSFORMATION - PROJECTION - // OperationGUI + // OperationGUI ----------------//-------------------------------- OpPartition = 3700, // MENU OPERATION - PARTITION OpArchimede = 3701, // MENU OPERATION - ARCHIMEDE OpFillet3d = 3702, // MENU OPERATION - FILLET @@ -142,7 +141,7 @@ namespace GEOMOp { OpSharedShapes = 3708, // MENU OPERATION - GET SHARED SHAPES OpExtrudedBoss = 3709, // MENU OPERATION - ETRUDED BOSS OpExtrudedCut = 3710, // MENU OPERATION - ETRUDED CUT - // RepairGUI -----------------//-------------------------------- + // RepairGUI -------------------//-------------------------------- OpSewing = 4000, // MENU REPAIR - SEWING OpSuppressFaces = 4001, // MENU REPAIR - SUPPRESS FACES OpSuppressHoles = 4002, // MENU REPAIR - SUPPRESS HOLES @@ -158,7 +157,7 @@ namespace GEOMOp { OpLimitTolerance = 4012, // MENU REPAIR - LIMIT TOLERANCE OpGlueEdges = 4013, // MENU REPAIR - GLUE EDGES OpFuseEdges = 4014, // MENU REPAIR - FUSE COLLINEAR EDGES - // MeasureGUI ----------------//-------------------------------- + // MeasureGUI ------------------//-------------------------------- OpProperties = 5000, // MENU MEASURES - PROPERTIES OpCenterMass = 5001, // MENU MEASURES - CENTRE OF MASS OpInertia = 5002, // MENU MEASURES - INERTIA @@ -172,22 +171,23 @@ namespace GEOMOp { OpCheckCompound = 5010, // MENU MEASURES - CHECK COMPOUND OF BLOCKS OpPointCoordinates = 5011, // MENU MEASURES - POINT COORDINATES OpCheckSelfInters = 5012, // MENU MEASURES - CHECK SELF INTERSECTIONS - // GroupGUI ------------------//-------------------------------- + OpGetNonBlocks = 5013, // MENU MEASURES - GET NON BLOCKS + // GroupGUI --------------------//-------------------------------- OpGroupCreate = 6000, // MENU GROUP - CREATE OpGroupEdit = 6001, // MENU GROUP - EDIT OpGroupCreatePopup = 6002, // POPUP MENU - CREATE GROUP - // BlocksGUI -----------------//-------------------------------- + // BlocksGUI -------------------//-------------------------------- OpHexaSolid = 6100, // MENU BLOCKS - HEXAHEDRAL SOLID OpMultiTransform = 6101, // MENU BLOCKS - MULTI-TRANSFORMATION OpQuadFace = 6102, // MENU BLOCKS - QUADRANGLE FACE OpPropagate = 6103, // MENU BLOCKS - PROPAGATE OpExplodeBlock = 6104, // MENU BLOCKS - EXPLODE ON BLOCKS - // AdvancedGUI ---------------//-------------------------------- + // AdvancedGUI -----------------//-------------------------------- OpAdvancedNoOp = 10000, // NO OPERATION (advanced operations base) OpPipeTShape = 10001, // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE -// OpPipeTShapeGroups = 10002, // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE GROUPS - OpDividedDisk = 10003, // MENU NEW ENTITY - ADVANCED - DIVIDEDDISK - OpDividedCylinder = 10004, // MENU NEW ENTITY - ADVANCED - DIVIDEDCYLINDER + //OpPipeTShapeGroups = 10002, // MENU NEW ENTITY - ADVANCED - PIPE TSHAPE GROUPS + OpDividedDisk = 10003, // MENU NEW ENTITY - ADVANCED - DIVIDEDDISK + OpDividedCylinder = 10004, // MENU NEW ENTITY - ADVANCED - DIVIDEDCYLINDER //@@ insert new functions before this line @@ do not remove this line @@// }; } diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index 95c2dbf08..d50d24858 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -600,7 +600,8 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const TopTools_ListOfShape BLO; // All blocks from the given compound TopTools_ListOfShape NOT; // Not blocks TopTools_ListOfShape EXT; // Hexahedral solids, having degenerated and/or seam edges - GEOMImpl_IBlocksOperations::AddBlocksFrom(aFixedExtra, BLO, NOT, EXT); + TopTools_ListOfShape NOQ; // All non-quadrangular faces + GEOMImpl_IBlocksOperations::AddBlocksFrom(aFixedExtra, BLO, NOT, EXT, NOQ); if (NOT.Extent() > 0) { MESSAGE("Some non-blocks have been removed"); diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 42aaa4260..efb69f42c 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifdef WNT #pragma warning( disable:4786 ) @@ -1735,7 +1734,8 @@ Standard_Boolean GEOMImpl_IBlocksOperations::IsCompoundOfBlocks void GEOMImpl_IBlocksOperations::AddBlocksFrom (const TopoDS_Shape& theShape, TopTools_ListOfShape& BLO, TopTools_ListOfShape& NOT, - TopTools_ListOfShape& EXT) + TopTools_ListOfShape& EXT, + TopTools_ListOfShape& NOQ) { TopAbs_ShapeEnum aType = theShape.ShapeType(); switch (aType) { @@ -1744,7 +1744,7 @@ void GEOMImpl_IBlocksOperations::AddBlocksFrom (const TopoDS_Shape& theShape, { TopoDS_Iterator It (theShape); for (; It.More(); It.Next()) { - AddBlocksFrom(It.Value(), BLO, NOT, EXT); + AddBlocksFrom(It.Value(), BLO, NOT, EXT, NOQ); } } break; @@ -1766,7 +1766,7 @@ void GEOMImpl_IBlocksOperations::AddBlocksFrom (const TopoDS_Shape& theShape, for (; expF.More(); expF.Next()) { if (mapFaces.Add(expF.Current())) { nbFaces++; - if (nbFaces > 6) break; + //0021483//if (nbFaces > 6) break; // get wire TopoDS_Shape aF = expF.Current(); @@ -1774,14 +1774,18 @@ void GEOMImpl_IBlocksOperations::AddBlocksFrom (const TopoDS_Shape& theShape, if (!wires.More()) { // no wire in the face hasNonQuadr = Standard_True; - break; + 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; - break; + NOQ.Append(aF);//0021483 + //0021483//break; + continue; } // Check number of edges in the face @@ -1796,6 +1800,7 @@ void GEOMImpl_IBlocksOperations::AddBlocksFrom (const TopoDS_Shape& theShape, } if (nbEdges != 4) { hasNonQuadr = Standard_True; + NOQ.Append(aF);//0021483 } } } @@ -1808,6 +1813,47 @@ void GEOMImpl_IBlocksOperations::AddBlocksFrom (const TopoDS_Shape& theShape, } } break; + case TopAbs_SHELL: //0021483 + case TopAbs_FACE: //0021483 + { + // Count edges in each face + 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; + } + + // 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) { + NOQ.Append(aF);//0021483 + } + } + } + } + break; default: NOT.Append(theShape); } @@ -2353,7 +2399,8 @@ Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks TopTools_ListOfShape NOT; // Not blocks TopTools_ListOfShape EXT; // Hexahedral solids, having degenerated and/or seam edges TopTools_ListOfShape BLO; // All blocks from the given compound - AddBlocksFrom(aBlockOrComp, BLO, NOT, EXT); + TopTools_ListOfShape NOQ; // All non-quadrangular faces + AddBlocksFrom(aBlockOrComp, BLO, NOT, EXT, NOQ); // Report non-blocks if (NOT.Extent() > 0) { @@ -2513,6 +2560,100 @@ Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks return isCompOfBlocks; } +//============================================================================= +/*! + * GetNonBlocks + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetNonBlocks + (Handle(GEOM_Object) theShape, + Handle(GEOM_Object)& theNonQuads) +{ + SetErrorCode(KO); + + if (theShape.IsNull()) return NULL; + TopoDS_Shape aShape = theShape->GetValue(); + + // Separate blocks from non-blocks + TopTools_ListOfShape BLO; // All blocks from the given compound + 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); + + if (NOT.IsEmpty() && EXT.IsEmpty() && NOQ.IsEmpty()) { + SetErrorCode("NOT_FOUND_ANY"); + return NULL; + } + + // Map sub-shapes and their indices + TopTools_IndexedMapOfShape anIndices; + TopExp::MapShapes(aShape, anIndices); + + // Non-blocks + Handle(GEOM_Object) aNonBlocks; + if (NOT.Extent() > 0 || EXT.Extent() > 0) { + Handle(TColStd_HArray1OfInteger) anArray = + new TColStd_HArray1OfInteger (1, NOT.Extent() + EXT.Extent()); + Standard_Integer ii = 1; + TopTools_ListIteratorOfListOfShape it1 (NOT); + for (; it1.More(); it1.Next(), ii++) { + anArray->SetValue(ii, anIndices.FindIndex(it1.Value())); + } + TopTools_ListIteratorOfListOfShape it2 (EXT); + for (; it2.More(); it2.Next(), ii++) { + anArray->SetValue(ii, anIndices.FindIndex(it2.Value())); + } + + aNonBlocks = GetEngine()->AddSubShape(theShape, anArray); + if (aNonBlocks.IsNull()) { + SetErrorCode("Error in algorithm: result found, but cannot be returned."); + return NULL; + } + aNonBlocks->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = aNonBlocks->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)TopAbs_SOLID); + } + + // Non-quadrangles + if (NOQ.Extent() > 0) { + Handle(TColStd_HArray1OfInteger) anArray = + new TColStd_HArray1OfInteger (1, NOQ.Extent()); + Standard_Integer ii = 1; + TopTools_ListIteratorOfListOfShape it1 (NOQ); + for (; it1.More(); it1.Next(), ii++) { + anArray->SetValue(ii, anIndices.FindIndex(it1.Value())); + } + + theNonQuads = GetEngine()->AddSubShape(theShape, anArray); + if (theNonQuads.IsNull()) { + SetErrorCode("Error in algorithm: result found, but cannot be returned."); + return NULL; + } + theNonQuads->SetType(GEOM_GROUP); + TDF_Label aFreeLabel = theNonQuads->GetFreeLabel(); + TDataStd_Integer::Set(aFreeLabel, (Standard_Integer)TopAbs_FACE); + } + + //Make a Python command + Handle(GEOM_Function) aMainShape = theShape->GetLastFunction(); + GEOM::TPythonDump pd (aMainShape, /*append=*/true); + pd << "("; + if (aNonBlocks.IsNull()) + pd << "no_bad_solids"; + else + pd << aNonBlocks; + pd << ", "; + if (theNonQuads.IsNull()) + pd << "no_bad_faces"; + else + pd << theNonQuads; + pd << ") = geompy.GetNonBlocks(" << theShape << ")"; + + SetErrorCode(OK); + return aNonBlocks; +} + //============================================================================= /*! * RemoveExtraEdges diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx index f702da402..8a34d5510 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.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_IBlocksOperations_HXX_ #define _GEOMImpl_IBlocksOperations_HXX_ @@ -126,14 +125,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations { }; Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound, - std::list& theErrors); + std::list& theErrors); Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound, - std::list& theErrors); + std::list& theErrors); - Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound, + Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound, const std::list& theErrors); + Standard_EXPORT Handle(GEOM_Object) GetNonBlocks (Handle(GEOM_Object) theShape, + Handle(GEOM_Object)& theNonQuads); + Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape, const Standard_Integer theOptimumNbFaces = 6); @@ -142,7 +144,8 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations { Standard_EXPORT static void AddBlocksFrom (const TopoDS_Shape& theShape, TopTools_ListOfShape& BLO, TopTools_ListOfShape& NOT, - TopTools_ListOfShape& EXT); + TopTools_ListOfShape& EXT, + TopTools_ListOfShape& NOQ); // Extract blocks from blocks compounds Standard_EXPORT Handle(TColStd_HSequenceOfTransient) ExplodeCompoundOfBlocks diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index 0c1917d46..c71432528 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_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 @@ -742,6 +741,39 @@ char* GEOM_IBlocksOperations_i::PrintBCErrors return CORBA::string_dup(aDescr.ToCString()); } +//============================================================================= +/*! + * GetNonBlocks + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetNonBlocks + (GEOM::GEOM_Object_ptr theShape, + GEOM::GEOM_Object_out theNonQuads) +{ + GEOM::GEOM_Object_var aGEOMObject; + GEOM::GEOM_Object_var aNonQuads; + + theNonQuads = aNonQuads._retn(); + + //Set a not done flag + GetOperations()->SetNotDone(); + + //Get the reference Objects + Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + if (aShape.IsNull()) return aGEOMObject._retn(); + + //Get the result + Handle(GEOM_Object) aFaces; + Handle(GEOM_Object) anObject = GetOperations()->GetNonBlocks(aShape, aFaces); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + if (!aFaces.IsNull()) + theNonQuads = GetObject(aFaces); + + return GetObject(anObject); +} + //============================================================================= /*! * RemoveExtraEdges diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh index a801a1e7e..6f5765092 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.hh +++ b/src/GEOM_I/GEOM_IBlocksOperations_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_IBlocksOperations_i_HeaderFile #define _GEOM_IBlocksOperations_i_HeaderFile @@ -121,6 +120,9 @@ class GEOM_I_EXPORT GEOM_IBlocksOperations_i : char* PrintBCErrors (GEOM::GEOM_Object_ptr theCompound, const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors); + GEOM::GEOM_Object_ptr GetNonBlocks (GEOM::GEOM_Object_ptr theShape, + GEOM::GEOM_Object_out theNonQuads); + GEOM::GEOM_Object_ptr RemoveExtraEdges (GEOM::GEOM_Object_ptr theShape, CORBA::Long theOptimumNbFaces); diff --git a/src/GEOM_SWIG/GEOM_Spanner.py b/src/GEOM_SWIG/GEOM_Spanner.py index 05c23aed6..7c17db76a 100644 --- a/src/GEOM_SWIG/GEOM_Spanner.py +++ b/src/GEOM_SWIG/GEOM_Spanner.py @@ -20,18 +20,17 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - # GEOM GEOM_SWIG : binding of C++ implementaion with Python # File : GEOM_Spanner.py # Author : Julia DOROVSKIKH # Module : GEOM -# $Header$ +# # ! Please, if you edit this example file, update also # ! GEOM_SRC/doc/salome/gui/GEOM/input/tui_test_spanner.doc # ! as some sequences of symbols from this example are used during # ! documentation generation to identify certain places of this file -############# MakeSpanner ############# # +############# MakeSpanner ############# def MakeSpanner (geompy, math, isBlocksTest = 0, isMeshTest = 0, smesh = None): ### Variables ### @@ -304,6 +303,11 @@ def MakeSpanner (geompy, math, isBlocksTest = 0, isMeshTest = 0, smesh = None): isCompOfBlocks6 = BlocksOp.CheckCompoundOfBlocks(Spanner) if isCompOfBlocks6 == 0: print "Spanner is not a compound of hexahedral solids" + (NonBlocks, NonQuads) = geompy.GetNonBlocks(Spanner) + if NonBlocks is not None: + geompy.addToStudyInFather(Spanner, NonBlocks, "Group of non-hexahedral solids") + if NonQuads is not None: + geompy.addToStudyInFather(Spanner, NonQuads, "Group of non-quadrangular faces") else: print "Spanner is a compound of hexahedral solids" diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 8e65788e2..73d91287d 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -243,6 +243,11 @@ def TestOtherOperations (geompy, math): IsValid = geompy.CheckCompoundOfBlocks(Compound1) if IsValid == 0: print "The Blocks Compound is NOT VALID" + (NonBlocks, NonQuads) = geompy.GetNonBlocks(Compound1) + if NonBlocks is not None: + geompy.addToStudyInFather(Compound1, NonBlocks, "Group of non-hexahedral solids") + if NonQuads is not None: + geompy.addToStudyInFather(Compound1, NonQuads, "Group of non-quadrangular faces") else: print "The Blocks Compound is VALID" diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index ca34d8893..b7e5a4a92 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -7774,6 +7774,36 @@ class geompyDC(GEOM._objref_GEOM_Gen): print Descr return IsValid + ## Retrieve all non blocks solids and faces from \a theShape. + # @param theShape The shape to explore. + # @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. + # + # @ref tui_measurement_tools_page "Example 1" + # \n @ref swig_GetNonBlocks "Example 2" + def GetNonBlocks (self, theShape): + """ + Retrieve all non blocks solids and faces from theShape. + + Parameters: + theShape The shape to explore. + + Returns: + A tuple of two GEOM_Objects. The first object is a group of all + non block solids (= not 6 faces, or with 6 faces, but with the + presence of non-quadrangular faces). The second object is a + group of all non quadrangular faces. + + Usage: + (res_sols, res_faces) = geompy.GetNonBlocks(myShape1) + """ + # Example: see GEOM_Spanner.py + aTuple = self.BlocksOp.GetNonBlocks(theShape) + RaiseIfFailed("GetNonBlocks", self.BlocksOp) + return aTuple + ## Remove all seam and degenerated edges from \a theShape. # Unite faces and edges, sharing one surface. It means that # this faces must have references to one C++ surface object (handle). diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am index 8b0541a9a..55cfcf7a5 100644 --- a/src/MeasureGUI/Makefile.am +++ b/src/MeasureGUI/Makefile.am @@ -40,6 +40,7 @@ salomeinclude_HEADERS = \ MeasureGUI_WhatisDlg.h \ MeasureGUI_CheckShapeDlg.h \ MeasureGUI_CheckCompoundOfBlocksDlg.h \ + MeasureGUI_GetNonBlocksDlg.h \ MeasureGUI_CheckSelfIntersectionsDlg.h \ MeasureGUI_PointDlg.h @@ -61,6 +62,7 @@ dist_libMeasureGUI_la_SOURCES = \ MeasureGUI_WhatisDlg.cxx \ MeasureGUI_CheckShapeDlg.cxx \ MeasureGUI_CheckCompoundOfBlocksDlg.cxx \ + MeasureGUI_GetNonBlocksDlg.cxx \ MeasureGUI_CheckSelfIntersectionsDlg.cxx \ MeasureGUI_PointDlg.cxx @@ -78,6 +80,7 @@ MOC_FILES = \ MeasureGUI_WhatisDlg_moc.cxx \ MeasureGUI_CheckShapeDlg_moc.cxx \ MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx \ + MeasureGUI_GetNonBlocksDlg_moc.cxx \ MeasureGUI_CheckSelfIntersectionsDlg_moc.cxx \ MeasureGUI_PointDlg_moc.cxx @@ -122,4 +125,3 @@ libMeasureGUI_la_CPPFLAGS = \ libMeasureGUI_la_LDFLAGS = \ $(CAS_LDFLAGS) -lTKGeomBase \ ../GEOMBase/libGEOMBase.la ../DlgRef/libDlgRef.la - diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx index e1ddbfcff..f31cf7161 100644 --- a/src/MeasureGUI/MeasureGUI.cxx +++ b/src/MeasureGUI/MeasureGUI.cxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // GEOM GEOMGUI : GUI for Geometry component // File : MeasureGUI.cxx @@ -42,6 +41,7 @@ #include "MeasureGUI_WhatisDlg.h" // Method WHATIS #include "MeasureGUI_CheckShapeDlg.h" // Method CHECKSHAPE #include "MeasureGUI_CheckCompoundOfBlocksDlg.h" // Method CHECKCOMPOUND +#include "MeasureGUI_GetNonBlocksDlg.h" // Method GET NON BLOCKS #include "MeasureGUI_CheckSelfIntersectionsDlg.h" // Method CHECK SELF INTERSCTIONS #include "MeasureGUI_PointDlg.h" // Method POINTCOORDINATES @@ -110,6 +110,9 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case GEOMOp::OpCheckCompound: dlg = new MeasureGUI_CheckCompoundOfBlocksDlg( getGeometryGUI(), parent ); break; // CHECKCOMPOUND + case GEOMOp::OpGetNonBlocks: + dlg = new MeasureGUI_GetNonBlocksDlg(getGeometryGUI(), parent); + break; // GET NON BLOCKS case GEOMOp::OpCheckSelfInters: dlg = new MeasureGUI_CheckSelfIntersectionsDlg( getGeometryGUI(), parent ); break; // CHECK SELF INTERSCTIONS diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx index 84676e669..df20f449c 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx @@ -84,7 +84,7 @@ MeasureGUI_CenterMassDlg::MeasureGUI_CenterMassDlg( GeometryGUI* theGeometryGUI, /***************************************************************/ - myHelpFileName = "using_measurement_tools_page.html#center_mass_anchor"; + myHelpFileName = "center_mass_page.html"; /* Initialisation */ Init(); diff --git a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx new file mode 100644 index 000000000..517f5974f --- /dev/null +++ b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.cxx @@ -0,0 +1,277 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// GEOM GEOMGUI : GUI for Geometry component +// File : MeasureGUI_GetNonBlocksDlg.cxx + +#include "MeasureGUI_GetNonBlocksDlg.h" + +#include +#include + +#include + +#include +#include +#include +#include +#include + +//================================================================================= +// class : MeasureGUI_GetNonBlocksDlg() +// purpose : Constructs a MeasureGUI_GetNonBlocksDlg 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_GetNonBlocksDlg::MeasureGUI_GetNonBlocksDlg (GeometryGUI* theGeometryGUI, QWidget* parent) + : GEOMBase_Skeleton(theGeometryGUI, parent, false) +{ + QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_GETNONBLOCKS"))); + QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); + + setWindowTitle(tr("GEOM_GETNONBLOCKS_TITLE")); + + /***************************************************************/ + mainFrame()->GroupConstructors->setTitle(tr("GEOM_GETNONBLOCKS")); + mainFrame()->RadioButton1->setIcon(image0); + mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton2->close(); + mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton3->close(); + + myGrp = new DlgRef_1Sel (centralWidget()); + myGrp->GroupBox1->setTitle(tr("GEOM_GETNONBLOCKS")); + myGrp->TextLabel1->setText(tr("GEOM_OBJECT")); + myGrp->PushButton1->setIcon(image1); + myGrp->LineEdit1->setReadOnly(true); + + QVBoxLayout* layout = new QVBoxLayout(centralWidget()); + layout->setMargin(0); layout->setSpacing(6); + layout->addWidget(myGrp); + + /***************************************************************/ + + myHelpFileName = "get_non_blocks_page.html"; + + /* Initialisation */ + Init(); +} + +//================================================================================= +// function : ~MeasureGUI_GetNonBlocksDlg() +// purpose : Destroys the object and frees any allocated resources +//================================================================================= +MeasureGUI_GetNonBlocksDlg::~MeasureGUI_GetNonBlocksDlg() +{ +} + +//================================================================================= +// function : Init() +// purpose : +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::Init() +{ + showOnlyPreviewControl(); + + /* init variables */ + myEditCurrentArgument = myGrp->LineEdit1; + + /* 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(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + + //initName(tr("GEOM_NONBLOCKS")); + mainFrame()->ResultName->setText(tr("GEOM_NONBLOCKS")); + globalSelection(); + SelectionIntoArgument(); +} + +//================================================================================= +// function : ClickOnOk() +// purpose : +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::ClickOnOk() +{ + if (ClickOnApply()) + ClickOnCancel(); +} + +//================================================================================= +// function : ClickOnApply() +// purpose : +//================================================================================= +bool MeasureGUI_GetNonBlocksDlg::ClickOnApply() +{ + if (!onAccept()) + return false; + + //initName(); + return true; +} + +//================================================================================= +// function : SelectionIntoArgument() +// purpose : Called when selection as changed or other case +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::SelectionIntoArgument() +{ + erasePreview(); + myObj = GEOM::GEOM_Object::_nil(); + + LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); + SALOME_ListIO aSelList; + aSelMgr->selectedObjects(aSelList); + + if (aSelList.Extent() != 1) { + processObject(); + return; + } + + GEOM::GEOM_Object_var aSelectedObject = + GEOMBase::ConvertIOinGEOMObject(aSelList.First()); + + if (aSelectedObject->_is_nil()) { + processObject(); + return; + } + + myObj = aSelectedObject; + processObject(); +} + +//================================================================================= +// function : SetEditCurrentArgument() +// purpose : +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::SetEditCurrentArgument() +{ + myGrp->LineEdit1->setFocus(); + myEditCurrentArgument = myGrp->LineEdit1; + SelectionIntoArgument(); +} + +//================================================================================= +// function : LineEditReturnPressed() +// purpose : +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::LineEditReturnPressed() +{ + QLineEdit* send = (QLineEdit*)sender(); + if (send == myGrp->LineEdit1) { + myEditCurrentArgument = myGrp->LineEdit1; + GEOMBase_Skeleton::LineEditReturnPressed(); + } +} + +//================================================================================= +// function : ActivateThisDialog() +// purpose : +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::ActivateThisDialog() +{ + GEOMBase_Skeleton::ActivateThisDialog(); + + connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + + globalSelection(); + processPreview(); +} + +//================================================================================= +// function : processObject() +// purpose : Fill dialog fields in accordance with myObj +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::processObject() +{ + if (myObj->_is_nil()) { + erasePreview(); + } + else { + myGrp->LineEdit1->setText(GEOMBase::GetName(myObj)); + + processPreview(); + } +} + +//================================================================================= +// function : enterEvent() +// purpose : +//================================================================================= +void MeasureGUI_GetNonBlocksDlg::enterEvent (QEvent*) +{ + if (!mainFrame()->GroupConstructors->isEnabled()) + ActivateThisDialog(); +} + +//================================================================================= +// function : createOperation +// purpose : +//================================================================================= +GEOM::GEOM_IOperations_ptr MeasureGUI_GetNonBlocksDlg::createOperation() +{ + return getGeomEngine()->GetIBlocksOperations(getStudyId()); +} + +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool MeasureGUI_GetNonBlocksDlg::isValid (QString&) +{ + return !myObj->_is_nil(); +} + +//================================================================================= +// function : execute +// purpose : +//================================================================================= +bool MeasureGUI_GetNonBlocksDlg::execute (ObjectList& objects) +{ + GEOM::GEOM_IBlocksOperations_var anOper = GEOM::GEOM_IBlocksOperations::_narrow(getOperation()); + GEOM::GEOM_Object_var aNonQuads; + GEOM::GEOM_Object_var anObj = anOper->GetNonBlocks(myObj, aNonQuads); + //mainFrame()->ResultName->setText(tr("GEOM_NONBLOCKS")); + + if (!anObj->_is_nil()) + objects.push_back(anObj._retn()); + if (!aNonQuads->_is_nil()) + objects.push_back(aNonQuads._retn()); + + return true; +} + +//================================================================ +// Function : getFather +// Purpose : Get father object for object to be added in study +// ( called with addInStudy method ) +//================================================================ +GEOM::GEOM_Object_ptr MeasureGUI_GetNonBlocksDlg::getFather (GEOM::GEOM_Object_ptr) +{ + return myObj; +} diff --git a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h new file mode 100644 index 000000000..438a4ec45 --- /dev/null +++ b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h @@ -0,0 +1,69 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// GEOM GEOMGUI : GUI for Geometry component +// File : MeasureGUI_GetNonBlocksDlg.h + +#ifndef MEASUREGUI_GETNONBLOCKSDLG_H +#define MEASUREGUI_GETNONBLOCKSDLG_H + +#include + +class DlgRef_1Sel; + +//================================================================================= +// class : MeasureGUI_GetNonBlocksDlg +// purpose : +//================================================================================= +class MeasureGUI_GetNonBlocksDlg : public GEOMBase_Skeleton +{ + Q_OBJECT + +public: + MeasureGUI_GetNonBlocksDlg (GeometryGUI*, QWidget*); + ~MeasureGUI_GetNonBlocksDlg(); + +protected: + // redefined from GEOMBase_Helper + virtual GEOM::GEOM_IOperations_ptr createOperation(); + virtual bool isValid (QString&); + virtual bool execute (ObjectList&); + virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); + +private slots: + void ClickOnOk(); + bool ClickOnApply(); + void ActivateThisDialog(); + void LineEditReturnPressed(); + void SelectionIntoArgument(); + void SetEditCurrentArgument(); + +private: + void Init(); + void enterEvent (QEvent*); + void processObject(); + +private: + GEOM::GEOM_Object_var myObj; + DlgRef_1Sel* myGrp; +}; + +#endif // MEASUREGUI_GETNONBLOCKSDLG_H -- 2.39.2