From 78246681ed6d62bdad42d0677e1aae3a0af8af47 Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 18 Aug 2015 12:11:38 +0300 Subject: [PATCH] It removes stabilization fix, which is not necessary anymore because ModuleBase_WidgetSelector performs this disconnect in deactivate(). --- src/ModuleBase/ModuleBase_ModelWidget.h | 3 --- src/ModuleBase/ModuleBase_Operation.cpp | 4 ---- src/ModuleBase/ModuleBase_WidgetSelector.cpp | 6 ------ src/ModuleBase/ModuleBase_WidgetSelector.h | 3 --- 4 files changed, 16 deletions(-) diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h index cad3f174c..bd9c15b0e 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.h +++ b/src/ModuleBase/ModuleBase_ModelWidget.h @@ -44,9 +44,6 @@ Q_OBJECT { } - //TODO: nds stabilization hotfix - virtual void disconnectSignals() {}; - /// Fills the widget with default values /// \return true if the widget current value is reset virtual bool reset() { return false; }; diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp index 60f5b1b08..fb3bebd72 100644 --- a/src/ModuleBase/ModuleBase_Operation.cpp +++ b/src/ModuleBase/ModuleBase_Operation.cpp @@ -255,15 +255,11 @@ void ModuleBase_Operation::onValuesChanged() myIsModified = true; } -//TODO: nds stabilization hotfix void ModuleBase_Operation::commitOperation() { if(!myPropertyPanel) { return; } - ModuleBase_ModelWidget* aWidget = myPropertyPanel->activeWidget(); - if (aWidget) - aWidget->disconnectSignals(); } void ModuleBase_Operation::activateByPreselection() diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp index e2233ab7c..5f57ebb15 100755 --- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp @@ -26,12 +26,6 @@ ModuleBase_WidgetSelector::~ModuleBase_WidgetSelector() { } -//TODO: nds stabilization hotfix -void ModuleBase_WidgetSelector::disconnectSignals() -{ - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); -} - //******************************************************************** void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs, ObjectPtr& theObject, diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.h b/src/ModuleBase/ModuleBase_WidgetSelector.h index 2d3796f67..99af3ad74 100755 --- a/src/ModuleBase/ModuleBase_WidgetSelector.h +++ b/src/ModuleBase/ModuleBase_WidgetSelector.h @@ -54,9 +54,6 @@ Q_OBJECT /// The methiod called when widget is deactivated virtual void deactivate(); - //TODO: nds stabilization hotfix - virtual void disconnectSignals(); - protected: /// Activate or deactivate selection void activateSelection(bool toActivate); -- 2.39.2