X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FTest%2FTestCompositeFeaturesOnCompSolids.py;h=1df2653bc57df55ad02a6fa25f2a8c56a3540986;hb=d2c5ce1931ca0695869fbf036af275fe282ab913;hp=ba38dd2f2033996dc59fd1627faf5d70cd9585b3;hpb=3c7b09f34c4d3432c707e6f85e8e0c94dcb9fcdf;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py b/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py index ba38dd2f2..1df2653bc 100644 --- a/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py +++ b/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py @@ -1,3 +1,23 @@ +## Copyright (C) 2014-2017 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 #========================================================================= @@ -28,8 +48,8 @@ norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm")) norm.setValue(0, 0, 1) aSketchCircle = aCircleSketchFeature.addFeature("SketchCircle") -aCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("CircleCenter")) -aCircleRadius = aSketchCircle.real("CircleRadius") +aCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("circle_center")) +aCircleRadius = aSketchCircle.real("circle_radius") aCircleCentr.setValue(0, 0) aCircleRadius.setValue(50) @@ -44,16 +64,8 @@ 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") @@ -81,7 +93,8 @@ assert (anExtrusionResult is not None) # Create from plane aSession.startOperation() aFromPlaneFeature = aPart.addFeature("Plane") -aFromPlaneFeature.string("CreationMethod").setValue("PlaneByGeneralEquation") +aFromPlaneFeature.string("creation_method").setValue("by_general_equation") +aFromPlaneFeature.string("by_other_plane_option").setValue("by_distance_from_other") # TODO: remove aFromPlaneFeature.real("A").setValue(0.) aFromPlaneFeature.real("B").setValue(0.) aFromPlaneFeature.real("C").setValue(1.) @@ -91,7 +104,8 @@ aSession.finishOperation() # Create to plane aSession.startOperation() aToPlaneFeature = aPart.addFeature("Plane") -aToPlaneFeature.string("CreationMethod").setValue("PlaneByGeneralEquation") +aToPlaneFeature.string("creation_method").setValue("by_general_equation") +aToPlaneFeature.string("by_other_plane_option").setValue("by_distance_from_other") # TODO: remove aToPlaneFeature.real("A").setValue(0.) aToPlaneFeature.real("B").setValue(0.) aToPlaneFeature.real("C").setValue(1.) @@ -116,8 +130,8 @@ norm.setValue(0, 0, 1) aCircleSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/To_Face_1") aSession.startOperation() 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(10) aSession.finishOperation() @@ -136,7 +150,7 @@ aFromResult = aFromPlaneFeature.firstResult() aFromShape = modelAPI_ResultConstruction(aFromResult).shape() anExtrusionCutFt.selection("from_object").setValue(aFromResult, aFromShape) anExtrusionCutFt.real("from_offset").setValue(0) -anExtrusionCutFt.selectionList("main_objects").append(modelAPI_ResultCompSolid(anExtrusionResult).subResult(1), None) +anExtrusionCutFt.selectionList("main_objects").append(anExtrusionResult.subResult(1), None) aSession.finishOperation() aSession.finishOperation() @@ -193,8 +207,8 @@ norm.setValue(0, 0, 1) aCircleSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/To_Face_1") aSession.startOperation() 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(10) aSession.finishOperation() @@ -210,7 +224,7 @@ anRevolutionFuseFt.selection("to_object").setValue(aToResult, None) anRevolutionFuseFt.real("to_offset").setValue(0) anRevolutionFuseFt.selection("from_object").setValue(None, None) anRevolutionFuseFt.real("from_offset").setValue(0) -anRevolutionFuseFt.selectionList("main_objects").append(modelAPI_ResultCompSolid(anExtrusionResult).subResult(1), None) +anRevolutionFuseFt.selectionList("main_objects").append(anExtrusionResult.subResult(1), None) aSession.finishOperation() aSession.finishOperation() @@ -222,3 +236,6 @@ assert (aFactory.validate(anRevolutionFuseFt)) assert (len(anRevolutionFuseFt.results()) > 0) aCurrentResult = modelAPI_ResultBody(anRevolutionFuseFt.firstResult()) assert (aCurrentResult is not None) + +from salome.shaper import model +assert(model.checkPythonDump())