From f275947fe33f4ac4525c9100df422a881fed512c Mon Sep 17 00:00:00 2001 From: isn Date: Wed, 13 Dec 2017 16:48:46 +0300 Subject: [PATCH] refs #1500 --- src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx index c9416967..b3d39014 100644 --- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx +++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx @@ -93,19 +93,7 @@ QList HYDROGUI_ShapeBathymetry::createShape() con return shapes; } -#include -#include -#include -#include -#include -class BVHB_dummy: public BVH_QueueBuilder -{ - BVHB_dummy(); - ~BVHB_dummy(); -public: - int* getNbThreads() {return &this->myNumOfThreads;} -}; void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(AIS_ColorScale)& theColorScale ) { if (!myCoords || getAISObjects().isEmpty()) @@ -123,33 +111,8 @@ void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(AIS_ColorScale myColors->SetValue( i, aColor ); } Handle(HYDROGUI_BathymetryPrs) aPntCloud = Handle(HYDROGUI_BathymetryPrs)::DownCast( getAISObjects()[0] ); - //const Handle(SelectMgr_Selection)& sel0 = aPntCloud->Selection(0); - //const Handle(SelectMgr_SensitiveEntity)& sens = sel0->Sensitive(); aPntCloud->SetPoints( myCoords, myColors ); getContext()->RecomputePrsOnly( aPntCloud, Standard_True ); - Handle(StdSelect_ViewerSelector3d) VS = getContext()->MainSelector(); - Handle(SelectMgr_ViewerSelector) VSD = Handle(SelectMgr_ViewerSelector)::DownCast(VS); - //size_t VSDsize = sizeof(VSD); - size_t VSDsize1 = sizeof(SelectMgr_ViewerSelector); - size_t mapSensSize = sizeof(SelectMgr_MapOfObjectSensitives); - SelectMgr_MapOfObjectSensitives* mapS = (SelectMgr_MapOfObjectSensitives*)((char*)VSD.get() + (VSDsize1 - mapSensSize)); - try - { - mapS->Size(); - NCollection_Handle& anEntitySet = mapS->ChangeFind (aPntCloud); - NCollection_Handle> BVH_Builder = anEntitySet->Builder(); - BVH_QueueBuilder* BVH_QB = dynamic_cast*>(BVH_Builder.get()); - int* nbt = static_cast(BVH_QB)->getNbThreads(); - if (*nbt == 1) - *nbt = 4; - } - catch (...) - { - - } - - //getContext()->LocalSelector(); - //aPntCloud->ComputeSelection(sel0, 0); getContext()->RecomputeSelectionOnly( aPntCloud ); } @@ -305,7 +268,7 @@ void HYDROGUI_ShapeBathymetry::Rescale( double theMin, double theMax ) if( !getAISObjects().isEmpty() ) { - getContext()->RecomputePrsOnly( getAISObjects()[0] ); + getContext()->RecomputePrsOnly( getAISObjects()[0], true ); //getAISObjects()[0]->Redisplay(); } } @@ -356,7 +319,7 @@ void HYDROGUI_ShapeBathymetry::TextLabels( bool isOn, bool isUpdateCurrentViewer selection = selected(); - getContext()->ClearSelected(true); + //getContext()->ClearSelected(true); prs->SetTextLabels( selection ); getContext()->RecomputePrsOnly( prs, Standard_False, Standard_False ); //prs->Redisplay(); -- 2.39.2