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
Fix for #767: correct the internal history structure for nested features
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index a4368946be30ddbfe501965959559300eb6e3487..63d8095fcc206036af95483e000fb618a4d20c3b 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-1,6
+1,6
@@
// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-// File: ModuleBase_ModelWidget.
h
+// File: ModuleBase_ModelWidget.
cpp
// Created: 25 Apr 2014
// Author: Natalia ERMOLAEVA
// Created: 25 Apr 2014
// Author: Natalia ERMOLAEVA
@@
-20,6
+20,7
@@
#include <QGraphicsDropShadowEffect>
#include <QColor>
#include <QLabel>
#include <QGraphicsDropShadowEffect>
#include <QColor>
#include <QLabel>
+#include <QFocusEvent>
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
const Config_WidgetAPI* theData,
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
const Config_WidgetAPI* theData,
@@
-29,8
+30,10
@@
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
myIsEditing(false)
{
myDefaultValue = theData->getProperty(ATTR_DEFAULT);
myIsEditing(false)
{
myDefaultValue = theData->getProperty(ATTR_DEFAULT);
+ myUseReset = theData->getBooleanAttribute(ATTR_USE_RESET, true);
myIsComputedDefault = theData->getProperty(ATTR_DEFAULT) == DOUBLE_WDG_DEFAULT_COMPUTED;
myAttributeID = theData ? theData->widgetId() : "";
myIsComputedDefault = theData->getProperty(ATTR_DEFAULT) == DOUBLE_WDG_DEFAULT_COMPUTED;
myAttributeID = theData ? theData->widgetId() : "";
+ myIsObligatory = theData->getBooleanAttribute(ATTR_OBLIGATORY, true);
connect(this, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
}
connect(this, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
}
@@
-44,8
+47,13
@@
void ModuleBase_ModelWidget::enableFocusProcessing()
{
QList<QWidget*> aMyControls = getControls();
foreach(QWidget* eachControl, aMyControls) {
{
QList<QWidget*> aMyControls = getControls();
foreach(QWidget* eachControl, aMyControls) {
- eachControl->setFocusPolicy(Qt::StrongFocus);
- eachControl->installEventFilter(this);
+ if (myIsObligatory) {
+ eachControl->setFocusPolicy(Qt::StrongFocus);
+ eachControl->installEventFilter(this);
+ }
+ else {
+ eachControl->setFocusPolicy(Qt::NoFocus);
+ }
}
}
}
}
@@
-85,14
+93,15
@@
bool ModuleBase_ModelWidget::focusTo()
{
QList<QWidget*> aControls = getControls();
QList<QWidget*>::const_iterator anIt = aControls.begin(), aLast = aControls.end();
{
QList<QWidget*> aControls = getControls();
QList<QWidget*>::const_iterator anIt = aControls.begin(), aLast = aControls.end();
- for (; anIt != aLast; anIt++) {
+ bool isFocusAccepted = false;
+ for (; anIt != aLast && !isFocusAccepted; anIt++) {
QWidget* aWidget = *anIt;
if (aWidget && aWidget->focusPolicy() != Qt::NoFocus) {
aWidget->setFocus();
QWidget* aWidget = *anIt;
if (aWidget && aWidget->focusPolicy() != Qt::NoFocus) {
aWidget->setFocus();
-
break
;
+
isFocusAccepted = true
;
}
}
}
}
- return
true
;
+ return
isFocusAccepted
;
}
void ModuleBase_ModelWidget::activate()
}
void ModuleBase_ModelWidget::activate()
@@
-116,6
+125,11
@@
void ModuleBase_ModelWidget::activate()
activateCustom();
}
activateCustom();
}
+void ModuleBase_ModelWidget::setDefaultValue(const std::string& theValue)
+{
+ myDefaultValue = theValue;
+}
+
bool ModuleBase_ModelWidget::storeValue()
{
emit beforeValuesChanged();
bool ModuleBase_ModelWidget::storeValue()
{
emit beforeValuesChanged();
@@
-125,14
+139,23
@@
bool ModuleBase_ModelWidget::storeValue()
return isDone;
}
return isDone;
}
-void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
+bool ModuleBase_ModelWidget::restoreValue()
+{
+ emit beforeValuesRestored();
+ bool isDone = restoreValueCustom();
+ emit afterValuesRestored();
+
+ return isDone;
+}
+
+void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj)
{
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
{
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
-void ModuleBase_ModelWidget::moveObject(ObjectPtr theObj)
const
+void ModuleBase_ModelWidget::moveObject(ObjectPtr theObj)
{
static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED);
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
{
static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED);
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
@@
-143,6
+166,11
@@
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = qobject_cast<QWidget*>(theObject);
if (theEvent->type() == QEvent::FocusIn) {
{
QWidget* aWidget = qobject_cast<QWidget*>(theObject);
if (theEvent->type() == QEvent::FocusIn) {
+ #ifdef _DEBUG
+ // The following two lines are for debugging purpose only
+ QFocusEvent* aFocusEvent = dynamic_cast<QFocusEvent*>(theEvent);
+ bool isWinFocus = aFocusEvent->reason() == Qt::ActiveWindowFocusReason;
+ #endif
if (getControls().contains(aWidget)) {
emit focusInWidget(this);
}
if (getControls().contains(aWidget)) {
emit focusInWidget(this);
}