From 9bb289b3f3a4bd9641eedf671eb836549d977e43 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 23 Nov 2010 16:31:26 +0000 Subject: [PATCH] Merge from V5_1_5_BR 23/11/2010 --- .../GEOM/images/get_in_place_lost_part.png | Bin 0 -> 3357 bytes .../gui/GEOM/input/chamfer_operation.doc | 2 +- .../gui/GEOM/input/fillet1d_operation.doc | 2 +- .../gui/GEOM/input/fillet2d_operation.doc | 2 +- .../gui/GEOM/input/fillet_operation.doc | 2 +- doc/salome/gui/GEOM/input/partition.doc | 3 +- src/GEOMGUI/GEOM_msg_fr.ts | 26 +++++++++--------- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 2 +- src/GEOM_SWIG/geompyDC.py | 12 +++++++- 9 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/get_in_place_lost_part.png diff --git a/doc/salome/gui/GEOM/images/get_in_place_lost_part.png b/doc/salome/gui/GEOM/images/get_in_place_lost_part.png new file mode 100644 index 0000000000000000000000000000000000000000..2abc8432a284451e78b849eac996bd6aac7ea89c GIT binary patch literal 3357 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/chamfer_operation.doc b/doc/salome/gui/GEOM/input/chamfer_operation.doc index 38fdba843..9e464518d 100644 --- a/doc/salome/gui/GEOM/input/chamfer_operation.doc +++ b/doc/salome/gui/GEOM/input/chamfer_operation.doc @@ -3,7 +3,7 @@ \page chamfer_operation_page Chamfer \n To produce a \b Chamfer in the Main Menu select -Operations - > Transformation - > Chamfer +Operations - > Chamfer \n This operation allows you to make chamfer of the edges of a Shape. \n The \b Result will be a \b GEOM_Object. diff --git a/doc/salome/gui/GEOM/input/fillet1d_operation.doc b/doc/salome/gui/GEOM/input/fillet1d_operation.doc index 46d291b48..7e1174bd5 100644 --- a/doc/salome/gui/GEOM/input/fillet1d_operation.doc +++ b/doc/salome/gui/GEOM/input/fillet1d_operation.doc @@ -10,7 +10,7 @@ constructed, have to lie in the same plane. \image html fillet1d_2.png To produce a \b Fillet 1D in the Main Menu select -Operations - > Transformation - > Fillet 1D +Operations - > Fillet 1D Define the Wire with planar Edges to create a fillet on, select the necessary vertexes on this wire in the OCC Viewer and define the \b Radius of the Fillet. diff --git a/doc/salome/gui/GEOM/input/fillet2d_operation.doc b/doc/salome/gui/GEOM/input/fillet2d_operation.doc index 74b044b05..a4c06f5e0 100755 --- a/doc/salome/gui/GEOM/input/fillet2d_operation.doc +++ b/doc/salome/gui/GEOM/input/fillet2d_operation.doc @@ -7,7 +7,7 @@ This operation creates fillets on the corners of a 2D Planar Face. \image html fillet2d_2.png To produce a \b Fillet 2D in the Main Menu select -Operations - > Transformation - > Fillet 2D +Operations - > Fillet 2D Define the Planar Face to create a fillet on, select the necessary vertexes on this face in the OCC Viewer and define the \b Radius of the Fillet. diff --git a/doc/salome/gui/GEOM/input/fillet_operation.doc b/doc/salome/gui/GEOM/input/fillet_operation.doc index 8bf2ee1f6..e913892e2 100644 --- a/doc/salome/gui/GEOM/input/fillet_operation.doc +++ b/doc/salome/gui/GEOM/input/fillet_operation.doc @@ -3,7 +3,7 @@ \page fillet_operation_page Fillet \n To produce a \b Fillet in the Main Menu select -Operations - > Transformation - > Fillet +Operations - > Fillet \n This operation creates fillets on the edges of a shape. \n The \b Result will be a \b GEOM_Object. diff --git a/doc/salome/gui/GEOM/input/partition.doc b/doc/salome/gui/GEOM/input/partition.doc index c58d6ed63..c802d7611 100644 --- a/doc/salome/gui/GEOM/input/partition.doc +++ b/doc/salome/gui/GEOM/input/partition.doc @@ -97,8 +97,7 @@ previous versions of SALOME. \image html partitionsn2.png "Result of intersection" \anchor partition_picture_3 -\image html partitionsn3.png "Result of intersection of a box and a -plane (both as \em Objects, no tools) with the Resulting type \em Solid and checked "Keep shapes of lower type" +\image html partitionsn3.png "Result of intersection of a box and a plane (both as \em Objects, no tools) with the Resulting type \em Solid and checked 'Keep shapes of lower type'" Our TUI Scripts provide you with useful examples of \ref tui_partition "Basic Operations". diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 33bff63ba..68b7685e3 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -1127,11 +1127,11 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_PIPE - tuyau + Tuyau GEOM_PIPE_TITLE - Construction d'un Tuyau + Construction d'un tuyau GEOM_SEGMENT @@ -1910,7 +1910,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau Vecteur - GEOM_AXIS_DEFAULT + GEOM_AXIS_DEFAULT (Axe Z par défaut) @@ -2207,7 +2207,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_EDIT - Editer + Edition MEN_ELLIPSE @@ -2575,7 +2575,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_VIEW - Vue + Affichage MEN_WHAT_IS @@ -3387,7 +3387,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_DISK - Créer une disque + Créer un disque TOP_DISPLAY @@ -3463,11 +3463,11 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_GROUP_CREATE - Créer une groupe + Créer un groupe TOP_GROUP_EDIT - Editer une groupe + Editer un groupe TOP_HEX_SOLID @@ -3475,7 +3475,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_IMPORT - Importer une géométry d'un fichier BREP + Importer une géométrie d'un fichier BREP TOP_INERTIA @@ -3495,7 +3495,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_LOCAL_CS - Créer un système local de coordonnées + Créer un système local de coordonnées TOP_MASS_CENTER @@ -3503,7 +3503,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_MIN_DIST - Distance minimale + Distance minimale TOP_MIRROR @@ -4408,7 +4408,7 @@ Le nombre de points n'est pas suffisant SHOW_ALL_SUB_SHAPES Afficher tous les sous-objets - + SELECT_ALL Tout sélectionner @@ -4638,7 +4638,7 @@ Voulez-vous continuer? GEOM_PIPE_TSHAPE - TuyauT + Tuyau en T GEOM_PIPE_TSHAPE_MPIPE diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 7706ab3c9..9efec8b19 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -419,7 +419,7 @@ void GEOMToolsGUI::OnChangeTransparency( bool increase ) return; // Delta - float delta = 0.01; + float delta = 0.1; // VSR: 23/11/2010 (transparency value <= 0.05 is ignored) if ( !increase ) delta *= -1; diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 7a6cff704..5eaaf3c46 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -1995,8 +1995,14 @@ class geompyDC(GEOM._objref_GEOM_Gen): # @param theShapeWhat Shape, specifying what to find. # @return Group of all found sub-shapes or a single found sub-shape. # + # @note This function has a restriction on argument shapes. + # If \a theShapeWhere has curved parts with significantly + # outstanding centres (i.e. the mass centre of a part is closer to + # \a theShapeWhat than to the part), such parts will not be found. + # @image html get_in_place_lost_part.png + # # @ref swig_GetInPlace "Example" - def GetInPlace(self,theShapeWhere, theShapeWhat): + def GetInPlace(self, theShapeWhere, theShapeWhat): # Example: see GEOM_TestOthers.py anObj = self.ShapesOp.GetInPlace(theShapeWhere, theShapeWhat) RaiseIfFailed("GetInPlace", self.ShapesOp) @@ -2987,8 +2993,10 @@ class geompyDC(GEOM._objref_GEOM_Gen): # @ref tui_fillet2d "Example" def MakeFillet1D(self,theShape, theR, theListOfVertexes): # Example: see GEOM_TestAll.py + theR,Parameters = ParseParameters(theR) anObj = self.LocalOp.MakeFillet1D(theShape, theR, theListOfVertexes) RaiseIfFailed("MakeFillet1D", self.LocalOp) + anObj.SetParameters(Parameters) return anObj ## Perform a fillet on the specified edges/faces of the given shape @@ -3001,8 +3009,10 @@ class geompyDC(GEOM._objref_GEOM_Gen): # @ref tui_fillet2d "Example" def MakeFillet2D(self,theShape, theR, theListOfVertexes): # Example: see GEOM_TestAll.py + theR,Parameters = ParseParameters(theR) anObj = self.LocalOp.MakeFillet2D(theShape, theR, theListOfVertexes) RaiseIfFailed("MakeFillet2D", self.LocalOp) + anObj.SetParameters(Parameters) return anObj ## Perform a symmetric chamfer on all edges of the given shape. -- 2.39.2