X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_ShapeAPI.cpp;h=ec477ca3ce308156677442bdc3c952c7c496fc84;hb=4c86b629d1bf8daa737f90b64e934c7bd22f6525;hp=55567c40a1fc167652428327c24c95d0cf57bac8;hpb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp index 55567c40a..ec477ca3c 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ #include -static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo) throw (GeomAlgoAPI_Exception) +static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo) { if (!theAlgo.check()) throw GeomAlgoAPI_Exception(theAlgo.getError()); @@ -50,7 +50,6 @@ static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo) throw (GeomAlgoAPI_ } static GeomShapePtr runAlgoAndCheckShape(GeomAlgoAPI_MakeShape& theAlgo, const std::string& theMsg) -throw (GeomAlgoAPI_Exception) { if (!theAlgo.check()) throw GeomAlgoAPI_Exception(theAlgo.getError()); @@ -68,7 +67,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeBox( const double theDx, const double theDy, - const double theDz) throw (GeomAlgoAPI_Exception) + const double theDz) { static const std::string aMsg("Box builder with dimensions"); GeomAlgoAPI_Box aBoxAlgo(theDx,theDy,theDz); @@ -78,7 +77,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeBox( std::shared_ptr theFirstPoint, - std::shared_ptr theSecondPoint) throw (GeomAlgoAPI_Exception) + std::shared_ptr theSecondPoint) { static const std::string aMsg("Box builder with two points"); GeomAlgoAPI_Box aBoxAlgo(theFirstPoint, theSecondPoint); @@ -88,7 +87,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( std::shared_ptr theBasePoint, std::shared_ptr theEdge, - double theRadius, double theHeight) throw (GeomAlgoAPI_Exception) + double theRadius, double theHeight) { // Check if the base point is OK if (!theBasePoint) { @@ -112,7 +111,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( std::shared_ptr theBasePoint, std::shared_ptr theEdge, - double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception) + double theRadius, double theHeight, double theAngle) { // Check if the base point is OK if (!theBasePoint) { @@ -135,7 +134,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( - double theRadius, double theHeight) throw (GeomAlgoAPI_Exception) + double theRadius, double theHeight) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -152,7 +151,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( - double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception) + double theRadius, double theHeight, double theAngle) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -169,7 +168,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSphere( - std::shared_ptr theCenterPoint, double theRadius) throw (GeomAlgoAPI_Exception) + std::shared_ptr theCenterPoint, double theRadius) { static const std::string aMsg("Sphere builder"); GeomAlgoAPI_Sphere aSphereAlgo(theCenterPoint, theRadius); @@ -178,7 +177,6 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSphere(double theRadius) - throw (GeomAlgoAPI_Exception) { std::shared_ptr aCenterPoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -193,7 +191,6 @@ namespace GeomAlgoAPI_ShapeAPI 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) { @@ -216,7 +213,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTorus(double theRadius, - double theRingRadius) throw (GeomAlgoAPI_Exception) + double theRingRadius) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -236,7 +233,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theBasePoint, std::shared_ptr theEdge, double theBaseRadius, double theTopRadius, - double theHeight) throw (GeomAlgoAPI_Exception) + double theHeight) { // Check if the base point is OK if (!theBasePoint) { @@ -260,7 +257,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCone( double theBaseRadius, double theTopRadius, - double theHeight) throw (GeomAlgoAPI_Exception) + double theHeight) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -279,7 +276,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTranslation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const double theDistance) throw (GeomAlgoAPI_Exception) + const double theDistance) { GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theAxis, theDistance); return runAlgo(aTranslationAlgo); @@ -290,7 +287,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, const double theDx, const double theDy, - const double theDz) throw (GeomAlgoAPI_Exception) + const double theDz) { GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theDx, theDy, theDz); return runAlgo(aTranslationAlgo); @@ -300,7 +297,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTranslation( std::shared_ptr theSourceShape, std::shared_ptr theStartPoint, - std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception) + std::shared_ptr theEndPoint) { GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theStartPoint, theEndPoint); return runAlgo(aTranslationAlgo); @@ -310,7 +307,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeRotation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const double theAngle) throw (GeomAlgoAPI_Exception) + const double theAngle) { GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theAxis, theAngle); return runAlgo(aRotationAlgo); @@ -321,7 +318,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, std::shared_ptr theCenterPoint, std::shared_ptr theStartPoint, - std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception) + std::shared_ptr theEndPoint) { GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theCenterPoint, theStartPoint, theEndPoint); return runAlgo(aRotationAlgo); @@ -330,7 +327,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr thePoint) throw (GeomAlgoAPI_Exception) + std::shared_ptr thePoint) { GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePoint); return runAlgo(aSymmetryAlgo); @@ -339,7 +336,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr theAxis) throw (GeomAlgoAPI_Exception) + std::shared_ptr theAxis) { GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, theAxis); return runAlgo(aSymmetryAlgo); @@ -348,7 +345,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr thePlane) throw (GeomAlgoAPI_Exception) + std::shared_ptr thePlane) { GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePlane); return runAlgo(aSymmetryAlgo); @@ -358,7 +355,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeScale( std::shared_ptr theSourceShape, std::shared_ptr theCenterPoint, - const double theScaleFactor) throw (GeomAlgoAPI_Exception) + const double theScaleFactor) { GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactor); return runAlgo(aScaleAlgo); @@ -370,7 +367,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theCenterPoint, const double theScaleFactorX, const double theScaleFactorY, - const double theScaleFactorZ) throw (GeomAlgoAPI_Exception) + const double theScaleFactorZ) { GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactorX, theScaleFactorY, theScaleFactorZ); @@ -382,7 +379,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, std::shared_ptr theAxis, const double theStep, - const int theNumber) throw (GeomAlgoAPI_Exception) + const int theNumber) { if (!theAxis) { std::string aError = "Multitranslation builder "; @@ -412,7 +409,7 @@ namespace GeomAlgoAPI_ShapeAPI const int theFirstNumber, std::shared_ptr theSecondAxis, const double theSecondStep, - const int theSecondNumber) throw (GeomAlgoAPI_Exception) + const int theSecondNumber) { if (!theFirstAxis) { std::string aError = "Multitranslation builder "; @@ -466,7 +463,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeMultiRotation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const int theNumber) throw (GeomAlgoAPI_Exception) + const int theNumber) { if (!theAxis) { std::string aError = "Multirotation builder "; @@ -495,7 +492,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, std::shared_ptr theAxis, const double theStep, - const int theNumber) throw (GeomAlgoAPI_Exception) + const int theNumber) { if (!theAxis) { std::string aError = "Multirotation builder "; @@ -522,7 +519,7 @@ namespace GeomAlgoAPI_ShapeAPI const double theRMin1, const double theRMax1, const double theRMin2, const double theRMax2, const double theZ, - const double theStartPhi, const double theDeltaPhi) throw (GeomAlgoAPI_Exception) + const double theStartPhi, const double theDeltaPhi) { GeomAlgoAPI_ConeSegment aConeSegmentAlgo(theRMin1, theRMax1, theRMin2, theRMax2, theZ, theStartPhi, theDeltaPhi);