-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: ModuleBase_WidgetIntValue.cpp
-// Created: 04 June 2014
-// Author: Vitaly Smetannikov
+// Copyright (C) 2014-2020 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 <ModuleBase_WidgetIntValue.h>
#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
-#include <ModuleBase_ParamIntSpinBox.h>
+#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_IconFactory.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_Data.h>
+#include <ModelAPI_AttributeString.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
#include <math.h>
#ifndef INT_MAX
-#define INT_MAX 2147483647
+#define INT_MAX 2147483647
#endif
#ifdef _DEBUG
ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(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);
- QString aLabelText = QString::fromStdString(theData->widgetLabel());
+ QString aLabelText = translate(theData->widgetLabel());
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
myLabel = new QLabel(aLabelText, this);
if (!aLabelIcon.isEmpty())
myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
- mySpinBox = new ModuleBase_ParamIntSpinBox(this);
+ mySpinBox = new ModuleBase_ParamSpinBox(this);
+ mySpinBox->setDecimals(0);
QString anObjName = QString::fromStdString(attributeID());
mySpinBox->setObjectName(anObjName);
mySpinBox->setSingleStep(aStepVal);
}
- int aDefVal = QString::fromStdString(getDefaultValue()).toInt(&isOk);
- if (isOk) {
- mySpinBox->setValue(aDefVal);
- }
+ myDefVal = QString::fromStdString(getDefaultValue()).toInt(&myHasDefault);
+ if (myHasDefault)
+ mySpinBox->setValue(myDefVal);
- QString aTTip = QString::fromStdString(theData->widgetTooltip());
+ QString aTTip = translate(theData->widgetTooltip());
mySpinBox->setToolTip(aTTip);
myLabel->setToolTip(aTTip);
aControlLay->addRow(myLabel, mySpinBox);
- connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesModified()));
+ connect(mySpinBox, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
}
ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
{
}
+void ModuleBase_WidgetIntValue::activateCustom()
+{
+ ModuleBase_ModelWidget::activateCustom();
+ QStringList aParameters;
+ ModuleBase_Tools::getParameters(aParameters);
+ mySpinBox->setCompletionList(aParameters);
+}
+
bool ModuleBase_WidgetIntValue::resetCustom()
{
bool aDone = false;
AttributeIntegerPtr anAttribute = aData->integer(attributeID());
if (mySpinBox->hasVariable()) {
// Here is a text of a real value or an expression.
- std::string aText = mySpinBox->text().toStdString();
- anAttribute->setText(aText);
+ QString aText = mySpinBox->text();
+ if (aText.contains('=')) {
+ if (!myParameter.get()) {
+ myParameter = ModuleBase_Tools::createParameter(aText);
+ if (!myParameter.get()) {
+ anAttribute->setExpressionError("Parameter cannot be created");
+ anAttribute->setExpressionInvalid(true);
+ updateObject(myFeature);
+ return false;
+ } else if (anAttribute->expressionInvalid()) {
+ anAttribute->setExpressionError("");
+ anAttribute->setExpressionInvalid(false);
+ }
+ } else {
+ ModuleBase_Tools::editParameter(myParameter, aText);
+ }
+ aText = aText.split('=').at(0);
+ } else if (myParameter.get()) {
+ // Nullyfy the parameter reference without deletion of the created
+ myParameter = FeaturePtr();
+ }
+ anAttribute->setText(aText.toStdString());
} 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
+ if (anAttribute->expressionInvalid()) {
+ anAttribute->setExpressionError("");
+ anAttribute->setExpressionInvalid(false);
+ }
anAttribute->setText("");
anAttribute->setValue(mySpinBox->value());
}
AttributeIntegerPtr anAttribute = aData->integer(attributeID());
std::string aTextRepr = anAttribute->text();
if (!aTextRepr.empty()) {
- ModuleBase_Tools::setSpinText(mySpinBox, QString::fromStdString(aTextRepr));
+ QString aText = QString::fromStdString(aTextRepr);
+ //if (aText.endsWith('=')) {
+ // if (!myParameter.get()) {
+ // QString aName = aText.left(aText.indexOf('=')).trimmed();
+ // myParameter = ModuleBase_Tools::findParameter(aName);
+ // }
+ // /// If myParameter is empty then it was not created because of an error
+ // if (!myParameter.get())
+ // return false;
+
+ // AttributeStringPtr aExprAttr = myParameter->string("expression");
+ // aText += aExprAttr->value().c_str();
+ //}
+ ModuleBase_Tools::setSpinText(mySpinBox, aText);
} else {
- ModuleBase_Tools::setSpinValue(mySpinBox, anAttribute->value());
+ ModuleBase_Tools::setSpinValue(mySpinBox,
+ anAttribute->isInitialized() ? anAttribute->value() : myDefVal);
+ if (anAttribute->isInitialized() && anAttribute->expressionInvalid()) {
+ anAttribute->setExpressionError("");
+ anAttribute->setExpressionInvalid(false);
+ }
+ if ((!anAttribute->isInitialized()) && myHasDefault)
+ anAttribute->setValue(myDefVal);
}
return true;
}
}
return isModified;
}
+
+bool ModuleBase_WidgetIntValue::isModified() const
+{
+ QString aText = mySpinBox->text();
+ if (aText.isEmpty())
+ return false;
+
+ if (myHasDefault) {
+ bool aOk = false;
+ int aVal = aText.toInt(&aOk);
+ if (!aOk || aVal == myDefVal)
+ return false;
+ }
+ return true;
+}
\ No newline at end of file
