]> OCCT Git - occt.git/commitdiff
0032161: Coding Rules - deprecate obsolete alias PrsMgr_PresentationManager3d
authorkgv <kgv@opencascade.com>
Thu, 25 Feb 2021 07:58:17 +0000 (10:58 +0300)
committerbugmaster <bugmaster@opencascade.com>
Fri, 26 Feb 2021 07:56:31 +0000 (10:56 +0300)
161 files changed:
adm/upgrade.dat
dox/upgrade/upgrade.md
dox/user_guides/visualization/visualization.md
samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx
samples/OCCTOverview/code/AdaptorCurve2d_AIS.h
samples/OCCTOverview/code/AdaptorCurve_AIS.cxx
samples/OCCTOverview/code/AdaptorCurve_AIS.h
samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx
samples/OCCTOverview/code/AdaptorPnt2d_AIS.h
samples/OCCTOverview/code/AdaptorVec_AIS.cxx
samples/OCCTOverview/code/AdaptorVec_AIS.h
samples/OCCTOverview/code/Sample2D_Face.cxx
samples/OCCTOverview/code/Sample2D_Face.h
samples/OCCTOverview/code/Sample2D_Markers.cxx
samples/OCCTOverview/code/Sample2D_Markers.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h
samples/mfc/standard/01_Geometry/src/StdAfx.h
samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp
samples/mfc/standard/02_Modeling/src/ISession_Direction.h
samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp
samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h
samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp
samples/mfc/standard/07_Triangulation/src/ISession_Curve.h
samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp
samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Face.h
samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Markers.h
samples/mfc/standard/Common/StdAfx.h
samples/mfc/standard/Common/User_Cylinder.cxx
samples/mfc/standard/Common/User_Cylinder.hxx
src/AIS/AIS_Axis.cxx
src/AIS/AIS_Axis.hxx
src/AIS/AIS_CameraFrustum.cxx
src/AIS/AIS_CameraFrustum.hxx
src/AIS/AIS_Circle.cxx
src/AIS/AIS_Circle.hxx
src/AIS/AIS_ColorScale.cxx
src/AIS/AIS_ColorScale.hxx
src/AIS/AIS_ColoredShape.cxx
src/AIS/AIS_ColoredShape.hxx
src/AIS/AIS_ConnectedInteractive.cxx
src/AIS/AIS_ConnectedInteractive.hxx
src/AIS/AIS_InteractiveContext.cxx
src/AIS/AIS_InteractiveContext.hxx
src/AIS/AIS_LightSource.cxx
src/AIS/AIS_LightSource.hxx
src/AIS/AIS_Line.cxx
src/AIS/AIS_Line.hxx
src/AIS/AIS_Manipulator.cxx
src/AIS/AIS_Manipulator.hxx
src/AIS/AIS_ManipulatorOwner.cxx
src/AIS/AIS_ManipulatorOwner.hxx
src/AIS/AIS_MediaPlayer.cxx
src/AIS/AIS_MediaPlayer.hxx
src/AIS/AIS_MultipleConnectedInteractive.cxx
src/AIS/AIS_MultipleConnectedInteractive.hxx
src/AIS/AIS_Plane.cxx
src/AIS/AIS_Plane.hxx
src/AIS/AIS_PlaneTrihedron.cxx
src/AIS/AIS_PlaneTrihedron.hxx
src/AIS/AIS_Point.cxx
src/AIS/AIS_Point.hxx
src/AIS/AIS_PointCloud.cxx
src/AIS/AIS_PointCloud.hxx
src/AIS/AIS_RubberBand.cxx
src/AIS/AIS_RubberBand.hxx
src/AIS/AIS_Shape.cxx
src/AIS/AIS_Shape.hxx
src/AIS/AIS_TextLabel.cxx
src/AIS/AIS_TextLabel.hxx
src/AIS/AIS_TexturedShape.cxx
src/AIS/AIS_TexturedShape.hxx
src/AIS/AIS_Triangulation.cxx
src/AIS/AIS_Triangulation.hxx
src/AIS/AIS_Trihedron.cxx
src/AIS/AIS_Trihedron.hxx
src/AIS/AIS_TrihedronOwner.cxx
src/AIS/AIS_TrihedronOwner.hxx
src/AIS/AIS_ViewCube.cxx
src/AIS/AIS_ViewCube.hxx
src/AIS/AIS_XRTrackedDevice.cxx
src/AIS/AIS_XRTrackedDevice.hxx
src/IVtkOCC/IVtkOCC_SelectableObject.hxx
src/MeshVS/MeshVS_Mesh.cxx
src/MeshVS/MeshVS_Mesh.hxx
src/MeshVS/MeshVS_MeshEntityOwner.cxx
src/MeshVS/MeshVS_MeshEntityOwner.hxx
src/MeshVS/MeshVS_MeshOwner.cxx
src/MeshVS/MeshVS_MeshOwner.hxx
src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx
src/MeshVS/MeshVS_PrsBuilder.cxx
src/MeshVS/MeshVS_PrsBuilder.hxx
src/PrsDim/PrsDim_AngleDimension.cxx
src/PrsDim/PrsDim_AngleDimension.hxx
src/PrsDim/PrsDim_Chamf2dDimension.cxx
src/PrsDim/PrsDim_Chamf2dDimension.hxx
src/PrsDim/PrsDim_Chamf3dDimension.cxx
src/PrsDim/PrsDim_Chamf3dDimension.hxx
src/PrsDim/PrsDim_ConcentricRelation.cxx
src/PrsDim/PrsDim_ConcentricRelation.hxx
src/PrsDim/PrsDim_DiameterDimension.cxx
src/PrsDim/PrsDim_DiameterDimension.hxx
src/PrsDim/PrsDim_Dimension.cxx
src/PrsDim/PrsDim_DimensionOwner.cxx
src/PrsDim/PrsDim_DimensionOwner.hxx
src/PrsDim/PrsDim_EqualDistanceRelation.cxx
src/PrsDim/PrsDim_EqualDistanceRelation.hxx
src/PrsDim/PrsDim_EqualRadiusRelation.cxx
src/PrsDim/PrsDim_EqualRadiusRelation.hxx
src/PrsDim/PrsDim_FixRelation.cxx
src/PrsDim/PrsDim_FixRelation.hxx
src/PrsDim/PrsDim_IdenticRelation.cxx
src/PrsDim/PrsDim_IdenticRelation.hxx
src/PrsDim/PrsDim_LengthDimension.cxx
src/PrsDim/PrsDim_LengthDimension.hxx
src/PrsDim/PrsDim_MaxRadiusDimension.cxx
src/PrsDim/PrsDim_MaxRadiusDimension.hxx
src/PrsDim/PrsDim_MidPointRelation.cxx
src/PrsDim/PrsDim_MidPointRelation.hxx
src/PrsDim/PrsDim_MinRadiusDimension.cxx
src/PrsDim/PrsDim_MinRadiusDimension.hxx
src/PrsDim/PrsDim_OffsetDimension.cxx
src/PrsDim/PrsDim_OffsetDimension.hxx
src/PrsDim/PrsDim_ParallelRelation.cxx
src/PrsDim/PrsDim_ParallelRelation.hxx
src/PrsDim/PrsDim_PerpendicularRelation.cxx
src/PrsDim/PrsDim_PerpendicularRelation.hxx
src/PrsDim/PrsDim_RadiusDimension.cxx
src/PrsDim/PrsDim_RadiusDimension.hxx
src/PrsDim/PrsDim_SymmetricRelation.cxx
src/PrsDim/PrsDim_SymmetricRelation.hxx
src/PrsDim/PrsDim_TangentRelation.cxx
src/PrsDim/PrsDim_TangentRelation.hxx
src/PrsMgr/PrsMgr_PresentableObject.hxx
src/PrsMgr/PrsMgr_Presentation.cxx
src/PrsMgr/PrsMgr_PresentationManager3d.hxx
src/QABugs/QABugs_19.cxx
src/QABugs/QABugs_PresentableObject.cxx
src/QABugs/QABugs_PresentableObject.hxx
src/StdSelect/StdSelect_BRepOwner.cxx
src/StdSelect/StdSelect_BRepOwner.hxx
src/StdSelect/StdSelect_Shape.cxx
src/StdSelect/StdSelect_Shape.hxx
src/ViewerTest/ViewerTest_ObjectCommands.cxx
src/ViewerTest/ViewerTest_OpenGlCommands.cxx
src/ViewerTest/ViewerTest_ViewerCommands.cxx
src/XCAFPrs/XCAFPrs_AISObject.cxx
src/XCAFPrs/XCAFPrs_AISObject.hxx

index cc120fb3b406aeede9b01188e3056730e9b1ec49..0ddb46f487ae884ad40f2bbfb35a91746238d39f 100644 (file)
@@ -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
index 0425f2354a57bfcef4175f9c5ad055632ebd9395..266548a03d2843e69863fd4edb4bf88deebb0436 100644 (file)
@@ -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)
 {
index aef9335a3efb02acfddcb796a785c097e7d6a4a5..be6016258d00d2204aa7002d635291028199c294 100644 (file)
@@ -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)
 (
index b17d89cb09467c69e27dba00df3e008047953b46..0fa262ba39edca7722d896f905895660e5cf6b16 100644 (file)
@@ -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)
 {
index abb5723d55c34355fbac1184aee38d8bef0a5472..ad66bb4d13487c7c0e92e6c862251b74b5fec7d7 100644 (file)
@@ -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;
 
index 21a692fc5b2e53a7b13ba6d11d5cd5f8d9205c60..18ef438ba3000fe141ee207e5209465e17769c63 100644 (file)
@@ -26,7 +26,7 @@
 #include <StdPrs_PoleCurve.hxx>
 #include <StdPrs_Curve.hxx>
 
-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)
 {
index a01c99d7c733603b32e8584893f59753629f2321..f4f377c5b89bd0c2aef693a346c716c62b618298 100644 (file)
@@ -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;
 
index 80fdbf11d546564aba6e3778c50f2e9e36292ce0..5159a34545cc47064629db1914f39bb9344d6629 100644 (file)
@@ -24,7 +24,7 @@
 #include <Geom_CartesianPoint.hxx>
 #include <StdPrs_Point.hxx>
 
-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)
 {
index b34bee2b791847d3a1966a4057c2b274fb6b5f15..e37a2bd672bcb26bcf50fa6247b630ee3e8c5e36 100644 (file)
@@ -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;
 
index e344acda843eb8620d78c6ee5758c91cb43bcb3c..725e2a53ea8b985b8c700dc4290212b7c2826b75 100644 (file)
@@ -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)
 {
index 25e02d7c86cbd16859e867cfe2c725e65492db5a..e04711c11ba3fa0be8ffcaf4182907229abd8f50 100644 (file)
@@ -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;
 
index 2e09ce099093304d73ffc46f21022d4b40ea02e9..462ec01f9a1e9692ec7f11ab6489923bc544a36b 100644 (file)
@@ -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)
 {
index f88e9c200924ac9e364fb641ca418b0cb5f69768..45afc3d49f32d98aed71c1f4d0181737e9c4b74b 100644 (file)
@@ -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;
 
index 6b6095fecc727139ba74037ad37f75f1b30e0e8f..a564bdcca73f0a5046ca75298ac799d8ca615a04 100644 (file)
@@ -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)
 {
index 5e77c4333877168de68abe88356e831dba0db1d6..f29719ddbe8ac53d3edaacb43c6484af906430bc 100644 (file)
@@ -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;
 
index a6a65127702dcaec9a3eaf7a142180571fd150be..f93c03f9ea179a5e08b29086e5f392eb1d491354 100755 (executable)
@@ -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 )
 {
index b9aa649a310ac10784522e1cc43c3c73f1a34249..eccf083f87a56646e3e6884adf01e8e9b8511874 100755 (executable)
@@ -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
index 267690e05373cdf59d2303db77d34c35854681c3..b43c27bb0aee29bb9aef9304bb5de56794930204 100755 (executable)
@@ -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)
 {
index 8999d1d3bcd69e3d5f7fa29e619bd31c135ccfb3..9688d79c6cd97ee0cdcccea32570289f07131971 100755 (executable)
@@ -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:
index e281c9cab03e1df93fb7f6904de026b2539b063a..042576946b516b21f5174aa0e40ed7b50b60626f 100755 (executable)
@@ -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*/)
 {
index 68072bd0098d70d8e69371877cea0bbaf10817b0..594e2985d2809ee112663e1de4acf2059cd3c4c6 100755 (executable)
@@ -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) ;
index 1bb4c601657a3402a58bbca67d9c812919be51e9..5c119f932e4c52679a072c174eb29c632dba7f77 100755 (executable)
@@ -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*/)
 {
index 8a9fa8d8d6dbe0589b0a281aeb4e47dd506aedd6..e4124f0d011607fd238ac5c1db332085359bafba 100755 (executable)
@@ -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);
 
index a9147a180eeab664a9da34db342458edf915ade1..81868ae0b058d36ed3abd68bc27c76092ed7faf9 100755 (executable)
@@ -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)
 {
index 2d7a00c0fc4b26087a42ff3f6fa3bfe05e993d5f..bbfc9eb06822e27aa2f5bc12cd527e5cffc7027f 100755 (executable)
@@ -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:
index 0bd735f6585224fa1cdf1da2e025c31d81a784c1..c86a3c90b7d3feed13796b89c9ded1df7039232e 100755 (executable)
 #include <Prs3d_Text.hxx>
 #include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_IsoAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
index 8e1f8771fe5eeaa773d8339641412c2acecc156d..dea846d7c6d10830df405c0cdff9dd4a98b94d20 100755 (executable)
@@ -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*/)
 {
index 00e13efcaa34ed08c55bb0e1f70068bf1c82e486..a6fce68ae3963523cd8c7a2fa0f70bb893e3d0c7 100755 (executable)
@@ -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);
 
index db70409988587c3f5bcb5e3a717a07fcaf37f872..6d6fb6de7249b29e8b2fd3d77f73c27c9d6fe3dd 100755 (executable)
@@ -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*/)
 {
index 8641c0c1844c738efa93052bee340cc3bea6f165..c1c955fdf94a5840dbba93d89e3cf0eec7ea8796 100755 (executable)
@@ -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;
index db70409988587c3f5bcb5e3a717a07fcaf37f872..6d6fb6de7249b29e8b2fd3d77f73c27c9d6fe3dd 100755 (executable)
@@ -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*/)
 {
index 8641c0c1844c738efa93052bee340cc3bea6f165..c1c955fdf94a5840dbba93d89e3cf0eec7ea8796 100755 (executable)
@@ -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;
index db70409988587c3f5bcb5e3a717a07fcaf37f872..6d6fb6de7249b29e8b2fd3d77f73c27c9d6fe3dd 100755 (executable)
@@ -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*/)
 {
index 8641c0c1844c738efa93052bee340cc3bea6f165..c1c955fdf94a5840dbba93d89e3cf0eec7ea8796 100755 (executable)
@@ -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;
index c26d81e742641c7931edbfd683670fe5a24977e6..4c1a12426d27b84969e16e09f6431b1e193dde5e 100755 (executable)
@@ -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)
 {
index 47f9ecd3e88a0e9e7b9298341bb2d73aaea00de0..658c6bb12722bba73ebd5fe1c76fb4ca5f9ff596 100755 (executable)
@@ -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);
 
index 42d6c5e83810fb6f969b782c22b849906656006b..acbaf9c666e452048114d4c70627841a6f156e2a 100755 (executable)
@@ -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)
 {
index f1eab36e27a628ab57e496b2947b0e28aa783a3c..53cecc6f99e77efafbb88bf83abec1de76e8d741 100755 (executable)
@@ -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);
 
index d858dc7843b80dd449bbc1efbf0c2857ff2f210a..84855176938117996fae538760831689d593a438 100755 (executable)
@@ -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*/)
 {
index 0400b41dc4f484104e9fcf4bfe4c8efb740717fe..0aa3b20333f8dff1e7cc82bc86be8a2cc5b91801 100755 (executable)
@@ -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*/);
 
index 562c85e14712021e918b031b420735d2b7942935..7faa086a6a029fdb1d80411602d9d0dc487d3ef4 100755 (executable)
@@ -70,7 +70,7 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Prs3d_Text.hxx>
 
index 3aca59fec19f642d2f11d5627e29665699c1e056..f7ecf73ddac0013d10e33b354c91b30619c47f6e 100755 (executable)
@@ -11,7 +11,7 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_StructureManager.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
 #include <Poly_Connect.hxx>
 #include <TColgp_Array1OfPnt.hxx>
@@ -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 ) 
 {
index 1602d850d376b6994d25f40042f9ab8f3fe09f99..194ab1deac92e43141e92e102c0fc4f83050264d 100755 (executable)
@@ -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,
index 27e691cc06b6040b9b1567ddc39b21b3c291ae7b..21977f796a000dd01eb506292d2b04827ccee416 100644 (file)
@@ -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);
   }
-
 }
 
 //=======================================================================
index 5cd764fb1bafdff2b8239b8ed8f5b3d697487069..725464c39a902567511b1d34f9978d9d7451cbc0 100644 (file)
@@ -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:
index fffcbea1ed919c24f6b4f1dea834be6c83d053bb..48f643b7d17bde9b1180e73595bd2c9582ff590b 100644 (file)
@@ -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())
index ebad3afc6ce5f139da2042fe48cadfe4e9778d13..4e8dcaa4e2c70d9e1eb3bba46638890c02f66a69 100644 (file)
@@ -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,
index 78239a13b71ac2dbb8c872c84d349b7fa15cd675..08160855aa4f699c0ecf7cb2230f21de1bc271b2 100644 (file)
@@ -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); }
 }
 
 //=======================================================================
index 0d1772d098352625db48bfa352324b1ece96b5b4..fb6b7cabf816b2f0384ad0a13af7c82368dd162a 100644 (file)
@@ -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.
index 8d0fd4837eb8b9c8b8f51c0499daa59ac0509ca4..ece1e08764e8353fecc18f1a1459f414442ba3c9 100644 (file)
@@ -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)
 {
index f261759521c878e54fc65262a15fac0a1b4bf585..a24dd88b93470a262ee18521f00348dadd05b298 100644 (file)
@@ -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;
 
index 01b5cd779f0df501638b88bf0fb550969e7afd06..b3bfb64a9aee89c6dbde59900a246cb9abca55a8 100644 (file)
@@ -33,7 +33,7 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <StdSelect_BRepSelectionTool.hxx>
 #include <StdPrs_ShadedShape.hxx>
@@ -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())
   {
index d23560bee5e6705ad7e22704209e3fe7e9db901f..55a406931135c0fb0d3526bfe456cfd891f99168 100644 (file)
@@ -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,
index cf839411f3285f0095906c3fb62c9b8167d13259..bf38ac297345128e9a967e8e9ed8599e5610d028 100644 (file)
@@ -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())
   {
index 5bb2578287dff120e9f122e2f1c59b2088c9dee6..dc14e2dfd6eaae7bffde93137b6e7890d85ddcf2 100644 (file)
@@ -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,
index 3b6480b7ec3468a86475282d308799f9b1d0eb49..cd84b02972bf8d13a0c052e8deaccfb3f65cbc2a 100644 (file)
@@ -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),
index c9db13e16c237564aa5085003c4d96d8b33a8e7c..125fb0e1f4146f5f628e5c15baa7c779d4a1f897 100644 (file)
@@ -33,7 +33,7 @@
 #include <Graphic3d_Vec2.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_TypeOfHighlight.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <SelectMgr_AndOrFilter.hxx>
 #include <SelectMgr_IndexedMapOfOwner.hxx>
 #include <SelectMgr_ListOfFilter.hxx>
@@ -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;
index f5112fa8398c866896b2e7e00d24b94e8d9d1849..49c718a61261947758310d51315c49b96a5528a9 100644 (file)
@@ -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)
 {
index 27b0bda4c6b56a2c5ba87d1d87a23fbf0e82429f..5ff70250cc49dab496b9d53d44347ca33836394b 100644 (file)
@@ -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;
 
index 499ccecbf0927501f73adfeb4c58aef9fe23ed23..b3d92c5c33179dad1b37df067215a1e180f84630 100644 (file)
@@ -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); }
 }
 
 //=======================================================================
index 4f2e8e9b2a2d4bc8f17e6e3dc7e179b30422b5ba..5706c0ad8c7862be9d782b41ee848a7500008528 100644 (file)
@@ -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 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);
 
+  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);
 
index 056d13d31a513c73f3f2bda0ea167839f3a66e68..7ff3327b1a7f0bb5cee8ff0b56ba161d5491780e 100644 (file)
@@ -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)
 {
index 73ea0527db8cfe5a0ac4e44cca0e5aedc9a3056b..8e928cbbe91b78b25acb6414f60dee718cafc5ce 100644 (file)
@@ -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;
 
index d57dab3d52895aa8a24d1e9676420c49afe76bbe..389157486d9dadb53a455830acc09a8510d1aa7f 100644 (file)
@@ -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)
 {
index 74ebf5a6b9f474b321d40f97f0bf5ddbcc3659b0..769c355b4868842e469f9ffe1447e08cfee513a9 100644 (file)
@@ -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;
 
index beb48a3c56d5267b98373162b1b3fe58d4ccce42..ee7093a2fedbb6fee185143104d6719895549823 100644 (file)
@@ -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)
 {
index 7a39837133b8c242201351e9873ac850210cd8d9..d6d00f5a93473eb1ccc7c9dd1ebfdea808ea622f 100644 (file)
@@ -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;
 
index ad04fe839dd38c8e807cf92f343387b918aaee42..9531647b9c1bf3dc63f82d802b84684cb82a87da 100644 (file)
@@ -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())
index a9882338151f0412d7793705dee25f8f0dd93adf..ab11283d6bb4339a9f158a6a54506e2248116163 100644 (file)
@@ -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.
index 3f8f064f125d9f583237b807a3317aaf6846d678..a9a31cf54e98f0cbf4d8a5093adfcfaf68aabc77 100644 (file)
@@ -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;
     }
   }
index 29f8d154c1049b3d4e7e81e4120f9b4ddd2f7f42..ea6372e81ddf5f0369e818d50304ac5575ccf05c 100644 (file)
@@ -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:
index f2a479a34450e97094e3f05e66f856d2521ef844..d7e84265107f1c4d2500fe37fc1ac03f54fb072d 100644 (file)
@@ -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);
 }
 
 //=======================================================================
index 73f9af6fcf0ebee31376cb3c3735f570be8e47d5..7ae1f34e448c45c2e70f3c16b9e86565e06aa85f 100644 (file)
@@ -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:
 
index e9e8711b3045c41f83abbbd509007770ff453905..a772b8ce6a1e503279df5f4dcfaa1bb2f07c5fc2 100644 (file)
@@ -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);
+  }
 }
 
 //=======================================================================
index ed920b733bee3af03b98b3d111565caad0ba70a7..d370356e993e785a2ec1504417a0358f1316fa89 100644 (file)
@@ -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:
 
index 4590faa454017108609ee3853eebd4a1edd0c6a9..917bd7f109caedd34e29eab196d8225a7e881a7f 100644 (file)
@@ -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)
   {
index ab7ab322fc2f5173a2f3d46d5fb5cfe3fcd7ca98..cf69b13709588edbcdcc0775e28c346c7ac9770f 100644 (file)
@@ -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;
 
index 8e5360dd429031b5aad5afd2939a86ad1e23cf9f..a5ce2927f53a12b10ca30713cadd1c375b3bdf93 100644 (file)
@@ -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())
   {
index 7ef181f000870b2028b073aa35a28377521d841f..9372d757ae659c97d9d5d316b7313d729f102a19 100644 (file)
@@ -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.
index f4add42867618c6754d657d0527f909c35c04c37..385fbdd4c83c21428119427d1bbe2fd569766842 100644 (file)
@@ -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();
 }
 
 //=======================================================================
index 6be0e15b7036999fce2dc54b6a0a794a55ee4098..8d08eb43112a301820719dea18303c29db8a5e37 100644 (file)
@@ -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;
 
index 8344e85da0437d7d207cd86bfef9fa4a7d2b917d..f20758e852a11d657a8e4fdd63975f31cc1ca036 100644 (file)
@@ -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)
   {
index 90b1c5cc01754bfe572b21a1ba0828c2ca173f14..4b0da2b6da6d26db262a397b156f8668eaac0586 100644 (file)
@@ -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,
index 74136aea543e02c26eba05465505a4eadfd68a0e..e42990c8d2af06d349b4f65624bfed2c344bfae2 100644 (file)
@@ -30,7 +30,7 @@
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Prs3d_BndBox.hxx>
 #include <StdPrs_ShadedShape.hxx>
@@ -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())
   {
index f3aebfe197bad844f2203564043956c4a9bfe869..5c3ece94bbdc500cbbded1639091b7aa0d047366 100644 (file)
@@ -25,7 +25,7 @@
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Texture2Dmanual.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 
 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);
 
index ff4c7b12a2a61341f423bea49ee6808b9fbc23d4..054b71986af846510420a6aee5e98521811a8d1e 100644 (file)
@@ -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();
+    return;
+  }
 
-      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_Boolean hasVNormals = myTriangulation->HasNormals();
+  Standard_Boolean hasVColors  = HasVertexColors();
 
-      Standard_Integer i;
+  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 ambient = 0.2;
-      if (hasVNormals)
+  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)
       {
-        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());
-          }
-        }
+        anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient));
+        myTriangulation->Normal (aNodeIter, aNormal);
+        anArray->SetVertexNormal (aNodeIter, aNormal.x(), aNormal.y(), aNormal.z());
       }
-      else // !hasVNormals
+    }
+    else // !hasVColors
+    {
+      for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
       {
-        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));
-          }
-        }
+        anArray->AddVertex (myTriangulation->Node (aNodeIter));
+        myTriangulation->Normal (aNodeIter, aNormal);
+        anArray->SetVertexNormal(aNodeIter, aNormal.x(), aNormal.y(), aNormal.z());
       }
-
-      Standard_Integer indexTriangle[3] = {0,0,0};
-      for ( i = 1; i<= myTriangulation->NbTriangles(); i++ )
+    }
+  }
+  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)
       {
-        myTriangulation->Triangle (i).Get (indexTriangle[0], indexTriangle[1], indexTriangle[2]);
-        anArray->AddEdge(indexTriangle[0]);
-        anArray->AddEdge(indexTriangle[1]);
-        anArray->AddEdge(indexTriangle[2]);
+        anArray->AddVertex (myTriangulation->Node (aNodeIter));
       }
-      TheGroup->SetPrimitivesAspect(aspect);
-      TheGroup->AddPrimitiveArray(anArray);
-      break;
+    }
+  }
+
+  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);
 }
 
 //=======================================================================
index 9961a21582ef89f829f37f02ae06eb63dd01b963..cfe919d03c536a5c02eee7de93c8e71dba3bcfc2 100644 (file)
@@ -67,15 +67,15 @@ protected:
 
   Standard_EXPORT void updatePresentation();
 
+private:
 
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
-private:
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
+                                                 const Standard_Integer theMode) 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)& aSelection, const Standard_Integer aMode) 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.
index b93257d83d309d578de656ab89df6e9f4f0483cc..a5ea0fb6b3ff3ff17fcede7582bccf35fa790302 100644 (file)
@@ -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)
index 336bbca5f3e70ee97f9734cf99da8ddebf158c94..3d0dd745b3436a47e2abd2b77436a2682961838c 100644 (file)
@@ -21,7 +21,7 @@
 #include <AIS_KindOfInteractive.hxx>
 #include <AIS_TrihedronSelectionMode.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_DatumMode.hxx>
 #include <Prs3d_DatumParts.hxx>
@@ -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.
index 7308920bc7b5828deba7d4155520e3530c0cf6e5..08291192eb41abbecdb0ff4afdbce18226671c59 100644 (file)
@@ -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*/)
 {
index 6d426a9ff0060a1f80978fa18e7396f5f3b0e539..e15ba3cdef0b2ee2a22bd55219d11d72cc235a2f 100644 (file)
@@ -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;
 
index 3edb4f14a1a5b681cf30403e159acfcdcbb97c98..fe18f9f4a3c782d397045161155893d493f2aa1c 100644 (file)
@@ -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
index cd153f9634b8756ae9e07910076b250e88538f3b..4da9de27f95326bd2d685a42ca44b808b22cc4e9 100644 (file)
@@ -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
index 2a4c8993afb197e388e5bee53fa486ac7be35917..4c52b6166188601cd6962a948defcd13a32a3812 100644 (file)
@@ -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)
 {
index 05f4efefa5b3474680a20ff1c78b663307dbc622..8ba3077597f9e599fae343ee61966623f29fe1b1 100644 (file)
@@ -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;
 
index b4a08b868bb27bc4cd6ffe4ce04b56d3697d1a81..2a80cb82ce90b262fb57a1ffcb27acb947e83691 100644 (file)
@@ -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 {}
 
index e2161a20732800d50180c65cef9edb96fe14d661..9d1df7055ab53750b950647f6423b2d17d313eb8 100644 (file)
@@ -43,7 +43,7 @@
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveGroup.hxx>
 #include <Select3D_SensitivePoint.hxx>
@@ -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)
 {
index 06a027504668fca87b8be72e0f98d6c2f6b620c8..9cb24e67632187f892db2cc7da91744e8d8443f2 100644 (file)
@@ -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;
   
index 092bb0b4d43330bf4b853f5d069b4a903e7bc6c1..ec417397de64ef5ff3bb2f93117d3e4529fc8ba6 100644 (file)
@@ -18,7 +18,7 @@
 #include <MeshVS_Mesh.hxx>
 #include <MeshVS_MeshEntityOwner.hxx>
 #include <PrsMgr_PresentationManager.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <SelectMgr_SelectableObject.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
@@ -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*/ )
 {
index cbc9b2acd988851556da87f2d496261f66625e3d..45554524a5c97e89295bb8071365c4a078e4a894 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <MeshVS_EntityType.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_NameOfColor.hxx>
 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;
index 9f5608aaddb368863341541867522d441d588eaa..2bdf6178bdda4715bbdd8fea68b2c67b87e5c871 100644 (file)
@@ -18,7 +18,7 @@
 #include <MeshVS_Mesh.hxx>
 #include <MeshVS_MeshOwner.hxx>
 #include <PrsMgr_PresentationManager.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <SelectMgr_SelectableObject.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_HPackedMapOfInteger.hxx>
@@ -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*/)
 {
index e3d9b3f1033eb70b7f537e9dbaa0a74eef7038a7..91dd4a96ca4d1ae4254c0871695b52df175a2b8b 100644 (file)
@@ -17,7 +17,7 @@
 #define _MeshVS_MeshOwner_HeaderFile
 
 #include <SelectMgr_EntityOwner.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_NameOfColor.hxx>
 
 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,
-                                                 const Handle(Prs3d_Drawer)& theColor,
-                                                 const Standard_Integer theMode = 0) 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;
 
+  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
+                                                 const Handle(Prs3d_Drawer)& theColor,
+                                                 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
index ce4da457e557db4b3518267cb87eb074f5eb639d..977b21933153e2367644fbfa6300dac856926ef6 100644 (file)
@@ -48,7 +48,7 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_Array1OfColor.hxx>
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
index 16f865f3b778afb0eaff8326467fb4019f1b9e5a..4a4a1c87fa1c04a45ea3aeb32487f1fd290bb8d1 100644 (file)
@@ -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;
 }
index 4fc363b597b01d1104ffaed1a700aec4e89c5464..edaf175d0fe3c3a4c517c67c6ce6ce3cc74002bc 100644 (file)
@@ -17,7 +17,7 @@
 #define _MeshVS_PrsBuilder_HeaderFile
 
 #include <MeshVS_MeshPtr.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <MeshVS_DisplayModeFlags.hxx>
 #include <MeshVS_BuilderPriority.hxx>
@@ -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);
-  
-  //! Get presentation manager of builder
-  Standard_EXPORT Handle(PrsMgr_PresentationManager3d) GetPresentationManager() const;
-
 
+  //! Set presentation manager for builder
+  Standard_EXPORT void SetPresentationManager (const Handle(PrsMgr_PresentationManager)& thePrsMgr);
 
+  //! Get presentation manager of builder
+  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;
 
-  MeshVS_MeshPtr myParentMesh;
+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
index d3e9c16b51e2fe9e0f55aca56bbb0be259ecbfa7..8e94f3a2f65cb0893a34c6a95bafe174cd3842ea 100644 (file)
@@ -42,7 +42,7 @@
 #include <IntAna2d_AnaIntersection.hxx>
 #include <ProjLib.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Select3D_SensitiveGroup.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -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)
 {
index b46ea7ab8fae154b94e81ccac48496fb3520f991..912e1a5f675f62de603929681f62a20cc8faf4ee 100644 (file)
@@ -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;
index 854b41720cc38668397bc9ff1ac1abc9a9e78cf1..ee4eb9c82d16fd04dc6865b3047e1ac1fce91023 100644 (file)
@@ -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;
index 3678d01773f8d27e12b4b4bec5121a6697ce614e..acc77f1c6a165c760a55287864a58e59638f6fac 100644 (file)
@@ -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:
 
index d48146592e90eb37786699dabd3b45926caf4ddf..a0f993a639c12b18c264ac64c479ef2b3b09ae40 100644 (file)
@@ -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
index c23d9e13ce5bcd11192d5cf09c919943ad663425..dd56ab594be97433049cbea345411c5656b29b4c 100644 (file)
@@ -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:
 
index 273ff76958e725570df4c1c9fb9cdd9ede6da06b..379e6ed0de2e45094c45e6a94405e3e742d17c7a 100644 (file)
@@ -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);
index f9c67126df5defa9812c0aff23cdf4763cc43724..3cb179a847c0db19ad00329388075e8a997b2fc8 100644 (file)
@@ -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:
 
index c86a4474ec2af9a10886024d7e994e21caca0b28..0c4ddf4c69224dbb66e868e818288dcb6296d65d 100644 (file)
@@ -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);
index 7fb2e1beb78be7c00e591e152f20d67a7833cff8..51b87103109a60433935d594a495a688dfa94b2c 100644 (file)
@@ -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;
index dbfaa98211c01934d164d14715f0163616846a04..eea797ce7f5ff82e58ca776d777f479f9bcee357 100644 (file)
@@ -38,7 +38,7 @@
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_Group.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_Arrow.hxx>
 #include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_Drawer.hxx>
index 1a3f83103cd2605f83a4f2861be15de9ed42e978..588e642706b173397b526103aa4292d2e18b47e5 100644 (file)
@@ -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*/)
 {
index 5ce4a42ceaf8934e7b6d12165ec174e7ff5c16e4..7dd1a914a00ad6517ce11dd6ebe5e8c3f29ca223 100644 (file)
@@ -23,7 +23,7 @@
 #include <PrsDim_DimensionSelectionMode.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Integer.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_NameOfColor.hxx>
 #include <Standard_Boolean.hxx>
 
@@ -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.
index b726874a2b34298710cbbced655431f87d024814..45ab79ac48cbcf5a65eac50f3f4adcdd81f13923 100644 (file)
@@ -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;
 
index 8c07112c17f34eae93017d472f4439449ed01cf2..e638b3473ba3c5b3e1db1fc7a44b486a9cf8442a 100644 (file)
@@ -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:
 
index 28578317a3a49cccb6d337edcc1e13ee0c4f2a7c..ef6cf4b30c5117ad2a78c9fe0a45ddbcaa60bbeb 100644 (file)
@@ -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 ) );
 
index b2f8e349bdb7b6739a89e4a901fc39d440404946..a45fb25bdb4418499409f5adbf5c6ed804a470ea 100644 (file)
@@ -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:
index cf31fd563d249aed70f25be6fdf7fad79e43978e..0ebf8e3d2145b30a3939c66a167fdca63721a956 100644 (file)
@@ -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
index fbea2fd47121038e78b3f1b9f92dd7cc8b955fb2..dcb7b583c1454639ff38633a6e53d24631303240 100644 (file)
@@ -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 <myFixShape> 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 <myFixShape> 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;
index 127c65a81cf2874e734fcba5d0f8577cf1ee3063..5dd9851be3bd54b9b117ac33b5cb28d70d5d02b9 100644 (file)
@@ -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() ) {
     
index 2cc184f45d9aba0c7b29f992d13d0fb4af886b2a..1ae3167a15b3f52e7dab4a1c91c09f7901f4b466 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <PrsDim_Relation.hxx>
 #include <gp_Pnt.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <SelectMgr_Selection.hxx>
 #include <TColStd_ListOfTransient.hxx>
 
@@ -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);
index 60f536adb6aea4eb45a9d9e3f78bc99e0ace10b9..4952ca2ca003e1e62a69659cf49371e342b75073 100644 (file)
@@ -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)
 {
index e2d989ca5cb42429ef3901af135545feb178c060..c5000ad56136a96759007b7fb6d05f70ee121875 100644 (file)
@@ -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;
 
index 271304c896b2609c81a39a53e70acf77fe5e21ab..303850cd099574c72b0e37d40c1f46257af8de08 100644 (file)
@@ -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 
index 73bf38cba040a4f6bdb0dacde53357c795d595bd..f9196489501225763333ae92eb86a799cd5790c2 100644 (file)
@@ -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:
index b2eb17892bd7a13601edb7e2121cd1be1b6270b1..8975ed753a5f26238757ab0970df362c3cb45611 100644 (file)
@@ -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)
     {
index a34a441675e511689d4ddf2a58f252e81d7bbdec..cc3ed5b027b549e8969d7525e912fd160a6c0b07 100644 (file)
@@ -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.
index 4281d2001575c7ed99fefefcfc3ddd1b5e04b370..9c8df5892a2e0f94961de601e1ce2103ade4c31f 100644 (file)
@@ -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
index 89a14185fe53d526f561d7f3a9d71725d5a78f7e..691de035e245979fe495c0489af17e9ae3049cbf 100644 (file)
@@ -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:
index 9dfed5f9e0f5b7f2702966844357b22329ad380e..5a05524ac1bc53b13dd00dcf608f3fe355cd2d51 100644 (file)
@@ -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.);
index 784f1da699c2fb3a478a42fcc48c900dd19c74f7..94196bc971de96d155e7e5038a434c363163bd5b 100644 (file)
@@ -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:
index bf8ebf42f5862074a56ec09ff41641ac5cc25ae4..bee2dbba84929b5335bb3606a443a8e786d97a4f 100644 (file)
@@ -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())
     {
index a85f0e2f7630b20dbc36bfaa55b6f7e2de00145d..9748e4a407bc557238da66f8de910af39de18869 100644 (file)
@@ -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:
index 4ddea4ecd2ee3971879e5dbf81fa75d7db8fea7e..d9b889c2b2187ef62f0819f1370f8c96970fd32b 100644 (file)
@@ -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()) {
index 7409038b0ff3c60a2a6d6ce1947f9bd42b2bf950..0fd0e4289a21da6e8e016941d68325becc2336f3 100644 (file)
@@ -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:
index 57a5f51d39ea906d7867e01395594f5c7ebd7be7..becd9f324a1c4405f52491751ec2babb784f444f 100644 (file)
@@ -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;
index 4250190a2c5e04c1190f6b575d7ae0d953e5c55b..9eab78168f0207a344af02d1c376657cfd39e81d 100644 (file)
@@ -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:
 
index e0e882cf48201777dd294aa18a2d7e7cd5de2446..ae0c8fee49243ac149d82b360781960a5327d1cd 100644 (file)
@@ -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 :
index 639d7ad45690ce936526497ff8bd9f4a30ed23b8..679fcb5bbb506e2704b0d155ba4965f38897a0d0 100644 (file)
@@ -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:
index 149b3c3a9643571434d74e68704a89769637492c..12bbcaa9cedeac4fe879cc5abb2b2aafcf44fbef 100644 (file)
@@ -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())
     {
index 501366ff3be51ecd9cefe3ee8b476ae60f4624a0..b4eb92c4b29bea9b2b1e1d56a43790226ba51dd9 100644 (file)
@@ -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:
index 75bb6977ffc5a2e4e865a89deb4e36c878bfe8d9..debcd3e3f7dd41456e8106fff537cf3187a9f19f 100644 (file)
@@ -33,6 +33,7 @@
 #include <TColStd_ListOfInteger.hxx>
 
 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.
index c53573d46ebd7c83378f2e2fe951c5c1fa9c633e..6ca7cd5dcbd219e631c46a4549281140b5f432a7 100644 (file)
@@ -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()),
index 72403f7d938d4601d198cf0b19dcb477d6223652..a79e0ad373a55d22bfca3778f9c9dc292b7dcf7a 100644 (file)
@@ -19,7 +19,9 @@
 
 #include <PrsMgr_PresentationManager.hxx>
 
+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
index 422433f62a02e695740f39ec5737dc9b02eab601..2d4e27858c68e43e8d7cd1048dd385010fb48178 100644 (file)
@@ -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));
index 87ee177f5de989397f9c9e4220278e38793f3f88..4edd72d08e24fa2058fe304a3f2e02960759081a 100644 (file)
@@ -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)
 {
index 002a131cc60af859d826797b0a02b84b2dcbdf38..00f282bee5f07d549699f4db8a3a0ae9bb5e2831 100644 (file)
@@ -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;
 
 };
 
index f86641e8ef6a51ca97ddb7ea2f3cfb27aa795188..7498a784fa1c18a8889eef543a1a9f4707660746 100644 (file)
@@ -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())
index 3df108af0d17a1de70682950c433033caac26afe..0d8492d9f7bf51b1b85fe4145ec9236269801095 100644 (file)
@@ -24,7 +24,7 @@
 #include <Standard_Boolean.hxx>
 #include <TopoDS_Shape.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_NameOfColor.hxx>
 #include <Graphic3d_ZLayerId.hxx>
 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
index a1d7710137bb8a4ddea915cbcea3d41e2de4b89a..09b3d873828b2339317ba607231af013aecdfc31 100644 (file)
@@ -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
index 850f6ade8717f6ac9fbe50ee55ee0fce3b618bc0..d14fc358b581d7d95b9f3333d1a179735fd28293 100644 (file)
@@ -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; }
 
index 6cda5a5ad1e65f3fb5979364f3ae29ba7a8ae4e8..519016dc6bdbef43d52a0a2d0fe529761c21dcbc 100644 (file)
@@ -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);
 
index 0399c111819ec792be62a0e361f24484977872be..d8aff828bee81121bd471c43044a43b0a0e659df 100644 (file)
@@ -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*/)
 {
index 750f8569fdd462e79fbe92e3c193c0f74b4c53d6..de53e4e77d6645f35ea03992ca291b0f57b24840 100644 (file)
@@ -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)
     {
index f24d6644c4677f5bebfd786997a8eed00600ddd9..2f182da0bb1591fba2a3899e3b99d94cae98a9c3 100644 (file)
@@ -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)
index 34d604ff5877edad4735890d0f0570300706b303..c8494c39c50e240b2922b4041aab2d0446344f22 100644 (file)
@@ -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: