From 423ada673a32661b556977782a3e89b9bdcd87fd Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sat, 19 Sep 2020 22:54:40 +0200 Subject: [PATCH] some more tests on bathy selection --- src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx | 11 ++++++----- src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx b/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx index 0c9a9587..e968bd00 100644 --- a/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx +++ b/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx @@ -198,20 +198,21 @@ void HYDROGUI_BathymetryPrs::ComputeSelection( const Handle(SelectMgr_Selection) { case 0: { - DEBTRACE("Bounding box selection"); - AIS_PointCloud::ComputeSelection( theSelection, SM_BndBox); + DEBTRACE("Points selection"); + AIS_PointCloud::ComputeSelection( theSelection, SM_Points); break; } case 1: { DEBTRACE("Subset of points detection"); - AIS_PointCloud::ComputeSelection( theSelection, SM_SubsetOfPoints ); // SM_Points ? + AIS_PointCloud::ComputeSelection( theSelection, SM_SubsetOfPoints ); break; } default: { - DEBTRACE("Do Nothing"); - return; + DEBTRACE("Bounding box selection"); + AIS_PointCloud::ComputeSelection( theSelection, SM_BndBox); + break; } } diff --git a/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx b/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx index 577eb7a1..c7037f83 100644 --- a/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx +++ b/src/HYDROGUI/HYDROGUI_BathymetrySelectionOp.cxx @@ -114,7 +114,7 @@ void HYDROGUI_BathymetrySelectionOp::activateSelection( bool isActive ) DEBTRACE("bathy name: " << bath->GetShape()->getObject()->GetName().toStdString()); ctx->Deactivate(bath); //ctx->Activate( bath, aSelectionMode, Standard_True ); - ctx->SetSelectionModeActive (bath, aSelectionMode, Standard_True, AIS_SelectionModesConcurrency_Multiple, Standard_False); + ctx->SetSelectionModeActive (bath, aSelectionMode, Standard_True, AIS_SelectionModesConcurrency_Single, Standard_False); bath->SetAutoHilight( Standard_False ); // True bloque le passage dans hilightSelected... // DEBTRACE("immediateMode: " << ctx->MainPrsMgr()->IsImmediateModeOn()); // if (!ctx->MainPrsMgr()->IsImmediateModeOn()) @@ -130,7 +130,7 @@ void HYDROGUI_BathymetrySelectionOp::activateSelection( bool isActive ) bath->SetAutoHilight( Standard_True ); bath->GetShape()->TextLabels( false ); ctx->Deactivate( bath ); - ctx->SetSelectionModeActive (bath, 0, Standard_True, AIS_SelectionModesConcurrency_Multiple, Standard_False); + ctx->SetSelectionModeActive (bath, 2, Standard_True, AIS_SelectionModesConcurrency_Multiple, Standard_False); } //ctx->CloseLocalContext( -1, Standard_True ); } -- 2.39.2