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
Issue #236: Avoid empty shape types definition
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetDoubleValue.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index 6d470dbbd14567860f40444e50068f7f1ce2b6e6..922ab91519dde70b29a459e79aa762472c752bff 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@
-4,6
+4,7
@@
#include <ModuleBase_WidgetDoubleValue.h>
#include <ModuleBase_DoubleSpinBox.h>
#include <ModuleBase_WidgetDoubleValue.h>
#include <ModuleBase_DoubleSpinBox.h>
+#include <ModuleBase_Tools.h>
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_Data.h>
@@
-18,7
+19,6
@@
#include <QLayout>
#include <QLabel>
#include <QEvent>
#include <QLayout>
#include <QLabel>
#include <QEvent>
-#include <QKeyEvent>
#include <QTimer>
#include <math.h>
#include <QTimer>
#include <math.h>
@@
-37,7
+37,7
@@
ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
{
myContainer = new QWidget(theParent);
QHBoxLayout* aControlLay = new QHBoxLayout(myContainer);
{
myContainer = new QWidget(theParent);
QHBoxLayout* aControlLay = new QHBoxLayout(myContainer);
-
aControlLay->setContentsMargins(0, 0, 0, 0
);
+
ModuleBase_Tools::adjustMargins(aControlLay
);
QString aLabelText = QString::fromStdString(theData->widgetLabel());
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
QString aLabelText = QString::fromStdString(theData->widgetLabel());
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
@@
-77,7
+77,7
@@
ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
mySpinBox->setSingleStep(aStepVal);
}
mySpinBox->setSingleStep(aStepVal);
}
- aProp = theData->getProperty(
DOUBLE
_WDG_DEFAULT);
+ aProp = theData->getProperty(
ANY
_WDG_DEFAULT);
double aDefVal = QString::fromStdString(aProp).toDouble(&isOk);
if (isOk) {
mySpinBox->setValue(aDefVal);
double aDefVal = QString::fromStdString(aProp).toDouble(&isOk);
if (isOk) {
mySpinBox->setValue(aDefVal);
@@
-92,8
+92,6
@@
ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
aControlLay->setStretch(1, 1);
connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
aControlLay->setStretch(1, 1);
connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
-
- mySpinBox->installEventFilter(this);
}
ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()
}
ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()