ModuleBase_WidgetEditor::ModuleBase_WidgetEditor(QWidget* theParent,
const Config_WidgetAPI* theData,
const std::string& theParentId)
- : ModuleBase_WidgetDoubleValue(theParent, theData, theParentId)
+: ModuleBase_WidgetDoubleValue(theParent, theData, theParentId),
+ //myIsEnterPressedEmitted(false),
+ myXPosition(-1), myYPosition(-1)
{
}
ModuleBase_ParamSpinBox* anEditor = new ModuleBase_ParamSpinBox(&aDlg);
anEditor->enableKeyPressEvent(true);
+ //if (!myIsEditing) {
+ // connect(anEditor, SIGNAL(enterPressed()), this, SLOT(onEnterPressed()));
+ //}
anEditor->setMinimum(0);
anEditor->setMaximum(DBL_MAX);
aLay->addWidget(anEditor);
- anEditor->setFocus();
+ ModuleBase_Tools::setFocus(anEditor, "ModuleBase_WidgetEditor::editedValue");
anEditor->selectAll();
- QObject::connect(anEditor, SIGNAL(editingFinished()), &aDlg, SLOT(accept()));
+ QObject::connect(anEditor, SIGNAL(enterReleased()), &aDlg, SLOT(accept()));
- aDlg.move(QCursor::pos());
+ QPoint aPoint = QCursor::pos();
+ if (myXPosition >= 0 && myYPosition >= 0)
+ aPoint = QPoint(myXPosition, myYPosition);
+
+ aDlg.move(aPoint);
aDlg.exec();
+
+ //if (!myIsEditing) {
+ // disconnect(anEditor, SIGNAL(keyReleased(QKeyEvent*)), this, SLOT(onEnterPressed()));
+ //}
+
outText = anEditor->text();
bool isDouble;
double aValue = outText.toDouble(&isDouble);
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()
+void ModuleBase_WidgetEditor::showPopupEditor(const bool theSendSignals)
{
+ //myIsEnterPressedEmitted = 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
} else {
ModuleBase_Tools::setSpinText(mySpinBox, aText);
}
- emit valuesChanged();
- emit focusOutWidget(this);
+ if (theSendSignals) {
+ emit valuesChanged();
+ // the focus leaves the control automatically by the Enter/Esc event
+ // it is processed in operation manager
+ //emit focusOutWidget(this);
+
+ //if (myIsEnterPressedEmitted)
+ if (!myIsEditing)
+ emit enterClicked();
+ }
+ else
+ storeValue();
+}
+
+/*void ModuleBase_WidgetEditor::onEnterPressed()
+{
+ myIsEnterPressedEmitted = true;
+}*/
+
+void ModuleBase_WidgetEditor::setCursorPosition(const int theX, const int theY)
+{
+ myXPosition = theX;
+ myYPosition = theY;
}