From 30269a68f190e02c9aaf3d4596ad6f41ee44a2d4 Mon Sep 17 00:00:00 2001 From: nds Date: Fri, 29 Apr 2016 12:13:34 +0300 Subject: [PATCH] #1449 Additional angle presentation: class is renamed because of linking trouble on Linux. Later, the modification is planed to integrate in OCCT, so the sources of the previous version should be taken --- ...eDimension.cxx => AIS_AngleDimension_.cxx} | 78 +++++++++---------- ...eDimension.hxx => AIS_AngleDimension_.hxx} | 18 ++--- src/SketcherPrs/CMakeLists.txt | 4 +- src/SketcherPrs/SketcherPrs_Angle.cpp | 10 +-- src/SketcherPrs/SketcherPrs_Angle.h | 6 +- 5 files changed, 58 insertions(+), 58 deletions(-) rename src/SketcherPrs/{AIS_AngleDimension.cxx => AIS_AngleDimension_.cxx} (94%) rename src/SketcherPrs/{AIS_AngleDimension.hxx => AIS_AngleDimension_.hxx} (96%) diff --git a/src/SketcherPrs/AIS_AngleDimension.cxx b/src/SketcherPrs/AIS_AngleDimension_.cxx similarity index 94% rename from src/SketcherPrs/AIS_AngleDimension.cxx rename to src/SketcherPrs/AIS_AngleDimension_.cxx index f37afab0a..c4d6ab40f 100755 --- a/src/SketcherPrs/AIS_AngleDimension.cxx +++ b/src/SketcherPrs/AIS_AngleDimension_.cxx @@ -14,7 +14,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include #include #include @@ -50,8 +50,8 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension) -IMPLEMENT_STANDARD_RTTIEXT (AIS_AngleDimension, AIS_Dimension) +IMPLEMENT_STANDARD_HANDLE (AIS_AngleDimension_, AIS_Dimension) +IMPLEMENT_STANDARD_RTTIEXT (AIS_AngleDimension_, AIS_Dimension) namespace { @@ -65,7 +65,7 @@ namespace //function : Constructor //purpose : //======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, +AIS_AngleDimension_::AIS_AngleDimension_ (const TopoDS_Edge& theFirstEdge, const TopoDS_Edge& theSecondEdge) : AIS_Dimension (AIS_KOD_PLANEANGLE) { @@ -77,7 +77,7 @@ AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, //function : Constructor //purpose : //======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const gp_Pnt& theFirstPoint, +AIS_AngleDimension_::AIS_AngleDimension_ (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint, const gp_Pnt& theThirdPoint) : AIS_Dimension (AIS_KOD_PLANEANGLE) @@ -90,7 +90,7 @@ AIS_AngleDimension::AIS_AngleDimension (const gp_Pnt& theFirstPoint, //function : Constructor //purpose : //======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Vertex& theFirstVertex, +AIS_AngleDimension_::AIS_AngleDimension_ (const TopoDS_Vertex& theFirstVertex, const TopoDS_Vertex& theSecondVertex, const TopoDS_Vertex& theThirdVertex) : AIS_Dimension (AIS_KOD_PLANEANGLE) @@ -103,7 +103,7 @@ AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Vertex& theFirstVertex, //function : Constructor //purpose : //======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theCone) +AIS_AngleDimension_::AIS_AngleDimension_ (const TopoDS_Face& theCone) : AIS_Dimension (AIS_KOD_PLANEANGLE) { Init(); @@ -114,7 +114,7 @@ AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theCone) //function : Constructor //purpose : //======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theFirstFace, +AIS_AngleDimension_::AIS_AngleDimension_ (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace) : AIS_Dimension (AIS_KOD_PLANEANGLE) { @@ -126,7 +126,7 @@ AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theFirstFace, //function : Constructor //purpose : //======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theFirstFace, +AIS_AngleDimension_::AIS_AngleDimension_ (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace, const gp_Pnt& thePoint) : AIS_Dimension (AIS_KOD_PLANEANGLE) @@ -139,7 +139,7 @@ AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theFirstFace, //function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Edge& theFirstEdge, +void AIS_AngleDimension_::SetMeasuredGeometry (const TopoDS_Edge& theFirstEdge, const TopoDS_Edge& theSecondEdge) { gp_Pln aComputedPlane; @@ -162,7 +162,7 @@ void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Edge& theFirstEdge, //function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetMeasuredGeometry (const gp_Pnt& theFirstPoint, +void AIS_AngleDimension_::SetMeasuredGeometry (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint, const gp_Pnt& theThirdPoint) { @@ -187,7 +187,7 @@ void AIS_AngleDimension::SetMeasuredGeometry (const gp_Pnt& theFirstPoint, //function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Vertex& theFirstVertex, +void AIS_AngleDimension_::SetMeasuredGeometry (const TopoDS_Vertex& theFirstVertex, const TopoDS_Vertex& theSecondVertex, const TopoDS_Vertex& theThirdVertex) { @@ -212,7 +212,7 @@ void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Vertex& theFirstVerte //function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theCone) +void AIS_AngleDimension_::SetMeasuredGeometry (const TopoDS_Face& theCone) { myFirstShape = theCone; mySecondShape = TopoDS_Shape(); @@ -232,7 +232,7 @@ void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theCone) //function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, +void AIS_AngleDimension_::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace) { myFirstShape = theFirstFace; @@ -253,7 +253,7 @@ void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, //function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, +void AIS_AngleDimension_::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace, const gp_Pnt& thePoint) { @@ -275,7 +275,7 @@ void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, //function : Init //purpose : //======================================================================= -void AIS_AngleDimension::Init() +void AIS_AngleDimension_::Init() { SetAngleReversed (Standard_False); SetArrowVisible (Standard_True, Standard_True); @@ -288,7 +288,7 @@ void AIS_AngleDimension::Init() //function: GetCenterOnArc //purpose : //======================================================================= -gp_Pnt AIS_AngleDimension::GetCenterOnArc (const gp_Pnt& theFirstAttach, +gp_Pnt AIS_AngleDimension_::GetCenterOnArc (const gp_Pnt& theFirstAttach, const gp_Pnt& theSecondAttach, const gp_Pnt& theCenter) const { @@ -330,7 +330,7 @@ gp_Pnt AIS_AngleDimension::GetCenterOnArc (const gp_Pnt& theFirstAttach, //function : DrawArc //purpose : draws the arc between two attach points //======================================================================= -void AIS_AngleDimension::DrawArc (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_AngleDimension_::DrawArc (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theFirstAttach, const gp_Pnt& theSecondAttach, const gp_Pnt& theCenter, @@ -424,7 +424,7 @@ void AIS_AngleDimension::DrawArc (const Handle(Prs3d_Presentation)& thePresentat //function: DrawArcWithText //purpose : //======================================================================= -void AIS_AngleDimension::DrawArcWithText (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_AngleDimension_::DrawArcWithText (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theFirstAttach, const gp_Pnt& theSecondAttach, const gp_Pnt& theCenter, @@ -507,7 +507,7 @@ void AIS_AngleDimension::DrawArcWithText (const Handle(Prs3d_Presentation)& theP //function : CheckPlane //purpose : //======================================================================= -Standard_Boolean AIS_AngleDimension::CheckPlane (const gp_Pln& thePlane)const +Standard_Boolean AIS_AngleDimension_::CheckPlane (const gp_Pln& thePlane)const { if (!thePlane.Contains (myFirstPoint, Precision::Confusion()) && !thePlane.Contains (mySecondPoint, Precision::Confusion()) && @@ -523,7 +523,7 @@ Standard_Boolean AIS_AngleDimension::CheckPlane (const gp_Pln& thePlane)const //function : ComputePlane //purpose : //======================================================================= -void AIS_AngleDimension::ComputePlane() +void AIS_AngleDimension_::ComputePlane() { if (!myIsGeometryValid) { @@ -543,7 +543,7 @@ void AIS_AngleDimension::ComputePlane() //function : GetModelUnits //purpose : //======================================================================= -const TCollection_AsciiString& AIS_AngleDimension::GetModelUnits() const +const TCollection_AsciiString& AIS_AngleDimension_::GetModelUnits() const { return myDrawer->DimAngleModelUnits(); } @@ -552,7 +552,7 @@ const TCollection_AsciiString& AIS_AngleDimension::GetModelUnits() const //function : GetDisplayUnits //purpose : //======================================================================= -const TCollection_AsciiString& AIS_AngleDimension::GetDisplayUnits() const +const TCollection_AsciiString& AIS_AngleDimension_::GetDisplayUnits() const { return myDrawer->DimAngleDisplayUnits(); } @@ -561,7 +561,7 @@ const TCollection_AsciiString& AIS_AngleDimension::GetDisplayUnits() const //function : SetModelUnits //purpose : //======================================================================= -void AIS_AngleDimension::SetModelUnits (const TCollection_AsciiString& theUnits) +void AIS_AngleDimension_::SetModelUnits (const TCollection_AsciiString& theUnits) { myDrawer->SetDimAngleModelUnits (theUnits); } @@ -570,7 +570,7 @@ void AIS_AngleDimension::SetModelUnits (const TCollection_AsciiString& theUnits) //function : SetDisplayUnits //purpose : //======================================================================= -void AIS_AngleDimension::SetDisplayUnits (const TCollection_AsciiString& theUnits) +void AIS_AngleDimension_::SetDisplayUnits (const TCollection_AsciiString& theUnits) { myDrawer->SetDimAngleDisplayUnits (theUnits); } @@ -579,7 +579,7 @@ void AIS_AngleDimension::SetDisplayUnits (const TCollection_AsciiString& theUnit //function : ComputeValue //purpose : //======================================================================= -Standard_Real AIS_AngleDimension::ComputeValue() const +Standard_Real AIS_AngleDimension_::ComputeValue() const { if (!IsValid()) { @@ -598,7 +598,7 @@ Standard_Real AIS_AngleDimension::ComputeValue() const //function : Compute //purpose : Having three gp_Pnt points compute presentation //======================================================================= -void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, +void AIS_AngleDimension_::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { @@ -826,7 +826,7 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* //function : ComputeFlyoutSelection //purpose : computes selection for flyouts //======================================================================= -void AIS_AngleDimension::ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, +void AIS_AngleDimension_::ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, const Handle(SelectMgr_EntityOwner)& theOwner) { gp_Pnt aFirstAttach = myCenterPoint.Translated (gp_Vec (myCenterPoint, myFirstPoint).Normalized() * GetFlyout()); @@ -843,7 +843,7 @@ void AIS_AngleDimension::ComputeFlyoutSelection (const Handle(SelectMgr_Selectio //function : InitTwoEdgesAngle //purpose : //======================================================================= -Standard_Boolean AIS_AngleDimension::InitTwoEdgesAngle (gp_Pln& theComputedPlane) +Standard_Boolean AIS_AngleDimension_::InitTwoEdgesAngle (gp_Pln& theComputedPlane) { TopoDS_Edge aFirstEdge = TopoDS::Edge (myFirstShape); TopoDS_Edge aSecondEdge = TopoDS::Edge (mySecondShape); @@ -939,7 +939,7 @@ Standard_Boolean AIS_AngleDimension::InitTwoEdgesAngle (gp_Pln& theComputedPlane //function : InitTwoFacesAngle //purpose : initialization of angle dimension between two faces //======================================================================= -Standard_Boolean AIS_AngleDimension::InitTwoFacesAngle() +Standard_Boolean AIS_AngleDimension_::InitTwoFacesAngle() { TopoDS_Face aFirstFace = TopoDS::Face (myFirstShape); TopoDS_Face aSecondFace = TopoDS::Face (mySecondShape); @@ -990,7 +990,7 @@ Standard_Boolean AIS_AngleDimension::InitTwoFacesAngle() //function : InitTwoFacesAngle //purpose : initialization of angle dimension between two faces //======================================================================= -Standard_Boolean AIS_AngleDimension::InitTwoFacesAngle (const gp_Pnt thePointOnFirstFace) +Standard_Boolean AIS_AngleDimension_::InitTwoFacesAngle (const gp_Pnt thePointOnFirstFace) { TopoDS_Face aFirstFace = TopoDS::Face (myFirstShape); TopoDS_Face aSecondFace = TopoDS::Face (mySecondShape); @@ -1044,7 +1044,7 @@ Standard_Boolean AIS_AngleDimension::InitTwoFacesAngle (const gp_Pnt thePointOnF //function : InitConeAngle //purpose : initialization of the cone angle //======================================================================= -Standard_Boolean AIS_AngleDimension::InitConeAngle() +Standard_Boolean AIS_AngleDimension_::InitConeAngle() { if (myFirstShape.IsNull()) { @@ -1148,7 +1148,7 @@ Standard_Boolean AIS_AngleDimension::InitConeAngle() //function : IsValidPoints //purpose : //======================================================================= -Standard_Boolean AIS_AngleDimension::IsValidPoints (const gp_Pnt& theFirstPoint, +Standard_Boolean AIS_AngleDimension_::IsValidPoints (const gp_Pnt& theFirstPoint, const gp_Pnt& theCenterPoint, const gp_Pnt& theSecondPoint) const { @@ -1162,7 +1162,7 @@ Standard_Boolean AIS_AngleDimension::IsValidPoints (const gp_Pnt& theFirstPoint, //function : GetTextPosition //purpose : //======================================================================= -const gp_Pnt AIS_AngleDimension::GetTextPosition() const +const gp_Pnt AIS_AngleDimension_::GetTextPosition() const { if (!IsValid()) { @@ -1233,7 +1233,7 @@ const gp_Pnt AIS_AngleDimension::GetTextPosition() const //function : SetTextPosition //purpose : //======================================================================= -void AIS_AngleDimension::SetTextPosition (const gp_Pnt& theTextPos) +void AIS_AngleDimension_::SetTextPosition (const gp_Pnt& theTextPos) { if (!IsValid()) { @@ -1254,7 +1254,7 @@ void AIS_AngleDimension::SetTextPosition (const gp_Pnt& theTextPos) //function : SetAngleReversed //purpose : //======================================================================= -void AIS_AngleDimension::SetAngleReversed(const Standard_Boolean& theUseReverse) +void AIS_AngleDimension_::SetAngleReversed(const Standard_Boolean& theUseReverse) { myUseReverse = theUseReverse; } @@ -1263,7 +1263,7 @@ void AIS_AngleDimension::SetAngleReversed(const Standard_Boolean& theUseReverse) //function : SetArrowVisible //purpose : //======================================================================= -void AIS_AngleDimension::SetArrowVisible(const Standard_Boolean& theFirstArrowVisible, +void AIS_AngleDimension_::SetArrowVisible(const Standard_Boolean& theFirstArrowVisible, const Standard_Boolean& theSecondArrowVisible) { myFirstArrowVisible = theFirstArrowVisible; @@ -1274,7 +1274,7 @@ void AIS_AngleDimension::SetArrowVisible(const Standard_Boolean& theFirstArrowVi //function : AdjustParameters //purpose : //======================================================================= -void AIS_AngleDimension::AdjustParameters (const gp_Pnt& theTextPos, +void AIS_AngleDimension_::AdjustParameters (const gp_Pnt& theTextPos, Standard_Real& theExtensionSize, Prs3d_DimensionTextHorizontalPosition& theAlignment, Standard_Real& theFlyout) const @@ -1371,7 +1371,7 @@ void AIS_AngleDimension::AdjustParameters (const gp_Pnt& theTextPos, //function : FitTextAlignment //purpose : //======================================================================= -void AIS_AngleDimension::FitTextAlignment (const Prs3d_DimensionTextHorizontalPosition& theHorizontalTextPos, +void AIS_AngleDimension_::FitTextAlignment (const Prs3d_DimensionTextHorizontalPosition& theHorizontalTextPos, Standard_Integer& theLabelPosition, Standard_Boolean& theIsArrowsExternal) const { diff --git a/src/SketcherPrs/AIS_AngleDimension.hxx b/src/SketcherPrs/AIS_AngleDimension_.hxx similarity index 96% rename from src/SketcherPrs/AIS_AngleDimension.hxx rename to src/SketcherPrs/AIS_AngleDimension_.hxx index b09fa7543..0a800f018 100755 --- a/src/SketcherPrs/AIS_AngleDimension.hxx +++ b/src/SketcherPrs/AIS_AngleDimension_.hxx @@ -34,7 +34,7 @@ #include #include -DEFINE_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension) +DEFINE_STANDARD_HANDLE (AIS_AngleDimension_, AIS_Dimension) //! Angle dimension. Can be constructed: //! - on two intersected edges. @@ -59,7 +59,7 @@ DEFINE_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension) //! In case of the conical face the center point of the angle is the apex of the conical surface. //! The attachment points are points of the first and the last parameter of the basis circle of the cone. //! -class AIS_AngleDimension : public AIS_Dimension +class AIS_AngleDimension_ : public AIS_Dimension { public: @@ -68,14 +68,14 @@ public: //! @param theFirstEdge [in] the first edge. //! @param theSecondEdge [in] the second edge. //! the maximum distanced point of edges from the presentation center - Standard_EXPORT AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, + Standard_EXPORT AIS_AngleDimension_ (const TopoDS_Edge& theFirstEdge, const TopoDS_Edge& theSecondEdge); //! Constructs the angle display object defined by three points. //! @param theFirstPoint [in] the first point (point on first angle flyout). //! @param theSecondPoint [in] the center point of angle dimension. //! @param theThirdPoint [in] the second point (point on second angle flyout). - Standard_EXPORT AIS_AngleDimension (const gp_Pnt& theFirstPoint, + Standard_EXPORT AIS_AngleDimension_ (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint, const gp_Pnt& theThirdPoint); @@ -83,18 +83,18 @@ public: //! @param theFirstVertex [in] the first vertex (vertex for first angle flyout). //! @param theSecondVertex [in] the center vertex of angle dimension. //! @param theThirdPoint [in] the second vertex (vertex for second angle flyout). - Standard_EXPORT AIS_AngleDimension (const TopoDS_Vertex& theFirstVertex, + Standard_EXPORT AIS_AngleDimension_ (const TopoDS_Vertex& theFirstVertex, const TopoDS_Vertex& theSecondVertex, const TopoDS_Vertex& theThirdVertex); //! Constructs angle dimension for the cone face. //! @param theCone [in] the conical face. - Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theCone); + Standard_EXPORT AIS_AngleDimension_ (const TopoDS_Face& theCone); //! Constructs angle dimension between two planar faces. //! @param theFirstFace [in] the first face. //! @param theSecondFace [in] the second face. - Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theFirstFace, + Standard_EXPORT AIS_AngleDimension_ (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace); //! Constructs angle dimension between two planar faces. @@ -102,7 +102,7 @@ public: //! @param theSecondFace [in] the second face. //! @param thePoint [in] the point which the dimension plane should pass through. //! This point can lay on the one of the faces or not. - Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theFirstFace, + Standard_EXPORT AIS_AngleDimension_ (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace, const gp_Pnt& thePoint); @@ -222,7 +222,7 @@ public: public: - DEFINE_STANDARD_RTTI (AIS_AngleDimension) + DEFINE_STANDARD_RTTI (AIS_AngleDimension_) protected: diff --git a/src/SketcherPrs/CMakeLists.txt b/src/SketcherPrs/CMakeLists.txt index e060ad325..3d1cadba6 100644 --- a/src/SketcherPrs/CMakeLists.txt +++ b/src/SketcherPrs/CMakeLists.txt @@ -27,7 +27,7 @@ SET(PROJECT_HEADERS SketcherPrs_Mirror.h SketcherPrs_Transformation.h SketcherPrs_Angle.h - AIS_AngleDimension.hxx + AIS_AngleDimension_.hxx ) SET(PROJECT_SOURCES @@ -51,7 +51,7 @@ SET(PROJECT_SOURCES SketcherPrs_Mirror.cpp SketcherPrs_Transformation.cpp SketcherPrs_Angle.cpp - AIS_AngleDimension.cxx + AIS_AngleDimension_.cxx ) SET(PROJECT_LIBRARIES diff --git a/src/SketcherPrs/SketcherPrs_Angle.cpp b/src/SketcherPrs/SketcherPrs_Angle.cpp index 1fb78cb75..c2ad79c46 100644 --- a/src/SketcherPrs/SketcherPrs_Angle.cpp +++ b/src/SketcherPrs/SketcherPrs_Angle.cpp @@ -29,12 +29,12 @@ #define PI 3.1415926535897932 -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension); -IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, AIS_AngleDimension); +IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension_); +IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, AIS_AngleDimension_); SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane) -: AIS_AngleDimension(gp_Pnt(0,0,0), gp_Pnt(1,0,0), gp_Pnt(0,1,0)), myConstraint(theConstraint), +: AIS_AngleDimension_(gp_Pnt(0,0,0), gp_Pnt(1,0,0), gp_Pnt(0,1,0)), myConstraint(theConstraint), mySketcherPlane(thePlane), myFirstPoint(gp_Pnt(0,0,0)), myCenterPoint(gp_Pnt(1,0,0)), mySecondPoint(gp_Pnt(0,1,0)), myAngle(90), myValue("90"), myFlyOutPoint(0, 0.5, 0) @@ -202,7 +202,7 @@ void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& theP // Update text visualization: parameter value or parameter text myStyleListener->updateDimensions(this, myHasParameters, myValue); - AIS_AngleDimension::Compute(thePresentationManager, thePresentation, theMode); + AIS_AngleDimension_::Compute(thePresentationManager, thePresentation, theMode); if (!aReadyToDisplay) SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, @@ -232,7 +232,7 @@ void SketcherPrs_Angle::ComputeSelection(const Handle(SelectMgr_Selection)& aSel return; } } - AIS_AngleDimension::ComputeSelection(aSelection, aMode); + AIS_AngleDimension_::ComputeSelection(aSelection, aMode); } bool SketcherPrs_Angle::isAnglePlaneReversedToSketchPlane() diff --git a/src/SketcherPrs/SketcherPrs_Angle.h b/src/SketcherPrs/SketcherPrs_Angle.h index 41265a529..09167273c 100644 --- a/src/SketcherPrs/SketcherPrs_Angle.h +++ b/src/SketcherPrs/SketcherPrs_Angle.h @@ -11,18 +11,18 @@ #include #include -#include +#include #include class SketcherPrs_DimensionStyleListener; -DEFINE_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension) +DEFINE_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension_) /** * \ingroup GUI * A class for representation of angle constraint */ -class SketcherPrs_Angle : public AIS_AngleDimension +class SketcherPrs_Angle : public AIS_AngleDimension_ { public: /// Constructor -- 2.39.2