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 'master' of newgeom:newgeom.git
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index c6670f24ae1647f8b8476dd2a088077c72d9833e..939345b517beefd395652896b194802d34b728a9 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-7,8
+7,10
@@
#include <ModelAPI_Data.h>
#include <ModelAPI_Attribute.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Attribute.h>
#include <ModelAPI_Events.h>
+#include <ModelAPI_Session.h>
-#include "Config_WidgetAPI.h"
+#include <Config_Keywords.h>
+#include <Config_WidgetAPI.h>
#include <Events_Loop.h>
#include <Events_Loop.h>
@@
-21,6
+23,7
@@
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QObject* theParent, const Config_
myParentId(theParentId)
{
myIsComputedDefault = false;
myParentId(theParentId)
{
myIsComputedDefault = false;
+ myIsObligatory = theData ? theData->getBooleanAttribute(FEATURE_OBLIGATORY, true) : true;
myAttributeID = theData ? theData->widgetId() : "";
}
myAttributeID = theData ? theData->widgetId() : "";
}
@@
-29,6
+32,16
@@
bool ModuleBase_ModelWidget::isInitialized(ObjectPtr theObject) const
return theObject->data()->attribute(attributeID())->isInitialized();
}
return theObject->data()->attribute(attributeID())->isInitialized();
}
+void ModuleBase_ModelWidget::enableFocusProcessing()
+{
+ QList<QWidget*> aMyControls = getControls();
+ foreach(QWidget* eachControl, aMyControls) {
+ if(!myFocusInWidgets.contains(eachControl)) {
+ enableFocusProcessing(eachControl);
+ }
+ }
+}
+
bool ModuleBase_ModelWidget::focusTo()
{
QList<QWidget*> aControls = getControls();
bool ModuleBase_ModelWidget::focusTo()
{
QList<QWidget*> aControls = getControls();
@@
-43,6
+56,7
@@
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));
@@
-50,7
+64,7
@@
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
-void ModuleBase_ModelWidget::
processFocus
(QWidget* theWidget)
+void ModuleBase_ModelWidget::
enableFocusProcessing
(QWidget* theWidget)
{
theWidget->setFocusPolicy(Qt::StrongFocus);
theWidget->installEventFilter(this);
{
theWidget->setFocusPolicy(Qt::StrongFocus);
theWidget->installEventFilter(this);
@@
-60,11
+74,10
@@
void ModuleBase_ModelWidget::processFocus(QWidget* theWidget)
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = dynamic_cast<QWidget*>(theObject);
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = dynamic_cast<QWidget*>(theObject);
- if (theEvent->type() == QEvent::FocusIn && myFocusInWidgets.contains(aWidget)) {
+ if (theEvent->type() == QEvent::MouseButtonRelease &&
+ myFocusInWidgets.contains(aWidget)) {
emit focusInWidget(this);
emit focusInWidget(this);
- return true;
- } else {
- // pass the event on to the parent class
- return QObject::eventFilter(theObject, theEvent);
- }
+ }
+ // pass the event on to the parent class
+ return QObject::eventFilter(theObject, theEvent);
}
}