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

0032161: Coding Rules - deprecate obsolete alias PrsMgr_PresentationManager3d

Browse Source
This commit is contained in:
kgv
2021-02-25 10:58:17 +03:00
committed by bugmaster
parent 1507ccda40
commit decbff0dfd
161 changed files with 736 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/AIS/AIS_Axis.cxx
View 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);
}
}
//=======================================================================

11
src/AIS/AIS_Axis.hxx
View 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:

6
src/AIS/AIS_CameraFrustum.cxx
View 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())

6
src/AIS/AIS_CameraFrustum.hxx
View 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,

13
src/AIS/AIS_Circle.cxx
View 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); }
}
//=======================================================================

17
src/AIS/AIS_Circle.hxx
View 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.

2
src/AIS/AIS_ColorScale.cxx
View 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)
{

2
src/AIS/AIS_ColorScale.hxx
View 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;

8
src/AIS/AIS_ColoredShape.cxx
View 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())
{

6
src/AIS/AIS_ColoredShape.hxx
View 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,

6
src/AIS/AIS_ConnectedInteractive.cxx
View 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())
{

4
src/AIS/AIS_ConnectedInteractive.hxx
View 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,

2
src/AIS/AIS_InteractiveContext.cxx
View 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),

6
src/AIS/AIS_InteractiveContext.hxx
View 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;

2
src/AIS/AIS_LightSource.cxx
View 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)
{

2
src/AIS/AIS_LightSource.hxx
View 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;

13
src/AIS/AIS_Line.cxx
View 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); }
}
//=======================================================================

26
src/AIS/AIS_Line.hxx
View 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 void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation);
Standard_EXPORT void ComputeSegmentLine (const Handle(Prs3d_Presentation)& aPresentation);
Standard_EXPORT void ComputeInfiniteLineSelection (const Handle(SelectMgr_Selection)& aSelection);
Standard_EXPORT void ComputeSegmentLineSelection (const Handle(SelectMgr_Selection)& aSelection);
Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
const Handle(Prs3d_Presentation)& thePrs,
const Standard_Integer theMode) Standard_OVERRIDE;
Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
const Standard_Integer theMode) Standard_OVERRIDE;
Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation);
Standard_EXPORT void ComputeSegmentLine (const Handle(Prs3d_Presentation)& aPresentation);
Standard_EXPORT void ComputeInfiniteLineSelection (const Handle(SelectMgr_Selection)& aSelection);
Standard_EXPORT void ComputeSegmentLineSelection (const Handle(SelectMgr_Selection)& aSelection);
//! Replace aspects of already computed groups with the new value.
void replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect);

6
src/AIS/AIS_Manipulator.cxx
View 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)
{

6
src/AIS/AIS_Manipulator.hxx
View 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;

2
src/AIS/AIS_ManipulatorOwner.cxx
View 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)
{

2
src/AIS/AIS_ManipulatorOwner.hxx
View 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;

2
src/AIS/AIS_MediaPlayer.cxx
View 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)
{

2
src/AIS/AIS_MediaPlayer.hxx
View 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;

6
src/AIS/AIS_MultipleConnectedInteractive.cxx
View 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())

4
src/AIS/AIS_MultipleConnectedInteractive.hxx
View 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.

34
src/AIS/AIS_Plane.cxx
View 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;
}
}

10
src/AIS/AIS_Plane.hxx
View 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:

16
src/AIS/AIS_PlaneTrihedron.cxx
View 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);
}
//=======================================================================

7
src/AIS/AIS_PlaneTrihedron.hxx
View 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:

32
src/AIS/AIS_Point.cxx
View 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);
}
}
//=======================================================================

4
src/AIS/AIS_Point.hxx
View 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:

14
src/AIS/AIS_PointCloud.cxx
View 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)
{

8
src/AIS/AIS_PointCloud.hxx
View 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;

9
src/AIS/AIS_RubberBand.cxx
View 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())
{

10
src/AIS/AIS_RubberBand.hxx
View 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.

42
src/AIS/AIS_Shape.cxx
View 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();
}
//=======================================================================

2
src/AIS/AIS_Shape.hxx
View 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;

6
src/AIS/AIS_TextLabel.cxx
View 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)
{

6
src/AIS/AIS_TextLabel.hxx
View 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,

9
src/AIS/AIS_TexturedShape.cxx
View 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())
{

8
src/AIS/AIS_TexturedShape.hxx
View 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);

136
src/AIS/AIS_Triangulation.cxx
View 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();
Handle(Graphic3d_ArrayOfTriangles) anArray = new Graphic3d_ArrayOfTriangles (myNbNodes, myNbTriangles * 3,
hasVNormals, hasVColors, Standard_False);
Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup();
Handle(Graphic3d_AspectFillArea3d) aspect = myDrawer->ShadingAspect()->Aspect();
Standard_Integer i;
const Standard_Real ambient = 0.2;
if (hasVNormals)
{
gp_Vec3f aNormal;
if (hasVColors)
{
const TColStd_Array1OfInteger& colors = myColor->Array1();
for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
{
anArray->AddVertex (myTriangulation->Node (i), attenuateColor (colors[i], ambient));
myTriangulation->Normal (i, aNormal);
anArray->SetVertexNormal (i, aNormal.x(), aNormal.y(), aNormal.z());
}
}
else // !hasVColors
{
for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
{
anArray->AddVertex (myTriangulation->Node (i));
myTriangulation->Normal (i, aNormal);
anArray->SetVertexNormal(i, aNormal.x(), aNormal.y(), aNormal.z());
}
}
}
else // !hasVNormals
{
if (hasVColors)
{
const TColStd_Array1OfInteger& colors = myColor->Array1();
for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
{
anArray->AddVertex (myTriangulation->Node (i), attenuateColor(colors(i), ambient));
}
}
else // !hasVColors
{
for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
{
anArray->AddVertex (myTriangulation->Node (i));
}
}
}
Standard_Integer indexTriangle[3] = {0,0,0};
for ( i = 1; i<= myTriangulation->NbTriangles(); i++ )
{
myTriangulation->Triangle (i).Get (indexTriangle[0], indexTriangle[1], indexTriangle[2]);
anArray->AddEdge(indexTriangle[0]);
anArray->AddEdge(indexTriangle[1]);
anArray->AddEdge(indexTriangle[2]);
}
TheGroup->SetPrimitivesAspect(aspect);
TheGroup->AddPrimitiveArray(anArray);
break;
return;
}
Standard_Boolean hasVNormals = myTriangulation->HasNormals();
Standard_Boolean hasVColors = HasVertexColors();
Handle(Graphic3d_ArrayOfTriangles) anArray = new Graphic3d_ArrayOfTriangles (myNbNodes, myNbTriangles * 3,
hasVNormals, hasVColors, Standard_False);
Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup();
Handle(Graphic3d_AspectFillArea3d) anAspect = myDrawer->ShadingAspect()->Aspect();
const Standard_Real anAmbient = 0.2;
if (hasVNormals)
{
gp_Vec3f aNormal;
if (hasVColors)
{
const TColStd_Array1OfInteger& colors = myColor->Array1();
for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
{
anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient));
myTriangulation->Normal (aNodeIter, aNormal);
anArray->SetVertexNormal (aNodeIter, aNormal.x(), aNormal.y(), aNormal.z());
}
}
else // !hasVColors
{
for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
{
anArray->AddVertex (myTriangulation->Node (aNodeIter));
myTriangulation->Normal (aNodeIter, aNormal);
anArray->SetVertexNormal(aNodeIter, aNormal.x(), aNormal.y(), aNormal.z());
}
}
}
else // !hasVNormals
{
if (hasVColors)
{
const TColStd_Array1OfInteger& colors = myColor->Array1();
for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
{
anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient));
}
}
else // !hasVColors
{
for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
{
anArray->AddVertex (myTriangulation->Node (aNodeIter));
}
}
}
Standard_Integer aTriIndices[3] = {0,0,0};
for (Standard_Integer aTriIter = 1; aTriIter <= myTriangulation->NbTriangles(); ++aTriIter)
{
myTriangulation->Triangle (aTriIter).Get (aTriIndices[0], aTriIndices[1], aTriIndices[2]);
anArray->AddEdge (aTriIndices[0]);
anArray->AddEdge (aTriIndices[1]);
anArray->AddEdge (aTriIndices[2]);
}
aGroup->SetPrimitivesAspect (anAspect);
aGroup->AddPrimitiveArray (anArray);
}
//=======================================================================

14
src/AIS/AIS_Triangulation.hxx
View File

@@ -67,15 +67,15 @@ protected:
Standard_EXPORT void updatePresentation();
private:
Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
const Handle(Prs3d_Presentation)& thePrs,
const Standard_Integer theMode) Standard_OVERRIDE;
Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
const Standard_Integer theMode) Standard_OVERRIDE;
//! Attenuates 32-bit color by a given attenuation factor (0...1):
//! aColor = Alpha << 24 + Blue << 16 + Green << 8 + Red
//! All color components are multiplied by aComponent, the result is then packed again as 32-bit integer.

8
src/AIS/AIS_Trihedron.cxx
View 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)

10
src/AIS/AIS_Trihedron.hxx
View 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.

2
src/AIS/AIS_TrihedronOwner.cxx
View 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*/)
{

2
src/AIS/AIS_TrihedronOwner.hxx
View 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;

6
src/AIS/AIS_ViewCube.cxx
View 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

6
src/AIS/AIS_ViewCube.hxx
View 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

2
src/AIS/AIS_XRTrackedDevice.cxx
View 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)
{

2
src/AIS/AIS_XRTrackedDevice.hxx
View 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;

2
src/IVtkOCC/IVtkOCC_SelectableObject.hxx
View 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 {}

8
src/MeshVS/MeshVS_Mesh.cxx
View 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)
{

20
src/MeshVS/MeshVS_Mesh.hxx
View 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;

4
src/MeshVS/MeshVS_MeshEntityOwner.cxx
View 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*/ )
{

6
src/MeshVS/MeshVS_MeshEntityOwner.hxx
View 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;

4
src/MeshVS/MeshVS_MeshOwner.cxx
View 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*/)
{

25
src/MeshVS/MeshVS_MeshOwner.hxx
View 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,
Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
const Handle(Prs3d_Drawer)& theColor,
const Standard_Integer theMode = 0) Standard_OVERRIDE;
const Standard_Integer theMode) Standard_OVERRIDE;
Standard_EXPORT virtual void Unhilight (const Handle(PrsMgr_PresentationManager)& PM, const Standard_Integer Mode = 0) Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Boolean IsForcedHilight() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(MeshVS_MeshOwner,SelectMgr_EntityOwner)
protected:
Handle(TColStd_HPackedMapOfInteger) mySelectedNodes;
Handle(TColStd_HPackedMapOfInteger) mySelectedElems;
private:
Handle(MeshVS_DataSource) myDataSource;
Handle(TColStd_HPackedMapOfInteger) myDetectedNodes;
Handle(TColStd_HPackedMapOfInteger) myDetectedElems;
Standard_Integer myLastID;
};
#endif // _MeshVS_MeshOwner_HeaderFile

2
src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx
View 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>

4
src/MeshVS/MeshVS_PrsBuilder.cxx
View 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;
}

29
src/MeshVS/MeshVS_PrsBuilder.hxx
View 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);
Standard_EXPORT void SetPresentationManager (const Handle(PrsMgr_PresentationManager)& thePrsMgr);
//! Get presentation manager of builder
Standard_EXPORT Handle(PrsMgr_PresentationManager3d) GetPresentationManager() const;
Standard_EXPORT Handle(PrsMgr_PresentationManager) GetPresentationManager() const;
DEFINE_STANDARD_RTTIEXT(MeshVS_PrsBuilder,Standard_Transient)
protected:
//! Constructor
//! Parent is pointer to MeshVS_Mesh object
//! Flags is set of display modes corresponding to this builder
@@ -121,27 +115,20 @@ protected:
//! Returns only custom drawer
Standard_EXPORT Handle(MeshVS_Drawer) Drawer() const;
protected:
MeshVS_MeshPtr myParentMesh;
private:
Standard_Boolean myIsExcluding;
Handle(MeshVS_DataSource) myDataSource;
Handle(MeshVS_Drawer) myDrawer;
Standard_Integer myFlags;
Standard_Integer myId;
Standard_Integer myPriority;
Handle(PrsMgr_PresentationManager3d) myPrsMgr;
Handle(PrsMgr_PresentationManager) myPrsMgr;
};
#endif // _MeshVS_PrsBuilder_HeaderFile

4
src/PrsDim/PrsDim_AngleDimension.cxx
View 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)
{

6
src/PrsDim/PrsDim_AngleDimension.hxx
View 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;

7
src/PrsDim/PrsDim_Chamf2dDimension.cxx
View 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;

9
src/PrsDim/PrsDim_Chamf2dDimension.hxx
View 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:

9
src/PrsDim/PrsDim_Chamf3dDimension.cxx
View 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

9
src/PrsDim/PrsDim_Chamf3dDimension.hxx
View 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:

8
src/PrsDim/PrsDim_ConcentricRelation.cxx
View 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);

21
src/PrsDim/PrsDim_ConcentricRelation.hxx
View 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:

4
src/PrsDim/PrsDim_DiameterDimension.cxx
View 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);

4
src/PrsDim/PrsDim_DiameterDimension.hxx
View 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;

2
src/PrsDim/PrsDim_Dimension.cxx
View 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>

2
src/PrsDim/PrsDim_DimensionOwner.cxx
View 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*/)
{

6
src/PrsDim/PrsDim_DimensionOwner.hxx
View 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.

9
src/PrsDim/PrsDim_EqualDistanceRelation.cxx
View 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;

9
src/PrsDim/PrsDim_EqualDistanceRelation.hxx
View 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:

7
src/PrsDim/PrsDim_EqualRadiusRelation.cxx
View 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 ) );

11
src/PrsDim/PrsDim_EqualRadiusRelation.hxx
View 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:

9
src/PrsDim/PrsDim_FixRelation.cxx
View 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

16
src/PrsDim/PrsDim_FixRelation.hxx
View 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;

8
src/PrsDim/PrsDim_IdenticRelation.cxx
View 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() ) {

22
src/PrsDim/PrsDim_IdenticRelation.hxx
View 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);

2
src/PrsDim/PrsDim_LengthDimension.cxx
View 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)
{

2
src/PrsDim/PrsDim_LengthDimension.hxx
View 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;

9
src/PrsDim/PrsDim_MaxRadiusDimension.cxx
View 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

13
src/PrsDim/PrsDim_MaxRadiusDimension.hxx
View 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:

8
src/PrsDim/PrsDim_MidPointRelation.cxx
View 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)
{

23
src/PrsDim/PrsDim_MidPointRelation.hxx
View 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.

9
src/PrsDim/PrsDim_MinRadiusDimension.cxx
View 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

15
src/PrsDim/PrsDim_MinRadiusDimension.hxx
View 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:

8
src/PrsDim/PrsDim_OffsetDimension.cxx
View 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.);

15
src/PrsDim/PrsDim_OffsetDimension.hxx
View 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:

8
src/PrsDim/PrsDim_ParallelRelation.cxx
View 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())
{

13
src/PrsDim/PrsDim_ParallelRelation.hxx
View 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:

8
src/PrsDim/PrsDim_PerpendicularRelation.cxx
View 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()) {

11
src/PrsDim/PrsDim_PerpendicularRelation.hxx
View 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:

5
src/PrsDim/PrsDim_RadiusDimension.cxx
View 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;

6
src/PrsDim/PrsDim_RadiusDimension.hxx
View 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:

8
src/PrsDim/PrsDim_SymmetricRelation.cxx
View 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 :

Some files were not shown because too many files have changed in this diff Show More