X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2FTest%2FTestAxisCreation.py;h=000a9dadf163ad8e7c801a6c92c5f3057dd7bc54;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=2c0dabfb65c2020abaa63e20e917e834840be4e8;hpb=46cd5e094f9b9eabde66e3a4848ee885933149b6;p=modules%2Fshaper.git diff --git a/src/ConstructionPlugin/Test/TestAxisCreation.py b/src/ConstructionPlugin/Test/TestAxisCreation.py index 2c0dabfb6..000a9dadf 100644 --- a/src/ConstructionPlugin/Test/TestAxisCreation.py +++ b/src/ConstructionPlugin/Test/TestAxisCreation.py @@ -1,3 +1,22 @@ +# Copyright (C) 2014-2019 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 #========================================================================= @@ -8,7 +27,7 @@ from GeomAPI import * import math from ModelAPI import * -import model +from salome.shaper import model aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() @@ -28,10 +47,8 @@ aSession.startOperation() aPointFeature = aPart.addFeature("Point") aPointFeatureData = aPointFeature.data() assert(aPointFeatureData is not None) -# aPointFeatureData.string("creation_method").setValue("by_xyz") -aPointFeatureData.real("x").setValue(0.) -aPointFeatureData.real("y").setValue(0.) -aPointFeatureData.real("z").setValue(0.) +geomDataAPI_Point(aPointFeatureData.attribute("point3d")).setValue(0., 0., 0.) +aPointFeatureData.string("creation_method").setValue("by_xyz") aPointFeature.execute() aSession.finishOperation() aPoint1Result = aPointFeature.firstResult(); @@ -43,10 +60,8 @@ aSession.startOperation() aPointFeature = aPart.addFeature("Point") aPointFeatureData = aPointFeature.data() assert(aPointFeatureData is not None) -# aPointFeatureData.string("creation_method").setValue("by_xyz") -aPointFeatureData.real("x").setValue(0.) -aPointFeatureData.real("y").setValue(0.) -aPointFeatureData.real("z").setValue(100.) +geomDataAPI_Point(aPointFeatureData.attribute("point3d")).setValue(0., 0., 100.) +aPointFeatureData.string("creation_method").setValue("by_xyz") aPointFeature.execute() aSession.finishOperation() aPoint2Result = aPointFeature.firstResult(); @@ -81,8 +96,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() @@ -91,22 +106,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]) +anExtrusionFt.selectionList("base").append(aCircleSketchResult, aCircleSketchResult.face(0)) anExtrusionFt.string("CreationMethod").setValue("BySizes") anExtrusionFt.real("to_size").setValue(100) anExtrusionFt.real("from_size").setValue(0) @@ -129,7 +137,7 @@ anAxisFeature = aPart.addFeature("Axis") anAxisFeatureData = anAxisFeature.data() assert(anAxisFeatureData is not None) anAxisFeatureData.string("CreationMethod").setValue("AxisByCylindricalFaceCase") -anAxisFeatureData.selection("CylindricalFace").selectSubShape("face", "Extrusion_1_1/Generated_Face_1") +anAxisFeatureData.selection("CylindricalFace").selectSubShape("face", "Extrusion_1_1/Generated_Face&Sketch_1/SketchCircle_1_2") anAxisFeature.execute() aSession.finishOperation() @@ -148,9 +156,9 @@ aSession.finishOperation() # Test an axis by line aSession.startOperation() -anAxis = model.addAxis(aPart, aSketchLine.result()[0]) +anAxis = model.addAxis(aPart, aSketchLine.result()) aSession.finishOperation() -assert (len(anAxis.result()) > 0) +assert (len(anAxis.results()) > 0) # Create plane aSession.startOperation() @@ -168,9 +176,9 @@ aSession.finishOperation() # Test an axis by plane and point aSession.startOperation() -anAxis = model.addAxis(aPart, aPlane1.result()[0], aSketchPoint.result()[0]) +anAxis = model.addAxis(aPart, aPlane1.result(), aSketchPoint.result()) aSession.finishOperation() -assert (len(anAxis.result()) > 0) +assert (len(anAxis.results()) > 0) # Create plane aSession.startOperation() @@ -179,15 +187,14 @@ aSession.finishOperation() # Test an axis by two planes aSession.startOperation() -anAxis = model.addAxis(aPart, aPlane1.result()[0], aPlane2.result()[0]) +anAxis = model.addAxis(aPart, aPlane1.result(), aPlane2.result()) aSession.finishOperation() -assert (len(anAxis.result()) > 0) +assert (len(anAxis.results()) > 0) # Test an axis by two planes and offsets aSession.startOperation() -anAxis = model.addAxis(aPart, aPlane1.result()[0], 50, False, aPlane2.result()[0], 100, True) +anAxis = model.addAxis(aPart, aPlane1.result(), 50, False, aPlane2.result(), 100, True) aSession.finishOperation() -assert (len(anAxis.result()) > 0) +assert (len(anAxis.results()) > 0) -import model assert(model.checkPythonDump())