From 84ead44e0b92006689ac4d24aa9825fcfc0d1381 Mon Sep 17 00:00:00 2001 From: vsv Date: Thu, 13 Feb 2020 15:58:07 +0300 Subject: [PATCH] Disable ISO lines for planes, previews and highlightings. --- src/GeomAPI/GeomAPI_AISObject.cpp | 1 + src/ModuleBase/ModuleBase_ResultPrs.cpp | 5 +++++ src/PartSet/PartSet_OperationPrs.cpp | 8 ++++++++ src/XGUI/XGUI_ViewerProxy.cpp | 2 ++ 4 files changed, 16 insertions(+) diff --git a/src/GeomAPI/GeomAPI_AISObject.cpp b/src/GeomAPI/GeomAPI_AISObject.cpp index 45f57fa5a..ac3a6ff4d 100644 --- a/src/GeomAPI/GeomAPI_AISObject.cpp +++ b/src/GeomAPI/GeomAPI_AISObject.cpp @@ -92,6 +92,7 @@ void GeomAPI_AISObject::createShape(std::shared_ptr theShape) aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS); else aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_PLUS, Quantity_NOC_YELLOW, 1.)); + aDrawer->SetIsoOnPlane(false); setImpl(new Handle(AIS_InteractiveObject)(aShape)); } } diff --git a/src/ModuleBase/ModuleBase_ResultPrs.cpp b/src/ModuleBase/ModuleBase_ResultPrs.cpp index e63531e58..fceb96c2f 100644 --- a/src/ModuleBase/ModuleBase_ResultPrs.cpp +++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -97,6 +98,8 @@ ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult) aDrawer->SetUIsoAspect(myUIsoAspect); aDrawer->SetVIsoAspect(myVIsoAspect); + aDrawer->SetIsoOnPlane(false); + if (aDrawer->HasOwnPointAspect()) aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS); else @@ -116,6 +119,8 @@ ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult) aDrawer->VIsoAspect()->SetNumber(0); aDrawer->UIsoAspect()->SetNumber(0); } + aDrawer->SetIsoOnPlane(false); + myHiddenSubShapesDrawer = new AIS_ColoredDrawer(myDrawer); Handle(Prs3d_ShadingAspect) aShadingAspect = new Prs3d_ShadingAspect(); aShadingAspect->SetMaterial(Graphic3d_NOM_BRASS); //default value of context material diff --git a/src/PartSet/PartSet_OperationPrs.cpp b/src/PartSet/PartSet_OperationPrs.cpp index f27f35f19..5c2d2ae11 100644 --- a/src/PartSet/PartSet_OperationPrs.cpp +++ b/src/PartSet/PartSet_OperationPrs.cpp @@ -58,6 +58,7 @@ #include #include #include +#include //#define DEBUG_EMPTY_SHAPE //#define DEBUG_OPERATION_PRS @@ -84,6 +85,13 @@ PartSet_OperationPrs::PartSet_OperationPrs(ModuleBase_IWorkshop* theWorkshop) BRepBuilderAPI_MakeVertex aMaker(aPnt); TopoDS_Vertex aVertex = aMaker.Vertex(); myShapeToPrsMap.Bind(aVertex, NULL); + + Handle(Prs3d_Drawer) aDrawer = Attributes(); + Handle(Prs3d_IsoAspect) aUIsoAspect = new Prs3d_IsoAspect(myShapeColor, Aspect_TOL_SOLID, 1, 0); + Handle(Prs3d_IsoAspect) aVIsoAspect = new Prs3d_IsoAspect(myShapeColor, Aspect_TOL_SOLID, 1, 0); + aDrawer->SetUIsoAspect(aUIsoAspect); + aDrawer->SetVIsoAspect(aVIsoAspect); + aDrawer->SetIsoOnPlane(false); } bool PartSet_OperationPrs::hasShapes() diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp index 82154a769..4b82e3ed6 100644 --- a/src/XGUI/XGUI_ViewerProxy.cpp +++ b/src/XGUI/XGUI_ViewerProxy.cpp @@ -466,6 +466,7 @@ void XGUI_ViewerProxy::displayHighlight(FeaturePtr theFeature, const TopoDS_Shap aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost aDeflection = Config_PropManager::real("Visualization", "construction_deflection"); aAis->Attributes()->SetDeviationCoefficient(aDeflection); + aAis->Attributes()->SetIsoOnPlane(false); myHighlights.Append(aAis); aContext->Display(aAis, false); aContext->Deactivate(aAis); @@ -480,6 +481,7 @@ void XGUI_ViewerProxy::displayHighlight(FeaturePtr theFeature, const TopoDS_Shap aAis->SetZLayer(Graphic3d_ZLayerId_Top); //Graphic3d_ZLayerId_Topmost aDeflection = Config_PropManager::real("Visualization", "body_deflection"); aAis->Attributes()->SetDeviationCoefficient(aDeflection); + aAis->Attributes()->SetIsoOnPlane(false); myHighlights.Append(aAis); aContext->Display(aAis, false); aContext->Deactivate(aAis); -- 2.39.2