From: isn Date: Wed, 13 Dec 2017 13:48:46 +0000 (+0300) Subject: refs #1500 X-Git-Tag: v2.1.1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=79ffe46b5a486e456328288888497b0d6be4a111;p=modules%2Fhydro.git refs #1500 Conflicts: src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx --- diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx index f59c3302..156e76c4 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 ); }