Added unit test for the issue #1512

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 90006d1d04dbab4720545aea427eb0b50fe8d9ac..27298e20e11eb9eee2904c776a11ffea179a2437 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -128,4 +128,5 @@ ADD_UNIT_TESTS(TestConstants.py
                TestUndoRedo.py
                TestDocument.py
                Test1064.py
-               TestResults.py)
+               TestResults.py
+               Test1512.py)

diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i
index f05afc1f0c732c027c0122ae69b9347cd603bbe9..b8fcaaa9def05582d3620e2704d2676a09d2f14a 100644 (file)
--- a/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@ -112,6 +112,7 @@
 template<class T1, class T2> std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr<T2> theObject);
 %template(featureToCompositeFeature) shared_ptr_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
 %template(objectToFeature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_Object>;
+%template(objectToResult) shared_ptr_cast<ModelAPI_Result, ModelAPI_Object>;
 %template(compositeFeatureToFeature) shared_ptr_cast<ModelAPI_Feature, ModelAPI_CompositeFeature>;
 
 %template(modelAPI_Result) shared_ptr_cast<ModelAPI_Result, ModelAPI_Object>;

diff --git a/src/ModelAPI/ModelAPI_Tools.cpp b/src/ModelAPI/ModelAPI_Tools.cpp
index 922bad719dc152adc287359167ff794a928111e4..f80d20e1b9a9250448009e4923ae56baf8c62eb6 100755 (executable)
--- a/src/ModelAPI/ModelAPI_Tools.cpp
+++ b/src/ModelAPI/ModelAPI_Tools.cpp
@@ -565,5 +565,3 @@ void findRefsToFeatures(const std::set<FeaturePtr>& theFeatures,
 }
 
 } // namespace ModelAPI_Tools
-
-

diff --git a/src/ModelAPI/Test/Test1512.py b/src/ModelAPI/Test/Test1512.py
new file mode 100755 (executable)
index 0000000..7ed32b0
--- /dev/null
+++ b/src/ModelAPI/Test/Test1512.py
@@ -0,0 +1,148 @@
+"""
+      Test1512.py
+      Unit test for testing the correct selection of feature by the faces after the BOPs applied
+
+"""
+#=========================================================================
+# Initialization of the test
+#=========================================================================
+from ModelAPI import *
+from GeomDataAPI import *
+from GeomAlgoAPI import *
+from GeomAPI import *
+
+__updated__ = "2016-05-31"
+
+aSession = ModelAPI_Session.get()
+aPartSet = aSession.moduleDocument()
+
+#=========================================================================
+# Create a part
+#=========================================================================
+aSession.startOperation()
+aPartFeature = aPartSet.addFeature("Part")
+aSession.finishOperation()
+assert (len(aPartFeature.results()) == 1)
+aPart = aSession.activeDocument()
+
+#=========================================================================
+# Create a sketch rectangle in PartSet
+#=========================================================================
+aSession.startOperation()
+aSketchFeature = featureToCompositeFeature(aPart.addFeature("Sketch"))
+aXOYPlane = objectToResult(aPartSet.objectByName("Construction", "XOY"))
+aSketchFeature.selection("External").setValue(aXOYPlane, None)
+# Create lines
+aLine1 = aSketchFeature.addFeature("SketchLine")
+geomDataAPI_Point2D(aLine1.attribute("StartPoint")).setValue(0, 0)
+geomDataAPI_Point2D(aLine1.attribute("EndPoint")).setValue(200, 0)
+aLine2 = aSketchFeature.addFeature("SketchLine")
+geomDataAPI_Point2D(aLine2.attribute("StartPoint")).setValue(200, 0)
+geomDataAPI_Point2D(aLine2.attribute("EndPoint")).setValue(200, 100)
+aLine3 = aSketchFeature.addFeature("SketchLine")
+geomDataAPI_Point2D(aLine3.attribute("StartPoint")).setValue(200, 100)
+geomDataAPI_Point2D(aLine3.attribute("EndPoint")).setValue(0, 100)
+aLine4 = aSketchFeature.addFeature("SketchLine")
+geomDataAPI_Point2D(aLine4.attribute("StartPoint")).setValue(0, 100)
+geomDataAPI_Point2D(aLine4.attribute("EndPoint")).setValue(0, 0)
+aSession.finishOperation()
+
+#=========================================================================
+# Make extrusion on rectangle
+#=========================================================================
+aSession.startOperation()
+aBox = aPart.addFeature("Extrusion")
+aBox.selectionList("base").append(aSketchFeature.firstResult(), None)
+aBox.string("CreationMethod").setValue("BySizes")
+aBox.real("to_size").setValue(50)
+aBox.real("from_size").setValue(0)
+aSession.finishOperation()
+
+#=========================================================================
+# Create a cylindrical sketch for a big hole
+#=========================================================================
+aSession.startOperation()
+aSketchFeature2 = featureToCompositeFeature(aPart.addFeature("Sketch"))
+aSketchFeature2.selection("External").setValue(aXOYPlane, None);
+aCirc1 = aSketchFeature2.addFeature("SketchCircle")
+geomDataAPI_Point2D(aCirc1.attribute("CircleCenter")).setValue(100, 50)
+aCirc1.real("CircleRadius").setValue(40)
+aSession.finishOperation()
+
+#=========================================================================
+# Make extrusion on a big circle
+#=========================================================================
+aSession.startOperation()
+aHoleExt = aPart.addFeature("Extrusion")
+aHoleExt.selectionList("base").append(aSketchFeature2.firstResult(), None)
+aHoleExt.string("CreationMethod").setValue("BySizes")
+aHoleExt.real("to_size").setValue(60)
+aHoleExt.real("from_size").setValue(0)
+aSession.finishOperation()
+
+#=========================================================================
+# Do cut a hole from a box
+#=========================================================================
+aSession.startOperation()
+aCut1 = aPart.addFeature("Boolean")
+aCut1.selectionList("main_objects").append(aBox.firstResult(), None)
+aCut1.selectionList("tool_objects").append(aHoleExt.firstResult(), None)
+aCut1.integer("bool_type").setValue(0) # cut
+aSession.finishOperation()
+
+#=========================================================================
+# Create a cylindrical sketch for a small tower
+#=========================================================================
+aSession.startOperation()
+aSketchFeature3 = featureToCompositeFeature(aPart.addFeature("Sketch"))
+aSketchFeature3.selection("External").setValue(aXOYPlane, None);
+aCirc2 = aSketchFeature3.addFeature("SketchCircle")
+geomDataAPI_Point2D(aCirc2.attribute("CircleCenter")).setValue(20, 20)
+aCirc2.real("CircleRadius").setValue(10)
+aSession.finishOperation()
+
+#=========================================================================
+# Make extrusion on a small circle
+#=========================================================================
+aSession.startOperation()
+aTower = aPart.addFeature("Extrusion")
+aTower.selectionList("base").append(aSketchFeature3.firstResult(), None)
+aTower.string("CreationMethod").setValue("BySizes")
+aTower.real("to_size").setValue(100)
+aTower.real("from_size").setValue(0)
+aSession.finishOperation()
+
+#=========================================================================
+# Do fuse with a tower. Tower must be an argument (not tool) to add the problem to the faces owners detection.
+#=========================================================================
+aSession.startOperation()
+aFuse = aPart.addFeature("Boolean")
+aFuse.selectionList("main_objects").append(aTower.firstResult(), None)
+aFuse.selectionList("tool_objects").append(aCut1.firstResult(), None)
+aFuse.integer("bool_type").setValue(1) # fuse
+aSession.finishOperation()
+
+#=========================================================================
+# Create a group feature to use the selection attribute for selection of faces by the name.
+#=========================================================================
+def check_owner(selection, topology_type, feature):
+  aSession.startOperation()
+  aGroup = aPart.addFeature("Group")
+  aGroup.selectionList("group_list").append(selection, topology_type)
+  aFace = aGroup.selectionList("group_list").value(0).value()
+  aTestFeature = aPart.producedByFeature(aFuse.firstResult(), aFace)
+  assert(aTestFeature.name() == feature.name())
+  aSession.abortOperation()
+
+# check faces
+check_owner("Extrusion_1_1/Generated_Face_1", "face", aBox)
+check_owner("Boolean_2_1/Modified_3", "face", aBox)
+check_owner("Boolean_1_1/Modified_1", "face", aHoleExt)
+check_owner("Boolean_2_1/Modified_2", "face", aTower)
+# check edges without ambiguity
+check_owner("Boolean_2_1/Modified_3&Extrusion_1_1/Generated_Face_2", "edge", aBox)
+check_owner("Boolean_2_1/Modified_2&Extrusion_3_1/To_Face_1_1", "edge", aTower)
+
+#=========================================================================
+# End of test
+#=========================================================================