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
Merge branch 'Dev_0.7.1' of newgeom:newgeom into Dev_0.7.1
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index dde892d224818d1606bbbf003c74fb512e192081..6a5421549ff74845da9a60dca29fd6257a54761d 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: ModuleBase_ModelWidget.h
// Created: 25 Apr 2014
// Author: Natalia ERMOLAEVA
// File: ModuleBase_ModelWidget.h
// Created: 25 Apr 2014
// Author: Natalia ERMOLAEVA
@@
-25,8
+27,8
@@
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent, const Config_
: QObject(theParent),
myParentId(theParentId)
{
: QObject(theParent),
myParentId(theParentId)
{
+ myIsValueDefault = !theData->getProperty(ATTR_DEFAULT).empty();
myIsComputedDefault = false;
myIsComputedDefault = false;
- myIsObligatory = theData ? theData->getBooleanAttribute(FEATURE_OBLIGATORY, true) : true;
myAttributeID = theData ? theData->widgetId() : "";
}
myAttributeID = theData ? theData->widgetId() : "";
}
@@
-83,7
+85,6
@@
bool ModuleBase_ModelWidget::focusTo()
return true;
}
return true;
}
-
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
{
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
{
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
@@
-91,6
+92,13
@@
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
+void ModuleBase_ModelWidget::moveObject(ObjectPtr theObj) const
+{
+ static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED);
+ ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
+ Events_Loop::loop()->flush(anEvent);
+}
+
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = qobject_cast<QWidget*>(theObject);
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = qobject_cast<QWidget*>(theObject);