OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0028316: Coding Rules - Elimilate confusing aliases of Standard_Real type in V3d_View

Browse Source 
Quantity_Factor, Quantity_Parameter, Quantity_Ratio, Quantity_Coefficient,
Quantity_PlaneAngle, Quantity_Length, V3d_Parameter and V3d_Coordinate
have been replaced by Standard_Real in visualization classes.
This commit is contained in:
kgv
2017-05-30 13:43:59 +03:00
committed by bugmaster
parent 3f5aa017e7
commit ee2be2a881
130 changed files with 891 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Prs3d/Prs3d.cxx
View File

@@ -31,13 +31,13 @@
//purpose :
//=======================================================================
Standard_Boolean Prs3d::MatchSegment
(const Quantity_Length X,
const Quantity_Length Y,
const Quantity_Length Z,
const Quantity_Length aDistance,
(const Standard_Real X,
const Standard_Real Y,
const Standard_Real Z,
const Standard_Real aDistance,
const gp_Pnt& P1,
const gp_Pnt& P2,
Quantity_Length& dist)
Standard_Real& dist)
{
Standard_Real X1,Y1,Z1,X2,Y2,Z2;
P1.Coord(X1,Y1,Z1); P2.Coord(X2,Y2,Z2);

3
src/Prs3d/Prs3d.hxx
View File

@@ -22,7 +22,6 @@
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Boolean.hxx>
#include <Quantity_Length.hxx>
#include <Standard_Real.hxx>
#include <Prs3d_Drawer.hxx>
#include <Prs3d_NListOfSequenceOfPnt.hxx>
@@ -51,7 +50,7 @@ public:
//! draws an arrow at a given location, with respect
//! to a given direction.
Standard_EXPORT static Standard_Boolean MatchSegment (const Quantity_Length X, const Quantity_Length Y, const Quantity_Length Z, const Quantity_Length aDistance, const gp_Pnt& p1, const gp_Pnt& p2, Quantity_Length& dist);
Standard_EXPORT static Standard_Boolean MatchSegment (const Standard_Real X, const Standard_Real Y, const Standard_Real Z, const Standard_Real aDistance, const gp_Pnt& p1, const gp_Pnt& p2, Standard_Real& dist);
//! Computes the absolute deflection value depending on
//! the type of deflection in theDrawer:

8
src/Prs3d/Prs3d_Arrow.cxx
View File

@@ -33,8 +33,8 @@
void Prs3d_Arrow::Draw(const Handle(Graphic3d_Group)& theGroup,
const gp_Pnt& theLocation,
const gp_Dir& theDirection,
const Quantity_PlaneAngle theAngle,
const Quantity_Length theLength)
const Standard_Real theAngle,
const Standard_Real theLength)
{
Handle(Graphic3d_ArrayOfSegments) aPrimitives = Prs3d_Arrow::DrawSegments(theLocation,
theDirection, theAngle, theLength, 15);
@@ -47,8 +47,8 @@ void Prs3d_Arrow::Draw(const Handle(Graphic3d_Group)& theGroup,
//=======================================================================
Handle(Graphic3d_ArrayOfSegments) Prs3d_Arrow::DrawSegments (const gp_Pnt& theLocation,
const gp_Dir& theDir,
const Quantity_PlaneAngle theAngle,
const Quantity_Length theLength,
const Standard_Real theAngle,
const Standard_Real theLength,
const Standard_Integer theNbSegments)
{
Handle(Graphic3d_ArrayOfSegments) aSegments = new Graphic3d_ArrayOfSegments (theNbSegments + 1, 2 * (2 * theNbSegments));

14
src/Prs3d/Prs3d_Arrow.hxx
View File

@@ -21,8 +21,6 @@
#include <Graphic3d_ArrayOfTriangles.hxx>
#include <Graphic3d_ArrayOfSegments.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Quantity_Length.hxx>
class gp_Ax1;
class gp_Pnt;
@@ -55,8 +53,8 @@ public:
//! @param theNbSegments count of points on polyline where location is connected
Standard_EXPORT static Handle(Graphic3d_ArrayOfSegments) DrawSegments (const gp_Pnt& theLocation,
const gp_Dir& theDir,
const Quantity_PlaneAngle theAngle,
const Quantity_Length theLength,
const Standard_Real theAngle,
const Standard_Real theLength,
const Standard_Integer theNbSegments);
//! Defines the representation of the arrow.
@@ -69,16 +67,16 @@ public:
Standard_EXPORT static void Draw (const Handle(Graphic3d_Group)& theGroup,
const gp_Pnt& theLocation,
const gp_Dir& theDirection,
const Quantity_PlaneAngle theAngle,
const Quantity_Length theLength);
const Standard_Real theAngle,
const Standard_Real theLength);
//! Alias to another method Draw() for backward compatibility.
Standard_DEPRECATED("Prs3d_Arrow::Draw() taking Graphic3d_Group should be used instead")
static void Draw (const Handle(Prs3d_Presentation)& thePrs,
const gp_Pnt& theLocation,
const gp_Dir& theDirection,
const Quantity_PlaneAngle theAngle,
const Quantity_Length theLength)
const Standard_Real theAngle,
const Standard_Real theLength)
{
Draw (Prs3d_Root::CurrentGroup (thePrs), theLocation, theDirection, theAngle, theLength);
}

6
src/Prs3d/Prs3d_ArrowAspect.cxx
View File

@@ -34,8 +34,8 @@ Prs3d_ArrowAspect::Prs3d_ArrowAspect()
// function : Prs3d_ArrowAspect
// purpose :
// =======================================================================
Prs3d_ArrowAspect::Prs3d_ArrowAspect (const Quantity_PlaneAngle theAngle,
const Quantity_Length theLength)
Prs3d_ArrowAspect::Prs3d_ArrowAspect (const Standard_Real theAngle,
const Standard_Real theLength)
: myArrowAspect (new Graphic3d_AspectLine3d (Quantity_Color(Quantity_NOC_WHITE), Aspect_TOL_SOLID, 1.0)),
myAngle (theAngle),
myLength(theLength)
@@ -59,7 +59,7 @@ Prs3d_ArrowAspect::Prs3d_ArrowAspect (const Handle(Graphic3d_AspectLine3d)& theA
// function : SetAngle
// purpose :
// =======================================================================
void Prs3d_ArrowAspect::SetAngle (const Quantity_PlaneAngle theAngle)
void Prs3d_ArrowAspect::SetAngle (const Standard_Real theAngle)
{
Prs3d_InvalidAngle_Raise_if (theAngle <= 0.0
|| theAngle >= M_PI / 2.0, "Prs3d_ArrowAspect::SetAngle() - angle out of range");

16
src/Prs3d/Prs3d_ArrowAspect.hxx
View File

@@ -19,8 +19,6 @@
#include <Graphic3d_AspectLine3d.hxx>
#include <Prs3d_BasicAspect.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Quantity_Length.hxx>
//! A framework for displaying arrows in representations of dimensions and relations.
class Prs3d_ArrowAspect : public Prs3d_BasicAspect
@@ -37,21 +35,21 @@ public:
//! Constructs a framework to display an arrow with a
//! shaft of the length aLength and having a head with
//! sides at the angle anAngle from each other.
Standard_EXPORT Prs3d_ArrowAspect(const Quantity_PlaneAngle anAngle, const Quantity_Length aLength);
Standard_EXPORT Prs3d_ArrowAspect(const Standard_Real anAngle, const Standard_Real aLength);
Standard_EXPORT Prs3d_ArrowAspect(const Handle(Graphic3d_AspectLine3d)& theAspect);
//! defines the angle of the arrows.
Standard_EXPORT void SetAngle (const Quantity_PlaneAngle anAngle);
Standard_EXPORT void SetAngle (const Standard_Real anAngle);
//! returns the current value of the angle used when drawing an arrow.
Quantity_PlaneAngle Angle() const { return myAngle; }
Standard_Real Angle() const { return myAngle; }
//! Defines the length of the arrows.
void SetLength (const Quantity_Length theLength) { myLength = theLength; }
void SetLength (const Standard_Real theLength) { myLength = theLength; }
//! Returns the current value of the length used when drawing an arrow.
Quantity_Length Length() const { return myLength; }
Standard_Real Length() const { return myLength; }
void SetColor (const Quantity_Color& theColor) { myArrowAspect->SetColor (theColor); }
@@ -62,8 +60,8 @@ public:
protected:
Handle(Graphic3d_AspectLine3d) myArrowAspect;
Quantity_PlaneAngle myAngle;
Quantity_Length myLength;
Standard_Real myAngle;
Standard_Real myLength;
};

2
src/Prs3d/Prs3d_Drawer.cxx
View File

@@ -118,7 +118,7 @@ void Prs3d_Drawer::SetTypeOfDeflection (const Aspect_TypeOfDeflection theTypeOfD
// purpose :
// =======================================================================
void Prs3d_Drawer::SetMaximalChordialDeviation (const Quantity_Length theChordialDeviation)
void Prs3d_Drawer::SetMaximalChordialDeviation (const Standard_Real theChordialDeviation)
{
myHasOwnChordialDeviation = Standard_True;
myChordialDeviation = theChordialDeviation;

7
src/Prs3d/Prs3d_Drawer.hxx
View File

@@ -20,7 +20,6 @@
#include <Standard_Integer.hxx>
#include <Standard_Boolean.hxx>
#include <Quantity_Length.hxx>
#include <Aspect_TypeOfDeflection.hxx>
#include <Graphic3d_GroupAspect.hxx>
#include <Graphic3d_PresentationAttributes.hxx>
@@ -76,11 +75,11 @@ public:
//! Prs3d_DeflectionCurve
//! Prs3d_WFDeflectionSurface
//! Prs3d_WFDeflectionRestrictedFace
Standard_EXPORT void SetMaximalChordialDeviation (const Quantity_Length theChordialDeviation);
Standard_EXPORT void SetMaximalChordialDeviation (const Standard_Real theChordialDeviation);
//! Returns the maximal chordal deviation. The default value is 0.1.
//! Drawings of curves or patches are made with respect to an absolute maximal chordal deviation.
Quantity_Length MaximalChordialDeviation() const
Standard_Real MaximalChordialDeviation() const
{
return HasOwnMaximalChordialDeviation() || myLink.IsNull()
? myChordialDeviation
@@ -855,7 +854,7 @@ protected:
Standard_Boolean myHasOwnNbPoints;
Standard_Real myMaximalParameterValue;
Standard_Boolean myHasOwnMaximalParameterValue;
Quantity_Length myChordialDeviation;
Standard_Real myChordialDeviation;
Standard_Boolean myHasOwnChordialDeviation;
Aspect_TypeOfDeflection myTypeOfDeflection;
Standard_Boolean myHasOwnTypeOfDeflection;

36
src/Prs3d/Prs3d_PlaneAspect.hxx
View File

@@ -17,8 +17,6 @@
#ifndef _Prs3d_PlaneAspect_HeaderFile
#define _Prs3d_PlaneAspect_HeaderFile
#include <Quantity_Length.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Prs3d_LineAspect.hxx>
//! A framework to define the display of planes.
@@ -39,24 +37,24 @@ public:
//! Returns the settings for displaying an arrow.
const Handle(Prs3d_LineAspect)& ArrowAspect() const { return myArrowAspect; }
void SetArrowsLength (const Quantity_Length theLength) { myArrowsLength = theLength; }
void SetArrowsLength (const Standard_Real theLength) { myArrowsLength = theLength; }
//! Returns the length of the arrow shaft used in the display of arrows.
Quantity_Length ArrowsLength() const { return myArrowsLength; }
Standard_Real ArrowsLength() const { return myArrowsLength; }
//! Sets the angle of the arrowhead used in the display of planes.
void SetArrowsSize (const Quantity_Length theSize) { myArrowsSize = theSize; }
void SetArrowsSize (const Standard_Real theSize) { myArrowsSize = theSize; }
//! Returns the size of arrows used in the display of planes.
Quantity_Length ArrowsSize() const { return myArrowsSize; }
Standard_Real ArrowsSize() const { return myArrowsSize; }
//! Sets the angle of the arrowhead used in the display
//! of arrows involved in the presentation of planes.
void SetArrowsAngle (const Quantity_PlaneAngle theAngle) { myArrowsAngle = theAngle; }
void SetArrowsAngle (const Standard_Real theAngle) { myArrowsAngle = theAngle; }
//! Returns the angle of the arrowhead used in the
//! display of arrows involved in the presentation of planes.
Quantity_PlaneAngle ArrowsAngle() const { return myArrowsAngle; }
Standard_Real ArrowsAngle() const { return myArrowsAngle; }
//! Sets the display attributes defined in DisplayCenterArrow to active.
void SetDisplayCenterArrow (const Standard_Boolean theToDraw) { myDrawCenterArrow = theToDraw; }
@@ -80,35 +78,35 @@ public:
//! Returns true if the display of isoparameters is allowed.
Standard_Boolean DisplayIso() const { return myDrawIso; }
void SetPlaneLength (const Quantity_Length theLX, const Quantity_Length theLY)
void SetPlaneLength (const Standard_Real theLX, const Standard_Real theLY)
{
myPlaneXLength = theLX;
myPlaneYLength = theLY;
}
//! Returns the length of the x axis used in the display of planes.
Quantity_Length PlaneXLength() const { return myPlaneXLength; }
Standard_Real PlaneXLength() const { return myPlaneXLength; }
//! Returns the length of the y axis used in the display of planes.
Quantity_Length PlaneYLength() const { return myPlaneYLength; }
Standard_Real PlaneYLength() const { return myPlaneYLength; }
//! Sets the distance L between isoparameters used in the display of planes.
void SetIsoDistance (const Quantity_Length theL) { myIsoDistance = theL; }
void SetIsoDistance (const Standard_Real theL) { myIsoDistance = theL; }
//! Returns the distance between isoparameters used in the display of planes.
Quantity_Length IsoDistance() const { return myIsoDistance; }
Standard_Real IsoDistance() const { return myIsoDistance; }
protected:
Handle(Prs3d_LineAspect) myEdgesAspect;
Handle(Prs3d_LineAspect) myIsoAspect;
Handle(Prs3d_LineAspect) myArrowAspect;
Quantity_Length myArrowsLength;
Quantity_Length myArrowsSize;
Quantity_PlaneAngle myArrowsAngle;
Quantity_Length myPlaneXLength;
Quantity_Length myPlaneYLength;
Quantity_Length myIsoDistance;
Standard_Real myArrowsLength;
Standard_Real myArrowsSize;
Standard_Real myArrowsAngle;
Standard_Real myPlaneXLength;
Standard_Real myPlaneYLength;
Standard_Real myIsoDistance;
Standard_Boolean myDrawCenterArrow;
Standard_Boolean myDrawEdgesArrows;
Standard_Boolean myDrawEdges;

15
src/Prs3d/Prs3d_Point.hxx
View File

@@ -14,14 +14,12 @@
#ifndef _Prs3d_Point_H__
#define _Prs3d_Point_H__
#include <Graphic3d_ArrayOfPoints.hxx>
#include <Graphic3d_Vertex.hxx>
#include <Graphic3d_Group.hxx>
#include <Prs3d_Drawer.hxx>
#include <Prs3d_PointAspect.hxx>
#include <Prs3d_Root.hxx>
#include <Quantity_Length.hxx>
template <class AnyPoint, class PointTool>
class Prs3d_Point : Prs3d_Root
@@ -34,7 +32,7 @@ private:
(const AnyPoint& thePoint,
const Handle(Graphic3d_Group) theGroup)
{
Quantity_Length aX,aY,aZ;
Standard_Real aX,aY,aZ;
PointTool::Coord(thePoint,aX,aY,aZ);
Handle(Graphic3d_ArrayOfPoints) anArrayOfPoints = new Graphic3d_ArrayOfPoints (1);
anArrayOfPoints->AddVertex (aX, aY, aZ);
@@ -54,15 +52,16 @@ public:
Standard_EXPORT static Standard_Boolean Match
(const AnyPoint& thePoint,
const Quantity_Length theX,
const Quantity_Length theY,
const Quantity_Length theZ,
const Quantity_Length theDistance)
const Standard_Real theX,
const Standard_Real theY,
const Standard_Real theZ,
const Standard_Real theDistance)
{
Quantity_Length aX,aY,aZ;
Standard_Real aX,aY,aZ;
PointTool::Coord(thePoint, aX, aY, aZ);
return Sqrt((theX - aX)*(theX - aX) + (theY - aY)*(theY - aY)
+ (theZ - aZ)*(theZ - aZ)) <= theDistance;
}
};
#endif

3
src/Prs3d/Prs3d_Presentation.hxx
View File

@@ -22,7 +22,7 @@
#include <Graphic3d_Structure.hxx>
#include <Standard_Boolean.hxx>
#include <Quantity_Length.hxx>
class Prs3d_Root;
class Graphic3d_StructureManager;
class Graphic3d_Structure;
@@ -30,7 +30,6 @@ class Graphic3d_DataStructureManager;
class Geom_Transformation;
class Graphic3d_Group;
class Prs3d_Presentation;
DEFINE_STANDARD_HANDLE(Prs3d_Presentation, Graphic3d_Structure)

20
src/Prs3d/Prs3d_Projector.cxx
View File

@@ -29,16 +29,16 @@ Prs3d_Projector::Prs3d_Projector (const HLRAlgo_Projector& HLPr): MyProjector(HL
Prs3d_Projector::Prs3d_Projector (const Standard_Boolean Pers,
const Quantity_Length Focus,
const Quantity_Length DX,
const Quantity_Length DY,
const Quantity_Length DZ,
const Quantity_Length XAt,
const Quantity_Length YAt,
const Quantity_Length ZAt,
const Quantity_Length XUp,
const Quantity_Length YUp,
const Quantity_Length ZUp)
const Standard_Real Focus,
const Standard_Real DX,
const Standard_Real DY,
const Standard_Real DZ,
const Standard_Real XAt,
const Standard_Real YAt,
const Standard_Real ZAt,
const Standard_Real XUp,
const Standard_Real YUp,
const Standard_Real ZUp)
{
gp_Pnt At (XAt,YAt,ZAt);
gp_Dir Zpers (DX,DY,DZ);

21
src/Prs3d/Prs3d_Projector.hxx
View File

@@ -23,9 +23,6 @@
#include <HLRAlgo_Projector.hxx>
#include <MMgt_TShared.hxx>
#include <Standard_Boolean.hxx>
#include <Quantity_Length.hxx>
class HLRAlgo_Projector;
class Prs3d_Projector;
DEFINE_STANDARD_HANDLE(Prs3d_Projector, MMgt_TShared)
@@ -51,33 +48,17 @@ public:
//! - XAt, YAt and ZAt are the coordinates of the view point;
//! - XUp, YUp and ZUp are the coordinates of the
//! vertical direction vector.
Standard_EXPORT Prs3d_Projector(const Standard_Boolean Pers, const Quantity_Length Focus, const Quantity_Length DX, const Quantity_Length DY, const Quantity_Length DZ, const Quantity_Length XAt, const Quantity_Length YAt, const Quantity_Length ZAt, const Quantity_Length XUp, const Quantity_Length YUp, const Quantity_Length ZUp);
Standard_EXPORT Prs3d_Projector(const Standard_Boolean Pers, const Standard_Real Focus, const Standard_Real DX, const Standard_Real DY, const Standard_Real DZ, const Standard_Real XAt, const Standard_Real YAt, const Standard_Real ZAt, const Standard_Real XUp, const Standard_Real YUp, const Standard_Real ZUp);
//! Returns a projector object for use in a hidden line removal algorithm.
Standard_EXPORT HLRAlgo_Projector Projector() const;
DEFINE_STANDARD_RTTIEXT(Prs3d_Projector,MMgt_TShared)
protected:
private:
HLRAlgo_Projector MyProjector;
};
#endif // _Prs3d_Projector_HeaderFile

10
src/Prs3d/Prs3d_TextAspect.hxx
View File

@@ -22,8 +22,6 @@
#include <Graphic3d_HorizontalTextAlignment.hxx>
#include <Graphic3d_VerticalTextAlignment.hxx>
#include <Prs3d_BasicAspect.hxx>
#include <Quantity_Length.hxx>
#include <Quantity_PlaneAngle.hxx>
//! Defines the attributes when displaying a text.
class Prs3d_TextAspect : public Prs3d_BasicAspect
@@ -46,19 +44,19 @@ public:
void SetHeightWidthRatio (const Standard_Real theRatio) { myTextAspect->SetExpansionFactor (theRatio); }
//! Sets the length of the box which text will occupy.
void SetSpace (const Quantity_Length theSpace) { myTextAspect->SetSpace (theSpace); }
void SetSpace (const Standard_Real theSpace) { myTextAspect->SetSpace (theSpace); }
//! Sets the height of the text.
void SetHeight (const Standard_Real theHeight) { myHeight = theHeight; }
//! Sets the angle
void SetAngle (const Quantity_PlaneAngle theAngle) { myAngle = theAngle; }
void SetAngle (const Standard_Real theAngle) { myAngle = theAngle; }
//! Returns the height of the text box.
Standard_Real Height() const { return myHeight; }
//! Returns the angle
Quantity_PlaneAngle Angle() const { return myAngle; }
Standard_Real Angle() const { return myAngle; }
//! Sets horizontal alignment of text.
void SetHorizontalJustification (const Graphic3d_HorizontalTextAlignment theJustification) { myHorizontalJustification = theJustification; }
@@ -108,7 +106,7 @@ public:
protected:
Handle(Graphic3d_AspectText3d) myTextAspect;
Quantity_PlaneAngle myAngle;
Standard_Real myAngle;
Standard_Real myHeight;
Graphic3d_HorizontalTextAlignment myHorizontalJustification;
Graphic3d_VerticalTextAlignment myVerticalJustification;