X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FTest%2FTestPartition.py;h=54ade555a4722bf2261361a27241fce0c863e0b5;hb=2f26d9737227d2d79cfac070c2235c18d47ef40d;hp=e126412573a776ff2e6eef8e315a81614aac90d0;hpb=c667d9fc9c0124e7e2f5909447e2744868491a59;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/Test/TestPartition.py b/src/FeaturesPlugin/Test/TestPartition.py
index e12641257..54ade555a 100644
--- a/src/FeaturesPlugin/Test/TestPartition.py
+++ b/src/FeaturesPlugin/Test/TestPartition.py
@@ -1,3 +1,22 @@
+# Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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
+#
+
 #=========================================================================
 # Initialization of the test
 #=========================================================================
@@ -34,8 +53,8 @@ norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 # Create circle
 aSketchCircle = aCircleSketchFeature.addFeature("SketchCircle")
-anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("CircleCenter"))
-aCircleRadius = aSketchCircle.real("CircleRadius")
+anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("circle_center"))
+aCircleRadius = aSketchCircle.real("circle_radius")
 anCircleCentr.setValue(0, 0)
 aCircleRadius.setValue(50)
 aSession.finishOperation()
@@ -44,23 +63,15 @@ aSession.finishOperation()
 # Make extrusion on circle
 #=========================================================================
 # Build shape from sketcher results
-aCircleSketchResult = aCircleSketchFeature.firstResult()
-aCircleSketchEdges = modelAPI_ResultConstruction(aCircleSketchResult).shape()
-origin = geomDataAPI_Point(aCircleSketchFeature.attribute("Origin")).pnt()
-dirX = geomDataAPI_Dir(aCircleSketchFeature.attribute("DirX")).dir()
-norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm")).dir()
-aCircleSketchFaces = ShapeList()
-GeomAlgoAPI_SketchBuilder.createFaces(
-    origin, dirX, norm, aCircleSketchEdges, aCircleSketchFaces)
-assert (len(aCircleSketchFaces) > 0)
-assert (aCircleSketchFaces[0] is not None)
+aCircleSketchResult = modelAPI_ResultConstruction(aCircleSketchFeature.firstResult())
+assert (aCircleSketchResult.facesNum() > 0)
 # Create extrusion
 aSession.startOperation()
 anExtrusionFt = aPart.addFeature("Extrusion")
 assert (anExtrusionFt.getKind() == "Extrusion")
 # selection type FACE=4
 anExtrusionFt.selectionList("base").append(
-    aCircleSketchResult, aCircleSketchFaces[0])
+    aCircleSketchResult, aCircleSketchResult.face(0))
 anExtrusionFt.string("CreationMethod").setValue("BySizes")
 anExtrusionFt.real("to_size").setValue(50)
 anExtrusionFt.real("from_size").setValue(0)
@@ -80,7 +91,8 @@ assert (anExtrusionResult is not None)
 #=========================================================================
 aSession.startOperation()
 aPlaneFeature = aPart.addFeature("Plane")
-aPlaneFeature.string("CreationMethod").setValue("PlaneByGeneralEquation")
+aPlaneFeature.string("creation_method").setValue("by_general_equation")
+aPlaneFeature.string("by_other_plane_option").setValue("by_distance_from_other") # TODO: remove
 aPlaneFeature.real("A").setValue(0.)
 aPlaneFeature.real("B").setValue(1.)
 aPlaneFeature.real("C").setValue(0.)
@@ -94,9 +106,8 @@ aPlaneResult = aPlaneFeature.firstResult()
 aSession.startOperation()
 aPartitionFt = aPart.addFeature("Partition")
 assert (aPartitionFt.getKind() == "Partition")
-aPartitionFt.selectionList("main_objects").append(anExtrusionResult, anExtrusionResult.shape())
-aPartitionFt.selectionList("tool_objects").append(aPlaneResult, None)
-aPartitionFt.boolean("partition_combine").setValue(True)
+aPartitionFt.selectionList("base_objects").append(anExtrusionResult, anExtrusionResult.shape())
+aPartitionFt.selectionList("base_objects").append(aPlaneResult, None)
 aPartitionFt.execute()
 aSession.finishOperation()
 
@@ -116,9 +127,8 @@ aSession.undo()
 aSession.startOperation()
 aPartitionFt = aPart.addFeature("Partition")
 assert (aPartitionFt.getKind() == "Partition")
-aPartitionFt.selectionList("main_objects").append(anExtrusionResult, anExtrusionResult.shape())
-aPartitionFt.selectionList("tool_objects").append(aPlaneResult, None)
-aPartitionFt.boolean("partition_combine").setValue(False)
+aPartitionFt.selectionList("base_objects").append(anExtrusionResult, anExtrusionResult.shape())
+aPartitionFt.selectionList("base_objects").append(aPlaneResult, None)
 aPartitionFt.execute()
 aSession.finishOperation()
 
@@ -130,3 +140,6 @@ assert (aFactory.validate(aPartitionFt))
 assert (len(aPartitionFt.results()) > 0)
 aPartitionResult = modelAPI_ResultBody(aPartitionFt.firstResult())
 assert (aPartitionResult is not None)
+
+from salome.shaper import model
+assert(model.checkPythonDump())