From caab0b9c8c32ac38142faea05153038607fd4ba3 Mon Sep 17 00:00:00 2001 From: vsv Date: Wed, 13 May 2020 15:55:22 +0300 Subject: [PATCH] bos #19088: Preselection of the origin point is not very distinguishable --- src/ModuleBase/ModuleBase_Tools.cpp | 2 +- src/ModuleBase/ModuleBase_Tools.h | 2 +- src/XGUI/XGUI_Displayer.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp index 4f0cc3575..17e6c516e 100644 --- a/src/ModuleBase/ModuleBase_Tools.cpp +++ b/src/ModuleBase/ModuleBase_Tools.cpp @@ -1126,7 +1126,7 @@ QString translate(const std::string& theContext, const std::string& theMessage) return aMessage; } -void setPointBallHighlighting(AIS_Shape* theAIS) +void setPointBallHighlighting(AIS_InteractiveObject* theAIS) { static Handle(Image_AlienPixMap) aPixMap; if(aPixMap.IsNull()) { diff --git a/src/ModuleBase/ModuleBase_Tools.h b/src/ModuleBase/ModuleBase_Tools.h index ea4e0a929..54eb46c9e 100644 --- a/src/ModuleBase/ModuleBase_Tools.h +++ b/src/ModuleBase/ModuleBase_Tools.h @@ -370,7 +370,7 @@ QString MODULEBASE_EXPORT translate(const std::string& theContext, const std::st /// Set Highlighting of points as a Ball shape /// \param theAIS - the presentation -void MODULEBASE_EXPORT setPointBallHighlighting(AIS_Shape* theAIS); +void MODULEBASE_EXPORT setPointBallHighlighting(AIS_InteractiveObject* theAIS); /// Creates a parameter from a given string /// \theText a text wit equation diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index 30a297eeb..9dc673f19 100644 --- a/src/XGUI/XGUI_Displayer.cpp +++ b/src/XGUI/XGUI_Displayer.cpp @@ -636,10 +636,6 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const //aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0); //aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0); - //Handle(AIS_Trihedron) aTrihedron = myWorkshop->viewer()->trihedron(); - //aTrihedron->getHighlightPointAspect()->SetScale(2.0); - //aTrihedron->getHighlightPointAspect()->SetTypeOfMarker(Aspect_TOM_O_STAR); - // Commented out according to discussion in bug #2825 ModuleBase_IViewer::DefaultHighlightDrawer = aContext->HighlightStyle(); //Handle(Prs3d_Drawer) aSelStyle = aContext->SelectionStyle(); @@ -651,6 +647,10 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const //ModuleBase_IViewer::DefaultHighlightDrawer->SetDeviationCoefficient(aDeflection); //aSelStyle->SetDeviationCoefficient(aDeflection); + + Handle(AIS_Trihedron) aTrihedron = myWorkshop->viewer()->trihedron(); + if (!aTrihedron.IsNull()) + ModuleBase_Tools::setPointBallHighlighting(aTrihedron.get()); } return aContext; } -- 2.39.2