diff --git a/adm/upgrade.dat b/adm/upgrade.dat index cc120fb3b4..0ddb46f487 100644 --- a/adm/upgrade.dat +++ b/adm/upgrade.dat @@ -94,6 +94,7 @@ GeomAdaptor_HCurve GeomAdaptor_Curve GeomAdaptor_HSurface GeomAdaptor_Surface GeomAdaptor_HSurfaceOfLinearExtrusion GeomAdaptor_SurfaceOfLinearExtrusion GeomAdaptor_HSurfaceOfRevolution GeomAdaptor_SurfaceOfRevolution +PrsMgr_PresentationManager3d PrsMgr_PresentationManager [tcollection] AdvApp2Var_SequenceOfNode diff --git a/dox/upgrade/upgrade.md b/dox/upgrade/upgrade.md index 0425f2354a..266548a03d 100644 --- a/dox/upgrade/upgrade.md +++ b/dox/upgrade/upgrade.md @@ -884,7 +884,7 @@ Old APIs based on global callback functions for creating *UserDraw* objects and class UserDrawElement : public OpenGl_Element {}; //! Implementation of virtual method AIS_InteractiveObject::Compute(). -void UserDrawObject::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void UserDrawObject::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/dox/user_guides/visualization/visualization.md b/dox/user_guides/visualization/visualization.md index aef9335a3e..be6016258d 100644 --- a/dox/user_guides/visualization/visualization.md +++ b/dox/user_guides/visualization/visualization.md @@ -551,7 +551,7 @@ If you are creating your own type of interactive object, you must implement the #### For 3D: ~~~~~{.cpp} -void PackageName_ClassName::Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, +void PackageName_ClassName::Compute (const Handle(PrsMgr_PresentationManager)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode); ~~~~~ @@ -650,7 +650,7 @@ Standard_Boolean myPk_IShape::AcceptDisplayMode (const Standard_Integer theMode) return theMode == 0 || theMode == 1; } -void myPk_IShape::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void myPk_IShape::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { @@ -2096,7 +2096,7 @@ i.e. in hidden line removal and wireframe modes. Let us look at the example of compute methods ~~~~~{.cpp} -void MyPresentableObject::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsManager, +void MyPresentableObject::Compute (const Handle(PrsMgr_PresentationManager)& thePrsManager, const Handle(Graphic3d_Structure)& thePrs, const Standard_Integer theMode) ( diff --git a/samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx b/samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx index b17d89cb09..0fa262ba39 100644 --- a/samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx +++ b/samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx @@ -46,7 +46,7 @@ AdaptorCurve2d_AIS::AdaptorCurve2d_AIS (const Handle(Geom2d_Curve)& theGeom2dCur // } -void AdaptorCurve2d_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)&, +void AdaptorCurve2d_AIS::Compute (const Handle(PrsMgr_PresentationManager)&, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/OCCTOverview/code/AdaptorCurve2d_AIS.h b/samples/OCCTOverview/code/AdaptorCurve2d_AIS.h index abb5723d55..ad66bb4d13 100644 --- a/samples/OCCTOverview/code/AdaptorCurve2d_AIS.h +++ b/samples/OCCTOverview/code/AdaptorCurve2d_AIS.h @@ -53,7 +53,7 @@ private: virtual Standard_Boolean AcceptDisplayMode(const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/samples/OCCTOverview/code/AdaptorCurve_AIS.cxx b/samples/OCCTOverview/code/AdaptorCurve_AIS.cxx index 21a692fc5b..18ef438ba3 100644 --- a/samples/OCCTOverview/code/AdaptorCurve_AIS.cxx +++ b/samples/OCCTOverview/code/AdaptorCurve_AIS.cxx @@ -26,7 +26,7 @@ #include #include -void AdaptorCurve_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)&, +void AdaptorCurve_AIS::Compute (const Handle(PrsMgr_PresentationManager)&, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/OCCTOverview/code/AdaptorCurve_AIS.h b/samples/OCCTOverview/code/AdaptorCurve_AIS.h index a01c99d7c7..f4f377c5b8 100644 --- a/samples/OCCTOverview/code/AdaptorCurve_AIS.h +++ b/samples/OCCTOverview/code/AdaptorCurve_AIS.h @@ -37,7 +37,7 @@ private: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0 || theMode == 1; } //! Compute presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx b/samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx index 80fdbf11d5..5159a34545 100644 --- a/samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx +++ b/samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx @@ -24,7 +24,7 @@ #include #include -void AdaptorPnt2d_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AdaptorPnt2d_AIS::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/OCCTOverview/code/AdaptorPnt2d_AIS.h b/samples/OCCTOverview/code/AdaptorPnt2d_AIS.h index b34bee2b79..e37a2bd672 100644 --- a/samples/OCCTOverview/code/AdaptorPnt2d_AIS.h +++ b/samples/OCCTOverview/code/AdaptorPnt2d_AIS.h @@ -40,7 +40,7 @@ private: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/samples/OCCTOverview/code/AdaptorVec_AIS.cxx b/samples/OCCTOverview/code/AdaptorVec_AIS.cxx index e344acda84..725e2a53ea 100644 --- a/samples/OCCTOverview/code/AdaptorVec_AIS.cxx +++ b/samples/OCCTOverview/code/AdaptorVec_AIS.cxx @@ -39,7 +39,7 @@ AdaptorVec_AIS::AdaptorVec_AIS (const gp_Pnt2d& thePnt1, myLength = aVec.Magnitude(); } -void AdaptorVec_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AdaptorVec_AIS::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/OCCTOverview/code/AdaptorVec_AIS.h b/samples/OCCTOverview/code/AdaptorVec_AIS.h index 25e02d7c86..e04711c11b 100644 --- a/samples/OCCTOverview/code/AdaptorVec_AIS.h +++ b/samples/OCCTOverview/code/AdaptorVec_AIS.h @@ -101,7 +101,7 @@ private: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/samples/OCCTOverview/code/Sample2D_Face.cxx b/samples/OCCTOverview/code/Sample2D_Face.cxx index 2e09ce0990..462ec01f9a 100644 --- a/samples/OCCTOverview/code/Sample2D_Face.cxx +++ b/samples/OCCTOverview/code/Sample2D_Face.cxx @@ -219,7 +219,7 @@ void Sample2D_Face::FillData(Standard_Boolean isSizesRecompute) } } -void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { @@ -303,7 +303,7 @@ void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& , thePresentation->CurrentGroup()->AddPrimitiveArray(myExternalArray); } -void Sample2D_Face::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void Sample2D_Face::HilightSelected (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const SelectMgr_SequenceOfOwner& theOwners) { Handle(Prs3d_Presentation) aSelectionPrs = GetSelectPresentation (thePrsMgr); @@ -368,7 +368,7 @@ void Sample2D_Face::ClearSelected() } } -void Sample2D_Face::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void Sample2D_Face::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { diff --git a/samples/OCCTOverview/code/Sample2D_Face.h b/samples/OCCTOverview/code/Sample2D_Face.h index f88e9c2009..45afc3d49f 100644 --- a/samples/OCCTOverview/code/Sample2D_Face.h +++ b/samples/OCCTOverview/code/Sample2D_Face.h @@ -56,7 +56,7 @@ private: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; @@ -67,11 +67,11 @@ private: virtual void ClearSelected() Standard_OVERRIDE; //! Method for advanced customizable selection of picked object - virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const SelectMgr_SequenceOfOwner& theOwners) Standard_OVERRIDE; //! Method for advanced customizable highlighting of picked object. - virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; diff --git a/samples/OCCTOverview/code/Sample2D_Markers.cxx b/samples/OCCTOverview/code/Sample2D_Markers.cxx index 6b6095fecc..a564bdcca7 100644 --- a/samples/OCCTOverview/code/Sample2D_Markers.cxx +++ b/samples/OCCTOverview/code/Sample2D_Markers.cxx @@ -54,7 +54,7 @@ Sample2D_Markers::Sample2D_Markers (const Standard_Real theXPosition, myArrayOfPoints = theArrayOfPoints; } -void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/OCCTOverview/code/Sample2D_Markers.h b/samples/OCCTOverview/code/Sample2D_Markers.h index 5e77c43338..f29719ddbe 100644 --- a/samples/OCCTOverview/code/Sample2D_Markers.h +++ b/samples/OCCTOverview/code/Sample2D_Markers.h @@ -61,7 +61,7 @@ private: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, + virtual void Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& /*aPresentation*/, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp index a6a6512770..f93c03f9ea 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp @@ -26,7 +26,7 @@ ISession2D_Curve::ISession2D_Curve(const Handle(Geom2d_Curve) aGeom2dCurve, myradiusratio = 1; } -void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& , +void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer ) { diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h index b9aa649a31..eccf083f87 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h @@ -63,7 +63,7 @@ private: // Methods PRIVATE virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const { return theMode == 0; } - virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; + virtual void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; void ComputeSelection(const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {} // Fields PRIVATE diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp index 267690e053..b43c27bb0a 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp @@ -14,7 +14,7 @@ IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject) static char THIS_FILE[]=__FILE__; #endif -void ISession_Curve::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void ISession_Curve::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h index 8999d1d3bc..9688d79c6c 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h @@ -17,7 +17,7 @@ public: private: - Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; + Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {} private: diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp index e281c9cab0..042576946b 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp @@ -69,7 +69,7 @@ ISession_Direction::~ISession_Direction() } -void ISession_Direction::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void ISession_Direction::Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h index 68072bd009..594e2985d2 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h @@ -30,7 +30,7 @@ public: private: - void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + void Compute (const Handle(PrsMgr_PresentationManager)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode); void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ; diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp index 1bb4c60165..5c119f932e 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp @@ -41,7 +41,7 @@ ISession_Point::~ISession_Point() } -void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h index 8a9fa8d8d6..e4124f0d01 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h @@ -26,7 +26,7 @@ public: private : - void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + void Compute (const Handle(PrsMgr_PresentationManager)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode); diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp index a9147a180e..81868ae0b0 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp @@ -18,7 +18,7 @@ static char THIS_FILE[]=__FILE__; IMPLEMENT_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject) -void ISession_Surface::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void ISession_Surface::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h index 2d7a00c0fc..bbfc9eb068 100755 --- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h +++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h @@ -17,7 +17,7 @@ public: private: - Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0); + Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0); virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {} private: diff --git a/samples/mfc/standard/01_Geometry/src/StdAfx.h b/samples/mfc/standard/01_Geometry/src/StdAfx.h index 0bd735f658..c86a3c90b7 100755 --- a/samples/mfc/standard/01_Geometry/src/StdAfx.h +++ b/samples/mfc/standard/01_Geometry/src/StdAfx.h @@ -215,7 +215,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp b/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp index 8e1f8771fe..dea846d7c6 100755 --- a/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp +++ b/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp @@ -31,7 +31,7 @@ ISession_Direction::ISession_Direction(const gp_Pnt& aPnt,const gp_Vec& aVec) } -void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/02_Modeling/src/ISession_Direction.h b/samples/mfc/standard/02_Modeling/src/ISession_Direction.h index 00e13efcaa..a6fce68ae3 100755 --- a/samples/mfc/standard/02_Modeling/src/ISession_Direction.h +++ b/samples/mfc/standard/02_Modeling/src/ISession_Direction.h @@ -28,7 +28,7 @@ public: private: - void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + void Compute (const Handle(PrsMgr_PresentationManager)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode); diff --git a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp index db70409988..6d6fb6de72 100755 --- a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp @@ -31,7 +31,7 @@ ISession_Curve::~ISession_Curve() { } -void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h index 8641c0c184..c1c955fdf9 100755 --- a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h +++ b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h @@ -23,7 +23,7 @@ public: DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject) private: -Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; +Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ; Handle(Geom_Curve) myCurve; diff --git a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp index db70409988..6d6fb6de72 100755 --- a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp +++ b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp @@ -31,7 +31,7 @@ ISession_Curve::~ISession_Curve() { } -void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h index 8641c0c184..c1c955fdf9 100755 --- a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h +++ b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h @@ -23,7 +23,7 @@ public: DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject) private: -Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; +Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ; Handle(Geom_Curve) myCurve; diff --git a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp index db70409988..6d6fb6de72 100755 --- a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp +++ b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp @@ -31,7 +31,7 @@ ISession_Curve::~ISession_Curve() { } -void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h index 8641c0c184..c1c955fdf9 100755 --- a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h +++ b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h @@ -23,7 +23,7 @@ public: DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject) private: -Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; +Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ; Handle(Geom_Curve) myCurve; diff --git a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp index c26d81e742..4c1a12426d 100755 --- a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp +++ b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp @@ -75,7 +75,7 @@ void ISession2D_Shape::BuildPolyAlgo() myPolyAlgo->Update(); } -void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, +void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager)& /*thePresentationManager*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { diff --git a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h index 47f9ecd3e8..658c6bb127 100755 --- a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h +++ b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h @@ -51,7 +51,7 @@ private: const TopoDS_Shape& theCompound, const Handle(Prs3d_LineAspect) theAspect); - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode = 0); diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp index 42d6c5e838..acbaf9c666 100755 --- a/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp +++ b/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp @@ -171,7 +171,7 @@ void Sample2D_Face::FillData(Standard_Boolean isSizesRecompute) } } -void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, +void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager)& /*thePresentationManager*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer /*theMode*/) { @@ -257,7 +257,7 @@ void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePr //Method for advanced customizable selection of picked object void Sample2D_Face::HilightSelected -( const Handle(PrsMgr_PresentationManager3d)& thePM, +( const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theOwners) { Handle( Prs3d_Presentation ) aSelectionPrs; @@ -329,7 +329,7 @@ void Sample2D_Face::ClearSelected () //Method for advanced customizable highlighting of picked object -void Sample2D_Face::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager3d)& thePM, +void Sample2D_Face::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Face.h b/samples/mfc/standard/Common/Primitive/Sample2D_Face.h index f1eab36e27..53cecc6f99 100755 --- a/samples/mfc/standard/Common/Primitive/Sample2D_Face.h +++ b/samples/mfc/standard/Common/Primitive/Sample2D_Face.h @@ -49,14 +49,14 @@ private: //private methods void FillData(Standard_Boolean isSizesRecomputed = Standard_False); void ClearSelected (); - void HilightSelected( const Handle(PrsMgr_PresentationManager3d)& thePM, + void HilightSelected( const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theOwners); - void HilightOwnerWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, + void HilightOwnerWithColor( const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner); - void Compute ( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + void Compute ( const Handle(PrsMgr_PresentationManager)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode); diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp index d858dc7843..8485517693 100755 --- a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp +++ b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp @@ -36,7 +36,7 @@ Sample2D_Markers::Sample2D_Markers (const Standard_Real theXPosition, } -void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer /*aMode*/) { diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h index 0400b41dc4..0aa3b20333 100755 --- a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h +++ b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h @@ -37,7 +37,7 @@ DEFINE_STANDARD_RTTIEXT(Sample2D_Markers,AIS_InteractiveObject) private: -virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +virtual void Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& /*aPresentation*/, const Standard_Integer /*aMode*/); diff --git a/samples/mfc/standard/Common/StdAfx.h b/samples/mfc/standard/Common/StdAfx.h index 562c85e147..7faa086a6a 100755 --- a/samples/mfc/standard/Common/StdAfx.h +++ b/samples/mfc/standard/Common/StdAfx.h @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include #include diff --git a/samples/mfc/standard/Common/User_Cylinder.cxx b/samples/mfc/standard/Common/User_Cylinder.cxx index 3aca59fec1..f7ecf73dda 100755 --- a/samples/mfc/standard/Common/User_Cylinder.cxx +++ b/samples/mfc/standard/Common/User_Cylinder.cxx @@ -11,7 +11,7 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject) #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant) myColor = Quantity_NOC_KHAKI4; } -void User_Cylinder::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void User_Cylinder::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode ) { diff --git a/samples/mfc/standard/Common/User_Cylinder.hxx b/samples/mfc/standard/Common/User_Cylinder.hxx index 1602d850d3..194ab1deac 100755 --- a/samples/mfc/standard/Common/User_Cylinder.hxx +++ b/samples/mfc/standard/Common/User_Cylinder.hxx @@ -25,7 +25,7 @@ public: void SetColor(const Quantity_Color &aColor); private: - void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, + void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) ; void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, diff --git a/src/AIS/AIS_Axis.cxx b/src/AIS/AIS_Axis.cxx index 27e691cc06..21977f796a 100644 --- a/src/AIS/AIS_Axis.cxx +++ b/src/AIS/AIS_Axis.cxx @@ -161,24 +161,23 @@ void AIS_Axis::SetAxis1Placement(const Handle(Geom_Axis1Placement)& anAxis) //function : Compute //purpose : //======================================================================= -void AIS_Axis::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void AIS_Axis::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer ) { - aPresentation->SetInfiniteState (myInfiniteState); - - aPresentation->SetDisplayPriority(5); - if (!myIsXYZAxis ){ - GeomAdaptor_Curve curv(myComponent); - StdPrs_Curve::Add(aPresentation,curv,myDrawer); + thePrs->SetInfiniteState (myInfiniteState); + thePrs->SetDisplayPriority(5); + if (!myIsXYZAxis) + { + GeomAdaptor_Curve curv (myComponent); + StdPrs_Curve::Add (thePrs, curv, myDrawer); } else { - DsgPrs_XYZAxisPresentation::Add (aPresentation,myLineAspect,myDir,myVal, + DsgPrs_XYZAxisPresentation::Add (thePrs, myLineAspect, myDir, myVal, myDrawer->DatumAspect()->ToDrawLabels() ? myText : "", myPfirst, myPlast); } - } //======================================================================= diff --git a/src/AIS/AIS_Axis.hxx b/src/AIS/AIS_Axis.hxx index 5cd764fb1b..725464c39a 100644 --- a/src/AIS/AIS_Axis.hxx +++ b/src/AIS/AIS_Axis.hxx @@ -98,10 +98,13 @@ public: private: - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeFields(); private: diff --git a/src/AIS/AIS_CameraFrustum.cxx b/src/AIS/AIS_CameraFrustum.cxx index fffcbea1ed..48f643b7d1 100644 --- a/src/AIS/AIS_CameraFrustum.cxx +++ b/src/AIS/AIS_CameraFrustum.cxx @@ -229,9 +229,9 @@ void AIS_CameraFrustum::fillBorders() //function : Compute //purpose : //======================================================================= -void AIS_CameraFrustum::Compute (const Handle(PrsMgr_PresentationManager3d)& , - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void AIS_CameraFrustum::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { thePrs->SetInfiniteState (true); if (myTriangles.IsNull()) diff --git a/src/AIS/AIS_CameraFrustum.hxx b/src/AIS/AIS_CameraFrustum.hxx index ebad3afc6c..4e8dcaa4e2 100644 --- a/src/AIS/AIS_CameraFrustum.hxx +++ b/src/AIS/AIS_CameraFrustum.hxx @@ -58,9 +58,9 @@ public: protected: //! Computes presentation of camera frustum. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Compute selection. Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, diff --git a/src/AIS/AIS_Circle.cxx b/src/AIS/AIS_Circle.cxx index 78239a13b7..08160855aa 100644 --- a/src/AIS/AIS_Circle.cxx +++ b/src/AIS/AIS_Circle.cxx @@ -72,15 +72,14 @@ AIS_Circle::AIS_Circle(const Handle(Geom_Circle)& theComponent, //function : Compute //purpose : //======================================================================= -void AIS_Circle::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer /*aMode*/) +void AIS_Circle::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer ) { - aPresentation->SetDisplayPriority(5); - - if (myCircleIsArc) ComputeArc(aPresentation); - else ComputeCircle(aPresentation); + thePrs->SetDisplayPriority (5); + if (myCircleIsArc) { ComputeArc (thePrs); } + else { ComputeCircle (thePrs); } } //======================================================================= diff --git a/src/AIS/AIS_Circle.hxx b/src/AIS/AIS_Circle.hxx index 0d1772d098..fb6b7cabf8 100644 --- a/src/AIS/AIS_Circle.hxx +++ b/src/AIS/AIS_Circle.hxx @@ -92,16 +92,19 @@ public: private: - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& theprs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeCircle (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeArc (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeCircleSelection (const Handle(SelectMgr_Selection)& aSelection); - + Standard_EXPORT void ComputeArcSelection (const Handle(SelectMgr_Selection)& aSelection); //! Replace aspects of already computed groups with the new value. diff --git a/src/AIS/AIS_ColorScale.cxx b/src/AIS/AIS_ColorScale.cxx index 8d0fd4837e..ece1e08764 100644 --- a/src/AIS/AIS_ColorScale.cxx +++ b/src/AIS/AIS_ColorScale.cxx @@ -545,7 +545,7 @@ void AIS_ColorScale::updateTextAspect() //function : Compute //purpose : //======================================================================= -void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/src/AIS/AIS_ColorScale.hxx b/src/AIS/AIS_ColorScale.hxx index f261759521..a24dd88b93 100644 --- a/src/AIS/AIS_ColorScale.hxx +++ b/src/AIS/AIS_ColorScale.hxx @@ -392,7 +392,7 @@ public: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_ColoredShape.cxx b/src/AIS/AIS_ColoredShape.cxx index 01b5cd779f..b3bfb64a9a 100644 --- a/src/AIS/AIS_ColoredShape.cxx +++ b/src/AIS/AIS_ColoredShape.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -349,9 +349,9 @@ void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial) //function : Compute //purpose : //======================================================================= -void AIS_ColoredShape::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void AIS_ColoredShape::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { if (myshape.IsNull()) { diff --git a/src/AIS/AIS_ColoredShape.hxx b/src/AIS/AIS_ColoredShape.hxx index d23560bee5..55a4069311 100644 --- a/src/AIS/AIS_ColoredShape.hxx +++ b/src/AIS/AIS_ColoredShape.hxx @@ -95,9 +95,9 @@ public: protected: //! @name override presentation computation //! Compute presentation considering sub-shape color map. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Compute selection considering sub-shape hidden state. Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, diff --git a/src/AIS/AIS_ConnectedInteractive.cxx b/src/AIS/AIS_ConnectedInteractive.cxx index cf839411f3..bf38ac2973 100644 --- a/src/AIS/AIS_ConnectedInteractive.cxx +++ b/src/AIS/AIS_ConnectedInteractive.cxx @@ -110,9 +110,9 @@ void AIS_ConnectedInteractive::Disconnect() //function : Compute //purpose : //======================================================================= -void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { if (HasConnection()) { diff --git a/src/AIS/AIS_ConnectedInteractive.hxx b/src/AIS/AIS_ConnectedInteractive.hxx index 5bb2578287..dc14e2dfd6 100644 --- a/src/AIS/AIS_ConnectedInteractive.hxx +++ b/src/AIS/AIS_ConnectedInteractive.hxx @@ -103,7 +103,9 @@ protected: //! compute anything, but just uses the //! presentation of this last object, with //! a transformation if there's one stored. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& theprs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Computes the presentation according to a point of view. Standard_EXPORT virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector, diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index 3b6480b7ec..cd84b02972 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -108,7 +108,7 @@ namespace //======================================================================= AIS_InteractiveContext::AIS_InteractiveContext(const Handle(V3d_Viewer)& MainViewer): -myMainPM(new PrsMgr_PresentationManager3d(MainViewer->StructureManager())), +myMainPM (new PrsMgr_PresentationManager (MainViewer->StructureManager())), myMainVwr(MainViewer), myMainSel(new StdSelect_ViewerSelector3d()), myToHilightSelected(Standard_True), diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx index c9db13e16c..125fb0e1f4 100644 --- a/src/AIS/AIS_InteractiveContext.hxx +++ b/src/AIS/AIS_InteractiveContext.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -834,7 +834,7 @@ public: //! @name common properties const Handle(SelectMgr_SelectionManager)& SelectionManager() const { return mgrSelector; } - const Handle(PrsMgr_PresentationManager3d)& MainPrsMgr() const { return myMainPM; } + const Handle(PrsMgr_PresentationManager)& MainPrsMgr() const { return myMainPM; } const Handle(StdSelect_ViewerSelector3d)& MainSelector() const { return myMainSel; } @@ -1411,7 +1411,7 @@ protected: //! @name internal fields AIS_DataMapOfIOStatus myObjects; Handle(SelectMgr_SelectionManager) mgrSelector; - Handle(PrsMgr_PresentationManager3d) myMainPM; + Handle(PrsMgr_PresentationManager) myMainPM; Handle(V3d_Viewer) myMainVwr; Handle(StdSelect_ViewerSelector3d) myMainSel; V3d_View* myLastActiveView; diff --git a/src/AIS/AIS_LightSource.cxx b/src/AIS/AIS_LightSource.cxx index f5112fa839..49c718a612 100644 --- a/src/AIS/AIS_LightSource.cxx +++ b/src/AIS/AIS_LightSource.cxx @@ -359,7 +359,7 @@ void AIS_LightSource::setLocalTransformation (const Handle(TopLoc_Datum3D)& theT // function : Compute // purpose : // ======================================================================= -void AIS_LightSource::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AIS_LightSource::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/src/AIS/AIS_LightSource.hxx b/src/AIS/AIS_LightSource.hxx index 27b0bda4c6..5ff70250cc 100644 --- a/src/AIS/AIS_LightSource.hxx +++ b/src/AIS/AIS_LightSource.hxx @@ -174,7 +174,7 @@ protected: } //! Computes selection sensitive zones(triangulation) for light source presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx index 499ccecbf0..b3d92c5c33 100644 --- a/src/AIS/AIS_Line.cxx +++ b/src/AIS/AIS_Line.cxx @@ -65,15 +65,14 @@ myLineIsSegment(Standard_True) //function : Compute //purpose : //======================================================================= -void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void AIS_Line::Compute (const Handle(PrsMgr_PresentationManager)&, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer ) { - aPresentation->SetDisplayPriority(5); - - if (!myLineIsSegment) ComputeInfiniteLine(aPresentation); - else ComputeSegmentLine(aPresentation); + thePrs->SetDisplayPriority (5); + if (!myLineIsSegment) { ComputeInfiniteLine (thePrs); } + else { ComputeSegmentLine (thePrs); } } //======================================================================= diff --git a/src/AIS/AIS_Line.hxx b/src/AIS/AIS_Line.hxx index 4f2e8e9b2a..5706c0ad8c 100644 --- a/src/AIS/AIS_Line.hxx +++ b/src/AIS/AIS_Line.hxx @@ -83,19 +83,21 @@ public: Standard_EXPORT void UnsetWidth() Standard_OVERRIDE; private: - - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - - Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation); - - Standard_EXPORT void ComputeSegmentLine (const Handle(Prs3d_Presentation)& aPresentation); - - Standard_EXPORT void ComputeInfiniteLineSelection (const Handle(SelectMgr_Selection)& aSelection); - - Standard_EXPORT void ComputeSegmentLineSelection (const Handle(SelectMgr_Selection)& aSelection); + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation); + + Standard_EXPORT void ComputeSegmentLine (const Handle(Prs3d_Presentation)& aPresentation); + + Standard_EXPORT void ComputeInfiniteLineSelection (const Handle(SelectMgr_Selection)& aSelection); + + Standard_EXPORT void ComputeSegmentLineSelection (const Handle(SelectMgr_Selection)& aSelection); //! Replace aspects of already computed groups with the new value. void replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect); diff --git a/src/AIS/AIS_Manipulator.cxx b/src/AIS/AIS_Manipulator.cxx index 056d13d31a..7ff3327b1a 100644 --- a/src/AIS/AIS_Manipulator.cxx +++ b/src/AIS/AIS_Manipulator.cxx @@ -965,7 +965,7 @@ void AIS_Manipulator::setLocalTransformation (const Handle(TopLoc_Datum3D)& /*th //function : Compute //purpose : //======================================================================= -void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { @@ -1007,7 +1007,7 @@ void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager3d)& thePr //function : HilightSelected //purpose : //======================================================================= -void AIS_Manipulator::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM, +void AIS_Manipulator::HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theSeq) { if (theSeq.IsEmpty()) @@ -1059,7 +1059,7 @@ void AIS_Manipulator::ClearSelected() //function : HilightOwnerWithColor //purpose : //======================================================================= -void AIS_Manipulator::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void AIS_Manipulator::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { diff --git a/src/AIS/AIS_Manipulator.hxx b/src/AIS/AIS_Manipulator.hxx index 73ea0527db..8e928cbbe9 100644 --- a/src/AIS/AIS_Manipulator.hxx +++ b/src/AIS/AIS_Manipulator.hxx @@ -317,7 +317,7 @@ public: //! @name Presentation computation //! Fills presentation. //! @note Manipulator presentation does not use display mode and for all modes has the same presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode = 0) Standard_OVERRIDE; @@ -337,11 +337,11 @@ public: //! @name Presentation computation Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE; //! Method which draws selected owners ( for fast presentation draw ). - Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM, const SelectMgr_SequenceOfOwner& theSeq) Standard_OVERRIDE; + Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theSeq) Standard_OVERRIDE; //! Method which hilight an owner belonging to //! this selectable object ( for fast presentation draw ). - Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; diff --git a/src/AIS/AIS_ManipulatorOwner.cxx b/src/AIS/AIS_ManipulatorOwner.cxx index d57dab3d52..389157486d 100644 --- a/src/AIS/AIS_ManipulatorOwner.cxx +++ b/src/AIS/AIS_ManipulatorOwner.cxx @@ -35,7 +35,7 @@ AIS_ManipulatorOwner::AIS_ManipulatorOwner (const Handle(SelectMgr_SelectableObj //function : HilightWithColor //purpose : //======================================================================= -void AIS_ManipulatorOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void AIS_ManipulatorOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer theMode) { diff --git a/src/AIS/AIS_ManipulatorOwner.hxx b/src/AIS/AIS_ManipulatorOwner.hxx index 74ebf5a6b9..769c355b48 100644 --- a/src/AIS/AIS_ManipulatorOwner.hxx +++ b/src/AIS/AIS_ManipulatorOwner.hxx @@ -35,7 +35,7 @@ public: const AIS_ManipulatorMode theMode, const Standard_Integer thePriority = 0); - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_MediaPlayer.cxx b/src/AIS/AIS_MediaPlayer.cxx index beb48a3c56..ee7093a2fe 100644 --- a/src/AIS/AIS_MediaPlayer.cxx +++ b/src/AIS/AIS_MediaPlayer.cxx @@ -210,7 +210,7 @@ void AIS_MediaPlayer::PlayPause() // function : Compute // purpose : // ======================================================================= -void AIS_MediaPlayer::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AIS_MediaPlayer::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/src/AIS/AIS_MediaPlayer.hxx b/src/AIS/AIS_MediaPlayer.hxx index 7a39837133..d6d00f5a93 100644 --- a/src/AIS/AIS_MediaPlayer.hxx +++ b/src/AIS/AIS_MediaPlayer.hxx @@ -69,7 +69,7 @@ protected: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_MultipleConnectedInteractive.cxx b/src/AIS/AIS_MultipleConnectedInteractive.cxx index ad04fe839d..9531647b9c 100644 --- a/src/AIS/AIS_MultipleConnectedInteractive.cxx +++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx @@ -125,9 +125,9 @@ void AIS_MultipleConnectedInteractive::DisconnectAll() //function : Compute //purpose : //======================================================================= -void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/, - const Handle(Prs3d_Presentation)& /*thePrs*/, - const Standard_Integer /*theMode*/) +void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& , + const Standard_Integer ) { Handle(AIS_InteractiveContext) aCtx = GetContext(); for (PrsMgr_ListOfPresentableObjectsIter anIter (Children()); anIter.More(); anIter.Next()) diff --git a/src/AIS/AIS_MultipleConnectedInteractive.hxx b/src/AIS/AIS_MultipleConnectedInteractive.hxx index a988233815..ab11283d6b 100644 --- a/src/AIS/AIS_MultipleConnectedInteractive.hxx +++ b/src/AIS/AIS_MultipleConnectedInteractive.hxx @@ -107,7 +107,9 @@ protected: //! compute anything, but just uses the //! presentation of this last object, with //! a transformation if there's one stored. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Establishes the connection between the Connected Interactive Object, theInteractive, and its reference. //! Locates instance in theLocation and applies specified transformation persistence mode. diff --git a/src/AIS/AIS_Plane.cxx b/src/AIS/AIS_Plane.cxx index 3f8f064f12..a9a31cf54e 100644 --- a/src/AIS/AIS_Plane.cxx +++ b/src/AIS/AIS_Plane.cxx @@ -208,17 +208,17 @@ void AIS_Plane::SetPlaneAttributes(const Handle(Geom_Plane)& aComponent, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& , - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode) +void AIS_Plane::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { ComputeFields(); - aPresentation->SetInfiniteState(myInfiniteState); + thePrs->SetInfiniteState (myInfiniteState); myDrawer->PlaneAspect()->EdgesAspect()->SetWidth(myCurrentMode == 0? 1 : 3); - switch (aMode) + switch (theMode) { case 0: { @@ -228,10 +228,12 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& , const Handle(Geom_Plane)& pl = myComponent; Handle(Geom_Plane) thegoodpl (Handle(Geom_Plane)::DownCast(pl->Translated(pl->Location(),myCenter))); GeomAdaptor_Surface surf(thegoodpl); - StdPrs_Plane::Add(aPresentation,surf,myDrawer); + StdPrs_Plane::Add (thePrs, surf, myDrawer); } else - DsgPrs_XYZPlanePresentation::Add(aPresentation,myDrawer,myCenter,myPmin,myPmax); + { + DsgPrs_XYZPlanePresentation::Add (thePrs, myDrawer, myCenter, myPmin, myPmax); + } break; } case 1: @@ -239,12 +241,12 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& , if (!myIsXYZPlane) { ComputeFrame(); - Handle(Prs3d_PlaneAspect) theaspect = myDrawer->PlaneAspect(); - Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup(); - TheGroup->SetPrimitivesAspect(myDrawer->ShadingAspect()->Aspect()); + Handle(Prs3d_PlaneAspect) anAspect = myDrawer->PlaneAspect(); + Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup(); + aGroup->SetPrimitivesAspect (myDrawer->ShadingAspect()->Aspect()); gp_Pnt p1; - const Standard_Real Xmax = 0.5*Standard_Real(theaspect->PlaneXLength()); - const Standard_Real Ymax = 0.5*Standard_Real(theaspect->PlaneYLength()); + const Standard_Real Xmax = 0.5*Standard_Real(anAspect->PlaneXLength()); + const Standard_Real Ymax = 0.5*Standard_Real(anAspect->PlaneYLength()); Handle(Graphic3d_ArrayOfQuadrangles) aQuads = new Graphic3d_ArrayOfQuadrangles(4); @@ -257,10 +259,12 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& , myComponent->D0(-Xmax,-Ymax,p1); aQuads->AddVertex(p1); - TheGroup->AddPrimitiveArray(aQuads); + aGroup->AddPrimitiveArray (aQuads); } else - DsgPrs_ShadedPlanePresentation::Add(aPresentation,myDrawer,myCenter,myPmin,myPmax); + { + DsgPrs_ShadedPlanePresentation::Add (thePrs, myDrawer, myCenter, myPmin, myPmax); + } break; } } diff --git a/src/AIS/AIS_Plane.hxx b/src/AIS/AIS_Plane.hxx index 29f8d154c1..ea6372e81d 100644 --- a/src/AIS/AIS_Plane.hxx +++ b/src/AIS/AIS_Plane.hxx @@ -140,12 +140,14 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeFrame(); - + Standard_EXPORT void ComputeFields(); - + Standard_EXPORT void InitDrawerAttributes(); private: diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx index f2a479a344..d7e8426510 100644 --- a/src/AIS/AIS_PlaneTrihedron.cxx +++ b/src/AIS/AIS_PlaneTrihedron.cxx @@ -147,13 +147,13 @@ Standard_Real AIS_PlaneTrihedron::GetLength() const { //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void AIS_PlaneTrihedron::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer ) { - aPresentation->SetDisplayPriority(5); + thePrs->SetDisplayPriority (5); // drawing axis in X direction gp_Pnt first, last; Standard_Real value = myDrawer->DatumAspect()->AxisLength(Prs3d_DatumParts_XAxis); @@ -166,7 +166,7 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&, first.SetCoord( xo, yo, zo ); last.SetCoord( xo + x * value, yo + y * value, zo + z * value ); - DsgPrs_XYZAxisPresentation::Add (aPresentation, + DsgPrs_XYZAxisPresentation::Add (thePrs, myDrawer->DatumAspect()->LineAspect(Prs3d_DatumParts_XAxis), myDrawer->ArrowAspect(), myDrawer->TextAspect(), @@ -178,13 +178,13 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&, yDir.Coord( x, y, z ); last.SetCoord( xo + x * value, yo + y * value, zo + z * value ); - DsgPrs_XYZAxisPresentation::Add (aPresentation, + DsgPrs_XYZAxisPresentation::Add (thePrs, myDrawer->DatumAspect()->LineAspect(Prs3d_DatumParts_XAxis), myDrawer->ArrowAspect(), myDrawer->TextAspect(), yDir, value, myYLabel.ToCString(), first, last); - aPresentation->SetInfiniteState (Standard_True); + thePrs->SetInfiniteState (Standard_True); } //======================================================================= diff --git a/src/AIS/AIS_PlaneTrihedron.hxx b/src/AIS/AIS_PlaneTrihedron.hxx index 73f9af6fcf..7ae1f34e44 100644 --- a/src/AIS/AIS_PlaneTrihedron.hxx +++ b/src/AIS/AIS_PlaneTrihedron.hxx @@ -88,11 +88,14 @@ public: protected: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& theprsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; private: - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/AIS/AIS_Point.cxx b/src/AIS/AIS_Point.cxx index e9e8711b30..a772b8ce6a 100644 --- a/src/AIS/AIS_Point.cxx +++ b/src/AIS/AIS_Point.cxx @@ -81,23 +81,23 @@ Handle(Geom_Point) AIS_Point::Component() //function : Compute //purpose : //======================================================================= -void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode) +void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { - aPresentation->SetInfiniteState(myInfiniteState); - - if (aMode==0) - StdPrs_Point::Add(aPresentation,myComponent,myDrawer); - else if (aMode== -99) - { - Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup(); - TheGroup->SetPrimitivesAspect (myHilightDrawer->PointAspect()->Aspect()); - Handle(Graphic3d_ArrayOfPoints) aPoint = new Graphic3d_ArrayOfPoints (1); - aPoint->AddVertex (myComponent->X(),myComponent->Y(),myComponent->Z()); - TheGroup->AddPrimitiveArray (aPoint); - } - + thePrs->SetInfiniteState (myInfiniteState); + if (theMode == 0) + { + StdPrs_Point::Add (thePrs, myComponent, myDrawer); + } + else if (theMode == -99) + { + Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup(); + aGroup->SetPrimitivesAspect (myHilightDrawer->PointAspect()->Aspect()); + Handle(Graphic3d_ArrayOfPoints) aPoint = new Graphic3d_ArrayOfPoints (1); + aPoint->AddVertex (myComponent->X(), myComponent->Y(), myComponent->Z()); + aGroup->AddPrimitiveArray (aPoint); + } } //======================================================================= diff --git a/src/AIS/AIS_Point.hxx b/src/AIS/AIS_Point.hxx index ed920b733b..d370356e99 100644 --- a/src/AIS/AIS_Point.hxx +++ b/src/AIS/AIS_Point.hxx @@ -72,7 +72,9 @@ public: protected: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/AIS/AIS_PointCloud.cxx b/src/AIS/AIS_PointCloud.cxx index 4590faa454..917bd7f109 100644 --- a/src/AIS/AIS_PointCloud.cxx +++ b/src/AIS/AIS_PointCloud.cxx @@ -67,9 +67,9 @@ Standard_Boolean AIS_PointCloudOwner::IsForcedHilight() const //function : HilightWithColor //purpose : //======================================================================= -void AIS_PointCloudOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Drawer)& theStyle, - const Standard_Integer ) +void AIS_PointCloudOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Drawer)& theStyle, + const Standard_Integer ) { Handle(AIS_PointCloud) anObj = Handle(AIS_PointCloud)::DownCast (Selectable()); if (anObj.IsNull()) @@ -150,7 +150,7 @@ void AIS_PointCloudOwner::HilightWithColor (const Handle(PrsMgr_PresentationMana //======================================================================= void AIS_PointCloudOwner::Unhilight (const Handle(PrsMgr_PresentationManager)& , const Standard_Integer ) { - if (Handle(Prs3d_Presentation) aPrs = Selectable()->GetSelectPresentation (Handle(PrsMgr_PresentationManager3d)())) + if (Handle(Prs3d_Presentation) aPrs = Selectable()->GetSelectPresentation (Handle(PrsMgr_PresentationManager)())) { aPrs->Erase(); } @@ -372,9 +372,9 @@ void AIS_PointCloud::UnsetMaterial() //function : Compute //purpose : //======================================================================= -void AIS_PointCloud::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void AIS_PointCloud::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { switch (theMode) { diff --git a/src/AIS/AIS_PointCloud.hxx b/src/AIS/AIS_PointCloud.hxx index ab7ab322fc..cf69b13709 100644 --- a/src/AIS/AIS_PointCloud.hxx +++ b/src/AIS/AIS_PointCloud.hxx @@ -106,9 +106,9 @@ public: protected: //! Prepare presentation for this object. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Prepare selection for this object. Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, @@ -146,7 +146,7 @@ public: Standard_EXPORT virtual Standard_Boolean IsForcedHilight() const Standard_OVERRIDE; //! Handle dynamic highlighting. - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_RubberBand.cxx b/src/AIS/AIS_RubberBand.cxx index 8e5360dd42..a5ce2927f5 100644 --- a/src/AIS/AIS_RubberBand.cxx +++ b/src/AIS/AIS_RubberBand.cxx @@ -390,10 +390,15 @@ Standard_Boolean AIS_RubberBand::fillTriangles() //function : Compute //purpose : //======================================================================= -void AIS_RubberBand::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, +void AIS_RubberBand::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer /*theMode*/) + const Standard_Integer theMode) { + if (theMode != 0) + { + return; + } + // Draw filling if (IsFilling() && fillTriangles()) { diff --git a/src/AIS/AIS_RubberBand.hxx b/src/AIS/AIS_RubberBand.hxx index 7ef181f000..9372d757ae 100644 --- a/src/AIS/AIS_RubberBand.hxx +++ b/src/AIS/AIS_RubberBand.hxx @@ -135,9 +135,15 @@ public: protected: + //! Returns true if the interactive object accepts the display mode. + Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE + { + return theMode == 0; + } + //! Computes presentation of rubber band. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; //! Does not fill selection primitives for rubber band. diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx index f4add42867..385fbdd4c8 100644 --- a/src/AIS/AIS_Shape.cxx +++ b/src/AIS/AIS_Shape.cxx @@ -115,19 +115,23 @@ AIS_Shape::AIS_Shape(const TopoDS_Shape& theShape) //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPrs, - const Standard_Integer theMode) -{ - if(myshape.IsNull()) return; +void AIS_Shape::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) +{ + if (myshape.IsNull()) + { + return; + } // wire,edge,vertex -> pas de HLR + priorite display superieure - Standard_Integer TheType = (Standard_Integer) myshape.ShapeType(); - if(TheType>4 && TheType<8) { - aPrs->SetVisual(Graphic3d_TOS_ALL); - aPrs->SetDisplayPriority(TheType+2); + const Standard_Integer aShapeType = (Standard_Integer )myshape.ShapeType(); + if (aShapeType > 4 && aShapeType < 8) + { + thePrs->SetVisual (Graphic3d_TOS_ALL); + thePrs->SetDisplayPriority (aShapeType + 2); } // Shape vide -> Assemblage vide. if (myshape.ShapeType() == TopAbs_COMPOUND && myshape.NbChildren() == 0) @@ -137,7 +141,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat if (IsInfinite()) { - aPrs->SetInfiniteState (Standard_True); //not taken in account during FITALL + thePrs->SetInfiniteState (Standard_True); //not taken in account during FITALL } switch (theMode) @@ -148,7 +152,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat try { OCC_CATCH_SIGNALS - StdPrs_WFShape::Add (aPrs, myshape, myDrawer); + StdPrs_WFShape::Add (thePrs, myshape, myDrawer); } catch (Standard_Failure const& anException) { @@ -162,20 +166,20 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat StdPrs_ToolTriangulatedShape::ClearOnOwnDeflectionChange (myshape, myDrawer, Standard_True); if ((Standard_Integer) myshape.ShapeType() > 4) { - StdPrs_WFShape::Add (aPrs, myshape, myDrawer); + StdPrs_WFShape::Add (thePrs, myshape, myDrawer); } else { if (IsInfinite()) { - StdPrs_WFShape::Add (aPrs, myshape, myDrawer); + StdPrs_WFShape::Add (thePrs, myshape, myDrawer); } else { try { OCC_CATCH_SIGNALS - StdPrs_ShadedShape::Add (aPrs, myshape, myDrawer, + StdPrs_ShadedShape::Add (thePrs, myshape, myDrawer, myDrawer->ShadingAspect()->Aspect()->ToMapTexture() && !myDrawer->ShadingAspect()->Aspect()->TextureMap().IsNull(), myUVOrigin, myUVRepeat, myUVScale); @@ -184,7 +188,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat { Message::SendFail (TCollection_AsciiString("Error: AIS_Shape::Compute() shaded presentation builder has failed (") + anException.GetMessageString() + ")"); - StdPrs_WFShape::Add (aPrs, myshape, myDrawer); + StdPrs_WFShape::Add (thePrs, myshape, myDrawer); } } } @@ -201,17 +205,17 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat { if (IsInfinite()) { - StdPrs_WFShape::Add (aPrs, myshape, myDrawer); + StdPrs_WFShape::Add (thePrs, myshape, myDrawer); } else { - Prs3d_BndBox::Add (aPrs, BoundingBox(), myDrawer); + Prs3d_BndBox::Add (thePrs, BoundingBox(), myDrawer); } } } // Recompute hidden line presentation (if necessary). - aPrs->ReCompute(); + thePrs->ReCompute(); } //======================================================================= diff --git a/src/AIS/AIS_Shape.hxx b/src/AIS/AIS_Shape.hxx index 6be0e15b70..8d08eb4311 100644 --- a/src/AIS/AIS_Shape.hxx +++ b/src/AIS/AIS_Shape.hxx @@ -248,7 +248,7 @@ public: //! @name methods to alter texture mapping properties protected: //! Compute normal presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_TextLabel.cxx b/src/AIS/AIS_TextLabel.cxx index 8344e85da0..f20758e852 100644 --- a/src/AIS/AIS_TextLabel.cxx +++ b/src/AIS/AIS_TextLabel.cxx @@ -263,9 +263,9 @@ void AIS_TextLabel::SetColorSubTitle (const Quantity_Color& theColor) //function : Compute //purpose : //======================================================================= -void AIS_TextLabel::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void AIS_TextLabel::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { switch (theMode) { diff --git a/src/AIS/AIS_TextLabel.hxx b/src/AIS/AIS_TextLabel.hxx index 90b1c5cc01..4b0da2b6da 100644 --- a/src/AIS/AIS_TextLabel.hxx +++ b/src/AIS/AIS_TextLabel.hxx @@ -132,9 +132,9 @@ public: protected: //! Compute - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& theprsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Compute selection Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, diff --git a/src/AIS/AIS_TexturedShape.cxx b/src/AIS/AIS_TexturedShape.cxx index 74136aea54..e42990c8d2 100644 --- a/src/AIS/AIS_TexturedShape.cxx +++ b/src/AIS/AIS_TexturedShape.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -345,10 +345,9 @@ void AIS_TexturedShape::updateAttributes (const Handle(Prs3d_Presentation)& theP //function : Compute //purpose : //======================================================================= - -void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { if (myshape.IsNull()) { diff --git a/src/AIS/AIS_TexturedShape.hxx b/src/AIS/AIS_TexturedShape.hxx index f3aebfe197..5c3ece94bb 100644 --- a/src/AIS/AIS_TexturedShape.hxx +++ b/src/AIS/AIS_TexturedShape.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include class Graphic3d_AspectFillArea3d; class Graphic3d_Texture2Dmanual; @@ -178,9 +178,9 @@ public: //! @name methods to alter texture mapping properties protected: //! @name overridden methods //! Compute presentation with texture mapping support. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; Standard_EXPORT void updateAttributes (const Handle(Prs3d_Presentation)& thePrs); diff --git a/src/AIS/AIS_Triangulation.cxx b/src/AIS/AIS_Triangulation.cxx index ff4c7b12a2..054b71986a 100644 --- a/src/AIS/AIS_Triangulation.cxx +++ b/src/AIS/AIS_Triangulation.cxx @@ -116,78 +116,76 @@ void AIS_Triangulation::updatePresentation() //function : Compute //purpose : //======================================================================= -void AIS_Triangulation::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode) +void AIS_Triangulation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { - switch (aMode) + if (theMode != 0) { - case 0: - Standard_Boolean hasVNormals = myTriangulation->HasNormals(); - Standard_Boolean hasVColors = HasVertexColors(); - - Handle(Graphic3d_ArrayOfTriangles) anArray = new Graphic3d_ArrayOfTriangles (myNbNodes, myNbTriangles * 3, - hasVNormals, hasVColors, Standard_False); - Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup(); - Handle(Graphic3d_AspectFillArea3d) aspect = myDrawer->ShadingAspect()->Aspect(); - - Standard_Integer i; - - const Standard_Real ambient = 0.2; - if (hasVNormals) - { - gp_Vec3f aNormal; - if (hasVColors) - { - const TColStd_Array1OfInteger& colors = myColor->Array1(); - for ( i = 1; i <= myTriangulation->NbNodes(); i++ ) - { - anArray->AddVertex (myTriangulation->Node (i), attenuateColor (colors[i], ambient)); - myTriangulation->Normal (i, aNormal); - anArray->SetVertexNormal (i, aNormal.x(), aNormal.y(), aNormal.z()); - } - } - else // !hasVColors - { - for ( i = 1; i <= myTriangulation->NbNodes(); i++ ) - { - anArray->AddVertex (myTriangulation->Node (i)); - myTriangulation->Normal (i, aNormal); - anArray->SetVertexNormal(i, aNormal.x(), aNormal.y(), aNormal.z()); - } - } - } - else // !hasVNormals - { - if (hasVColors) - { - const TColStd_Array1OfInteger& colors = myColor->Array1(); - for ( i = 1; i <= myTriangulation->NbNodes(); i++ ) - { - anArray->AddVertex (myTriangulation->Node (i), attenuateColor(colors(i), ambient)); - } - } - else // !hasVColors - { - for ( i = 1; i <= myTriangulation->NbNodes(); i++ ) - { - anArray->AddVertex (myTriangulation->Node (i)); - } - } - } - - Standard_Integer indexTriangle[3] = {0,0,0}; - for ( i = 1; i<= myTriangulation->NbTriangles(); i++ ) - { - myTriangulation->Triangle (i).Get (indexTriangle[0], indexTriangle[1], indexTriangle[2]); - anArray->AddEdge(indexTriangle[0]); - anArray->AddEdge(indexTriangle[1]); - anArray->AddEdge(indexTriangle[2]); - } - TheGroup->SetPrimitivesAspect(aspect); - TheGroup->AddPrimitiveArray(anArray); - break; + return; } + + Standard_Boolean hasVNormals = myTriangulation->HasNormals(); + Standard_Boolean hasVColors = HasVertexColors(); + + Handle(Graphic3d_ArrayOfTriangles) anArray = new Graphic3d_ArrayOfTriangles (myNbNodes, myNbTriangles * 3, + hasVNormals, hasVColors, Standard_False); + Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup(); + Handle(Graphic3d_AspectFillArea3d) anAspect = myDrawer->ShadingAspect()->Aspect(); + + const Standard_Real anAmbient = 0.2; + if (hasVNormals) + { + gp_Vec3f aNormal; + if (hasVColors) + { + const TColStd_Array1OfInteger& colors = myColor->Array1(); + for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter) + { + anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient)); + myTriangulation->Normal (aNodeIter, aNormal); + anArray->SetVertexNormal (aNodeIter, aNormal.x(), aNormal.y(), aNormal.z()); + } + } + else // !hasVColors + { + for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter) + { + anArray->AddVertex (myTriangulation->Node (aNodeIter)); + myTriangulation->Normal (aNodeIter, aNormal); + anArray->SetVertexNormal(aNodeIter, aNormal.x(), aNormal.y(), aNormal.z()); + } + } + } + else // !hasVNormals + { + if (hasVColors) + { + const TColStd_Array1OfInteger& colors = myColor->Array1(); + for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter) + { + anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient)); + } + } + else // !hasVColors + { + for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter) + { + anArray->AddVertex (myTriangulation->Node (aNodeIter)); + } + } + } + + Standard_Integer aTriIndices[3] = {0,0,0}; + for (Standard_Integer aTriIter = 1; aTriIter <= myTriangulation->NbTriangles(); ++aTriIter) + { + myTriangulation->Triangle (aTriIter).Get (aTriIndices[0], aTriIndices[1], aTriIndices[2]); + anArray->AddEdge (aTriIndices[0]); + anArray->AddEdge (aTriIndices[1]); + anArray->AddEdge (aTriIndices[2]); + } + aGroup->SetPrimitivesAspect (anAspect); + aGroup->AddPrimitiveArray (anArray); } //======================================================================= diff --git a/src/AIS/AIS_Triangulation.hxx b/src/AIS/AIS_Triangulation.hxx index 9961a21582..cfe919d03c 100644 --- a/src/AIS/AIS_Triangulation.hxx +++ b/src/AIS/AIS_Triangulation.hxx @@ -67,15 +67,15 @@ protected: Standard_EXPORT void updatePresentation(); - - private: - - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + //! Attenuates 32-bit color by a given attenuation factor (0...1): //! aColor = Alpha << 24 + Blue << 16 + Green << 8 + Red //! All color components are multiplied by aComponent, the result is then packed again as 32-bit integer. diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx index b93257d83d..a5ea0fb6b3 100644 --- a/src/AIS/AIS_Trihedron.cxx +++ b/src/AIS/AIS_Trihedron.cxx @@ -165,7 +165,7 @@ Standard_Real AIS_Trihedron::Size() const //function : Compute //purpose : //======================================================================= -void AIS_Trihedron::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void AIS_Trihedron::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { @@ -257,7 +257,7 @@ void AIS_Trihedron::ComputeSelection (const Handle(SelectMgr_Selection)& theSele //function : HilightOwnerWithColor //purpose : //======================================================================= -void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { @@ -318,7 +318,7 @@ void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManag //function : HilightSelected //purpose : //======================================================================== -void AIS_Trihedron::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM, +void AIS_Trihedron::HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theOwners) { if (theOwners.IsEmpty() || !HasInteractiveContext()) @@ -415,7 +415,7 @@ void AIS_Trihedron::ClearSelected() //function : computePresentation //purpose : //======================================================================= -void AIS_Trihedron::computePresentation (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/, +void AIS_Trihedron::computePresentation (const Handle(PrsMgr_PresentationManager)& /*thePrsMgr*/, const Handle(Prs3d_Presentation)& thePrs) { for (Standard_Integer aPartIter = 0; aPartIter < Prs3d_DatumParts_NB; ++aPartIter) diff --git a/src/AIS/AIS_Trihedron.hxx b/src/AIS/AIS_Trihedron.hxx index 336bbca5f3..3d0dd745b3 100644 --- a/src/AIS/AIS_Trihedron.hxx +++ b/src/AIS/AIS_Trihedron.hxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -189,19 +189,19 @@ public: Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE; //! Method which draws selected owners ( for fast presentation draw ). - Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theOwners) Standard_OVERRIDE; //! Method which hilight an owner belonging to //! this selectable object ( for fast presentation draw ). - Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; protected: //! Compute trihedron presentation. - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; @@ -219,7 +219,7 @@ protected: const Handle(SelectMgr_EntityOwner)& theOwner) const; //! Computes presentation for display mode equal 1. - Standard_EXPORT void computePresentation (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT void computePresentation (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs); //! Returns own datum aspect of trihedron, create this aspect if it was not created yet. diff --git a/src/AIS/AIS_TrihedronOwner.cxx b/src/AIS/AIS_TrihedronOwner.cxx index 7308920bc7..08291192eb 100644 --- a/src/AIS/AIS_TrihedronOwner.cxx +++ b/src/AIS/AIS_TrihedronOwner.cxx @@ -32,7 +32,7 @@ AIS_TrihedronOwner::AIS_TrihedronOwner (const Handle(SelectMgr_SelectableObject) // function : HilightWithColor // purpose : // ======================================================================= -void AIS_TrihedronOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void AIS_TrihedronOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer /*theMode*/) { diff --git a/src/AIS/AIS_TrihedronOwner.hxx b/src/AIS/AIS_TrihedronOwner.hxx index 6d426a9ff0..e15ba3cdef 100644 --- a/src/AIS/AIS_TrihedronOwner.hxx +++ b/src/AIS/AIS_TrihedronOwner.hxx @@ -34,7 +34,7 @@ public: Prs3d_DatumParts DatumPart() const { return myDatumPart; } //! Highlights selectable object's presentation. - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/AIS/AIS_ViewCube.cxx b/src/AIS/AIS_ViewCube.cxx index 3edb4f14a1..fe18f9f4a3 100644 --- a/src/AIS/AIS_ViewCube.cxx +++ b/src/AIS/AIS_ViewCube.cxx @@ -563,7 +563,7 @@ void AIS_ViewCube::createBoxCornerTriangles (const Handle(Graphic3d_ArrayOfTrian //function : Compute //purpose : //======================================================================= -void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { @@ -1001,7 +1001,7 @@ void AIS_ViewCube::HandleClick (const Handle(AIS_ViewCubeOwner)& theOwner) //function : HilightOwnerWithColor //purpose : //======================================================================= -void AIS_ViewCube::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void AIS_ViewCube::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { @@ -1044,7 +1044,7 @@ void AIS_ViewCube::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManage //function : HilightSelected //purpose : //======================================================================= -void AIS_ViewCube::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& , +void AIS_ViewCube::HilightSelected (const Handle(PrsMgr_PresentationManager)& , const SelectMgr_SequenceOfOwner& theSeq) { // this method should never be called since AIS_InteractiveObject::HandleClick() has been overridden diff --git a/src/AIS/AIS_ViewCube.hxx b/src/AIS/AIS_ViewCube.hxx index cd153f9634..4da9de27f9 100644 --- a/src/AIS/AIS_ViewCube.hxx +++ b/src/AIS/AIS_ViewCube.hxx @@ -533,7 +533,7 @@ public: //! @name Presentation computation //! @param thePrs [in] input presentation that is to be filled with flat presentation primitives. //! @param theMode [in] display mode. //! @warning this object accept only 0 display mode. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode = 0) Standard_OVERRIDE; @@ -555,12 +555,12 @@ public: //! @name Presentation computation //! @param thePM [in] presentation manager //! @param theStyle [in] style for dynamic highlighting. //! @param theOwner [in] input entity owner. - Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; //! Method which draws selected owners. - Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theSeq) Standard_OVERRIDE; //! Set default parameters for visual attributes diff --git a/src/AIS/AIS_XRTrackedDevice.cxx b/src/AIS/AIS_XRTrackedDevice.cxx index 2a4c8993af..4c52b61661 100644 --- a/src/AIS/AIS_XRTrackedDevice.cxx +++ b/src/AIS/AIS_XRTrackedDevice.cxx @@ -148,7 +148,7 @@ void AIS_XRTrackedDevice::computeLaserRay() //function : Compute //purpose : //======================================================================= -void AIS_XRTrackedDevice::Compute (const Handle(PrsMgr_PresentationManager3d)& , +void AIS_XRTrackedDevice::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/src/AIS/AIS_XRTrackedDevice.hxx b/src/AIS/AIS_XRTrackedDevice.hxx index 05f4efefa5..8ba3077597 100644 --- a/src/AIS/AIS_XRTrackedDevice.hxx +++ b/src/AIS/AIS_XRTrackedDevice.hxx @@ -62,7 +62,7 @@ protected: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } //! Compute presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE; diff --git a/src/IVtkOCC/IVtkOCC_SelectableObject.hxx b/src/IVtkOCC/IVtkOCC_SelectableObject.hxx index b4a08b868b..2a80cb82ce 100644 --- a/src/IVtkOCC/IVtkOCC_SelectableObject.hxx +++ b/src/IVtkOCC/IVtkOCC_SelectableObject.hxx @@ -64,7 +64,7 @@ private: const Standard_Integer theMode) Standard_OVERRIDE; //! Dummy. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& , + virtual void Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& , const Standard_Integer ) Standard_OVERRIDE {} diff --git a/src/MeshVS/MeshVS_Mesh.cxx b/src/MeshVS/MeshVS_Mesh.cxx index e2161a2073..9d1df7055a 100644 --- a/src/MeshVS/MeshVS_Mesh.cxx +++ b/src/MeshVS/MeshVS_Mesh.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -166,7 +166,7 @@ Standard_Boolean MeshVS_Mesh::AcceptDisplayMode (const Standard_Integer theMode) // Function : Compute // Purpose : //================================================================ -void MeshVS_Mesh::Compute ( const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void MeshVS_Mesh::Compute ( const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode ) { @@ -927,7 +927,7 @@ void MeshVS_Mesh::SetDataSource( const Handle(MeshVS_DataSource)& theDataSource // Function : HilightSelected // Purpose : //================================================================ -void MeshVS_Mesh::HilightSelected ( const Handle(PrsMgr_PresentationManager3d)& thePM, +void MeshVS_Mesh::HilightSelected ( const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theOwners ) { if ( myHilighter.IsNull() ) @@ -1073,7 +1073,7 @@ void MeshVS_Mesh::HilightSelected ( const Handle(PrsMgr_PresentationManager3d)& // Function : HilightOwnerWithColor // Purpose : //================================================================ -void MeshVS_Mesh::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager3d)& thePM, +void MeshVS_Mesh::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { diff --git a/src/MeshVS/MeshVS_Mesh.hxx b/src/MeshVS/MeshVS_Mesh.hxx index 06a0275046..9cb24e6763 100644 --- a/src/MeshVS/MeshVS_Mesh.hxx +++ b/src/MeshVS/MeshVS_Mesh.hxx @@ -48,19 +48,23 @@ public: //! Computes presentation using builders added to sequence. Each builder computes //! own part of mesh presentation according to its type. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& PM, const Handle(Prs3d_Presentation)& Prs, const Standard_Integer DisplayMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theDispMode) Standard_OVERRIDE; + //! Computes selection according to SelectMode - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& Sel, const Standard_Integer SelectMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theSelMode) Standard_OVERRIDE; + //! Draw selected owners presentation - Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& PM, const SelectMgr_SequenceOfOwner& Owners) Standard_OVERRIDE; - + Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const SelectMgr_SequenceOfOwner& theOwners) Standard_OVERRIDE; + //! Draw hilighted owner presentation - Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theColor, const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; - + //! Clears internal selection presentation Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE; diff --git a/src/MeshVS/MeshVS_MeshEntityOwner.cxx b/src/MeshVS/MeshVS_MeshEntityOwner.cxx index 092bb0b4d4..ec417397de 100644 --- a/src/MeshVS/MeshVS_MeshEntityOwner.cxx +++ b/src/MeshVS/MeshVS_MeshEntityOwner.cxx @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ Standard_Boolean MeshVS_MeshEntityOwner::IsHilighted ( const Handle(PrsMgr_Prese // Function : HilightWithColor // Purpose : //================================================================ -void MeshVS_MeshEntityOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void MeshVS_MeshEntityOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer /*theMode*/ ) { diff --git a/src/MeshVS/MeshVS_MeshEntityOwner.hxx b/src/MeshVS/MeshVS_MeshEntityOwner.hxx index cbc9b2acd9..45554524a5 100644 --- a/src/MeshVS/MeshVS_MeshEntityOwner.hxx +++ b/src/MeshVS/MeshVS_MeshEntityOwner.hxx @@ -18,7 +18,7 @@ #include #include -#include +#include #include class PrsMgr_PresentationManager; @@ -54,9 +54,9 @@ public: Standard_EXPORT virtual Standard_Boolean IsHilighted (const Handle(PrsMgr_PresentationManager)& PM, const Standard_Integer Mode = 0) const Standard_OVERRIDE; //! Hilights owner with the certain color - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, - const Standard_Integer theMode = 0) Standard_OVERRIDE; + const Standard_Integer theMode) Standard_OVERRIDE; //! Strip hilight of owner Standard_EXPORT virtual void Unhilight (const Handle(PrsMgr_PresentationManager)& PM, const Standard_Integer Mode = 0) Standard_OVERRIDE; diff --git a/src/MeshVS/MeshVS_MeshOwner.cxx b/src/MeshVS/MeshVS_MeshOwner.cxx index 9f5608aadd..2bdf6178bd 100644 --- a/src/MeshVS/MeshVS_MeshOwner.cxx +++ b/src/MeshVS/MeshVS_MeshOwner.cxx @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -133,7 +133,7 @@ void MeshVS_MeshOwner::SetDetectedEntities (const Handle(TColStd_HPackedMapOfInt // Function : HilightWithColor // Purpose : //================================================================ -void MeshVS_MeshOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void MeshVS_MeshOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer /*theMode*/) { diff --git a/src/MeshVS/MeshVS_MeshOwner.hxx b/src/MeshVS/MeshVS_MeshOwner.hxx index e3d9b3f103..91dd4a96ca 100644 --- a/src/MeshVS/MeshVS_MeshOwner.hxx +++ b/src/MeshVS/MeshVS_MeshOwner.hxx @@ -17,7 +17,7 @@ #define _MeshVS_MeshOwner_HeaderFile #include -#include +#include #include class MeshVS_DataSource; @@ -61,42 +61,29 @@ public: //! Saves ids of hilighted mesh entities Standard_EXPORT void SetDetectedEntities (const Handle(TColStd_HPackedMapOfInteger)& Nodes, const Handle(TColStd_HPackedMapOfInteger)& Elems); - - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theColor, - const Standard_Integer theMode = 0) Standard_OVERRIDE; - + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Unhilight (const Handle(PrsMgr_PresentationManager)& PM, const Standard_Integer Mode = 0) Standard_OVERRIDE; - + Standard_EXPORT virtual Standard_Boolean IsForcedHilight() const Standard_OVERRIDE; - - - DEFINE_STANDARD_RTTIEXT(MeshVS_MeshOwner,SelectMgr_EntityOwner) protected: - Handle(TColStd_HPackedMapOfInteger) mySelectedNodes; Handle(TColStd_HPackedMapOfInteger) mySelectedElems; - private: - Handle(MeshVS_DataSource) myDataSource; Handle(TColStd_HPackedMapOfInteger) myDetectedNodes; Handle(TColStd_HPackedMapOfInteger) myDetectedElems; Standard_Integer myLastID; - }; - - - - - - #endif // _MeshVS_MeshOwner_HeaderFile diff --git a/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx b/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx index ce4da457e5..977b219331 100644 --- a/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx +++ b/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/MeshVS/MeshVS_PrsBuilder.cxx b/src/MeshVS/MeshVS_PrsBuilder.cxx index 16f865f3b7..4a4a1c87fa 100644 --- a/src/MeshVS/MeshVS_PrsBuilder.cxx +++ b/src/MeshVS/MeshVS_PrsBuilder.cxx @@ -190,7 +190,7 @@ Handle (MeshVS_Drawer) MeshVS_PrsBuilder::Drawer () const // MeshVS_Mesh::Compute methodto assign presentation // manager to the builder. //================================================================ -void MeshVS_PrsBuilder::SetPresentationManager( const Handle(PrsMgr_PresentationManager3d)& thePrsMgr ) +void MeshVS_PrsBuilder::SetPresentationManager( const Handle(PrsMgr_PresentationManager)& thePrsMgr ) { myPrsMgr = thePrsMgr; } @@ -199,7 +199,7 @@ void MeshVS_PrsBuilder::SetPresentationManager( const Handle(PrsMgr_Presentation // Function : GetPresentationManager // Purpose : Get presentation manager //================================================================ -Handle(PrsMgr_PresentationManager3d) MeshVS_PrsBuilder::GetPresentationManager() const +Handle(PrsMgr_PresentationManager) MeshVS_PrsBuilder::GetPresentationManager() const { return myPrsMgr; } diff --git a/src/MeshVS/MeshVS_PrsBuilder.hxx b/src/MeshVS/MeshVS_PrsBuilder.hxx index 4fc363b597..edaf175d0f 100644 --- a/src/MeshVS/MeshVS_PrsBuilder.hxx +++ b/src/MeshVS/MeshVS_PrsBuilder.hxx @@ -17,7 +17,7 @@ #define _MeshVS_PrsBuilder_HeaderFile #include -#include +#include #include #include #include @@ -35,10 +35,8 @@ DEFINE_STANDARD_HANDLE(MeshVS_PrsBuilder, Standard_Transient) //! It provides base fields and methods all buildes need. class MeshVS_PrsBuilder : public Standard_Transient { - public: - //! Builds presentation of certain type of data. //! Prs is presentation object which this method constructs. //! IDs is set of numeric identificators forming object appearance. @@ -90,21 +88,17 @@ public: //! Read excluding state Standard_EXPORT Standard_Boolean IsExcludingOn() const; - + //! Set presentation manager for builder - Standard_EXPORT void SetPresentationManager (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr); - + Standard_EXPORT void SetPresentationManager (const Handle(PrsMgr_PresentationManager)& thePrsMgr); + //! Get presentation manager of builder - Standard_EXPORT Handle(PrsMgr_PresentationManager3d) GetPresentationManager() const; - - - + Standard_EXPORT Handle(PrsMgr_PresentationManager) GetPresentationManager() const; DEFINE_STANDARD_RTTIEXT(MeshVS_PrsBuilder,Standard_Transient) protected: - //! Constructor //! Parent is pointer to MeshVS_Mesh object //! Flags is set of display modes corresponding to this builder @@ -121,27 +115,20 @@ protected: //! Returns only custom drawer Standard_EXPORT Handle(MeshVS_Drawer) Drawer() const; +protected: + MeshVS_MeshPtr myParentMesh; - private: - Standard_Boolean myIsExcluding; Handle(MeshVS_DataSource) myDataSource; Handle(MeshVS_Drawer) myDrawer; Standard_Integer myFlags; Standard_Integer myId; Standard_Integer myPriority; - Handle(PrsMgr_PresentationManager3d) myPrsMgr; - + Handle(PrsMgr_PresentationManager) myPrsMgr; }; - - - - - - #endif // _MeshVS_PrsBuilder_HeaderFile diff --git a/src/PrsDim/PrsDim_AngleDimension.cxx b/src/PrsDim/PrsDim_AngleDimension.cxx index d3e9c16b51..8e94f3a2f6 100644 --- a/src/PrsDim/PrsDim_AngleDimension.cxx +++ b/src/PrsDim/PrsDim_AngleDimension.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -623,7 +623,7 @@ Standard_Real PrsDim_AngleDimension::ComputeValue() const //function : Compute //purpose : Having three gp_Pnt points compute presentation //======================================================================= -void PrsDim_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, +void PrsDim_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { diff --git a/src/PrsDim/PrsDim_AngleDimension.hxx b/src/PrsDim/PrsDim_AngleDimension.hxx index b46ea7ab8f..912e1a5f67 100644 --- a/src/PrsDim/PrsDim_AngleDimension.hxx +++ b/src/PrsDim/PrsDim_AngleDimension.hxx @@ -288,9 +288,9 @@ protected: Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE; - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePM, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePM, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode = 0) Standard_OVERRIDE; Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE; diff --git a/src/PrsDim/PrsDim_Chamf2dDimension.cxx b/src/PrsDim/PrsDim_Chamf2dDimension.cxx index 854b41720c..ee4eb9c82d 100644 --- a/src/PrsDim/PrsDim_Chamf2dDimension.cxx +++ b/src/PrsDim/PrsDim_Chamf2dDimension.cxx @@ -95,11 +95,10 @@ PrsDim_Chamf2dDimension::PrsDim_Chamf2dDimension(const TopoDS_Shape& aFShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= - -void PrsDim_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& , - const Handle(Prs3d_Presentation)& aPresentation, +void PrsDim_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer) { Handle(Geom_Curve) gcurv; diff --git a/src/PrsDim/PrsDim_Chamf2dDimension.hxx b/src/PrsDim/PrsDim_Chamf2dDimension.hxx index 3678d01773..acc77f1c6a 100644 --- a/src/PrsDim/PrsDim_Chamf2dDimension.hxx +++ b/src/PrsDim/PrsDim_Chamf2dDimension.hxx @@ -54,10 +54,13 @@ public: virtual Standard_Boolean IsMovable() const Standard_OVERRIDE { return Standard_True; } private: - - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/PrsDim/PrsDim_Chamf3dDimension.cxx b/src/PrsDim/PrsDim_Chamf3dDimension.cxx index d48146592e..a0f993a639 100644 --- a/src/PrsDim/PrsDim_Chamf3dDimension.cxx +++ b/src/PrsDim/PrsDim_Chamf3dDimension.cxx @@ -89,12 +89,11 @@ PrsDim_Chamf3dDimension::PrsDim_Chamf3dDimension(const TopoDS_Shape& aFShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= - -void PrsDim_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& , - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void PrsDim_Chamf3dDimension::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { //---------------------------- // Calcul du centre de la face diff --git a/src/PrsDim/PrsDim_Chamf3dDimension.hxx b/src/PrsDim/PrsDim_Chamf3dDimension.hxx index c23d9e13ce..dd56ab594b 100644 --- a/src/PrsDim/PrsDim_Chamf3dDimension.hxx +++ b/src/PrsDim/PrsDim_Chamf3dDimension.hxx @@ -53,9 +53,12 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/PrsDim/PrsDim_ConcentricRelation.cxx b/src/PrsDim/PrsDim_ConcentricRelation.cxx index 273ff76958..379e6ed0de 100644 --- a/src/PrsDim/PrsDim_ConcentricRelation.cxx +++ b/src/PrsDim/PrsDim_ConcentricRelation.cxx @@ -57,11 +57,11 @@ PrsDim_ConcentricRelation::PrsDim_ConcentricRelation( //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_ConcentricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void PrsDim_ConcentricRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { TopAbs_ShapeEnum type2(mySShape.ShapeType()); aPresentation->SetInfiniteState(Standard_True); diff --git a/src/PrsDim/PrsDim_ConcentricRelation.hxx b/src/PrsDim/PrsDim_ConcentricRelation.hxx index f9c67126df..3cb179a847 100644 --- a/src/PrsDim/PrsDim_ConcentricRelation.hxx +++ b/src/PrsDim/PrsDim_ConcentricRelation.hxx @@ -44,15 +44,18 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT void ComputeTwoEdgesConcentric (const Handle(Prs3d_Presentation)& aPresentationManager); - - Standard_EXPORT void ComputeEdgeVertexConcentric (const Handle(Prs3d_Presentation)& aPresentationManager); - - Standard_EXPORT void ComputeTwoVerticesConcentric (const Handle(Prs3d_Presentation)& aPresentationManager); - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT void ComputeTwoEdgesConcentric (const Handle(Prs3d_Presentation)& thePrsMgr); + + Standard_EXPORT void ComputeEdgeVertexConcentric (const Handle(Prs3d_Presentation)& thePrsMgr); + + Standard_EXPORT void ComputeTwoVerticesConcentric (const Handle(Prs3d_Presentation)& thePrsMgr); + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/PrsDim/PrsDim_DiameterDimension.cxx b/src/PrsDim/PrsDim_DiameterDimension.cxx index c86a4474ec..0c4ddf4c69 100644 --- a/src/PrsDim/PrsDim_DiameterDimension.cxx +++ b/src/PrsDim/PrsDim_DiameterDimension.cxx @@ -277,8 +277,8 @@ Standard_Real PrsDim_DiameterDimension::ComputeValue() const //function : Compute //purpose : //======================================================================= -void PrsDim_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, - const Handle(Prs3d_Presentation)& thePresentation, +void PrsDim_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { mySelectionGeom.Clear (theMode); diff --git a/src/PrsDim/PrsDim_DiameterDimension.hxx b/src/PrsDim/PrsDim_DiameterDimension.hxx index 7fb2e1beb7..51b8710310 100644 --- a/src/PrsDim/PrsDim_DiameterDimension.hxx +++ b/src/PrsDim/PrsDim_DiameterDimension.hxx @@ -137,9 +137,9 @@ protected: Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE; - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0) Standard_OVERRIDE; + const Standard_Integer theMode) Standard_OVERRIDE; Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, const Handle(SelectMgr_EntityOwner)& theEntityOwner) Standard_OVERRIDE; diff --git a/src/PrsDim/PrsDim_Dimension.cxx b/src/PrsDim/PrsDim_Dimension.cxx index dbfaa98211..eea797ce7f 100644 --- a/src/PrsDim/PrsDim_Dimension.cxx +++ b/src/PrsDim/PrsDim_Dimension.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/PrsDim/PrsDim_DimensionOwner.cxx b/src/PrsDim/PrsDim_DimensionOwner.cxx index 1a3f83103c..588e642706 100644 --- a/src/PrsDim/PrsDim_DimensionOwner.cxx +++ b/src/PrsDim/PrsDim_DimensionOwner.cxx @@ -89,7 +89,7 @@ void PrsDim_DimensionOwner::Unhilight (const Handle(PrsMgr_PresentationManager)& //function : HilightWithColor //purpose : //======================================================================= -void PrsDim_DimensionOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, +void PrsDim_DimensionOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, const Standard_Integer /*theMode*/) { diff --git a/src/PrsDim/PrsDim_DimensionOwner.hxx b/src/PrsDim/PrsDim_DimensionOwner.hxx index 5ce4a42cea..7dd1a914a0 100644 --- a/src/PrsDim/PrsDim_DimensionOwner.hxx +++ b/src/PrsDim/PrsDim_DimensionOwner.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -54,9 +54,9 @@ public: PrsDim_DimensionSelectionMode SelectionMode() const { return mySelectionMode; } - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, const Handle(Prs3d_Drawer)& theStyle, - const Standard_Integer theMode = 0) Standard_OVERRIDE; + const Standard_Integer theMode) Standard_OVERRIDE; //! Returns true if an object with the selection mode //! aMode is highlighted in the presentation manager aPM. diff --git a/src/PrsDim/PrsDim_EqualDistanceRelation.cxx b/src/PrsDim/PrsDim_EqualDistanceRelation.cxx index b726874a2b..45ab79ac48 100644 --- a/src/PrsDim/PrsDim_EqualDistanceRelation.cxx +++ b/src/PrsDim/PrsDim_EqualDistanceRelation.cxx @@ -72,12 +72,11 @@ PrsDim_EqualDistanceRelation::PrsDim_EqualDistanceRelation( const TopoDS_Shape& //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= - -void PrsDim_EqualDistanceRelation::Compute( const Handle( PrsMgr_PresentationManager3d )&, - const Handle( Prs3d_Presentation )& aPresentation, - const Standard_Integer ) +void PrsDim_EqualDistanceRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { gp_Pnt Position12 = myPosition, Position34 = myPosition; diff --git a/src/PrsDim/PrsDim_EqualDistanceRelation.hxx b/src/PrsDim/PrsDim_EqualDistanceRelation.hxx index 8c07112c17..e638b3473b 100644 --- a/src/PrsDim/PrsDim_EqualDistanceRelation.hxx +++ b/src/PrsDim/PrsDim_EqualDistanceRelation.hxx @@ -75,9 +75,12 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; private: diff --git a/src/PrsDim/PrsDim_EqualRadiusRelation.cxx b/src/PrsDim/PrsDim_EqualRadiusRelation.cxx index 28578317a3..ef6cf4b30c 100644 --- a/src/PrsDim/PrsDim_EqualRadiusRelation.cxx +++ b/src/PrsDim/PrsDim_EqualRadiusRelation.cxx @@ -58,10 +58,9 @@ PrsDim_EqualRadiusRelation::PrsDim_EqualRadiusRelation( const TopoDS_Edge& aFirs //function : Compute //purpose : //======================================================================= - -void PrsDim_EqualRadiusRelation::Compute( const Handle( PrsMgr_PresentationManager3d )&, - const Handle( Prs3d_Presentation )& aPresentation, - const Standard_Integer ) +void PrsDim_EqualRadiusRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { BRepAdaptor_Curve FirstCurve( TopoDS::Edge( myFShape ) ), SecondCurve( TopoDS::Edge( mySShape ) ); diff --git a/src/PrsDim/PrsDim_EqualRadiusRelation.hxx b/src/PrsDim/PrsDim_EqualRadiusRelation.hxx index b2f8e349bd..a45fb25bdb 100644 --- a/src/PrsDim/PrsDim_EqualRadiusRelation.hxx +++ b/src/PrsDim/PrsDim_EqualRadiusRelation.hxx @@ -35,10 +35,13 @@ public: private: - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeRadiusPosition(); private: diff --git a/src/PrsDim/PrsDim_FixRelation.cxx b/src/PrsDim/PrsDim_FixRelation.cxx index cf31fd563d..0ebf8e3d21 100644 --- a/src/PrsDim/PrsDim_FixRelation.cxx +++ b/src/PrsDim/PrsDim_FixRelation.cxx @@ -139,12 +139,11 @@ PrsDim_FixRelation::PrsDim_FixRelation( //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= - -void PrsDim_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void PrsDim_FixRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { // Calculate position of the symbol and // point of attach of the segment on the shape diff --git a/src/PrsDim/PrsDim_FixRelation.hxx b/src/PrsDim/PrsDim_FixRelation.hxx index fbea2fd471..dcb7b583c1 100644 --- a/src/PrsDim/PrsDim_FixRelation.hxx +++ b/src/PrsDim/PrsDim_FixRelation.hxx @@ -68,13 +68,15 @@ public: virtual Standard_Boolean IsMovable() const Standard_OVERRIDE { return Standard_True; } private: - - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - - //! computes the presentation for if it's a - //! vertex. + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + + //! computes the presentation for if it's a vertex. Standard_EXPORT void ComputeVertex (const TopoDS_Vertex& FixVertex, gp_Pnt& curpos); Standard_EXPORT gp_Pnt ComputePosition (const Handle(Geom_Curve)& curv1, const Handle(Geom_Curve)& curv2, const gp_Pnt& firstp1, const gp_Pnt& lastp1, const gp_Pnt& firstp2, const gp_Pnt& lastp2) const; diff --git a/src/PrsDim/PrsDim_IdenticRelation.cxx b/src/PrsDim/PrsDim_IdenticRelation.cxx index 127c65a81c..5dd9851be3 100644 --- a/src/PrsDim/PrsDim_IdenticRelation.cxx +++ b/src/PrsDim/PrsDim_IdenticRelation.cxx @@ -300,11 +300,11 @@ PrsDim_IdenticRelation::PrsDim_IdenticRelation(const TopoDS_Shape& FirstShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_IdenticRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aprs, - const Standard_Integer) +void PrsDim_IdenticRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aprs, + const Standard_Integer ) { switch ( myFShape.ShapeType() ) { diff --git a/src/PrsDim/PrsDim_IdenticRelation.hxx b/src/PrsDim/PrsDim_IdenticRelation.hxx index 2cc184f45d..1ae3167a15 100644 --- a/src/PrsDim/PrsDim_IdenticRelation.hxx +++ b/src/PrsDim/PrsDim_IdenticRelation.hxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -62,19 +62,21 @@ public: private: - - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeOneEdgeOVertexPresentation (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeTwoEdgesPresentation (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeTwoLinesPresentation (const Handle(Prs3d_Presentation)& aPresentation, const Handle(Geom_Line)& aLin, gp_Pnt& Pnt1On1, gp_Pnt& Pnt2On1, gp_Pnt& Pnt1On2, gp_Pnt& Pnt2On2, const Standard_Boolean isInf1, const Standard_Boolean isInf2); - + Standard_EXPORT void ComputeTwoCirclesPresentation (const Handle(Prs3d_Presentation)& aPresentation, const Handle(Geom_Circle)& aCircle, const gp_Pnt& Pnt1On1, const gp_Pnt& Pnt2On1, const gp_Pnt& Pnt1On2, const gp_Pnt& Pnt2On2); - + //! Computes the presentation of the identic constraint //! between 2 arcs in the case of automatic presentation Standard_EXPORT void ComputeAutoArcPresentation (const Handle(Geom_Circle)& aCircle, const gp_Pnt& firstp, const gp_Pnt& lastp, const Standard_Boolean isstatic = Standard_False); diff --git a/src/PrsDim/PrsDim_LengthDimension.cxx b/src/PrsDim/PrsDim_LengthDimension.cxx index 60f536adb6..4952ca2ca0 100644 --- a/src/PrsDim/PrsDim_LengthDimension.cxx +++ b/src/PrsDim/PrsDim_LengthDimension.cxx @@ -278,7 +278,7 @@ Standard_Real PrsDim_LengthDimension::ComputeValue() const //function : Compute //purpose : //======================================================================= -void PrsDim_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, +void PrsDim_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { diff --git a/src/PrsDim/PrsDim_LengthDimension.hxx b/src/PrsDim/PrsDim_LengthDimension.hxx index e2d989ca5c..c5000ad561 100644 --- a/src/PrsDim/PrsDim_LengthDimension.hxx +++ b/src/PrsDim/PrsDim_LengthDimension.hxx @@ -176,7 +176,7 @@ protected: //! @return dimension value Standard_EXPORT Standard_Real ComputeValue() const Standard_OVERRIDE; - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode = 0) Standard_OVERRIDE; diff --git a/src/PrsDim/PrsDim_MaxRadiusDimension.cxx b/src/PrsDim/PrsDim_MaxRadiusDimension.cxx index 271304c896..303850cd09 100644 --- a/src/PrsDim/PrsDim_MaxRadiusDimension.cxx +++ b/src/PrsDim/PrsDim_MaxRadiusDimension.cxx @@ -94,12 +94,11 @@ PrsDim_MaxRadiusDimension::PrsDim_MaxRadiusDimension(const TopoDS_Shape& aShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= - -void PrsDim_MaxRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer /*aMode*/) +void PrsDim_MaxRadiusDimension::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { // if( myAutomaticPosition ) {//ota : recompute in any case diff --git a/src/PrsDim/PrsDim_MaxRadiusDimension.hxx b/src/PrsDim/PrsDim_MaxRadiusDimension.hxx index 73bf38cba0..f919648950 100644 --- a/src/PrsDim/PrsDim_MaxRadiusDimension.hxx +++ b/src/PrsDim/PrsDim_MaxRadiusDimension.hxx @@ -40,12 +40,15 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeEllipse (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeArcOfEllipse (const Handle(Prs3d_Presentation)& aPresentation); private: diff --git a/src/PrsDim/PrsDim_MidPointRelation.cxx b/src/PrsDim/PrsDim_MidPointRelation.cxx index b2eb17892b..8975ed753a 100644 --- a/src/PrsDim/PrsDim_MidPointRelation.cxx +++ b/src/PrsDim/PrsDim_MidPointRelation.cxx @@ -71,11 +71,11 @@ PrsDim_MidPointRelation::PrsDim_MidPointRelation(const TopoDS_Shape& aMidPointTo //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_MidPointRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aprs, - const Standard_Integer) +void PrsDim_MidPointRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aprs, + const Standard_Integer ) { if (myTool.ShapeType() == TopAbs_VERTEX) { diff --git a/src/PrsDim/PrsDim_MidPointRelation.hxx b/src/PrsDim/PrsDim_MidPointRelation.hxx index a34a441675..cc3ed5b027 100644 --- a/src/PrsDim/PrsDim_MidPointRelation.hxx +++ b/src/PrsDim/PrsDim_MidPointRelation.hxx @@ -42,22 +42,25 @@ public: private: - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeFaceFromPnt (const Handle(Prs3d_Presentation)& aprs, const Standard_Boolean first); - + Standard_EXPORT void ComputeEdgeFromPnt (const Handle(Prs3d_Presentation)& aprs, const Standard_Boolean first); - + Standard_EXPORT void ComputeVertexFromPnt (const Handle(Prs3d_Presentation)& aprs, const Standard_Boolean first); - + Standard_EXPORT void ComputePointsOnLine (const gp_Lin& aLin, const Standard_Boolean first); - + Standard_EXPORT void ComputePointsOnLine (const gp_Pnt& pnt1, const gp_Pnt& pnt2, const Standard_Boolean first); - + Standard_EXPORT void ComputePointsOnCirc (const gp_Circ& aCirc, const gp_Pnt& pnt1, const gp_Pnt& pnt2, const Standard_Boolean first); - + //! ComputePointsOn... methods set myFAttach, myFirstPnt and myLastPnt //! from the following initial data: curve, end points, myMidPoint. //! End points (pnt1 & pnt2) and curve define the trimmed curve. diff --git a/src/PrsDim/PrsDim_MinRadiusDimension.cxx b/src/PrsDim/PrsDim_MinRadiusDimension.cxx index 4281d20015..9c8df5892a 100644 --- a/src/PrsDim/PrsDim_MinRadiusDimension.cxx +++ b/src/PrsDim/PrsDim_MinRadiusDimension.cxx @@ -94,12 +94,11 @@ PrsDim_MinRadiusDimension::PrsDim_MinRadiusDimension(const TopoDS_Shape& aShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= - -void PrsDim_MinRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer /*aMode*/) +void PrsDim_MinRadiusDimension::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { // if( myAutomaticPosition ) //{ //ota : recompute ellipse always diff --git a/src/PrsDim/PrsDim_MinRadiusDimension.hxx b/src/PrsDim/PrsDim_MinRadiusDimension.hxx index 89a14185fe..691de035e2 100644 --- a/src/PrsDim/PrsDim_MinRadiusDimension.hxx +++ b/src/PrsDim/PrsDim_MinRadiusDimension.hxx @@ -39,13 +39,16 @@ public: Standard_EXPORT PrsDim_MinRadiusDimension(const TopoDS_Shape& aShape, const Standard_Real aVal, const TCollection_ExtendedString& aText, const gp_Pnt& aPosition, const DsgPrs_ArrowSide aSymbolPrs, const Standard_Real anArrowSize = 0.0); private: - - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeEllipse (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeArcOfEllipse (const Handle(Prs3d_Presentation)& aPresentation); private: diff --git a/src/PrsDim/PrsDim_OffsetDimension.cxx b/src/PrsDim/PrsDim_OffsetDimension.cxx index 9dfed5f9e0..5a05524ac1 100644 --- a/src/PrsDim/PrsDim_OffsetDimension.cxx +++ b/src/PrsDim/PrsDim_OffsetDimension.cxx @@ -81,11 +81,11 @@ mySAttach(0.,0.,0.) //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_OffsetDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aprs, - const Standard_Integer) +void PrsDim_OffsetDimension::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aprs, + const Standard_Integer ) { gp_Trsf aInvertTrsf = myRelativePos; //myArrowSize = fabs (myVal/5.); diff --git a/src/PrsDim/PrsDim_OffsetDimension.hxx b/src/PrsDim/PrsDim_OffsetDimension.hxx index 784f1da699..94196bc971 100644 --- a/src/PrsDim/PrsDim_OffsetDimension.hxx +++ b/src/PrsDim/PrsDim_OffsetDimension.hxx @@ -49,14 +49,17 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeTwoFacesOffset (const Handle(Prs3d_Presentation)& aPresentation, const gp_Trsf& aTrsf); - + Standard_EXPORT void ComputeTwoAxesOffset (const Handle(Prs3d_Presentation)& aPresentation, const gp_Trsf& aTrsf); - + Standard_EXPORT void ComputeAxeFaceOffset (const Handle(Prs3d_Presentation)& aPresentation, const gp_Trsf& aTrsf); private: diff --git a/src/PrsDim/PrsDim_ParallelRelation.cxx b/src/PrsDim/PrsDim_ParallelRelation.cxx index bf8ebf42f5..bee2dbba84 100644 --- a/src/PrsDim/PrsDim_ParallelRelation.cxx +++ b/src/PrsDim/PrsDim_ParallelRelation.cxx @@ -88,11 +88,11 @@ PrsDim_ParallelRelation::PrsDim_ParallelRelation(const TopoDS_Shape& aFShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_ParallelRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void PrsDim_ParallelRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { switch (myFShape.ShapeType()) { diff --git a/src/PrsDim/PrsDim_ParallelRelation.hxx b/src/PrsDim/PrsDim_ParallelRelation.hxx index a85f0e2f76..9748e4a407 100644 --- a/src/PrsDim/PrsDim_ParallelRelation.hxx +++ b/src/PrsDim/PrsDim_ParallelRelation.hxx @@ -48,12 +48,15 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeTwoFacesParallel (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeTwoEdgesParallel (const Handle(Prs3d_Presentation)& aPresentation); private: diff --git a/src/PrsDim/PrsDim_PerpendicularRelation.cxx b/src/PrsDim/PrsDim_PerpendicularRelation.cxx index 4ddea4ecd2..d9b889c2b2 100644 --- a/src/PrsDim/PrsDim_PerpendicularRelation.cxx +++ b/src/PrsDim/PrsDim_PerpendicularRelation.cxx @@ -77,11 +77,11 @@ PrsDim_PerpendicularRelation::PrsDim_PerpendicularRelation(const TopoDS_Shape& a //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_PerpendicularRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void PrsDim_PerpendicularRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { if (myFShape.ShapeType() == mySShape.ShapeType()) { switch (myFShape.ShapeType()) { diff --git a/src/PrsDim/PrsDim_PerpendicularRelation.hxx b/src/PrsDim/PrsDim_PerpendicularRelation.hxx index 7409038b0f..0fd0e4289a 100644 --- a/src/PrsDim/PrsDim_PerpendicularRelation.hxx +++ b/src/PrsDim/PrsDim_PerpendicularRelation.hxx @@ -46,12 +46,15 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - Standard_EXPORT void ComputeTwoFacesPerpendicular (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeTwoEdgesPerpendicular (const Handle(Prs3d_Presentation)& aPresentation); private: diff --git a/src/PrsDim/PrsDim_RadiusDimension.cxx b/src/PrsDim/PrsDim_RadiusDimension.cxx index 57a5f51d39..becd9f324a 100644 --- a/src/PrsDim/PrsDim_RadiusDimension.cxx +++ b/src/PrsDim/PrsDim_RadiusDimension.cxx @@ -203,14 +203,13 @@ Standard_Real PrsDim_RadiusDimension::ComputeValue() const //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, +void PrsDim_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { mySelectionGeom.Clear (theMode); - if (!IsValid()) { return; diff --git a/src/PrsDim/PrsDim_RadiusDimension.hxx b/src/PrsDim/PrsDim_RadiusDimension.hxx index 4250190a2c..9eab78168f 100644 --- a/src/PrsDim/PrsDim_RadiusDimension.hxx +++ b/src/PrsDim/PrsDim_RadiusDimension.hxx @@ -127,9 +127,9 @@ protected: Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE; - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; protected: diff --git a/src/PrsDim/PrsDim_SymmetricRelation.cxx b/src/PrsDim/PrsDim_SymmetricRelation.cxx index e0e882cf48..ae0c8fee49 100644 --- a/src/PrsDim/PrsDim_SymmetricRelation.cxx +++ b/src/PrsDim/PrsDim_SymmetricRelation.cxx @@ -67,11 +67,11 @@ PrsDim_SymmetricRelation::PrsDim_SymmetricRelation(const TopoDS_Shape& aSymmTool //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_SymmetricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aprs, - const Standard_Integer) +void PrsDim_SymmetricRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aprs, + const Standard_Integer ) { switch (myFShape.ShapeType()) { case TopAbs_FACE : diff --git a/src/PrsDim/PrsDim_SymmetricRelation.hxx b/src/PrsDim/PrsDim_SymmetricRelation.hxx index 639d7ad456..679fcb5bbb 100644 --- a/src/PrsDim/PrsDim_SymmetricRelation.hxx +++ b/src/PrsDim/PrsDim_SymmetricRelation.hxx @@ -57,14 +57,17 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeTwoFacesSymmetric (const Handle(Prs3d_Presentation)& aprs); - + Standard_EXPORT void ComputeTwoEdgesSymmetric (const Handle(Prs3d_Presentation)& aprs); - + Standard_EXPORT void ComputeTwoVerticesSymmetric (const Handle(Prs3d_Presentation)& aprs); private: diff --git a/src/PrsDim/PrsDim_TangentRelation.cxx b/src/PrsDim/PrsDim_TangentRelation.cxx index 149b3c3a96..12bbcaa9ce 100644 --- a/src/PrsDim/PrsDim_TangentRelation.cxx +++ b/src/PrsDim/PrsDim_TangentRelation.cxx @@ -69,11 +69,11 @@ PrsDim_TangentRelation::PrsDim_TangentRelation(const TopoDS_Shape& aFShape, //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= -void PrsDim_TangentRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer) +void PrsDim_TangentRelation::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { switch (myFShape.ShapeType()) { diff --git a/src/PrsDim/PrsDim_TangentRelation.hxx b/src/PrsDim/PrsDim_TangentRelation.hxx index 501366ff3b..b4eb92c4b2 100644 --- a/src/PrsDim/PrsDim_TangentRelation.hxx +++ b/src/PrsDim/PrsDim_TangentRelation.hxx @@ -55,12 +55,15 @@ public: private: - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; - - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT void ComputeTwoFacesTangent (const Handle(Prs3d_Presentation)& aPresentation); - + Standard_EXPORT void ComputeTwoEdgesTangent (const Handle(Prs3d_Presentation)& aPresentation); private: diff --git a/src/PrsMgr/PrsMgr_PresentableObject.hxx b/src/PrsMgr/PrsMgr_PresentableObject.hxx index 75bb6977ff..debcd3e3f7 100644 --- a/src/PrsMgr/PrsMgr_PresentableObject.hxx +++ b/src/PrsMgr/PrsMgr_PresentableObject.hxx @@ -33,6 +33,7 @@ #include class PrsMgr_PresentationManager; +Standard_DEPRECATED("Deprecated alias to PrsMgr_PresentationManager") typedef PrsMgr_PresentationManager PrsMgr_PresentationManager3d; //! A framework to supply the Graphic3d structure of the object to be presented. diff --git a/src/PrsMgr/PrsMgr_Presentation.cxx b/src/PrsMgr/PrsMgr_Presentation.cxx index c53573d46e..6ca7cd5dcb 100644 --- a/src/PrsMgr/PrsMgr_Presentation.cxx +++ b/src/PrsMgr/PrsMgr_Presentation.cxx @@ -45,7 +45,7 @@ namespace //function : PrsMgr_Presentation //purpose : //======================================================================= -PrsMgr_Presentation::PrsMgr_Presentation (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +PrsMgr_Presentation::PrsMgr_Presentation (const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(PrsMgr_PresentableObject)& thePrsObject, const Standard_Integer theMode) : Graphic3d_Structure (thePrsMgr->StructureManager()), diff --git a/src/PrsMgr/PrsMgr_PresentationManager3d.hxx b/src/PrsMgr/PrsMgr_PresentationManager3d.hxx index 72403f7d93..a79e0ad373 100644 --- a/src/PrsMgr/PrsMgr_PresentationManager3d.hxx +++ b/src/PrsMgr/PrsMgr_PresentationManager3d.hxx @@ -19,7 +19,9 @@ #include +Standard_DEPRECATED("Deprecated alias to PrsMgr_PresentationManager") typedef PrsMgr_PresentationManager PrsMgr_PresentationManager3d; +Standard_DEPRECATED("Deprecated alias to PrsMgr_PresentationManager") typedef Handle_PrsMgr_PresentationManager Handle_PrsMgr_PresentationManager3d; #endif // _PrsMgr_PresentationManager3d_HeaderFile diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 422433f62a..2d4e27858c 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -5025,9 +5025,9 @@ public: DEFINE_STANDARD_RTTI_INLINE (OCC27700_Text, AIS_InteractiveObject) - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, + virtual void Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer /*theMode*/) Standard_OVERRIDE + const Standard_Integer ) Standard_OVERRIDE { Handle(Graphic3d_ArrayOfTriangles) aFrame = new Graphic3d_ArrayOfTriangles (6, 6); aFrame->AddVertex (gp_Pnt (-1, 0, 0)); diff --git a/src/QABugs/QABugs_PresentableObject.cxx b/src/QABugs/QABugs_PresentableObject.cxx index 87ee177f5d..4edd72d08e 100644 --- a/src/QABugs/QABugs_PresentableObject.cxx +++ b/src/QABugs/QABugs_PresentableObject.cxx @@ -34,7 +34,7 @@ QABugs_PresentableObject::QABugs_PresentableObject(const PrsMgr_TypeOfPresentati { } -void QABugs_PresentableObject::Compute(const Handle(PrsMgr_PresentationManager3d)& , +void QABugs_PresentableObject::Compute(const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { diff --git a/src/QABugs/QABugs_PresentableObject.hxx b/src/QABugs/QABugs_PresentableObject.hxx index 002a131cc6..00f282bee5 100644 --- a/src/QABugs/QABugs_PresentableObject.hxx +++ b/src/QABugs/QABugs_PresentableObject.hxx @@ -29,9 +29,12 @@ public: protected: - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE; - - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; }; diff --git a/src/StdSelect/StdSelect_BRepOwner.cxx b/src/StdSelect/StdSelect_BRepOwner.cxx index f86641e8ef..7498a784fa 100644 --- a/src/StdSelect/StdSelect_BRepOwner.cxx +++ b/src/StdSelect/StdSelect_BRepOwner.cxx @@ -86,9 +86,9 @@ IsHilighted(const Handle(PrsMgr_PresentationManager)& PM, //function : HilightWithColor //purpose : //======================================================================= -void StdSelect_BRepOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, - const Handle(Prs3d_Drawer)& theStyle, - const Standard_Integer theMode) +void StdSelect_BRepOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, + const Handle(Prs3d_Drawer)& theStyle, + const Standard_Integer theMode) { if (!HasSelectable()) { @@ -174,7 +174,7 @@ void StdSelect_BRepOwner::SetLocation(const TopLoc_Location& aLoc) //purpose : //======================================================================= void StdSelect_BRepOwner::UpdateHighlightTrsf (const Handle(V3d_Viewer)& theViewer, - const Handle(PrsMgr_PresentationManager3d)& theManager, + const Handle(PrsMgr_PresentationManager)& theManager, const Standard_Integer theDispMode) { if (myPrsSh.IsNull() && Selectable().IsNull()) diff --git a/src/StdSelect/StdSelect_BRepOwner.hxx b/src/StdSelect/StdSelect_BRepOwner.hxx index 3df108af0d..0d8492d9f7 100644 --- a/src/StdSelect/StdSelect_BRepOwner.hxx +++ b/src/StdSelect/StdSelect_BRepOwner.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include class StdSelect_Shape; @@ -98,9 +98,9 @@ public: //! aMode is highlighted in the presentation manager aPM. Standard_EXPORT virtual Standard_Boolean IsHilighted (const Handle(PrsMgr_PresentationManager)& aPM, const Standard_Integer aMode = 0) const Standard_OVERRIDE; - Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM, - const Handle(Prs3d_Drawer)& theStyle, - const Standard_Integer theMode = 0) Standard_OVERRIDE; + Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM, + const Handle(Prs3d_Drawer)& theStyle, + const Standard_Integer theMode) Standard_OVERRIDE; //! Removes highlighting from the type of shape //! identified the selection mode aMode in the presentation manager aPM. @@ -114,7 +114,7 @@ public: //! Implements immediate application of location transformation of parent object to dynamic highlight structure Standard_EXPORT virtual void UpdateHighlightTrsf (const Handle(V3d_Viewer)& theViewer, - const Handle(PrsMgr_PresentationManager3d)& theManager, + const Handle(PrsMgr_PresentationManager)& theManager, const Standard_Integer theDispMode) Standard_OVERRIDE; //! Dumps the content of me into the stream diff --git a/src/StdSelect/StdSelect_Shape.cxx b/src/StdSelect/StdSelect_Shape.cxx index a1d7710137..09b3d87382 100644 --- a/src/StdSelect/StdSelect_Shape.cxx +++ b/src/StdSelect/StdSelect_Shape.cxx @@ -36,24 +36,31 @@ StdSelect_Shape::StdSelect_Shape (const TopoDS_Shape& theShape, } } -void StdSelect_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*PM*/, - const Handle(Prs3d_Presentation)& P, - const Standard_Integer aMode) +void StdSelect_Shape::Compute(const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { - if(mysh.IsNull()) + if (mysh.IsNull()) { return; } - Standard_Boolean CanShade = (mysh.ShapeType()<5 || mysh.ShapeType()==8); - if(aMode==1){ - if(CanShade) - StdPrs_ShadedShape::Add (P, mysh, myDrawer); + Standard_Boolean canShade = (mysh.ShapeType() < 5 || mysh.ShapeType() == 8); + if (theMode == 1) + { + if (canShade) + { + StdPrs_ShadedShape::Add (thePrs, mysh, myDrawer); + } else - StdPrs_WFShape::Add (P, mysh, myDrawer); + { + StdPrs_WFShape::Add (thePrs, mysh, myDrawer); + } + } + else if (theMode == 0) + { + StdPrs_WFShape::Add (thePrs, mysh, myDrawer); } - else if (aMode==0) - StdPrs_WFShape::Add (P, mysh, myDrawer); } void StdSelect_Shape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const diff --git a/src/StdSelect/StdSelect_Shape.hxx b/src/StdSelect/StdSelect_Shape.hxx index 850f6ade87..d14fc358b5 100644 --- a/src/StdSelect/StdSelect_Shape.hxx +++ b/src/StdSelect/StdSelect_Shape.hxx @@ -30,8 +30,10 @@ class StdSelect_Shape : public PrsMgr_PresentableObject public: Standard_EXPORT StdSelect_Shape(const TopoDS_Shape& theShape, const Handle(Prs3d_Drawer)& theDrawer = Handle(Prs3d_Drawer)()); - - Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE; + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; const TopoDS_Shape& Shape() const { return mysh; } diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx index 6cda5a5ad1..519016dc6b 100644 --- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx +++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx @@ -1946,26 +1946,27 @@ Handle(Geom_Circle) CreateCircle(gp_Pnt theCenter, Standard_Real theRadius) class FilledCircle : public AIS_InteractiveObject { public: - // CASCADE RTTI - DEFINE_STANDARD_RTTI_INLINE(FilledCircle,AIS_InteractiveObject); + // CASCADE RTTI + DEFINE_STANDARD_RTTI_INLINE(FilledCircle, AIS_InteractiveObject); - FilledCircle(gp_Pnt theCenter, Standard_Real theRadius); - FilledCircle(Handle(Geom_Circle) theCircle); + FilledCircle (gp_Pnt theCenter, Standard_Real theRadius); + FilledCircle (Handle(Geom_Circle) theCircle); private: - TopoDS_Face ComputeFace(); + TopoDS_Face ComputeFace(); - // Virtual methods implementation - void Compute ( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) Standard_OVERRIDE; + // Virtual methods implementation + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; - void ComputeSelection ( const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode) Standard_OVERRIDE; + virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; protected: - Handle(Geom_Circle) myCircle; - Standard_Boolean myFilledStatus; + + Handle(Geom_Circle) myCircle; + Standard_Boolean myFilledStatus; }; @@ -1999,18 +2000,18 @@ TopoDS_Face FilledCircle::ComputeFace() return aFace; } -void FilledCircle::Compute(const Handle(PrsMgr_PresentationManager3d) &/*thePresentationManager*/, - const Handle(Prs3d_Presentation) &thePresentation, - const Standard_Integer theMode) +void FilledCircle::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { - thePresentation->Clear(); + thePrs->Clear(); TopoDS_Face aFace = ComputeFace(); if (aFace.IsNull()) return; if (theMode != 0) return; - StdPrs_ShadedShape::Add(thePresentation, aFace, myDrawer); + StdPrs_ShadedShape::Add (thePrs, aFace, myDrawer); } void FilledCircle::ComputeSelection(const Handle(SelectMgr_Selection) &theSelection, @@ -3311,12 +3312,12 @@ public: private: - void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode) Standard_OVERRIDE; + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; - void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer /*theMode*/) Standard_OVERRIDE; + virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; bool CheckInputCommand (const TCollection_AsciiString theCommand, const Handle(TColStd_HArray1OfAsciiString)& theArgsArray, @@ -3338,7 +3339,7 @@ protected: }; -void MyPArrayObject::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, +void MyPArrayObject::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) { @@ -5483,12 +5484,12 @@ public: private: - void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer aMode) Standard_OVERRIDE; + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; - void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer /*theMode*/) Standard_OVERRIDE; + virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel, + const Standard_Integer theMode) Standard_OVERRIDE; protected: @@ -5498,9 +5499,9 @@ protected: }; -void ViewerTest_MarkersArrayObject::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/, - const Handle(Prs3d_Presentation)& aPresentation, - const Standard_Integer /*aMode*/) +void ViewerTest_MarkersArrayObject::Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& aPresentation, + const Standard_Integer ) { Handle(Graphic3d_ArrayOfPrimitives) anArray = new Graphic3d_ArrayOfPoints ((Standard_Integer )Pow (myPointsOnSide, 3), myPointsOnSide != 1); if (myPointsOnSide == 1) @@ -6600,10 +6601,10 @@ public: protected: - //! Comnpute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) Standard_OVERRIDE + //! Compute presentation. + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE { AIS_Shape::Compute (thePrsMgr, thePrs, theMode); diff --git a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx index 0399c11181..d8aff828be 100644 --- a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx +++ b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx @@ -53,28 +53,28 @@ extern Standard_Boolean VDisplayAISObject (const TCollection_AsciiString& theNam Standard_Boolean theReplaceIfExists = Standard_True); extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); -namespace { +namespace +{ //======================================================================= //function : VUserDraw //purpose : Checks availability and operation of UserDraw feature //======================================================================= - class VUserDrawObj : public AIS_InteractiveObject { public: - // CASCADE RTTI - DEFINE_STANDARD_RTTI_INLINE(VUserDrawObj,AIS_InteractiveObject); + // CASCADE RTTI + DEFINE_STANDARD_RTTI_INLINE(VUserDrawObj, AIS_InteractiveObject); - VUserDrawObj() - { - myCoords[0] = -10.; - myCoords[1] = -20.; - myCoords[2] = -30.; - myCoords[3] = 10.; - myCoords[4] = 20.; - myCoords[5] = 30.; - } + VUserDrawObj() + { + myCoords[0] = -10.; + myCoords[1] = -20.; + myCoords[2] = -30.; + myCoords[3] = 10.; + myCoords[4] = 20.; + myCoords[5] = 30.; + } public: class Element : public OpenGl_Element @@ -103,23 +103,23 @@ public: }; private: - // Virtual methods implementation - void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) Standard_OVERRIDE; + // Virtual methods implementation + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; - void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode) Standard_OVERRIDE; + virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, + const Standard_Integer theMode) Standard_OVERRIDE; - // Called by VUserDrawElement - void Render(const Handle(OpenGl_Workspace)& theWorkspace) const; + // Called by VUserDrawElement + void Render(const Handle(OpenGl_Workspace)& theWorkspace) const; private: - GLfloat myCoords[6]; - friend class Element; + GLfloat myCoords[6]; + friend class Element; }; -void VUserDrawObj::Compute(const Handle(PrsMgr_PresentationManager3d)& thePrsMgr, +void VUserDrawObj::Compute(const Handle(PrsMgr_PresentationManager)& thePrsMgr, const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer /*theMode*/) { diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 750f8569fd..de53e4e77d 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -5785,14 +5785,14 @@ public: Standard_Real theWidth = 0.5, Standard_Real theTransp = 1.0); - private: +private: - void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) Standard_OVERRIDE; + virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; - void ComputeSelection (const Handle(SelectMgr_Selection)& /*aSelection*/, - const Standard_Integer /*aMode*/) Standard_OVERRIDE + virtual void ComputeSelection (const Handle(SelectMgr_Selection)& , + const Standard_Integer ) Standard_OVERRIDE {} private: @@ -5815,9 +5815,9 @@ V3d_LineItem::V3d_LineItem(Standard_Real X1, Standard_Real Y1, } // render line -void V3d_LineItem::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, +void V3d_LineItem::Compute (const Handle(PrsMgr_PresentationManager)& , const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer /*theMode*/) + const Standard_Integer ) { thePresentation->Clear(); Quantity_Color aColor (Quantity_NOC_RED); @@ -7281,7 +7281,9 @@ public: virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0 || theMode == 1; } //! Compute presentation. - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& , const Handle(Prs3d_Presentation)& thePrs, const Standard_Integer theMode) Standard_OVERRIDE + virtual void Compute (const Handle(PrsMgr_PresentationManager)& , + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE { switch (theMode) { diff --git a/src/XCAFPrs/XCAFPrs_AISObject.cxx b/src/XCAFPrs/XCAFPrs_AISObject.cxx index f24d6644c4..2f182da0bb 100644 --- a/src/XCAFPrs/XCAFPrs_AISObject.cxx +++ b/src/XCAFPrs/XCAFPrs_AISObject.cxx @@ -200,9 +200,9 @@ void XCAFPrs_AISObject::DispatchStyles (const Standard_Boolean theToSyncStyles) //function : Compute //purpose : //======================================================================= -void XCAFPrs_AISObject::Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePrs, - const Standard_Integer theMode) +void XCAFPrs_AISObject::Compute (const Handle(PrsMgr_PresentationManager)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) { // update shape and sub-shapes styles only on first compute, or on first recompute if (myToSyncStyles) diff --git a/src/XCAFPrs/XCAFPrs_AISObject.hxx b/src/XCAFPrs/XCAFPrs_AISObject.hxx index 34d604ff58..c8494c39c5 100644 --- a/src/XCAFPrs/XCAFPrs_AISObject.hxx +++ b/src/XCAFPrs/XCAFPrs_AISObject.hxx @@ -53,14 +53,14 @@ public: protected: //! Redefined method to compute presentation. - Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) Standard_OVERRIDE; + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr, + const Handle(Prs3d_Presentation)& thePrs, + const Standard_Integer theMode) Standard_OVERRIDE; //! Fills out a default style object which is used when styles are //! not explicitly defined in the document. //! By default, the style uses white color for curves and surfaces. - Standard_EXPORT virtual void DefaultStyle (XCAFPrs_Style& theStyle) const; + Standard_EXPORT virtual void DefaultStyle (XCAFPrs_Style& theStyle) const; protected: