#include <string>
ExpressionEditor::ExpressionEditor(QWidget* theParent)
-: QPlainTextEdit(theParent)
+: QPlainTextEdit(theParent), myCompletedAndSelected(false)
{
myCompleter = new QCompleter(this);
myCompleter->setWidget(this);
this, SLOT(insertCompletion(const QString&)));
(void) new QShortcut(QKeySequence(tr("Ctrl+Space", "Complete")),
this, SLOT(performCompletion()));
+
+ connect(this, SIGNAL(textChanged()), this, SLOT(onTextChanged()));
+
+ setTabChangesFocus(true);
}
ExpressionEditor::~ExpressionEditor()
switch (theEvent->key()) {
case Qt::Key_Up:
case Qt::Key_Down:
+ case Qt::Key_Escape:
case Qt::Key_Enter:
case Qt::Key_Return:
- case Qt::Key_Escape:
theEvent->ignore();
- return;
+ return;
default:
myCompleter->popup()->hide();
break;
}
}
+ else {
+ switch (theEvent->key()) {
+ case Qt::Key_Enter:
+ case Qt::Key_Return:
+ emit keyReleased(this, theEvent);
+ // do not react to the Enter key, the property panel processes it
+ return;
+ break;
+ default:
+ break;
+ }
+ }
QPlainTextEdit::keyPressEvent(theEvent);
}
}
}
+void ExpressionEditor::onTextChanged()
+{
+ emit valueModified();
+}
ModuleBase_WidgetExprEditor::ModuleBase_WidgetExprEditor( QWidget* theParent,
aMainLay->addWidget(myEditor);
this->setLayout(aMainLay);
- connect(myEditor, SIGNAL(textChanged()), this, SLOT(onTextChanged()));
+ connect(myEditor, SIGNAL(valueModified()), this, SIGNAL(valuesModified()));
+ connect(myEditor, SIGNAL(keyReleased(QObject*, QKeyEvent*)),
+ this, SIGNAL(keyReleased(QObject*, QKeyEvent*)));
}
ModuleBase_WidgetExprEditor::~ModuleBase_WidgetExprEditor()
{
}
+void ModuleBase_WidgetExprEditor::initializeValueByActivate()
+{
+}
+
bool ModuleBase_WidgetExprEditor::storeValueCustom() const
{
// A rare case when plugin was not loaded.
return false;
DataPtr aData = myFeature->data();
AttributeStringPtr aStringAttr = aData->string(attributeID());
+
QString aWidgetValue = myEditor->toPlainText();
aStringAttr->setValue(aWidgetValue.toStdString());
updateObject(myFeature);
// Try to get the value
QString aStateMsg;
- std::string anErrorMessage = myFeature->error();
+ std::string anErrorMessage = myFeature->string("ExpressionError")->value();
if (anErrorMessage.empty()) {
ResultParameterPtr aParam =
std::dynamic_pointer_cast<ModelAPI_ResultParameter>(myFeature->firstResult());
}
}
} else {
- aStateMsg = QString::fromStdString(anErrorMessage);
+ aStateMsg = "Error: " + QString::fromStdString(anErrorMessage);
}
myResultLabel->setText(aStateMsg);
return true;
return result;
}
+bool ModuleBase_WidgetExprEditor::processEnter()
+{
+ bool isModified = getValueState() == ModifiedInPP;
+ if (isModified) {
+ emit valuesChanged();
+ myEditor->selectAll();
+ }
+ return isModified;
+}
+
void ModuleBase_WidgetExprEditor::onTextChanged()
{
- storeValue();
+ emit valuesChanged();
}