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
Open transaction before setCurrentFeatuire if it is not opened
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index ea7de61acc3b52dfd5b3e3fbb7dc0482b88af1d1..130e8940476f581a582483dffa5778fbacc0968d 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-17,19
+17,22
@@
#include <Events_Loop.h>
#include <QEvent>
#include <Events_Loop.h>
#include <QEvent>
-#include <QWidget>
#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,
const std::string& theParentId)
const std::string& theParentId)
- : QObject(theParent),
- myParentId(theParentId)
+ : QWidget(theParent),
+ myParentId(theParentId),
+ myIsEditing(false)
{
myDefaultValue = theData->getProperty(ATTR_DEFAULT);
myIsComputedDefault = theData->getProperty(ATTR_DEFAULT) == DOUBLE_WDG_DEFAULT_COMPUTED;
myAttributeID = theData ? theData->widgetId() : "";
{
myDefaultValue = theData->getProperty(ATTR_DEFAULT);
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()));
}
@@
-43,8
+46,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);
+ }
}
}
}
}
@@
-84,14
+92,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()
@@
-115,6
+124,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();
@@
-142,6
+156,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);
}