OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0028550: Foundation Classes - fix empty message passed to thrown exception

Browse Source
This commit is contained in:
kgv
2017-04-18 18:58:12 +03:00
committed by bugmaster
parent e87d0237d8
commit 2d2b3d53b7
142 changed files with 519 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gp/gp_Circ.lxx
View File

@@ -23,7 +23,7 @@ inline gp_Circ::gp_Circ () : radius(RealLast())
inline gp_Circ::gp_Circ (const gp_Ax2& A2,
const Standard_Real R) : pos(A2), radius(R)
{
Standard_ConstructionError_Raise_if (R < 0.0, "");
Standard_ConstructionError_Raise_if (R < 0.0, "gp_Circ() - radius should be positive number");
}
inline void gp_Circ::SetAxis (const gp_Ax1& A1)
@@ -37,7 +37,7 @@ inline void gp_Circ::SetPosition (const gp_Ax2& A2)
inline void gp_Circ::SetRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if (R < 0.0, "");
Standard_ConstructionError_Raise_if (R < 0.0, "gp_Circ::SetRadius() - radius should be positive number");
radius = R;
}

8
src/gp/gp_Circ2d.lxx
View File

@@ -21,7 +21,7 @@ inline gp_Circ2d::gp_Circ2d (const gp_Ax2d& XAxis,
const Standard_Real Radius,
const Standard_Boolean Sense) : radius(Radius)
{
Standard_ConstructionError_Raise_if(Radius < 0.0,"");
Standard_ConstructionError_Raise_if (Radius < 0.0, "gp_Circ2d() - radius should be positive number");
pos = gp_Ax22d(XAxis,Sense);
}
@@ -29,7 +29,9 @@ inline gp_Circ2d::gp_Circ2d (const gp_Ax22d& Axis,
const Standard_Real Radius) :
pos(Axis),
radius(Radius)
{ Standard_ConstructionError_Raise_if(Radius < 0.0,""); }
{
Standard_ConstructionError_Raise_if (Radius < 0.0, "gp_Circ2d() - radius should be positive number");
}
inline void gp_Circ2d::SetLocation (const gp_Pnt2d& P)
{ pos.SetLocation (P); }
@@ -45,7 +47,7 @@ inline void gp_Circ2d::SetYAxis (const gp_Ax2d& A)
inline void gp_Circ2d::SetRadius (const Standard_Real Radius)
{
Standard_ConstructionError_Raise_if(Radius < 0.0,"");
Standard_ConstructionError_Raise_if (Radius < 0.0, "gp_Circ2d::SetRadius() - radius should be positive number");
radius = Radius;
}

7
src/gp/gp_Cone.lxx
View File

@@ -32,7 +32,7 @@ inline gp_Cone::gp_Cone (const gp_Ax3& A3,
Standard_ConstructionError_Raise_if
(radius < 0. ||
val <= gp::Resolution() ||
M_PI * 0.5 - val <= gp::Resolution(), "");
M_PI * 0.5 - val <= gp::Resolution(), "gp_Cone() - invalid construction parameters");
}
inline void gp_Cone::SetAxis (const gp_Ax1& A1)
@@ -46,8 +46,7 @@ inline void gp_Cone::SetPosition (const gp_Ax3& A3)
inline void gp_Cone::SetRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if
(R < 0.0,"");
Standard_ConstructionError_Raise_if (R < 0.0, "gp_Cone::SetRadius() - radius should be positive number");
radius = R;
}
@@ -57,7 +56,7 @@ inline void gp_Cone::SetSemiAngle (const Standard_Real Ang)
if (val < 0) val = - val;
Standard_ConstructionError_Raise_if
(val <= gp::Resolution() ||
M_PI * 0.5 - val <= gp::Resolution(),"");
M_PI * 0.5 - val <= gp::Resolution(), "gp_Cone::SetSemiAngle() - invalid angle range");
semiAngle = Ang;
}

6
src/gp/gp_Cylinder.lxx
View File

@@ -21,7 +21,9 @@ inline gp_Cylinder::gp_Cylinder (const gp_Ax3& A3,
const Standard_Real Radius) :
pos(A3),
radius (Radius)
{ Standard_ConstructionError_Raise_if (Radius < 0.0,""); }
{
Standard_ConstructionError_Raise_if (Radius < 0.0, "gp_Cylinder() - radius should be positive number");
}
inline void gp_Cylinder::SetAxis (const gp_Ax1& A1)
{ pos.SetAxis (A1); }
@@ -34,7 +36,7 @@ inline void gp_Cylinder::SetPosition (const gp_Ax3& A3)
inline void gp_Cylinder::SetRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if (R < 0.0,"");
Standard_ConstructionError_Raise_if (R < 0.0, "gp_Cylinder::SetRadius() - radius should be positive number");
radius = R;
}

28
src/gp/gp_Dir.lxx
View File

@@ -28,7 +28,7 @@ inline gp_Dir::gp_Dir (const gp_Vec& V)
Standard_Real Y = XYZ.Y();
Standard_Real Z = XYZ.Z();
Standard_Real D = sqrt(X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir() - input vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -40,7 +40,7 @@ inline gp_Dir::gp_Dir (const gp_XYZ& XYZ)
Standard_Real Y = XYZ.Y();
Standard_Real Z = XYZ.Z();
Standard_Real D = sqrt(X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir() - input vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -51,7 +51,7 @@ inline gp_Dir::gp_Dir (const Standard_Real Xv,
const Standard_Real Zv)
{
Standard_Real D = sqrt (Xv * Xv + Yv * Yv + Zv * Zv);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir() - input vector has zero norm");
coord.SetX(Xv / D);
coord.SetY(Yv / D);
coord.SetZ(Zv / D);
@@ -63,12 +63,12 @@ inline void gp_Dir::SetCoord (const Standard_Integer Index,
Standard_Real X = coord.X();
Standard_Real Y = coord.Y();
Standard_Real Z = coord.Z();
Standard_OutOfRange_Raise_if (Index < 1 || Index > 3, " ");
Standard_OutOfRange_Raise_if (Index < 1 || Index > 3, "gp_Dir::SetCoord() - index is out of range [1, 3]");
if (Index == 1) X = Xi;
else if (Index == 2) Y = Xi;
else Z = Xi;
Standard_Real D = sqrt (X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::SetCoord() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -78,7 +78,7 @@ inline void gp_Dir::SetCoord (const Standard_Real Xv,
const Standard_Real Yv,
const Standard_Real Zv) {
Standard_Real D = sqrt(Xv * Xv + Yv * Yv + Zv * Zv);
Standard_ConstructionError_Raise_if(D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if(D <= gp::Resolution(), "gp_Dir::SetCoord() - input vector has zero norm");
coord.SetX(Xv / D);
coord.SetY(Yv / D);
coord.SetZ(Zv / D);
@@ -89,7 +89,7 @@ inline void gp_Dir::SetX (const Standard_Real X)
Standard_Real Y = coord.Y();
Standard_Real Z = coord.Z();
Standard_Real D = sqrt (X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::SetX() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -100,7 +100,7 @@ inline void gp_Dir::SetY (const Standard_Real Y)
Standard_Real Z = coord.Z();
Standard_Real X = coord.X();
Standard_Real D = sqrt (X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::SetY() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -111,7 +111,7 @@ inline void gp_Dir::SetZ (const Standard_Real Z)
Standard_Real X = coord.X();
Standard_Real Y = coord.Y();
Standard_Real D = sqrt (X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::SetZ() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -123,7 +123,7 @@ inline void gp_Dir::SetXYZ (const gp_XYZ& XYZ)
Standard_Real Y = XYZ.Y();
Standard_Real Z = XYZ.Z();
Standard_Real D = sqrt(X * X + Y * Y + Z * Z);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::SetX() - input vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
coord.SetZ(Z / D);
@@ -180,7 +180,7 @@ inline void gp_Dir::Cross (const gp_Dir& Right)
{
coord.Cross (Right.coord);
Standard_Real D = coord.Modulus ();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::Cross() - result vector has zero norm");
coord.Divide (D);
}
@@ -189,7 +189,7 @@ inline gp_Dir gp_Dir::Crossed (const gp_Dir& Right) const
gp_Dir V = *this;
V.coord.Cross (Right.coord);
Standard_Real D = V.coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::Crossed() - result vector has zero norm");
V.coord.Divide (D);
return V;
}
@@ -199,7 +199,7 @@ inline void gp_Dir::CrossCross (const gp_Dir& V1,
{
coord.CrossCross (V1.coord, V2.coord);
Standard_Real D = coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::CrossCross() - result vector has zero norm");
coord.Divide(D);
}
@@ -209,7 +209,7 @@ inline gp_Dir gp_Dir::CrossCrossed (const gp_Dir& V1,
gp_Dir V = *this;
(V.coord).CrossCross (V1.coord, V2.coord);
Standard_Real D = V.coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir::CrossCrossed() - result vector has zero norm");
V.coord.Divide(D);
return V;
}

18
src/gp/gp_Dir2d.lxx
View File

@@ -30,7 +30,7 @@ inline gp_Dir2d::gp_Dir2d (const gp_Vec2d& V)
Standard_Real X = XY.X();
Standard_Real Y = XY.Y();
Standard_Real D = sqrt(X * X + Y * Y);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d() - input vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
}
@@ -40,7 +40,7 @@ inline gp_Dir2d::gp_Dir2d (const gp_XY& XY)
Standard_Real X = XY.X();
Standard_Real Y = XY.Y();
Standard_Real D = sqrt(X * X + Y * Y);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d() - input vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
}
@@ -49,7 +49,7 @@ inline gp_Dir2d::gp_Dir2d (const Standard_Real Xv,
const Standard_Real Yv)
{
Standard_Real D = sqrt (Xv * Xv + Yv * Yv);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d() - input vector has zero norm");
coord.SetX(Xv / D);
coord.SetY(Yv / D);
}
@@ -59,11 +59,11 @@ inline void gp_Dir2d::SetCoord (const Standard_Integer Index,
{
Standard_Real X = coord.X();
Standard_Real Y = coord.Y();
Standard_OutOfRange_Raise_if (Index < 1 || Index > 2, " ");
Standard_OutOfRange_Raise_if (Index < 1 || Index > 2, "gp_Dir2d::SetCoord() - index is out of range [1, 2]");
if (Index == 1) X = Xi;
else Y = Xi;
Standard_Real D = sqrt (X * X + Y * Y);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d::SetCoord() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
}
@@ -72,7 +72,7 @@ inline void gp_Dir2d::SetCoord (const Standard_Real Xv,
const Standard_Real Yv)
{
Standard_Real D = sqrt (Xv * Xv + Yv * Yv);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d::SetCoord() - result vector has zero norm");
coord.SetX(Xv / D);
coord.SetY(Yv / D);
}
@@ -81,7 +81,7 @@ inline void gp_Dir2d::SetX (const Standard_Real X)
{
Standard_Real Y = coord.Y();
Standard_Real D = sqrt (X * X + Y * Y);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d::SetX() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
}
@@ -90,7 +90,7 @@ inline void gp_Dir2d::SetY (const Standard_Real Y)
{
Standard_Real X = coord.X();
Standard_Real D = sqrt (X * X + Y * Y);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d::SetY() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
}
@@ -100,7 +100,7 @@ inline void gp_Dir2d::SetXY (const gp_XY& XY)
Standard_Real X = XY.X();
Standard_Real Y = XY.Y();
Standard_Real D = sqrt(X * X + Y * Y);
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "gp_Dir2d::SetZ() - result vector has zero norm");
coord.SetX(X / D);
coord.SetY(Y / D);
}

14
src/gp/gp_Elips.lxx
View File

@@ -30,8 +30,8 @@ inline gp_Elips::gp_Elips (const gp_Ax2& A2,
majorRadius (MajorRadius),
minorRadius (MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < MinorRadius,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < MinorRadius,
"gp_Elips() - invalid construction parameters");
}
inline Standard_Real gp_Elips::Area() const
@@ -58,7 +58,7 @@ inline const gp_Ax1& gp_Elips::Axis () const
inline gp_Ax1 gp_Elips::Directrix1() const
{
Standard_Real E = Eccentricity();
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "gp_Elips::Directrix1() - zero eccentricity");
gp_XYZ Orig = pos.XDirection().XYZ();
Orig.Multiply (majorRadius/E);
Orig.Add (pos.Location().XYZ());
@@ -68,7 +68,7 @@ inline gp_Ax1 gp_Elips::Directrix1() const
inline gp_Ax1 gp_Elips::Directrix2() const
{
Standard_Real E = Eccentricity();
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "gp_Elips::Directrix2() - zero eccentricity");
gp_XYZ Orig = pos.XDirection().XYZ();
Orig.Multiply (-majorRadius/E);
Orig.Add (pos.Location().XYZ());
@@ -132,13 +132,15 @@ inline void gp_Elips::SetLocation (const gp_Pnt& P)
inline void gp_Elips::SetMajorRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if(R < minorRadius,"");
Standard_ConstructionError_Raise_if (R < minorRadius,
"gp_Elips::SetMajorRadius() - major radius should be greater or equal to minor radius");
majorRadius = R;
}
inline void gp_Elips::SetMinorRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if(R < 0.0 || majorRadius < R,"");
Standard_ConstructionError_Raise_if (R < 0.0 || majorRadius < R,
"gp_Elips::SetMinorRadius() - minor radius should be a positive number lesser or equal to major radius");
minorRadius = R;
}

19
src/gp/gp_Elips2d.lxx
View File

@@ -29,8 +29,8 @@ inline gp_Elips2d::gp_Elips2d (const gp_Ax2d& MajorAxis,
minorRadius(MinorRadius)
{
pos = gp_Ax22d(MajorAxis,Sense);
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < MinorRadius,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < MinorRadius,
"gp_Elips2d() - invalid construction parameters");
}
inline gp_Elips2d::gp_Elips2d (const gp_Ax22d& A,
@@ -40,8 +40,8 @@ inline gp_Elips2d::gp_Elips2d (const gp_Ax22d& A,
majorRadius(MajorRadius),
minorRadius(MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < MinorRadius,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < MinorRadius,
"gp_Elips2d() - invalid construction parameters");
}
inline void gp_Elips2d::SetLocation (const gp_Pnt2d& P)
@@ -49,14 +49,15 @@ inline void gp_Elips2d::SetLocation (const gp_Pnt2d& P)
inline void gp_Elips2d::SetMajorRadius (const Standard_Real MajorRadius)
{
Standard_ConstructionError_Raise_if(MajorRadius < minorRadius,"");
Standard_ConstructionError_Raise_if (MajorRadius < minorRadius,
"gp_Elips2d::SetMajorRadius() - major radius should be greater or equal to minor radius");
majorRadius = MajorRadius;
}
inline void gp_Elips2d::SetMinorRadius (const Standard_Real MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || majorRadius < MinorRadius,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || majorRadius < MinorRadius,
"gp_Elips2d::SetMinorRadius() - minor radius should be a positive number lesser or equal to major radius");
minorRadius = MinorRadius;
}
@@ -75,7 +76,7 @@ inline Standard_Real gp_Elips2d::Area() const
inline gp_Ax2d gp_Elips2d::Directrix1() const
{
Standard_Real E = Eccentricity();
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "gp_Elips2d::Directrix1() - zero eccentricity");
gp_XY Orig = pos.XDirection().XY();
Orig.Multiply (majorRadius/E);
Orig.Add (pos.Location().XY());
@@ -85,7 +86,7 @@ inline gp_Ax2d gp_Elips2d::Directrix1() const
inline gp_Ax2d gp_Elips2d::Directrix2() const
{
Standard_Real E = Eccentricity();
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (E <= gp::Resolution(), "gp_Elips2d::Directrix2() - zero eccentricity");
gp_XY Orig = pos.XDirection().XY();
Orig.Multiply (-majorRadius/E);
Orig.Add (pos.Location().XY());

23
src/gp/gp_Hypr.lxx
View File

@@ -28,8 +28,8 @@ inline gp_Hypr::gp_Hypr (const gp_Ax2& A2,
majorRadius(MajorRadius),
minorRadius(MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < 0.0,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < 0.0,
"gp_Hypr() - invalid construction parameters");
}
inline void gp_Hypr::SetAxis (const gp_Ax1& A1)
@@ -40,13 +40,15 @@ inline void gp_Hypr::SetLocation (const gp_Pnt& P)
inline void gp_Hypr::SetMajorRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if(R < 0.0,"");
Standard_ConstructionError_Raise_if (R < 0.0,
"gp_Hypr::SetMajorRadius() - major radius should be greater or equal zero");
majorRadius = R;
}
inline void gp_Hypr::SetMinorRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if(R < 0.0,"");
Standard_ConstructionError_Raise_if (R < 0.0,
"gp_Hypr::SetMinorRadius() - minor radius should be greater or equal zero");
minorRadius = R;
}
@@ -55,8 +57,8 @@ inline void gp_Hypr::SetPosition (const gp_Ax2& A2)
inline gp_Ax1 gp_Hypr::Asymptote1 () const
{
Standard_ConstructionError_Raise_if
(majorRadius <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr::Asymptote1() - major radius is zero");
gp_Vec V1 = gp_Vec (pos.YDirection());
V1.Multiply (minorRadius / majorRadius);
gp_Vec V = gp_Vec (pos.XDirection());
@@ -66,7 +68,8 @@ inline gp_Ax1 gp_Hypr::Asymptote1 () const
inline gp_Ax1 gp_Hypr::Asymptote2 () const
{
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr::Asymptote1() - major radius is zero");
gp_Vec V1 = gp_Vec (pos.YDirection());
V1.Multiply (-minorRadius / majorRadius);
gp_Vec V = gp_Vec (pos.XDirection());
@@ -113,7 +116,8 @@ inline gp_Ax1 gp_Hypr::Directrix2 () const
inline Standard_Real gp_Hypr::Eccentricity () const
{
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr::Eccentricity() - major radius is zero");
return sqrt(majorRadius * majorRadius +
minorRadius * minorRadius) / majorRadius;
}
@@ -165,7 +169,8 @@ inline gp_Hypr gp_Hypr::OtherBranch () const
inline Standard_Real gp_Hypr::Parameter() const
{
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr::Parameter() - major radius is zero");
return (minorRadius * minorRadius) / majorRadius;
}

26
src/gp/gp_Hypr2d.lxx
View File

@@ -30,8 +30,8 @@ inline gp_Hypr2d::gp_Hypr2d (const gp_Ax22d& A,
majorRadius(MajorRadius),
minorRadius(MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < 0.0,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < 0.0,
"gp_Hypr2d() - invalid construction parameters");
}
inline gp_Hypr2d::gp_Hypr2d (const gp_Ax2d& MajorAxis,
@@ -42,8 +42,8 @@ inline gp_Hypr2d::gp_Hypr2d (const gp_Ax2d& MajorAxis,
minorRadius(MinorRadius)
{
pos = gp_Ax22d(MajorAxis,Sense);
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < 0.0,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < 0.0,
"gp_Hypr2d() - invalid construction parameters");
}
inline void gp_Hypr2d::SetLocation (const gp_Pnt2d& P)
@@ -51,13 +51,15 @@ inline void gp_Hypr2d::SetLocation (const gp_Pnt2d& P)
inline void gp_Hypr2d::SetMajorRadius (const Standard_Real MajorRadius)
{
Standard_ConstructionError_Raise_if(MajorRadius < 0.0,"");
Standard_ConstructionError_Raise_if (MajorRadius < 0.0,
"gp_Hypr2d::SetMajorRadius() - major radius should be greater or equal zero");
majorRadius = MajorRadius;
}
inline void gp_Hypr2d::SetMinorRadius (const Standard_Real MinorRadius)
{
Standard_ConstructionError_Raise_if(MinorRadius < 0.0,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0,
"gp_Hypr2d::SetMinorRadius() - minor radius should be greater or equal zero");
minorRadius = MinorRadius;
}
@@ -72,7 +74,8 @@ inline void gp_Hypr2d::SetYAxis (const gp_Ax2d& A)
inline gp_Ax2d gp_Hypr2d::Asymptote1() const
{
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr2d::Asymptote1() - major radius is zero");
gp_Dir2d Vdir = pos.XDirection();
gp_XY Coord1 (pos.YDirection().XY());
gp_XY Coord2 = Coord1.Multiplied (minorRadius / majorRadius);
@@ -82,7 +85,8 @@ inline gp_Ax2d gp_Hypr2d::Asymptote1() const
}
inline gp_Ax2d gp_Hypr2d::Asymptote2() const {
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr2d::Asymptote2() - major radius is zero");
gp_Vec2d Vdir = pos.XDirection();
gp_XY Coord1 (pos.YDirection().XY());
gp_XY Coord2 = Coord1.Multiplied (-minorRadius / majorRadius);
@@ -125,7 +129,8 @@ inline gp_Ax2d gp_Hypr2d::Directrix2() const
inline Standard_Real gp_Hypr2d::Eccentricity() const
{
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr2d::Eccentricity() - major radius is zero");
return sqrt(majorRadius * majorRadius +
minorRadius * minorRadius) / majorRadius;
}
@@ -170,7 +175,8 @@ inline gp_Hypr2d gp_Hypr2d::OtherBranch() const
inline Standard_Real gp_Hypr2d::Parameter() const
{
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(), "");
Standard_DomainError_Raise_if (majorRadius <= gp::Resolution(),
"gp_Hypr2d::Parameter() - major radius is zero");
return (minorRadius * minorRadius) / majorRadius;
}

10
src/gp/gp_Mat.cxx
View File

@@ -165,7 +165,7 @@ void gp_Mat::SetRows (const gp_XYZ& Row1,
gp_XYZ gp_Mat::Column (const Standard_Integer Col) const
{
Standard_OutOfRange_Raise_if (Col < 1 || Col > 3, "");
Standard_OutOfRange_Raise_if (Col < 1 || Col > 3, "gp_Mat::Column() - wrong index");
const Standard_Address M = (Standard_Address)&(matrix[0][0]);
if (Col == 1) return gp_XYZ (M00,M10,M20);
if (Col == 2) return gp_XYZ (M01,M11,M21);
@@ -180,7 +180,7 @@ gp_XYZ gp_Mat::Diagonal () const
gp_XYZ gp_Mat::Row (const Standard_Integer Row) const
{
Standard_OutOfRange_Raise_if (Row < 1 || Row > 3, "");
Standard_OutOfRange_Raise_if (Row < 1 || Row > 3, "gp_Mat::Row() - wrong index");
const Standard_Address M = (Standard_Address)&(matrix[0][0]);
if (Row == 1) return gp_XYZ (M00,M01,M02);
if (Row == 2) return gp_XYZ (M10,M11,M12);
@@ -208,8 +208,7 @@ void gp_Mat::Invert ()
Standard_Real det = M00 * N00 + M01* N10 + M02 * N20 ;
Standard_Real val = det;
if (val < 0) val = - val;
Standard_ConstructionError_Raise_if
(val <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (val <= gp::Resolution(), "gp_Mat::Invert() - matrix has zero determinant");
det = 1.0e0 / det ;
M00 = N00;
M10 = N10;
@@ -243,8 +242,7 @@ gp_Mat gp_Mat::Inverted () const
Standard_Real det = M00 * N00 + M01* N10 + M02 * N20 ;
Standard_Real val = det;
if (val < 0) val = - val;
Standard_ConstructionError_Raise_if
(val <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (val <= gp::Resolution(), "gp_Mat::Inverted() - matrix has zero determinant");
det = 1.0e0 / det ;
NewMat.Multiply(det) ;
return NewMat;

10
src/gp/gp_Mat2d.cxx
View File

@@ -47,7 +47,7 @@ gp_Mat2d::gp_Mat2d (const gp_XY& Col1, const gp_XY& Col2)
void gp_Mat2d::SetCol (const Standard_Integer Col,
const gp_XY& Value)
{
Standard_OutOfRange_Raise_if (Col < 1 || Col > 2,"");
Standard_OutOfRange_Raise_if (Col < 1 || Col > 2, "gp_Mat2d::SetCol() - invalid index");
const Standard_Address M = (Standard_Address)&(matrix[0][0]);
if (Col == 1) {
M00 = Value.X();
@@ -69,7 +69,7 @@ void gp_Mat2d::SetCols (const gp_XY& Col1,
void gp_Mat2d::SetRow (const Standard_Integer Row, const gp_XY& Value)
{
Standard_OutOfRange_Raise_if (Row < 1 || Row > 2,"");
Standard_OutOfRange_Raise_if (Row < 1 || Row > 2, "gp_Mat2d::SetRow() - invalid index");
const Standard_Address M = (Standard_Address)&(matrix[0][0]);
if (Row == 1) {
M00 = Value.X();
@@ -90,7 +90,7 @@ void gp_Mat2d::SetRows (const gp_XY& Row1, const gp_XY& Row2)
gp_XY gp_Mat2d::Column (const Standard_Integer Col) const
{
Standard_OutOfRange_Raise_if (Col < 1 || Col > 2,"");
Standard_OutOfRange_Raise_if (Col < 1 || Col > 2, "gp_Mat2d::Column() - invalid index");
const Standard_Address M = (Standard_Address)&(matrix[0][0]);
if (Col == 1) return gp_XY (M00,M10);
return gp_XY (M01,M11);
@@ -104,7 +104,7 @@ gp_XY gp_Mat2d::Diagonal () const
gp_XY gp_Mat2d::Row (const Standard_Integer Row) const
{
Standard_OutOfRange_Raise_if (Row < 1 || Row > 2,"");
Standard_OutOfRange_Raise_if (Row < 1 || Row > 2, "gp_Mat2d::Row() - invalid index");
const Standard_Address M = (Standard_Address)&(matrix[0][0]);
if (Row == 1) return gp_XY (M00,M01);
return gp_XY (M10,M11);
@@ -123,7 +123,7 @@ void gp_Mat2d::Invert ()
det = N00 * N11 - N01 * N10 ;
Standard_Real val = det;
if (val < 0) val = - val;
Standard_ConstructionError_Raise_if (val <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (val <= gp::Resolution(), "gp_Mat2d::Invert() - matrix has zero determinant");
det = 1.0 / det ;
M00 = N00 * det ;
M10 = N10 * det ;

6
src/gp/gp_Parab.lxx
View File

@@ -23,7 +23,9 @@ inline gp_Parab::gp_Parab (const gp_Ax2& A2,
const Standard_Real Focal) :
pos(A2),
focalLength (Focal)
{ Standard_ConstructionError_Raise_if(Focal < 0.0,""); }
{
Standard_ConstructionError_Raise_if (Focal < 0.0, "gp_Parab() - focal length should be >= 0");
}
inline gp_Parab::gp_Parab (const gp_Ax1& D,
const gp_Pnt& F)
@@ -45,7 +47,7 @@ inline void gp_Parab::SetAxis (const gp_Ax1& A1)
inline void gp_Parab::SetFocal (const Standard_Real Focal)
{
Standard_ConstructionError_Raise_if(Focal < 0.0,"");
Standard_ConstructionError_Raise_if (Focal < 0.0, "gp_Parab::SetFocal() - focal length should be >= 0");
focalLength = Focal;
}

6
src/gp/gp_Parab2d.lxx
View File

@@ -21,7 +21,7 @@ inline gp_Parab2d::gp_Parab2d(const gp_Ax22d& theMirrorAxis,
pos (theMirrorAxis),
focalLength (theFocalLength)
{
Standard_ConstructionError_Raise_if(theFocalLength < 0.0,"");
Standard_ConstructionError_Raise_if (theFocalLength < 0.0, "gp_Parab2d() - focal length should be >= 0");
}
inline gp_Parab2d::gp_Parab2d(const gp_Ax2d& theMirrorAxis,
@@ -30,12 +30,12 @@ inline gp_Parab2d::gp_Parab2d(const gp_Ax2d& theMirrorAxis,
focalLength (theFocalLength)
{
pos = gp_Ax22d(theMirrorAxis,theSense);
Standard_ConstructionError_Raise_if(theFocalLength < 0.0,"");
Standard_ConstructionError_Raise_if (theFocalLength < 0.0, "gp_Parab2d() - focal length should be >= 0");
}
inline void gp_Parab2d::SetFocal (const Standard_Real Focal)
{
Standard_ConstructionError_Raise_if(Focal < 0.0,"");
Standard_ConstructionError_Raise_if (Focal < 0.0, "gp_Parab2d::SetFocal() - focal length should be >= 0");
focalLength = Focal;
}

6
src/gp/gp_Sphere.lxx
View File

@@ -19,7 +19,9 @@ inline gp_Sphere::gp_Sphere (const gp_Ax3& A3,
const Standard_Real Radius) :
pos (A3),
radius (Radius)
{ Standard_ConstructionError_Raise_if (Radius < 0.0,""); }
{
Standard_ConstructionError_Raise_if (Radius < 0.0, "gp_Sphere() - radius should be >= 0");
}
inline void gp_Sphere::SetLocation (const gp_Pnt& Loc)
{ pos.SetLocation (Loc); }
@@ -29,7 +31,7 @@ inline void gp_Sphere::SetPosition (const gp_Ax3& A3)
inline void gp_Sphere::SetRadius (const Standard_Real R)
{
Standard_ConstructionError_Raise_if (R < 0.0,"");
Standard_ConstructionError_Raise_if (R < 0.0, "gp_Sphere::SetRadius() - radius should be >= 0");
radius = R;
}

12
src/gp/gp_Torus.lxx
View File

@@ -24,8 +24,8 @@ inline gp_Torus::gp_Torus (const gp_Ax3& A3,
majorRadius (MajorRadius),
minorRadius (MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || MajorRadius < 0.0,"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || MajorRadius < 0.0,
"gp_Torus() - invalid construction parameters");
}
inline void gp_Torus::SetAxis (const gp_Ax1& A1)
@@ -36,15 +36,15 @@ inline void gp_Torus::SetLocation (const gp_Pnt& Loc)
inline void gp_Torus::SetMajorRadius (const Standard_Real MajorRadius)
{
Standard_ConstructionError_Raise_if
(MajorRadius - minorRadius <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (MajorRadius - minorRadius <= gp::Resolution(),
"gp_Torus::SetMajorRadius() - invalid input parameters");
majorRadius = MajorRadius;
}
inline void gp_Torus::SetMinorRadius (const Standard_Real MinorRadius)
{
Standard_ConstructionError_Raise_if
(MinorRadius < 0.0 || majorRadius - MinorRadius <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (MinorRadius < 0.0 || majorRadius - MinorRadius <= gp::Resolution(),
"gp_Torus::SetMinorRadius() - invalid input parameters");
minorRadius = MinorRadius;
}

6
src/gp/gp_Trsf.cxx
View File

@@ -405,16 +405,14 @@ void gp_Trsf::Invert()
else if (shape == gp_Scale) {
Standard_Real As = scale;
if (As < 0) As = - As;
Standard_ConstructionError_Raise_if
(As <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (As <= gp::Resolution(), "gp_Trsf::Invert() - transformation has zero scale");
scale = 1.0 / scale;
loc.Multiply (-scale);
}
else {
Standard_Real As = scale;
if (As < 0) As = - As;
Standard_ConstructionError_Raise_if
(As <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (As <= gp::Resolution(), "gp_Trsf::Invert() - transformation has zero scale");
scale = 1.0 / scale;
matrix.Transpose ();
loc.Multiply (matrix);

4
src/gp/gp_Trsf2d.cxx
View File

@@ -173,14 +173,14 @@ void gp_Trsf2d::Invert()
else if ( shape == gp_Scale) {
Standard_Real As = scale;
if (As < 0) As = - As;
Standard_ConstructionError_Raise_if(As <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (As <= gp::Resolution(), "gp_Trsf2d::Invert() - transformation has zero scale");
scale = 1.0 / scale;
loc.Multiply (-scale);
}
else {
Standard_Real As = scale;
if (As < 0) As = - As;
Standard_ConstructionError_Raise_if(As <= gp::Resolution(),"");
Standard_ConstructionError_Raise_if (As <= gp::Resolution(), "gp_Trsf2d::Invert() - transformation has zero scale");
scale = 1.0 / scale;
matrix.Transpose();
loc.Multiply (matrix);

6
src/gp/gp_Vec.lxx
View File

@@ -223,14 +223,16 @@ inline Standard_Real gp_Vec::DotCross (const gp_Vec& V1,
inline void gp_Vec::Normalize()
{
Standard_Real D = coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_Vec::Normalize() - vector has zero norm");
coord.Divide (D);
}
inline gp_Vec gp_Vec::Normalized() const
{
Standard_Real D = coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_Vec::Normalized() - vector has zero norm");
gp_Vec V = *this;
V.coord.Divide (D);
return V;

6
src/gp/gp_Vec2d.lxx
View File

@@ -147,14 +147,16 @@ inline gp_Vec2d gp_Vec2d::Multiplied (const Standard_Real Scalar) const
inline void gp_Vec2d::Normalize()
{
Standard_Real D = coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_Vec2d::Normalize() - vector has zero norm");
coord.Divide (D);
}
inline gp_Vec2d gp_Vec2d::Normalized() const
{
Standard_Real D = coord.Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_Vec2d::Normalized() - vector has zero norm");
gp_Vec2d V = *this;
V.coord.Divide (D);
return V;

6
src/gp/gp_XY.lxx
View File

@@ -151,14 +151,16 @@ inline gp_XY gp_XY::Multiplied (const gp_Mat2d& Matrix) const
inline void gp_XY::Normalize ()
{
Standard_Real D = Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_XY::Normalize() - vector has zero norm");
x = x / D; y = y / D;
}
inline gp_XY gp_XY::Normalized () const
{
Standard_Real D = Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_XY::Normalized() - vector has zero norm");
return gp_XY (x / D, y / D);
}

6
src/gp/gp_XYZ.lxx
View File

@@ -210,14 +210,16 @@ inline gp_XYZ gp_XYZ::Multiplied (const gp_Mat& Matrix) const
inline void gp_XYZ::Normalize ()
{
Standard_Real D = Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_XYZ::Normalize() - vector has zero norm");
x = x / D; y = y / D; z = z / D;
}
inline gp_XYZ gp_XYZ::Normalized () const
{
Standard_Real D = Modulus();
Standard_ConstructionError_Raise_if (D <= gp::Resolution(), "");
Standard_ConstructionError_Raise_if (D <= gp::Resolution(),
"gp_XYZ::Normalized() - vector has zero norm");
return gp_XYZ (x / D, y / D, z / D);
}