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
Correct compilation on Linux.
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetIntValue.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
index cb6986301bc142e160ad241a96b5dbe7265def22..308aef0ff7f2dc46f576e137a4c473ddc28f0098 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetIntValue.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetIntValue.cpp
@@
-7,6
+7,7
@@
#include <ModuleBase_WidgetIntValue.h>
#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_WidgetIntValue.h>
#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
+#include <ModuleBase_IntSpinBox.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_Data.h>
@@
-22,7
+23,6
@@
#include <QLabel>
#include <QEvent>
#include <QTimer>
#include <QLabel>
#include <QEvent>
#include <QTimer>
-#include <QSpinBox>
#include <math.h>
#include <math.h>
@@
-34,8
+34,6
@@
#include <iostream>
#endif
#include <iostream>
#endif
-#define APPLY_BY_ENTER_OR_TAB
-
ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
const Config_WidgetAPI* theData,
const std::string& theParentId)
ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
const Config_WidgetAPI* theData,
const std::string& theParentId)
@@
-50,7
+48,7
@@
ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
if (!aLabelIcon.isEmpty())
myLabel->setPixmap(QPixmap(aLabelIcon));
if (!aLabelIcon.isEmpty())
myLabel->setPixmap(QPixmap(aLabelIcon));
- mySpinBox = new
Q
SpinBox(this);
+ mySpinBox = new
ModuleBase_Int
SpinBox(this);
QString anObjName = QString::fromStdString(attributeID());
mySpinBox->setObjectName(anObjName);
QString anObjName = QString::fromStdString(attributeID());
mySpinBox->setObjectName(anObjName);
@@
-87,13
+85,7
@@
ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
myLabel->setToolTip(aTTip);
aControlLay->addRow(myLabel, mySpinBox);
myLabel->setToolTip(aTTip);
aControlLay->addRow(myLabel, mySpinBox);
-#ifdef APPLY_BY_ENTER_OR_TAB
- // Apply widget value change by enter/tab event.
- connect(mySpinBox, SIGNAL(editingFinished()), this, SIGNAL(valuesChanged()));
connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesModified()));
connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesModified()));
-#else
- connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesChanged()));
-#endif
}
ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
}
ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
@@
-147,3
+139,13
@@
QList<QWidget*> ModuleBase_WidgetIntValue::getControls() const
aList.append(mySpinBox);
return aList;
}
aList.append(mySpinBox);
return aList;
}
+
+bool ModuleBase_WidgetIntValue::processEnter()
+{
+ bool isModified = getValueState() == ModifiedInPP;
+ if (isModified) {
+ emit valuesChanged();
+ mySpinBox->selectAll();
+ }
+ return isModified;
+}