IPAL 18539 & turn off the local selection in PrimitiveGUI where it needs

diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index a684cf24b94818c945be6587fb6c09930b47c8a1..415ff983baf4fab07e3b064ff80aa1dd9ff1804d 100644 (file)
--- 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 c42d9fccbe2a903230d6ee8f523d6082d3480e85..4ff84badbada16883695d387d4715eb24d4d7060 100644 (file)
--- 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 9593128905ab27f40caa17bdc5a81203aa65b837..e2ad901fe6f69f1bc29e6e6dadfcb8c6a09ae2b9 100644 (file)
--- 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 3411259006513e9532014306f0ce5a5b599f3525..82de95d33dc6382d17149cc4defea6ce66bfd004 100644 (file)
--- 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 b51e1c2224bc198780a4364d15fbc14cc6a35ef4..8b0dbb107526521b67a65eca33012403319bdf39 100644 (file)
--- 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 2cf16f2d755fcbd3e1866886a21d05e4e07e779e..00fc1c109619a30a2012a98814d8e8c092edbd57 100644 (file)
--- 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();