From d7febecdfab48204354f2473b7ba8f3cb56a0c84 Mon Sep 17 00:00:00 2001 From: vsv Date: Fri, 15 Nov 2019 15:18:53 +0300 Subject: [PATCH] Temporarily comment out code dedicated to visibility of origin point selection --- src/SHAPERGUI/SHAPERGUI.cpp | 30 +++++++++++++++--------------- src/XGUI/XGUI_Displayer.cpp | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp index 53e372458..2bd967917 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -322,11 +322,11 @@ bool SHAPERGUI::activateModule(SUIT_Study* theStudy) XGUI_Displayer* aDisp = myWorkshop->displayer(); QObjectPtrList aObjList = aDisp->displayedObjects(); - if (myHighlightPointAspect.IsNull()) { - Handle(AIS_Trihedron) aTrihedron = mySelector->viewer()->getTrihedron(); - myHighlightPointAspect = - new Graphic3d_AspectMarker3d(aTrihedron->getHighlightPointAspect()->Aspect().operator*()); - } + //if (myHighlightPointAspect.IsNull()) { + // Handle(AIS_Trihedron) aTrihedron = mySelector->viewer()->getTrihedron(); + // myHighlightPointAspect = + // new Graphic3d_AspectMarker3d(aTrihedron->getHighlightPointAspect()->Aspect().operator*()); + //} if (myOldSelectionColor.size() == 0) myOldSelectionColor = aDisp->selectionColor(); @@ -408,11 +408,11 @@ bool SHAPERGUI::deactivateModule(SUIT_Study* theStudy) } // Delete selector because it has to be redefined on next activation if (mySelector) { - if (!myHighlightPointAspect.IsNull()) { - Handle(AIS_Trihedron) aTrihedron = mySelector->viewer()->getTrihedron(); - aTrihedron->getHighlightPointAspect()->SetAspect(myHighlightPointAspect); - myHighlightPointAspect.Nullify(); - } + //if (!myHighlightPointAspect.IsNull()) { + // Handle(AIS_Trihedron) aTrihedron = mySelector->viewer()->getTrihedron(); + // aTrihedron->getHighlightPointAspect()->SetAspect(myHighlightPointAspect); + // myHighlightPointAspect.Nullify(); + //} myWorkshop->displayer()->setSelectionColor(myOldSelectionColor); myProxyViewer->setSelector(0); delete mySelector; @@ -548,11 +548,11 @@ SHAPERGUI_OCCSelector* SHAPERGUI::createSelector(SUIT_ViewManager* theMgr) if (theMgr->getType() == OCCViewer_Viewer::Type()) { OCCViewer_Viewer* aViewer = static_cast(theMgr->getViewModel()); - if (myHighlightPointAspect.IsNull()) { - Handle(AIS_Trihedron) aTrihedron = aViewer->getTrihedron(); - myHighlightPointAspect = - new Graphic3d_AspectMarker3d(aTrihedron->getHighlightPointAspect()->Aspect().operator*()); - } + //if (myHighlightPointAspect.IsNull()) { + // Handle(AIS_Trihedron) aTrihedron = aViewer->getTrihedron(); + // myHighlightPointAspect = + // new Graphic3d_AspectMarker3d(aTrihedron->getHighlightPointAspect()->Aspect().operator*()); + //} SHAPERGUI_OCCSelector* aSelector = new SHAPERGUI_OCCSelector(aViewer, getApp()->selectionMgr()); #ifdef SALOME_PATCH_FOR_CTRL_WHEEL diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index 0cad0a338..b9ff21eef 100644 --- a/src/XGUI/XGUI_Displayer.cpp +++ b/src/XGUI/XGUI_Displayer.cpp @@ -647,9 +647,9 @@ 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); + //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(); -- 2.39.2