mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-08 14:17:06 +03:00
0030675: Visualization - remove redundant proxy classes in hierarchy of PrsMgr_Presentation
Removed redundant proxy class Prs3d_Presentation - Graphic3d_Structure now should be used directly. Removed auxiliary class PrsMgr_ModedPresentation holding Structure and Display Mode index (field has been moved to Structure itself), so that PrsMgr_Presentations (AIS_InteractiveObject::Presentations()) now holds Structures directly. PrsMgr_Prs proxy class has been removed, and PrsMgr_Presentation now inherits Graphic3d_Structure. Graphic3d_Structure, maps declarations have been corrected to use class instead of void*, which allowed to avoid redundant casts. Several methods have been also modified to avoid creating Handle from this pointer. AIS package headers have been cleaned up from forward declaration of Prs3d_Presentation class. Fixed dereference of destroyed presentations within connected and HLR computed objects: - AIS_InteractiveContext::Disconnect() now erases connected presentation. - Graphic3d_CView::Clear() now removes destructed structures from Computed list. - fix inaccessibility of PrsMgr_Presentation methods
This commit is contained in:
@@ -17,19 +17,11 @@
|
||||
#ifndef _StdPrs_Curve_HeaderFile
|
||||
#define _StdPrs_Curve_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#include <TColgp_SequenceOfPnt.hxx>
|
||||
#include <Standard_Integer.hxx>
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_Curve;
|
||||
|
||||
class Adaptor3d_Curve;
|
||||
|
||||
//! A framework to define display of lines, arcs of circles
|
||||
//! and conic sections.
|
||||
|
@@ -17,20 +17,12 @@
|
||||
#ifndef _StdPrs_DeflectionCurve_HeaderFile
|
||||
#define _StdPrs_DeflectionCurve_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Standard_Real.hxx>
|
||||
#include <TColgp_SequenceOfPnt.hxx>
|
||||
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_Curve;
|
||||
|
||||
|
||||
//! A framework to provide display of any curve with
|
||||
//! respect to the maximal chordal deviation defined in
|
||||
//! the Prs3d_Drawer attributes manager.
|
||||
|
@@ -17,17 +17,12 @@
|
||||
#ifndef _StdPrs_HLRPolyShape_HeaderFile
|
||||
#define _StdPrs_HLRPolyShape_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
class Prs3d_Presentation;
|
||||
|
||||
class TopoDS_Shape;
|
||||
class Prs3d_Projector;
|
||||
|
||||
|
||||
//! Instantiates Prs3d_PolyHLRShape to define a
|
||||
//! display of a shape where hidden and visible lines are
|
||||
//! identified with respect to a given projection.
|
||||
|
@@ -17,18 +17,11 @@
|
||||
#ifndef _StdPrs_Plane_HeaderFile
|
||||
#define _StdPrs_Plane_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_Surface;
|
||||
|
||||
|
||||
//! A framework to display infinite planes.
|
||||
class StdPrs_Plane : public Prs3d_Root
|
||||
{
|
||||
|
@@ -17,19 +17,11 @@
|
||||
#ifndef _StdPrs_PoleCurve_HeaderFile
|
||||
#define _StdPrs_PoleCurve_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Standard_Integer.hxx>
|
||||
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_Curve;
|
||||
|
||||
|
||||
//! A framework to provide display of Bezier or BSpline curves
|
||||
//! (by drawing a broken line linking the poles of the curve).
|
||||
class StdPrs_PoleCurve : public Prs3d_Root
|
||||
|
@@ -21,11 +21,9 @@
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <StdPrs_Volume.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
|
||||
class Graphic3d_ArrayOfSegments;
|
||||
class Graphic3d_ArrayOfTriangles;
|
||||
class Prs3d_Presentation;
|
||||
class TopoDS_Shape;
|
||||
class gp_Pnt2d;
|
||||
class BRep_Builder;
|
||||
|
@@ -17,15 +17,10 @@
|
||||
#ifndef _StdPrs_ShadedSurface_HeaderFile
|
||||
#define _StdPrs_ShadedSurface_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_Surface;
|
||||
|
||||
class Adaptor3d_Surface;
|
||||
|
||||
//! Computes the shading presentation of surfaces.
|
||||
//! Draws a surface by drawing the isoparametric curves with respect to
|
||||
|
@@ -17,21 +17,13 @@
|
||||
#ifndef _StdPrs_WFDeflectionRestrictedFace_HeaderFile
|
||||
#define _StdPrs_WFDeflectionRestrictedFace_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <Prs3d_NListOfSequenceOfPnt.hxx>
|
||||
|
||||
class Prs3d_Presentation;
|
||||
class BRepAdaptor_HSurface;
|
||||
class Bnd_Box;
|
||||
|
||||
|
||||
//! A framework to provide display of U and V
|
||||
//! isoparameters of faces, while allowing you to impose
|
||||
//! a deflection on them.
|
||||
|
@@ -17,15 +17,10 @@
|
||||
#ifndef _StdPrs_WFDeflectionSurface_HeaderFile
|
||||
#define _StdPrs_WFDeflectionSurface_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_HSurface;
|
||||
|
||||
class Adaptor3d_HSurface;
|
||||
|
||||
//! Draws a surface by drawing the isoparametric curves with respect to
|
||||
//! a maximal chordial deviation.
|
||||
|
@@ -17,15 +17,10 @@
|
||||
#ifndef _StdPrs_WFPoleSurface_HeaderFile
|
||||
#define _StdPrs_WFPoleSurface_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_Surface;
|
||||
|
||||
class Adaptor3d_Surface;
|
||||
|
||||
//! Computes the presentation of surfaces by drawing a
|
||||
//! double network of lines linking the poles of the surface
|
||||
|
@@ -17,15 +17,10 @@
|
||||
#ifndef _StdPrs_WFSurface_HeaderFile
|
||||
#define _StdPrs_WFSurface_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <Prs3d_Root.hxx>
|
||||
#include <Prs3d_Drawer.hxx>
|
||||
class Prs3d_Presentation;
|
||||
class Adaptor3d_HSurface;
|
||||
|
||||
class Adaptor3d_HSurface;
|
||||
|
||||
//! Computes the wireframe presentation of surfaces
|
||||
//! by displaying a given number of U and/or V isoparametric
|
||||
|
Reference in New Issue
Block a user