From 229416c43c7704b4bddae0db4cc60e05944e2481 Mon Sep 17 00:00:00 2001 From: IKhonakhbeeva Date: Mon, 23 Oct 2023 01:54:28 +0200 Subject: [PATCH] Reset draw action when reloading world model --- .../include/twoDModel/engine/view/twoDModelWidget.h | 1 + .../common/twoDModel/src/engine/twoDModelEngineFacade.cpp | 1 + .../common/twoDModel/src/engine/view/twoDModelWidget.cpp | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h b/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h index 5f404eec30..00a3542365 100644 --- a/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h +++ b/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h @@ -101,6 +101,7 @@ class TWO_D_MODEL_EXPORT TwoDModelWidget : public QWidget void setBackgroundMode(); void bringToFront(); + void resetDrawAction(); QString editorId() const override; bool supportsZooming() const override; diff --git a/plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp b/plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp index c5977fff37..4b5f91a154 100644 --- a/plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp +++ b/plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp @@ -89,6 +89,7 @@ void TwoDModelEngineFacade::init(const kitBase::EventsForKitPluginInterface &eve } mView->loadXmls(worldModel); + mView->resetDrawAction(); loadReadOnlyFlags(logicalModel); QLOG_DEBUG() << "Reloading 2D world done"; diff --git a/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp b/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp index dc252008cc..7070dd8fa4 100644 --- a/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp +++ b/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp @@ -300,6 +300,11 @@ void TwoDModelWidget::initPalette() connect(imageTool, &QAction::triggered, this, [this](){ mUi->palette->unselect(); }); } +void TwoDModelWidget::resetDrawAction() +{ + mUi->palette->unselect(); +} + void TwoDModelWidget::initDetailsTab() { }