X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetEditor.cpp;h=017298b9634edfee11b217ea3b20aa68250e61f8;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=8c3b74bdfd4f372db20791bea0838dd6aefc0502;hpb=b33f086ad6bc7e610d37631b003c9d97c59ba935;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetEditor.cpp b/src/ModuleBase/ModuleBase_WidgetEditor.cpp index 8c3b74bdf..017298b96 100644 --- a/src/ModuleBase/ModuleBase_WidgetEditor.cpp +++ b/src/ModuleBase/ModuleBase_WidgetEditor.cpp @@ -1,11 +1,24 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetEditor.cpp -// Created: 25 Apr 2014 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include -#include +#include #include #include @@ -21,17 +34,42 @@ #include -#include +#include +#include #include -#include +#include +#include +#include +#include +#include +#include #include #include -#include + +// Dialog is redefined to avoid Escape key processing +class ModuleBase_EditorDialog : public QDialog +{ +public: + ModuleBase_EditorDialog(QWidget* theParent, Qt::WindowFlags theFlags) + : QDialog(theParent, theFlags) + { + setMinimumWidth(100); + } + ~ModuleBase_EditorDialog() {} + +protected: + // Do nothing if key pressed because it is processing on operation manager level + virtual void keyPressEvent(QKeyEvent* theEvent) { + if (theEvent->key() == Qt::Key_Escape) + return; + QDialog::keyPressEvent(theEvent); + } +}; 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), myEditorDialog(0) { } @@ -39,61 +77,130 @@ ModuleBase_WidgetEditor::~ModuleBase_WidgetEditor() { } -double editedValue(double theValue, bool& isDone) +bool ModuleBase_WidgetEditor::editedValue(double theSpinMinValue, double theSpinMaxValue, + double& outValue, QString& outText) { - QDialog aDlg; - aDlg.setWindowFlags(Qt::FramelessWindowHint); - QHBoxLayout* aLay = new QHBoxLayout(&aDlg); - ModuleBase_Tools::zeroMargins(aLay); + bool isValueAccepted = false; - QLineEdit* aEditor = new QLineEdit(QString::number(theValue), &aDlg); - aEditor->selectAll(); - aEditor->setValidator(new QDoubleValidator(aEditor)); - QObject::connect(aEditor, SIGNAL(returnPressed()), &aDlg, SLOT(accept())); - aLay->addWidget(aEditor); + myEditorDialog = new ModuleBase_EditorDialog(QApplication::desktop(), Qt::FramelessWindowHint); - QPoint aPoint = QCursor::pos(); - aDlg.move(aPoint); + QHBoxLayout* aLay = new QHBoxLayout(myEditorDialog); + aLay->setContentsMargins(2, 2, 2, 2); + + ModuleBase_ParamSpinBox* anEditor = new ModuleBase_ParamSpinBox(myEditorDialog); + anEditor->setMinimum(theSpinMinValue); + anEditor->setMaximum(theSpinMaxValue); + + QStringList aParameters; + ModuleBase_Tools::getParameters(aParameters); + anEditor->setCompletionList(aParameters); + + if (outText.isEmpty()) + anEditor->setValue(outValue); + else + anEditor->setText(outText); + + aLay->addWidget(anEditor); - isDone = aDlg.exec() == QDialog::Accepted; - double aValue = theValue; - if (isDone) - aValue = aEditor->text().toDouble(); - return aValue; + ModuleBase_Tools::setFocus(anEditor, "ModuleBase_WidgetEditor::editedValue"); + anEditor->selectAll(); + + QPoint aPoint = QCursor::pos(); + if (myXPosition >= 0 && myYPosition >= 0) + aPoint = QPoint(myXPosition, myYPosition); + + myEditorDialog->move(aPoint); + isValueAccepted = myEditorDialog->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 + } + } + delete myEditorDialog; + myEditorDialog = 0; + return isValueAccepted; } bool ModuleBase_WidgetEditor::focusTo() { - // 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())); - return true; + showPopupEditor(); + return false; } -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. Also we need this widget as active to provide call of processEnter() applyed + // by operation manager to the current widget. If not, the myEditorDialog will stay opened + emitFocusInWidget(); + + // nds: it seems, that the envents processing is not necessary anymore // White while all events will be processed - QApplication::processEvents(); + //QApplication::processEvents(); double aValue = mySpinBox->value(); - bool isDone; - aValue = editedValue(aValue, isDone); + QString aText; + if (mySpinBox->hasVariable()) + aText = mySpinBox->text(); + + isValueAccepted = editedValue(mySpinBox->minimum(), mySpinBox->maximum(), aValue, aText); + if (isValueAccepted) { + if (aText.isEmpty()) { + if (mySpinBox->hasVariable()) { + // variable text should be cleared before setting value as the value + // will not be set if there is a varable in control + ModuleBase_Tools::setSpinText(mySpinBox, ""); + } + 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(); + } + ModuleBase_Tools::setFocus(mySpinBox, "ModuleBase_WidgetEditor::editedValue"); + mySpinBox->selectAll(); + // enter is processed, so we need not anymore emit clicked signal + //if (theSendSignals && !myIsEditing && isValueAccepted) + // emit enterClicked(this); - if (isDone) { - ModuleBase_Tools::setSpinValue(mySpinBox, aValue); + return isValueAccepted; +} + +void ModuleBase_WidgetEditor::setCursorPosition(const int theX, const int theY) +{ + myXPosition = theX; + myYPosition = theY; +} + +bool ModuleBase_WidgetEditor::processEnter() +{ + if (myEditorDialog) { + myEditorDialog->accept(); + return true; } - emit valuesChanged(); - emit focusOutWidget(this); + + return ModuleBase_WidgetDoubleValue::processEnter(); } -void ModuleBase_WidgetEditor::editFeatureValue(FeaturePtr theFeature, - const std::string theAttribute) +bool ModuleBase_WidgetEditor::processEscape() { - DataPtr aData = theFeature->data(); - AttributeDoublePtr aRef = aData->real(theAttribute); - double aValue = aRef->value(); - - bool isDone; - aValue = editedValue(aValue, isDone); - if (isDone) - aRef->setValue(aValue); + if (myEditorDialog) { + myEditorDialog->reject(); + return true; + } + + return ModuleBase_WidgetDoubleValue::processEscape(); }