From eaf84a526d6b44d1d9cd7c56daea6c63f97a679c Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 19 Mar 2021 14:03:52 +0300 Subject: [PATCH] Bos #24055. Minor changes. --- src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp | 2 +- src/FeaturesPlugin/FeaturesPlugin_Extrusion.h | 12 ++++++------ src/FeaturesPlugin/FeaturesPlugin_Revolution.h | 12 ++++++------ src/ModuleBase/ModuleBase_ModelWidget.cpp | 2 +- src/ModuleBase/ModuleBase_ModelWidget.h | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp index 0ef1875dc..3461326aa 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp @@ -220,7 +220,7 @@ void FeaturesPlugin_Extrusion::getSizes(double& theToSize, double& theFromSize) if (string(CREATION_METHOD())->value() == CREATION_METHOD_BY_SIZES()) { theToSize = real(TO_SIZE_ID())->value(); theFromSize = real(FROM_SIZE_ID())->value(); - } if (string(CREATION_METHOD())->value() == CREATION_METHOD_BY_PLANES()) { + } else if (string(CREATION_METHOD())->value() == CREATION_METHOD_BY_PLANES()) { theToSize = real(TO_OFFSET_ID())->value(); theFromSize = real(FROM_OFFSET_ID())->value(); } else { diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h index 088e8b19c..0928ff61a 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h +++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h @@ -56,22 +56,22 @@ public: /// Attribute name for creation method. inline static const std::string& CREATION_METHOD_BY_SIZES() { - static const std::string MY_CREATION_METHOD_ID("BySizes"); - return MY_CREATION_METHOD_ID; + static const std::string MY_CREATION_METHOD_BY_SIZES("BySizes"); + return MY_CREATION_METHOD_BY_SIZES; } /// Attribute name for creation method. inline static const std::string& CREATION_METHOD_BY_PLANES() { - static const std::string MY_CREATION_METHOD_ID("ByPlanesAndOffsets"); - return MY_CREATION_METHOD_ID; + static const std::string MY_CREATION_METHOD_BY_PLANES("ByPlanesAndOffsets"); + return MY_CREATION_METHOD_BY_PLANES; } /// Attribute name for creation method. inline static const std::string& CREATION_METHOD_THROUGH_ALL() { - static const std::string MY_CREATION_METHOD_ID("ThroughAll"); - return MY_CREATION_METHOD_ID; + static const std::string MY_CREATION_METHOD_THROUGH_ALL("ThroughAll"); + return MY_CREATION_METHOD_THROUGH_ALL; } /// Attribute name of an object to which the extrusion grows. diff --git a/src/FeaturesPlugin/FeaturesPlugin_Revolution.h b/src/FeaturesPlugin/FeaturesPlugin_Revolution.h index d9c2b9910..6ab504e34 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Revolution.h +++ b/src/FeaturesPlugin/FeaturesPlugin_Revolution.h @@ -51,22 +51,22 @@ public: /// Attribute name for creation method. inline static const std::string& CREATION_METHOD_THROUGH_ALL() { - static const std::string MY_CREATION_METHOD_ID("ThroughAll"); - return MY_CREATION_METHOD_ID; + static const std::string MY_CREATION_METHOD_THROUGH_ALL("ThroughAll"); + return MY_CREATION_METHOD_THROUGH_ALL; } /// Attribute name for creation method. inline static const std::string& CREATION_METHOD_BY_ANGLES() { - static const std::string MY_CREATION_METHOD_ID("ByAngles"); - return MY_CREATION_METHOD_ID; + static const std::string MY_CREATION_METHOD_BY_ANGLES("ByAngles"); + return MY_CREATION_METHOD_BY_ANGLES; } /// Attribute name for creation method. inline static const std::string& CREATION_METHOD_BY_PLANES() { - static const std::string MY_CREATION_METHOD_ID("ByPlanesAndOffsets"); - return MY_CREATION_METHOD_ID; + static const std::string MY_CREATION_METHOD_BY_PLANES("ByPlanesAndOffsets"); + return MY_CREATION_METHOD_BY_PLANES; } /// Attribute name of an revolution axis. diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp index e232d1d89..e54f8c6dd 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.cpp +++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp @@ -53,8 +53,8 @@ ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent, const Config_WidgetAPI* theData) : QWidget(theParent), myWidgetValidator(0), - myIsEditing(false), myState(Stored), + myIsEditing(false), myIsValueStateBlocked(false), myFlushUpdateBlocked(false) { diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h index 73de512dd..de0aae6fa 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.h +++ b/src/ModuleBase/ModuleBase_ModelWidget.h @@ -441,9 +441,6 @@ protected: /// A feature ID std::string myFeatureId; - /// Flag which shows that current operation is in editing mode - bool myIsEditing; - /// Flag which shows whether current widget is obligatory /// The non-obligatory widgets should not accept the focus in the property panel bool myIsObligatory; @@ -455,6 +452,9 @@ protected: ValueState myState; private: + /// Flag which shows that current operation is in editing mode + bool myIsEditing; + /// Value should be computed on execute, like radius for circle's constraint (can not be zero) bool myIsComputedDefault; -- 2.39.2