From 1706a8d813956b88022dfa569743e1a24f52cb61 Mon Sep 17 00:00:00 2001 From: dmv Date: Mon, 14 Jan 2008 15:07:41 +0000 Subject: [PATCH] IPAL 18539 & turn off the local selection in PrimitiveGUI where it needs --- src/GEOM_SWIG/geompyDC.py | 21 +++++++++++++++++++ src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx | 1 + src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 1 + src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 1 + src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx | 1 + src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 1 + 6 files changed, 26 insertions(+) diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index a684cf24b..415ff983b 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -186,6 +186,16 @@ class geompyDC(GEOM._objref_GEOM_Gen): anObj = self.BasicOp.MakePointOnCurve(theRefCurve, theParameter) RaiseIfFailed("MakePointOnCurve", self.BasicOp) return anObj + + ## Create a point on intersection of two lines. + # @param theRefLine1, theRefLine2 The referenced lines. + # @return New GEOM_Object, containing the created point. + # + # Example: see GEOM_TestAll.py + def MakeVertexOnLinesIntersection(self, theRefLine1, theRefLine2): + anObj = self.BasicOp.MakePointOnLinesIntersection(theRefLine1, theRefLine2) + RaiseIfFailed("MakePointOnLinesIntersection", self.BasicOp) + return anObj ## Create a tangent, corresponding to the given parameter on the given curve. # @param theRefCurve The referenced curve. @@ -241,6 +251,17 @@ class geompyDC(GEOM._objref_GEOM_Gen): anObj = self.BasicOp.MakeLineTwoPnt(thePnt1, thePnt2) RaiseIfFailed("MakeLineTwoPnt", self.BasicOp) return anObj + + ## Create a line on two faces intersection. + # @param theFace1 First of two faces, defining the line. + # @param theFace2 Second of two faces, defining the line. + # @return New GEOM_Object, containing the created line. + # + # Example: see GEOM_TestAll.py + def MakeLineTwoFaces(self, theFace1, theFace2): + anObj = self.BasicOp.MakeLineTwoFaces(theFace1, theFace2) + RaiseIfFailed("MakeLineTwoFaces", self.BasicOp) + return anObj ## Create a plane, passing through the given point # and normal to the given vector. diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx index c42d9fccb..4ff84badb 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx @@ -191,6 +191,7 @@ void PrimitiveGUI_BoxDlg::ConstructorsClicked(int constructorId) case 1: { GroupPoints->hide(); + globalSelection(); // close local contexts, if any resize(0, 0); GroupDimensions->show(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx index 959312890..e2ad901fe 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx @@ -205,6 +205,7 @@ void PrimitiveGUI_ConeDlg::ConstructorsClicked(int constructorId) case 1 : { GroupPoints->hide(); + globalSelection(); // close local contexts, if any resize( 0, 0 ); GroupDimensions->show(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index 341125900..82de95d33 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -198,6 +198,7 @@ void PrimitiveGUI_CylinderDlg::ConstructorsClicked(int constructorId) case 1 : { GroupPoints->hide(); + globalSelection(); // close local contexts, if any resize( 0, 0 ); GroupDimensions->show(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx index b51e1c222..8b0dbb107 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx @@ -173,6 +173,7 @@ void PrimitiveGUI_SphereDlg::ConstructorsClicked (int constructorId) case 1: { GroupPoints->hide(); + globalSelection(); // close local contexts, if any resize(0, 0); GroupDimensions->show(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx index 2cf16f2d7..00fc1c109 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx @@ -199,6 +199,7 @@ void PrimitiveGUI_TorusDlg::ConstructorsClicked (int constructorId) case 1: { GroupPoints->hide(); + globalSelection(); // close local contexts, if any resize(0, 0); GroupDimensions->show(); -- 2.39.2