From f5bdf33f12c4224da1672519f36ca1e759ee8fe1 Mon Sep 17 00:00:00 2001 From: vsv Date: Wed, 27 Nov 2019 11:36:07 +0300 Subject: [PATCH] Issue #3091: Enable DOF objects for selection list. --- src/XGUI/XGUI_ModuleConnector.cpp | 8 +------- src/XGUI/XGUI_OperationMgr.cpp | 2 +- src/XGUI/XGUI_Workshop.cpp | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp index 36866a91e..b0ee40950 100644 --- a/src/XGUI/XGUI_ModuleConnector.cpp +++ b/src/XGUI/XGUI_ModuleConnector.cpp @@ -130,13 +130,7 @@ void XGUI_ModuleConnector::setSelected(const QList& the myWorkshop->selector()->clearSelection(); aBrowser->treeView()->clearSelection(); } else { - aDisp->setSelected(theValues); - // Synchronise the selection with Object browser - QObjectPtrList anObjects; - foreach(ModuleBase_ViewerPrsPtr aVal, theValues) { - anObjects.append(aVal->object()); - } - aBrowser->setObjectsSelected(anObjects); + myWorkshop->selector()->setSelected(theValues); } } diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp index b8857fecf..68c1b535d 100644 --- a/src/XGUI/XGUI_OperationMgr.cpp +++ b/src/XGUI/XGUI_OperationMgr.cpp @@ -843,7 +843,7 @@ bool XGUI_OperationMgr::onProcessDelete(QObject* theObject) /// processing delete by workshop XGUI_ObjectsBrowser* aBrowser = XGUI_Tools::workshop(myWorkshop)->objectBrowser(); QWidget* aViewPort = myWorkshop->viewer()->activeViewPort(); - bool isToDeleteObject = false; + bool isToDeleteObject = true; XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); XGUI_ContextMenuMgr* aContextMenuMgr = aWorkshop->contextMenuMgr(); if (theObject == aBrowser->treeView()) { diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 4d2f003b1..d42b7e247 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -1861,6 +1861,7 @@ void XGUI_Workshop::deleteObjects() // allow the module to delete objects, do nothing if it has succeed if (aModule->deleteObjects()) { updateCommandStatus(); + myDisplayer->updateViewer(); return; } -- 2.30.2