#include <QLayout>
ModuleBase_WidgetEditor::ModuleBase_WidgetEditor(QWidget* theParent,
- const Config_WidgetAPI* theData,
- const std::string& theParentId)
- : ModuleBase_WidgetDoubleValue(theParent, theData, theParentId)
+ const Config_WidgetAPI* theData)
+: ModuleBase_WidgetDoubleValue(theParent, theData),
+ myXPosition(-1), myYPosition(-1)
{
}
{
}
-void editedValue(double& outValue, QString& outText)
+bool ModuleBase_WidgetEditor::editedValue(double& outValue, QString& outText)
{
- QDialog aDlg(QApplication::desktop(), Qt::Popup/* | Qt::FramelessWindowHint*/);
+ bool isValueAccepted = false;
+
+ QDialog aDlg(QApplication::desktop(), Qt::FramelessWindowHint);
QHBoxLayout* aLay = new QHBoxLayout(&aDlg);
aLay->setContentsMargins(2, 2, 2, 2);
- ModuleBase_ParamSpinBox* aEditor = new ModuleBase_ParamSpinBox(&aDlg);
- aEditor->setMinimum(0);
- aEditor->setMaximum(DBL_MAX);
+ ModuleBase_ParamSpinBox* anEditor = new ModuleBase_ParamSpinBox(&aDlg);
+ anEditor->enableKeyPressEvent(true);
+
+ anEditor->setMinimum(0);
+ anEditor->setMaximum(DBL_MAX);
if (outText.isEmpty())
- aEditor->setValue(outValue);
+ anEditor->setValue(outValue);
else
- aEditor->setText(outText);
-
- aLay->addWidget(aEditor);
-
- aEditor->setFocus();
- aEditor->selectAll();
- QObject::connect(aEditor, SIGNAL(editingFinished()), &aDlg, SLOT(accept()));
-
- aDlg.move(QCursor::pos());
- aDlg.exec();
- outText = aEditor->text();
- bool isDouble;
- double aValue = outText.toDouble(&isDouble);
- if (isDouble) {
- outValue = aValue;
- outText = ""; // return empty string, if it's can be converted to a double
+ anEditor->setText(outText);
+
+ aLay->addWidget(anEditor);
+
+ ModuleBase_Tools::setFocus(anEditor, "ModuleBase_WidgetEditor::editedValue");
+ anEditor->selectAll();
+ QObject::connect(anEditor, SIGNAL(enterReleased()), &aDlg, SLOT(accept()));
+
+ QPoint aPoint = QCursor::pos();
+ if (myXPosition >= 0 && myYPosition >= 0)
+ aPoint = QPoint(myXPosition, myYPosition);
+
+ aDlg.move(aPoint);
+ isValueAccepted = aDlg.exec() == QDialog::Accepted;
+ if (isValueAccepted) {
+ outText = anEditor->text();
+ bool isDouble;
+ double aValue = outText.toDouble(&isDouble);
+ if (isDouble) {
+ outValue = aValue;
+ outText = ""; // return empty string, if it's can be converted to a double
+ }
}
+ return isValueAccepted;
}
bool ModuleBase_WidgetEditor::focusTo()
{
- // nds: it seems, that the timer is not necessary anymore
-
- // We can not launch here modal process for value editing because
- // it can be called on other focusOutWidget event and will block it
- //QTimer::singleShot(1, this, SLOT(showPopupEditor()));
-
showPopupEditor();
-
return true;
}
-void ModuleBase_WidgetEditor::showPopupEditor()
+bool ModuleBase_WidgetEditor::showPopupEditor(const bool theSendSignals)
{
+ bool isValueAccepted = false;
// we need to emit the focus in event manually in order to save the widget as an active
// in the property panel before the mouse leave event happens in the viewer. The module
// ask an active widget and change the feature visualization if the widget is not the current one.
- emit focusInWidget(this);
+ if (theSendSignals)
+ emit focusInWidget(this);
// nds: it seems, that the envents processing is not necessary anymore
// White while all events will be processed
if (mySpinBox->hasVariable())
aText = mySpinBox->text();
- editedValue(aValue, aText);
- if (aText.isEmpty()) {
- ModuleBase_Tools::setSpinValue(mySpinBox, aValue);
- } else {
- ModuleBase_Tools::setSpinText(mySpinBox, aText);
+ isValueAccepted = editedValue(aValue, aText);
+ if (isValueAccepted) {
+ if (aText.isEmpty()) {
+ ModuleBase_Tools::setSpinValue(mySpinBox, aValue);
+ } else {
+ ModuleBase_Tools::setSpinText(mySpinBox, aText);
+ }
+ if (theSendSignals) {
+ emit valuesChanged();
+ // the focus leaves the control automatically by the Enter/Esc event
+ // it is processed in operation manager
+ //emit focusOutWidget(this);
+ }
+ else
+ storeValue();
}
- emit valuesChanged();
- emit focusOutWidget(this);
+
+ if (theSendSignals && !myIsEditing)
+ emit enterClicked(this);
+
+ return isValueAccepted;
+}
+
+void ModuleBase_WidgetEditor::setCursorPosition(const int theX, const int theY)
+{
+ myXPosition = theX;
+ myYPosition = theY;
}