X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FTest%2FTestRevolutionCut.py;h=03a3ade72e91d06ba2513b14869fef4be971651a;hb=370cc602fef21d77fedca07d1e18da229727562b;hp=1b51b2e89df645ffa38712e2e967cd9251283649;hpb=b009697e108880aafb3e58579019ca432661955d;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/Test/TestRevolutionCut.py b/src/FeaturesPlugin/Test/TestRevolutionCut.py index 1b51b2e89..03a3ade72 100644 --- a/src/FeaturesPlugin/Test/TestRevolutionCut.py +++ b/src/FeaturesPlugin/Test/TestRevolutionCut.py @@ -1,31 +1,23 @@ -""" - TestRevolutionCut.py - Unit test of FeaturesPlugin_RevolutionCut class - - class FeaturesPlugin_RevolutionCut : public FeaturesPlugin_RevolutionBoolean - static const std::string MY_REVOLUTION_ID("RevolutionCut"); - static const std::string MY_SKETCH_OBJECT_ID("sketch"); - static const std::string MY_AXIS_ID("axis_object"); - static const std::string METHOD_ATTR("CreationMethod"); - static const std::string MY_TO_ANGLE_ID("to_angle"); - static const std::string MY_FROM_ANGLE_ID("from_angle"); - static const std::string MY_TO_OBJECT_ID("to_object"); - static const std::string MY_TO_OFFSET_ID("to_offset"); - static const std::string MY_FROM_OBJECT_ID("from_object"); - static const std::string MY_FROM_OFFSET_ID("from_offset"); - static const std::string MY_BOOLEAN_OBJECTS_ID("boolean_objects"); +## 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 +## - data()->addAttribute(SKETCH_OBJECT_ID(), ModelAPI_AttributeReference::typeId()); - data()->addAttribute(AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId()); - data()->addAttribute(TO_ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); - data()->addAttribute(FROM_ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); - data()->addAttribute(TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(TO_OFFSET_ID(), ModelAPI_AttributeDouble::typeId()); - data()->addAttribute(FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(FROM_OFFSET_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(BOOLEAN_OBJECTS_ID(), ModelAPI_AttributeSelectionList::typeId()); -""" #========================================================================= # Initialization of the test #========================================================================= @@ -61,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(20) aSession.finishOperation() @@ -70,23 +62,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) @@ -112,7 +96,7 @@ dirx = geomDataAPI_Dir(aLineSketchFeature.attribute("DirX")) dirx.setValue(1, 0, 0) norm = geomDataAPI_Dir(aLineSketchFeature.attribute("Norm")) norm.setValue(0, 0, 1) -aLineSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/TopFace_1") +aLineSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/TopFace") aSketchLine = aLineSketchFeature.addFeature("SketchLine") aLineStartPoint = geomDataAPI_Point2D(aSketchLine.attribute("StartPoint")) @@ -142,21 +126,26 @@ dirx = geomDataAPI_Dir(aCircleSketchFeature.attribute("DirX")) dirx.setValue(1, 0, 0) norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm")) norm.setValue(0, 0, 1) -aCircleSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/TopFace_1") +aCircleSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/To_Face") +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() +aSession.finishOperation() +aSession.startOperation() +aCircleSketchFeature.execute() # execute for sketch should be called here, because it is not set as current feature, so it is disabled. +anRevolutionCutFt.selectionList("base").append(aCircleSketchFeature.firstResult(), None) anRevolutionCutFt.selection("axis_object").setValue(aLineSketchResult, aLineEdge) anRevolutionCutFt.string("CreationMethod").setValue("ByAngles") anRevolutionCutFt.real("to_angle").setValue(50) anRevolutionCutFt.real("from_angle").setValue(50) anRevolutionCutFt.real("to_offset").setValue(0) #TODO: remove anRevolutionCutFt.real("from_offset").setValue(0) #TODO: remove -anRevolutionCutFt.selectionList("boolean_objects").append(anExtrusionResult, anExtrusionResult.shape()) -anRevolutionCutFt.execute() +anRevolutionCutFt.selectionList("main_objects").append(anExtrusionResult, anExtrusionResult.shape()) +aSession.finishOperation() aSession.finishOperation() #========================================================================= @@ -167,4 +156,6 @@ assert (aFactory.validate(anRevolutionCutFt)) assert (len(anRevolutionCutFt.results()) > 0) aCurrentResult = modelAPI_ResultBody(anRevolutionCutFt.firstResult()) assert (aCurrentResult is not None) -aSession.finishOperation() \ No newline at end of file + +from salome.shaper import model +assert(model.checkPythonDump())