-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 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
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Config_Keywords.h>
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Object.h>
-#include <ModelAPI_Expression.h>
-#include <ModelAPI_AttributeString.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Document.h>
#include <ModelAPI_ResultParameter.h>
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_Tools.h>
#include <ModelAPI_Events.h>
+#include <ModelAPI_AttributeString.h>
#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
#include <iostream>
#endif
-#define DEBUG_COMPLETE_WITH_PARAMETERS
-
ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
const Config_WidgetAPI* theData)
- : ModuleBase_ModelWidget(theParent, theData)
+ : ModuleBase_ModelWidget(theParent, theData), myHasDefault(false)
{
QFormLayout* aControlLay = new QFormLayout(this);
ModuleBase_Tools::adjustMargins(aControlLay);
mySpinBox->setSingleStep(aStepVal);
}
- double aDefVal = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
- if (isOk) {
- mySpinBox->setValue(aDefVal);
- }
+ myDefaultVal = QString::fromStdString(getDefaultValue()).toDouble(&myHasDefault);
+ if (myHasDefault)
+ mySpinBox->setValue(myDefaultVal);
QString aTTip = translate(theData->widgetTooltip());
mySpinBox->setToolTip(aTTip);
void ModuleBase_WidgetDoubleValue::activateCustom()
{
ModuleBase_ModelWidget::activateCustom();
-#ifdef DEBUG_COMPLETE_WITH_PARAMETERS
QStringList aParameters;
ModuleBase_Tools::getParameters(aParameters);
mySpinBox->setCompletionList(aParameters);
-#endif
}
bool ModuleBase_WidgetDoubleValue::resetCustom()
QString aText = mySpinBox->text();
if (aText.contains('=')) {
if (!myParameter.get()) {
- myParameter = createParameter(aText);
+ myParameter = ModuleBase_Tools::createParameter(aText);
+ if (!myParameter.get()) {
+ aReal->setExpressionError("Parameter cannot be created");
+ aReal->setExpressionInvalid(true);
+ updateObject(myFeature);
+ return false;
+ } else if (aReal->expressionInvalid()) {
+ aReal->setExpressionError("");
+ aReal->setExpressionInvalid(false);
+ }
} else {
- editParameter(aText);
+ ModuleBase_Tools::editParameter(myParameter, aText);
}
- aText = aText.split('=').at(0) + "=";
+ aText = aText.split('=').at(0);
} else if (myParameter.get()){
// Nullyfy the parameter reference without deletion of the created
myParameter = FeaturePtr();
}
- aReal->setText(aText.toStdString());
+ aReal->setText(aText.toStdWString());
} else {
// it is important to set the empty text value to the attribute before set the value
// because setValue tries to calculate the attribute value according to the
// attribute current text
- aReal->setText("");
+ if (aReal->expressionInvalid()) {
+ aReal->setExpressionError("");
+ aReal->setExpressionInvalid(false);
+ }
+ aReal->setText(L"");
aReal->setValue(mySpinBox->value());
}
updateObject(myFeature);
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aRef = aData->real(attributeID());
- std::string aTextRepr = aRef->text();
+ std::wstring aTextRepr = aRef->text();
if (!aTextRepr.empty()) {
- QString aText = QString::fromStdString(aTextRepr);
- if (aText.endsWith('=')) {
- if (!myParameter.get()) {
- QString aName = aText.left(aText.length() - aText.indexOf('=')).trimmed();
- myParameter = findParameter(aName);
- }
- AttributeStringPtr aExprAttr = myParameter->string("expression");
- aText += aExprAttr->value().c_str();
- }
+ QString aText = QString::fromStdWString(aTextRepr);
ModuleBase_Tools::setSpinText(mySpinBox, aText);
- } else {
- ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : 0);
+ }
+ else {
+ ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : myDefaultVal);
+ if (aRef->isInitialized() && aRef->expressionInvalid()) {
+ aRef->setExpressionError("");
+ aRef->setExpressionInvalid(false);
+ }
+ if ((!aRef->isInitialized()) && myHasDefault)
+ aRef->setValue(myDefaultVal);
}
return true;
}
return isModified;
}
-
-FeaturePtr ModuleBase_WidgetDoubleValue::createParameter(const QString& theText) const
-{
- FeaturePtr aParameter;
- QStringList aList = theText.split("=");
- QString aParamName = aList.at(0).trimmed();
-
- if (isNameExist(aParamName)) {
- return aParameter;
- }
-
- if (!ModelAPI_Expression::isVariable(aParamName.toStdString())) {
- return aParameter;
- }
-
- QString aExpression = aList.at(1).trimmed();
- if (aExpression.isEmpty()) {
- return aParameter;
- }
-
- SessionPtr aMgr = ModelAPI_Session::get();
- std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
-
- aParameter = aDoc->addFeature("Parameter");
- if (aParameter.get()) {
- AttributeStringPtr aNameAttr = aParameter->string("variable");
- aNameAttr->setValue(aParamName.toStdString());
-
- AttributeStringPtr aExprAttr = aParameter->string("expression");
- aExprAttr->setValue(aExpression.toStdString());
- aParameter->execute();
-
- Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
- Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
- }
- return aParameter;
-}
-
-bool ModuleBase_WidgetDoubleValue::isNameExist(const QString& theName) const
-{
- SessionPtr aMgr = ModelAPI_Session::get();
- std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
- FeaturePtr aParamFeature;
- int aNbFeatures = aDoc->numInternalFeatures();
- std::string aName = theName.toStdString();
- for (int i = 0; i < aNbFeatures; i++) {
- aParamFeature = aDoc->internalFeature(i);
- if (aParamFeature && aParamFeature->getKind() == "Parameter") {
- if ((myParameter != aParamFeature) && (aParamFeature->name() == aName))
- return true;
- }
- }
- return false;
-}
-
-void ModuleBase_WidgetDoubleValue::editParameter(const QString& theText)
+bool ModuleBase_WidgetDoubleValue::isModified() const
{
- QStringList aList = theText.split("=");
- QString aParamName = aList.at(0).trimmed();
+ QString aText = mySpinBox->text();
+ if (aText.isEmpty())
+ return false;
- QString aExpression = aList.at(1).trimmed();
- if (aExpression.isEmpty()) {
- return;
+ if (myHasDefault) {
+ bool aOk = false;
+ double aVal = aText.toDouble(&aOk);
+ if (!aOk || aVal == myDefaultVal)
+ return false;
}
-
- if (isNameExist(aParamName)) {
- return;
- }
- AttributeStringPtr aNameAttr = myParameter->string("variable");
- aNameAttr->setValue(aParamName.toStdString());
-
- AttributeStringPtr aExprAttr = myParameter->string("expression");
- aExprAttr->setValue(aExpression.toStdString());
- myParameter->execute();
-
- Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
-}
-
-FeaturePtr ModuleBase_WidgetDoubleValue::findParameter(const QString& theName) const
-{
- SessionPtr aMgr = ModelAPI_Session::get();
- std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
- FeaturePtr aParamFeature;
- int aNbFeatures = aDoc->numInternalFeatures();
- std::string aName = theName.toStdString();
- for (int i = 0; i < aNbFeatures; i++) {
- aParamFeature = aDoc->internalFeature(i);
- if (aParamFeature && aParamFeature->getKind() == "Parameter") {
- if (aParamFeature->name() == aName)
- return aParamFeature;
- }
- }
- return FeaturePtr();
-}
+ return true;
+}
\ No newline at end of file
