X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_ShapeAPI.cpp;h=550bf68f3f0b74d9d9e824b29c685f244d4e172e;hb=b06cf1477fb1ee46d7ae260c234cac5d0000abf2;hp=faba77138781436e08d0054a31eb6ba9a824cde7;hpb=bd1b8c8100e2b2cffd30ee0b4d73836b13d518ae;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp index faba77138..550bf68f3 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp @@ -1,21 +1,42 @@ -// Copyright (C) 2014-2016 CEA/DEN, EDF R&D - -// File: GeomAlgoAPI_ShapeAPI.cpp -// Created: 17 Mar 2016 -// Author: Clarisse Genrault (CEA) +// 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 +// #include "GeomAlgoAPI_ShapeAPI.h" #include -#include +#include +#include #include +#include #include +#include #include +#include #include +#include #include #include +#include + namespace GeomAlgoAPI_ShapeAPI { //=============================================================================================== @@ -67,6 +88,15 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theBasePoint, std::shared_ptr theEdge, double theRadius, double theHeight) throw (GeomAlgoAPI_Exception) { + // Check if the base point is OK + if (!theBasePoint) { + throw GeomAlgoAPI_Exception("Cylinder builder :: the base point is not valid."); + } + // Check if the edge is OK + if (!theEdge) { + throw GeomAlgoAPI_Exception("Cylinder builder :: the axis is not valid."); + } + std::shared_ptr anAxis; anAxis = std::shared_ptr(new GeomAPI_Ax2(theBasePoint, theEdge->line()->direction())); @@ -93,6 +123,15 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theBasePoint, std::shared_ptr theEdge, double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception) { + // Check if the base point is OK + if (!theBasePoint) { + throw GeomAlgoAPI_Exception("Cylinder builder :: the base point is not valid."); + } + // Check if the edge is OK + if (!theEdge) { + throw GeomAlgoAPI_Exception("Cylinder builder :: the axis is not valid."); + } + std::shared_ptr anAxis; anAxis = std::shared_ptr(new GeomAPI_Ax2(theBasePoint, theEdge->line()->direction())); @@ -170,6 +209,187 @@ namespace GeomAlgoAPI_ShapeAPI return aCylinderAlgo.shape(); } + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSphere( + std::shared_ptr theCenterPoint, double theRadius) throw (GeomAlgoAPI_Exception) + { + GeomAlgoAPI_Sphere aSphereAlgo(theCenterPoint, theRadius); + + if (!aSphereAlgo.check()) { + throw GeomAlgoAPI_Exception(aSphereAlgo.getError()); + } + + aSphereAlgo.build(); + + if(!aSphereAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aSphereAlgo.getError()); + } + + if (!aSphereAlgo.checkValid("Sphere builder")) { + throw GeomAlgoAPI_Exception(aSphereAlgo.getError()); + } + return aSphereAlgo.shape(); + } + + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSphere(double theRadius) + throw (GeomAlgoAPI_Exception) + { + std::shared_ptr aCenterPoint = + std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); + + GeomAlgoAPI_Sphere aSphereAlgo(aCenterPoint, theRadius); + + if (!aSphereAlgo.check()) { + throw GeomAlgoAPI_Exception(aSphereAlgo.getError()); + } + + aSphereAlgo.build(); + + if(!aSphereAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aSphereAlgo.getError()); + } + + if (!aSphereAlgo.checkValid("Sphere builder")) { + throw GeomAlgoAPI_Exception(aSphereAlgo.getError()); + } + return aSphereAlgo.shape(); + } + + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTorus( + std::shared_ptr theBasePoint, + std::shared_ptr theEdge,double theRadius, double theRingRadius) + throw (GeomAlgoAPI_Exception) + { + // Check if the base point is OK + if (!theBasePoint) { + throw GeomAlgoAPI_Exception("Torus builder :: the base point is not valid."); + } + // Check if the edge is OK + if (!theEdge) { + throw GeomAlgoAPI_Exception("Torus builder :: the axis is not valid."); + } + + std::shared_ptr anAxis; + anAxis = std::shared_ptr(new GeomAPI_Ax2(theBasePoint, + theEdge->line()->direction())); + + GeomAlgoAPI_Torus aTorusAlgo(anAxis, theRadius, theRingRadius); + + if (!aTorusAlgo.check()) { + throw GeomAlgoAPI_Exception(aTorusAlgo.getError()); + } + + aTorusAlgo.build(); + + if(!aTorusAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aTorusAlgo.getError()); + } + + if (!aTorusAlgo.checkValid("Torus builder")) { + throw GeomAlgoAPI_Exception(aTorusAlgo.getError()); + } + return aTorusAlgo.shape(); + } + + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTorus(double theRadius, + double theRingRadius) throw (GeomAlgoAPI_Exception) + { + std::shared_ptr aBasePoint = + std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); + std::shared_ptr aEdge = GeomAlgoAPI_EdgeBuilder::line(0., 0., 1.); + std::shared_ptr anAxis; + anAxis = std::shared_ptr(new GeomAPI_Ax2(aBasePoint, + aEdge->line()->direction())); + + GeomAlgoAPI_Torus aTorusAlgo(anAxis, theRadius, theRingRadius); + + if (!aTorusAlgo.check()) { + throw GeomAlgoAPI_Exception(aTorusAlgo.getError()); + } + + aTorusAlgo.build(); + + if(!aTorusAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aTorusAlgo.getError()); + } + + if (!aTorusAlgo.checkValid("Torus builder")) { + throw GeomAlgoAPI_Exception(aTorusAlgo.getError()); + } + return aTorusAlgo.shape(); + } + + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCone( + std::shared_ptr theBasePoint, + std::shared_ptr theEdge, + double theBaseRadius, double theTopRadius, + double theHeight) throw (GeomAlgoAPI_Exception) + { + // Check if the base point is OK + if (!theBasePoint) { + throw GeomAlgoAPI_Exception("Cone builder :: the base point is not valid."); + } + // Check if the edge is OK + if (!theEdge) { + throw GeomAlgoAPI_Exception("Cone builder :: the axis is not valid."); + } + + std::shared_ptr anAxis; + anAxis = std::shared_ptr(new GeomAPI_Ax2(theBasePoint, + theEdge->line()->direction())); + + GeomAlgoAPI_Cone aConeAlgo(anAxis, theBaseRadius, theTopRadius, theHeight); + + if (!aConeAlgo.check()) { + throw GeomAlgoAPI_Exception(aConeAlgo.getError()); + } + + aConeAlgo.build(); + + if(!aConeAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aConeAlgo.getError()); + } + + if (!aConeAlgo.checkValid("Cone builder")) { + throw GeomAlgoAPI_Exception(aConeAlgo.getError()); + } + return aConeAlgo.shape(); + } + + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCone( + double theBaseRadius, double theTopRadius, + double theHeight) throw (GeomAlgoAPI_Exception) + { + std::shared_ptr aBasePoint = + std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); + std::shared_ptr aEdge = GeomAlgoAPI_EdgeBuilder::line(0., 0., 1.); + std::shared_ptr anAxis; + anAxis = std::shared_ptr(new GeomAPI_Ax2(aBasePoint, + aEdge->line()->direction())); + + GeomAlgoAPI_Cone aConeAlgo(anAxis, theBaseRadius, theTopRadius, theHeight); + + if (!aConeAlgo.check()) { + throw GeomAlgoAPI_Exception(aConeAlgo.getError()); + } + + aConeAlgo.build(); + + if(!aConeAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aConeAlgo.getError()); + } + + if (!aConeAlgo.checkValid("Cone builder")) { + throw GeomAlgoAPI_Exception(aConeAlgo.getError()); + } + return aConeAlgo.shape(); + } + //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTranslation( std::shared_ptr theSourceShape, @@ -187,9 +407,7 @@ namespace GeomAlgoAPI_ShapeAPI if(!aTranslationAlgo.isDone()) { throw GeomAlgoAPI_Exception(aTranslationAlgo.getError()); } - if (!aTranslationAlgo.checkValid("Translation builder with axis and distance")) { - throw GeomAlgoAPI_Exception(aTranslationAlgo.getError()); - } + return aTranslationAlgo.shape(); } @@ -211,9 +429,7 @@ namespace GeomAlgoAPI_ShapeAPI if(!aTranslationAlgo.isDone()) { throw GeomAlgoAPI_Exception(aTranslationAlgo.getError()); } - if (!aTranslationAlgo.checkValid("Translation builder with dimensions")) { - throw GeomAlgoAPI_Exception(aTranslationAlgo.getError()); - } + return aTranslationAlgo.shape(); } @@ -234,12 +450,53 @@ namespace GeomAlgoAPI_ShapeAPI if(!aTranslationAlgo.isDone()) { throw GeomAlgoAPI_Exception(aTranslationAlgo.getError()); } - if (!aTranslationAlgo.checkValid("Translation builder with two points")) { - throw GeomAlgoAPI_Exception(aTranslationAlgo.getError()); - } + return aTranslationAlgo.shape(); } + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeRotation( + std::shared_ptr theSourceShape, + std::shared_ptr theAxis, + const double theAngle) throw (GeomAlgoAPI_Exception) + { + GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theAxis, theAngle); + + if (!aRotationAlgo.check()) { + throw GeomAlgoAPI_Exception(aRotationAlgo.getError()); + } + + aRotationAlgo.build(); + + if(!aRotationAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aRotationAlgo.getError()); + } + + return aRotationAlgo.shape(); + } + + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeRotation( + std::shared_ptr theSourceShape, + std::shared_ptr theCenterPoint, + std::shared_ptr theStartPoint, + std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception) + { + GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theCenterPoint, theStartPoint, theEndPoint); + + if (!aRotationAlgo.check()) { + throw GeomAlgoAPI_Exception(aRotationAlgo.getError()); + } + + aRotationAlgo.build(); + + if(!aRotationAlgo.isDone()) { + throw GeomAlgoAPI_Exception(aRotationAlgo.getError()); + } + + return aRotationAlgo.shape(); + } + //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, @@ -256,9 +513,7 @@ namespace GeomAlgoAPI_ShapeAPI if(!aSymmetryAlgo.isDone()) { throw GeomAlgoAPI_Exception(aSymmetryAlgo.getError()); } - if (!aSymmetryAlgo.checkValid("Symmetry builder by a point")) { - throw GeomAlgoAPI_Exception(aSymmetryAlgo.getError()); - } + return aSymmetryAlgo.shape(); } @@ -278,9 +533,7 @@ namespace GeomAlgoAPI_ShapeAPI if(!aSymmetryAlgo.isDone()) { throw GeomAlgoAPI_Exception(aSymmetryAlgo.getError()); } - if (!aSymmetryAlgo.checkValid("Symmetry builder by an axis")) { - throw GeomAlgoAPI_Exception(aSymmetryAlgo.getError()); - } + return aSymmetryAlgo.shape(); } @@ -300,9 +553,7 @@ namespace GeomAlgoAPI_ShapeAPI if(!aSymmetryAlgo.isDone()) { throw GeomAlgoAPI_Exception(aSymmetryAlgo.getError()); } - if (!aSymmetryAlgo.checkValid("Symmetry builder by a plane")) { - throw GeomAlgoAPI_Exception(aSymmetryAlgo.getError()); - } + return aSymmetryAlgo.shape(); } @@ -323,19 +574,17 @@ namespace GeomAlgoAPI_ShapeAPI if(!aScaleAlgo.isDone()) { throw GeomAlgoAPI_Exception(aScaleAlgo.getError()); } - if (!aScaleAlgo.checkValid("Scale builder by a scale factor")) { - throw GeomAlgoAPI_Exception(aScaleAlgo.getError()); - } + return aScaleAlgo.shape(); } //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeScale( - std::shared_ptr theSourceShape, - std::shared_ptr theCenterPoint, - const double theScaleFactorX, - const double theScaleFactorY, - const double theScaleFactorZ) throw (GeomAlgoAPI_Exception) + std::shared_ptr theSourceShape, + std::shared_ptr theCenterPoint, + const double theScaleFactorX, + const double theScaleFactorY, + const double theScaleFactorZ) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactorX, theScaleFactorY, theScaleFactorZ); @@ -349,12 +598,150 @@ namespace GeomAlgoAPI_ShapeAPI if(!aScaleAlgo.isDone()) { throw GeomAlgoAPI_Exception(aScaleAlgo.getError()); } - if (!aScaleAlgo.checkValid("Scale builder by dimensions")) { - throw GeomAlgoAPI_Exception(aScaleAlgo.getError()); - } + return aScaleAlgo.shape(); } + //=============================================================================================== + std::shared_ptr GeomAlgoAPI_ShapeAPI::makeMultiTranslation( + std::shared_ptr theSourceShape, + std::shared_ptr theAxis, + const double theStep, + const int theNumber) throw (GeomAlgoAPI_Exception) + { + if (!theAxis) { + std::string aError = "Multitranslation builder "; + aError+=":: the first axis is not valid"; + throw GeomAlgoAPI_Exception(aError); + } + + if (theNumber <=0) { + std::string aError = "Multitranslation builder "; + aError+=":: the number of copies for the first direction is null or negative."; + throw GeomAlgoAPI_Exception(aError); + } + + ListOfShape aListOfShape; + for (int i=0; i GeomAlgoAPI_ShapeAPI::makeMultiTranslation( + std::shared_ptr theSourceShape, + std::shared_ptr theFirstAxis, + const double theFirstStep, + const int theFirstNumber, + std::shared_ptr theSecondAxis, + const double theSecondStep, + const int theSecondNumber) throw (GeomAlgoAPI_Exception) + { + if (!theFirstAxis) { + std::string aError = "Multitranslation builder "; + aError+=":: the first axis is not valid"; + throw GeomAlgoAPI_Exception(aError); + } + + if (!theSecondAxis) { + std::string aError = "Multitranslation builder "; + aError+=":: the second axis is not valid"; + throw GeomAlgoAPI_Exception(aError); + } + + if (theFirstNumber <=0) { + std::string aError = "Multitranslation builder "; + aError+=":: the number of copies for the first direction is null or negative."; + throw GeomAlgoAPI_Exception(aError); + } + + if (theSecondNumber <=0) { + std::string aError = "Multitranslation builder "; + aError+=":: the number of copies for the second direction is null or negative."; + throw GeomAlgoAPI_Exception(aError); + } + + // Coord theFirstAxis + double x1 = theFirstAxis->dir()->x(); + double y1 = theFirstAxis->dir()->y(); + double z1 = theFirstAxis->dir()->z(); + double norm1 = sqrt(x1*x1 + y1*y1 + z1*z1); + + // Coord theSecondAxis + double x2 = theSecondAxis->dir()->x(); + double y2 = theSecondAxis->dir()->y(); + double z2 = theSecondAxis->dir()->z(); + double norm2 = sqrt(x2*x2 + y2*y2 + z2*z2); + + ListOfShape aListOfShape; + for (int j=0; j GeomAlgoAPI_ShapeAPI::makeMultiRotation( + std::shared_ptr theSourceShape, + std::shared_ptr theAxis, + const int theNumber) + { + if (!theAxis) { + std::string aError = "Multirotation builder "; + aError+=":: the axis is not valid"; + throw GeomAlgoAPI_Exception(aError); + } + + if (theNumber <=0) { + std::string aError = "Multirotation builder "; + aError+=":: the number of copies is null or negative."; + throw GeomAlgoAPI_Exception(aError); + } + + double anAngle = 360./theNumber; + + ListOfShape aListOfShape; + for (int i=0; i GeomAlgoAPI_ShapeAPI::makeMultiRotation( + std::shared_ptr theSourceShape, + std::shared_ptr theAxis, + const double theStep, + const int theNumber) + { + if (!theAxis) { + std::string aError = "Multirotation builder "; + aError+=":: the axis is not valid"; + throw GeomAlgoAPI_Exception(aError); + } + + if (theNumber <=0) { + std::string aError = "Multirotation builder "; + aError+=":: the number of copies is null or negative."; + throw GeomAlgoAPI_Exception(aError); + } + + ListOfShape aListOfShape; + for (int i=0; i GeomAlgoAPI_ShapeAPI::makeConeSegment( const double theRMin1, const double theRMax1,