+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: ModuleBase_Widgets.h
// Created: 04 June 2014
// Author: Vitaly Smetannikov
#include <ModuleBase_WidgetDoubleValue.h>
-#include <ModuleBase_DoubleSpinBox.h>
+#include <ModuleBase_ParamSpinBox.h>
#include <ModuleBase_Tools.h>
#include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeString.h>
#include <ModelAPI_Data.h>
#include <Config_Keywords.h>
#include <ModelAPI_Events.h>
#include <QWidget>
-#include <QLayout>
+#include <QFormLayout>
#include <QLabel>
#include <QEvent>
#include <QTimer>
const std::string& theParentId)
: ModuleBase_ModelWidget(theParent, theData, theParentId)
{
- myContainer = new QWidget(theParent);
- QHBoxLayout* aControlLay = new QHBoxLayout(myContainer);
+ QFormLayout* aControlLay = new QFormLayout(this);
ModuleBase_Tools::adjustMargins(aControlLay);
QString aLabelText = QString::fromStdString(theData->widgetLabel());
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
- myLabel = new QLabel(aLabelText, myContainer);
+ myLabel = new QLabel(aLabelText, this);
if (!aLabelIcon.isEmpty())
myLabel->setPixmap(QPixmap(aLabelIcon));
- aControlLay->addWidget(myLabel);
- mySpinBox = new ModuleBase_DoubleSpinBox(myContainer);
+ mySpinBox = new ModuleBase_ParamSpinBox(this);
QString anObjName = QString::fromStdString(attributeID());
mySpinBox->setObjectName(anObjName);
mySpinBox->setSingleStep(aStepVal);
}
- aProp = theData->getProperty(ATTR_DEFAULT);
- double aDefVal = QString::fromStdString(aProp).toDouble(&isOk);
+ double aDefVal = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
if (isOk) {
mySpinBox->setValue(aDefVal);
- } else if (aProp == DOUBLE_WDG_DEFAULT_COMPUTED){
- myIsComputedDefault = true;
}
QString aTTip = QString::fromStdString(theData->widgetTooltip());
mySpinBox->setToolTip(aTTip);
- aControlLay->addWidget(mySpinBox);
- aControlLay->setStretch(1, 1);
-
+ aControlLay->addRow(myLabel, mySpinBox);
connect(mySpinBox, SIGNAL(valueChanged(double)), this, SIGNAL(valuesChanged()));
}
{
}
-bool ModuleBase_WidgetDoubleValue::storeValue() const
+void ModuleBase_WidgetDoubleValue::reset()
+{
+ if (isComputedDefault()) {
+ return;
+ //if (myFeature->compute(myAttributeID))
+ // restoreValue();
+ }
+ else {
+ bool isOk;
+ double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
+ // reset the value just if there is a default value definition in the XML definition
+ // if the double value can not be found by the default value, do nothing
+ if (isOk) {
+ ModuleBase_Tools::setSpinValue(mySpinBox, isOk ? aDefValue : 0.0);
+ storeValueCustom();
+ }
+ }
+}
+
+bool ModuleBase_WidgetDoubleValue::storeValueCustom() const
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aReal = aData->real(attributeID());
aReal->setValue(mySpinBox->value());
+ std::string aTextRepr = aReal->text();
+ if (mySpinBox->hasVariable()) {
+ aTextRepr = mySpinBox->text().toStdString();
+ }
+ aReal->setText(aTextRepr);
updateObject(myFeature);
return true;
}
{
DataPtr aData = myFeature->data();
AttributeDoublePtr aRef = aData->real(attributeID());
-
- bool isBlocked = mySpinBox->blockSignals(true);
- mySpinBox->setValue(aRef->value());
- mySpinBox->blockSignals(isBlocked);
-
+ std::string aTextRepr = aRef->text();
+ if (!aTextRepr.empty()) {
+ mySpinBox->setText(QString::fromStdString(aTextRepr));
+ } else {
+ ModuleBase_Tools::setSpinValue(mySpinBox, aRef->value());
+ }
return true;
}