OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0030820: Draw Harness, ViewerTest - vsetcolor has no effect on objects created by vsegment and vtriangle

Browse Source 
MyPArrayObject class (an interactive object representing some array of primitives) is improved: a possibility of color changing is added to it.
This commit is contained in:
tiv 2019-07-02 19:53:20 +03:00 committed by apn
parent 803bdcdf2b
commit acc6542a1b
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -3344,6 +3344,10 @@ public:
virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; } virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
//! Sets color to this interactive object
//! @param theColor the color to be set
virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE;
private: private:
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
@ -3359,6 +3363,13 @@ private:
Standard_Integer theArgCount, Standard_Integer theArgCount,
Standard_Integer theMaxArgs); Standard_Integer theMaxArgs);
//! Sets color for the shading aspect of the drawer used in this interactive object
//! @param theColor the color to be set
void setColorForShadingAspect(const Quantity_Color& theColor);
//! Replaces shading aspect from myDrawer->Link() with the own shading aspect of myDrawer for this interactive object
void replaceShadingAspect();
protected: protected:
Handle(Graphic3d_AspectMarker3d) myMarkerAspect; Handle(Graphic3d_AspectMarker3d) myMarkerAspect;
@ -3584,6 +3595,21 @@ Standard_Boolean MyPArrayObject::Init (Graphic3d_TypeOfPrimitiveArray thePrimTyp
return Standard_True; return Standard_True;
} }
//=======================================================================
// function : SetColor
// purpose :
//=======================================================================
void MyPArrayObject::SetColor (const Quantity_Color& theColor)
{
AIS_InteractiveObject::SetColor (theColor);
setColorForShadingAspect (theColor);
if (myMarkerAspect)
{
myMarkerAspect->SetColor (theColor);
}
SynchronizeAspects();
}
void MyPArrayObject::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, void MyPArrayObject::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
const Standard_Integer theMode) const Standard_Integer theMode)
{ {
@ -3660,6 +3686,34 @@ bool MyPArrayObject::CheckInputCommand (const TCollection_AsciiString theCommand
return true; return true;
} }
//=======================================================================
// function : setColorForShadingAspect
// purpose :
//=======================================================================
void MyPArrayObject::setColorForShadingAspect (const Quantity_Color& theColor)
{
if (myDrawer->SetupOwnShadingAspect())
{
replaceShadingAspect();
}
myDrawer->ShadingAspect()->SetColor (theColor);
}
//=======================================================================
// function : replaceShadingAspect
// purpose :
//=======================================================================
void MyPArrayObject::replaceShadingAspect()
{
if (!myDrawer->Link())
{
return;
}
Graphic3d_MapOfAspectsToAspects anAspectReplacementMap;
anAspectReplacementMap.Bind (myDrawer->Link()->ShadingAspect()->Aspect(), myDrawer->ShadingAspect()->Aspect());
replaceAspects (anAspectReplacementMap);
}
//============================================================================= //=============================================================================
//function : VDrawPArray //function : VDrawPArray
//purpose : Draws primitives array from list of vertexes, bounds, edges //purpose : Draws primitives array from list of vertexes, bounds, edges