Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #1303 Re-ordering of Sketcher menus: Delete to be the last
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index b1d5b5a461865730ccdedd057c0edcee06c1a9bd..cf67219928e96d3c8113dece3d4b4e8c584ddead 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-32,6
+32,7
@@
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
myIsEditing(false),
myState(Stored),
myIsValueStateBlocked(false),
myIsEditing(false),
myState(Stored),
myIsValueStateBlocked(false),
+ myFlushUpdateBlocked(false),
myWidgetValidator(0)
{
myIsInternal = theData->getBooleanAttribute(ATTR_INTERNAL, false);
myWidgetValidator(0)
{
myIsInternal = theData->getBooleanAttribute(ATTR_INTERNAL, false);
@@
-138,11
+139,16
@@
void ModuleBase_ModelWidget::setHighlighted(bool isHighlighted)
}
}
}
}
-void ModuleBase_ModelWidget::setFeature(const FeaturePtr& theFeature, const bool theToStoreValue)
+void ModuleBase_ModelWidget::setFeature(const FeaturePtr& theFeature, const bool theToStoreValue,
+ const bool isUpdateFlushed)
{
{
+ /// it is possible to give this flag as parameter in storeValue/storeCustomValue
+ /// after debug, it may be corrected
+ myFlushUpdateBlocked = !isUpdateFlushed;
myFeature = theFeature;
if (theToStoreValue)
storeValue();
myFeature = theFeature;
if (theToStoreValue)
storeValue();
+ myFlushUpdateBlocked = false;
}
bool ModuleBase_ModelWidget::focusTo()
}
bool ModuleBase_ModelWidget::focusTo()
@@
-287,8
+293,10
@@
bool ModuleBase_ModelWidget::restoreValue()
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObject)
{
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObject)
{
- ModuleBase_Tools::flushUpdated(theObject);
- emit objectUpdated();
+ if (!myFlushUpdateBlocked) {
+ ModuleBase_Tools::flushUpdated(theObject);
+ emit objectUpdated();
+ }
}
void ModuleBase_ModelWidget::moveObject(ObjectPtr theObj)
}
void ModuleBase_ModelWidget::moveObject(ObjectPtr theObj)