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
refs #226: the next non-filled widget should have focus after preselection processing
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetEditor.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetEditor.cpp
b/src/ModuleBase/ModuleBase_WidgetEditor.cpp
index b42e8401797c260b8450242e57db5a550f19b9a7..ee5bc67f476ba024490da025fc8dbea9f5f87b10 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetEditor.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetEditor.cpp
@@
-3,6
+3,8
@@
// Author: Natalia ERMOLAEVA
#include <ModuleBase_WidgetEditor.h>
// Author: Natalia ERMOLAEVA
#include <ModuleBase_WidgetEditor.h>
+#include <ModuleBase_DoubleSpinBox.h>
+#include <ModuleBase_Tools.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
@@
-22,7
+24,6
@@
#include <QTimer>
#include <QDialog>
#include <QLayout>
#include <QTimer>
#include <QDialog>
#include <QLayout>
-#include <QDoubleSpinBox>
ModuleBase_WidgetEditor::ModuleBase_WidgetEditor(QWidget* theParent,
const Config_WidgetAPI* theData,
ModuleBase_WidgetEditor::ModuleBase_WidgetEditor(QWidget* theParent,
const Config_WidgetAPI* theData,
@@
-31,13
+32,6
@@
ModuleBase_WidgetEditor::ModuleBase_WidgetEditor(QWidget* theParent,
{
}
{
}
-ModuleBase_WidgetEditor::ModuleBase_WidgetEditor(QWidget* theParent,
- const std::string& theAttribute)
- : ModuleBase_WidgetDoubleValue(theParent, 0, "")
-{
- setAttributeID(theAttribute);
-}
-
ModuleBase_WidgetEditor::~ModuleBase_WidgetEditor()
{
}
ModuleBase_WidgetEditor::~ModuleBase_WidgetEditor()
{
}
@@
-47,7
+41,7
@@
double editedValue(double theValue, bool& isDone)
QDialog aDlg;
aDlg.setWindowFlags(Qt::FramelessWindowHint);
QHBoxLayout* aLay = new QHBoxLayout(&aDlg);
QDialog aDlg;
aDlg.setWindowFlags(Qt::FramelessWindowHint);
QHBoxLayout* aLay = new QHBoxLayout(&aDlg);
-
aLay->setContentsMargins(0, 0, 0, 0
);
+
ModuleBase_Tools::zeroMargins(aLay
);
QLineEdit* aEditor = new QLineEdit(QString::number(theValue), &aDlg);
aEditor->setValidator(new QDoubleValidator(aEditor));
QLineEdit* aEditor = new QLineEdit(QString::number(theValue), &aDlg);
aEditor->setValidator(new QDoubleValidator(aEditor));