From 838523560afbec323f8e37dd3ddc6b0bd17da069 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 23 Apr 2014 16:47:33 +0400 Subject: [PATCH] refs #30 - Sketch base GUI: create, draw lines Creation of the operation manager to provide the operations stack. --- src/ModuleBase/ModuleBase_Operation.cpp | 10 ---------- src/ModuleBase/ModuleBase_Operation.h | 2 -- src/ModuleBase/ModuleBase_PropPanelOperation.h | 9 +++++++++ src/XGUI/XGUI_Workshop.cpp | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp index 95112d67f..3c052e475 100644 --- a/src/ModuleBase/ModuleBase_Operation.cpp +++ b/src/ModuleBase/ModuleBase_Operation.cpp @@ -54,16 +54,6 @@ QString ModuleBase_Operation::operationId() const return myOperationId; } -/*! - * \brief Replied whether the operation should be commited after the start, or the operation itself - * do that. The default realization provides the check by the operation having the xml prepresentation - * @return the boolean value - */ -bool ModuleBase_Operation::isPerformedImmediately() const -{ - return xmlRepresentation().isEmpty(); -} - std::shared_ptr ModuleBase_Operation::feature() const { return myFeature; diff --git a/src/ModuleBase/ModuleBase_Operation.h b/src/ModuleBase/ModuleBase_Operation.h index 4042beeb4..6e109860b 100644 --- a/src/ModuleBase/ModuleBase_Operation.h +++ b/src/ModuleBase/ModuleBase_Operation.h @@ -76,8 +76,6 @@ public: // Operation processing. virtual QString operationId() const; - virtual bool isPerformedImmediately() const; - std::shared_ptr feature() const; OperationState state() const; diff --git a/src/ModuleBase/ModuleBase_PropPanelOperation.h b/src/ModuleBase/ModuleBase_PropPanelOperation.h index c6dc06814..29ced2bd3 100644 --- a/src/ModuleBase/ModuleBase_PropPanelOperation.h +++ b/src/ModuleBase/ModuleBase_PropPanelOperation.h @@ -29,6 +29,15 @@ public: ModuleBase_PropPanelOperation(const QString& theId = "", QObject* parent = 0); virtual ~ModuleBase_PropPanelOperation(); + /*! + * \brief Replied whether the operation should be commited after the start, or the operation itself + * do that. The default realization provides the check by the operation having the xml prepresentation + * @return the boolean value + */ + virtual bool isPerformedImmediately() const + { + return xmlRepresentation().isEmpty(); + } /*! * \brief Returns XML representation of the operation's widget. * \return XML QString diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 3775dc254..f9e46bf96 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -202,7 +202,7 @@ void XGUI_Workshop::onBeforeOperationStart() if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel //myPartSetModule->connectToPropertyPanel(aOperation); } else { - connectToPropertyPanel(aOperation); + connectWithOperation(aOperation); QWidget* aPropWidget = myMainWindow->findChild(XGUI::PROP_PANEL_WDG); qDeleteAll(aPropWidget->children()); } -- 2.39.2