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

0029570: Visualization, Graphic3d_Aspect - merge Graphic3d_Group aspects

Browse Source 
Graphic3d_AspectFillArea3d, Graphic3d_AspectLine3d, Graphic3d_AspectMarker3d
and Graphic3d_AspectText3d have been merged into new class Graphic3d_Aspects.
The old classes are preserved as dummy sub-classes of Graphic3d_Aspects
preserving different per-aspect defaults.

Methods IsGroupPrimitivesAspectSet(), GroupPrimitivesAspect(), FillAreaAspect(),
LineAspect() and MarkerAspect() have been removed from Graphic3d_Group.
Instead, a new method Graphic3d_Group::ReplaceAspects() has been introduced
for replacing existing group aspects.

AIS_Shape now uses new method AIS_InteractiveObject::replaceAspects()
for updating computed groups with new aspects without presentation recomputation
in places where SynchronizeAspects() is not applicable.

OpenGl_AspectFace, OpenGl_AspectLine, OpenGl_AspectMarker
and OpenGl_AspectText have been merged into new class OpenGl_Aspects.

ViewerTest::parseColor() - fix uninitialized alpha component.
Graphic3d_AspectText3d/Prs3d_TextAspect - removed unused properties Space, ExpansionFactor, Angle.
Remove getters Values() deprecated since OCCT 7.1.0.
This commit is contained in:
kgv
2019-03-03 21:07:55 +03:00
committed by apn
parent e08a9b0302
commit bf5f0ca20a
86 changed files with 2275 additions and 3412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/StdPrs/StdPrs_WFShape.hxx
View File

@@ -24,6 +24,8 @@
#include <TopoDS_Shape.hxx>
#include <TopTools_ListOfShape.hxx>
class Graphic3d_ArrayOfPoints;
//! Tool for computing wireframe presentation of a TopoDS_Shape.
class StdPrs_WFShape : public Prs3d_Root
{
@@ -53,24 +55,44 @@ public:
const TopoDS_Shape& theShape,
const Standard_Boolean theToExcludeGeometric = Standard_True);
//! Compute all edges (wire, free, unfree) and put them into single primitive array.
//! @param theShape [in] the shape
//! @param theDrawer [in] the drawer settings (deviation angle and maximal parameter value)
Standard_EXPORT static Handle(Graphic3d_ArrayOfPrimitives) AddAllEdges (const TopoDS_Shape& theShape,
const Handle(Prs3d_Drawer)& theDrawer);
//! Compute vertex presentation for a shape.
//! @param theShape [in] the shape
//! @param theVertexMode [in] vertex filter
Standard_EXPORT static Handle(Graphic3d_ArrayOfPoints) AddVertexes (const TopoDS_Shape& theShape,
Prs3d_VertexDrawMode theVertexMode);
private:
//! Compute edge presentations for a shape.
//! @param theEdges [in] the list of edges.
//! @param theDrawer [in] the drawer settings.
//! @param theShapeDeflection [in] the deflection for the wireframe shape.
//! @param theShape [in] the shape
//! @param theDrawer [in] the drawer settings (deviation angle and maximal parameter value)
//! @param theShapeDeflection [in] the deflection for the wireframe shape
//! @param theWire [out] output polylines for lonely wires
//! @param theFree [out] output polylines for free edges
//! @param theUnFree [out] output polylines for non-free edges
Standard_EXPORT static void addEdges (const TopoDS_Shape& theShape,
const Handle(Prs3d_Drawer)& theDrawer,
Standard_Real theShapeDeflection,
Prs3d_NListOfSequenceOfPnt* theWire,
Prs3d_NListOfSequenceOfPnt* theFree,
Prs3d_NListOfSequenceOfPnt* theUnFree);
//! Compute edge presentations for a shape.
//! @param theEdges [in] the list of edges
//! @param theDrawer [in] the drawer settings (deviation angle and maximal parameter value)
//! @param theShapeDeflection [in] the deflection for the wireframe shape
//! @param thePolylines [out] output polylines
static void addEdges (const TopTools_ListOfShape& theEdges,
const Handle(Prs3d_Drawer)& theDrawer,
const Standard_Real theShapeDeflection,
Prs3d_NListOfSequenceOfPnt& thePolylines);
//! Compute vertex presentation for a shape.
//! @param thePresentation [in] the presentation.
//! @param theVertices [in] the list of points.
//! @param theAspect [in] the point drawing aspect.
static void addVertices (const Handle (Prs3d_Presentation)& thePresentation,
const TColgp_SequenceOfPnt& theVertices,
const Handle (Prs3d_PointAspect)& theAspect);
};
#endif // _StdPrs_WFShape_H__