Jenkins compilation correction.

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetDoubleValue.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index a43f02cb6b2b6e43db5d314a612e487f082e453c..3b5b8b455cf0633464499acd892207f194b2d523 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModuleBase_WidgetDoubleValue.cpp
-// Created:     04 June 2014
-// Author:      Vitaly Smetannikov
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>
@@ -14,6 +28,7 @@
 #include <ModuleBase_ParamSpinBox.h>
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_WidgetDoubleValue.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <QFormLayout>
 #include <QLabel>
@@ -25,27 +40,31 @@
 #include <cfloat>
 
 #ifndef DBL_MAX
-#define DBL_MAX 1.7976931348623158e+308 
+#define DBL_MAX 1.7976931348623158e+308
 #endif
 #ifdef _DEBUG
 #include <iostream>
 #endif
 
+//#define DEBUG_COMPLETE_WITH_PARAMETERS
+
 ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
-                                                           const Config_WidgetAPI* theData,
-                                                           const std::string& theParentId)
-    : ModuleBase_ModelWidget(theParent, theData, theParentId)
+                                                           const Config_WidgetAPI* theData)
+    : ModuleBase_ModelWidget(theParent, theData)
 {
   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(QPixmap(aLabelIcon));
+    myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
+
+  bool aAcceptVariables = theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true);
 
   mySpinBox = new ModuleBase_ParamSpinBox(this);
+  mySpinBox->setAcceptVariables(aAcceptVariables);
   QString anObjName = QString::fromStdString(attributeID());
   mySpinBox->setObjectName(anObjName);
 
@@ -81,18 +100,30 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
     mySpinBox->setValue(aDefVal);
   }
 
-  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(const QString&)), this, SIGNAL(valuesModified()));
+  // we should listen textChanged signal as valueChanged do not send when text is modified
+  connect(mySpinBox, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
+  mySpinBox->setValueEnabled(isValueEnabled());
 }
 
 ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()
 {
 }
 
+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()
 {
   bool aDone = false;
@@ -102,7 +133,7 @@ bool ModuleBase_WidgetDoubleValue::resetCustom()
     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 the value can not be found by the default value, do nothing
     if (isOk) {
       ModuleBase_Tools::setSpinValue(mySpinBox, aDefValue);
       storeValue();
@@ -112,7 +143,7 @@ bool ModuleBase_WidgetDoubleValue::resetCustom()
   return aDone;
 }
 
-bool ModuleBase_WidgetDoubleValue::storeValueCustom() const
+bool ModuleBase_WidgetDoubleValue::storeValueCustom()
 {
   DataPtr aData = myFeature->data();
   AttributeDoublePtr aReal = aData->real(attributeID());
@@ -139,7 +170,7 @@ bool ModuleBase_WidgetDoubleValue::restoreValueCustom()
   if (!aTextRepr.empty()) {
     ModuleBase_Tools::setSpinText(mySpinBox, QString::fromStdString(aTextRepr));
   } else {
-    ModuleBase_Tools::setSpinValue(mySpinBox, aRef->value());
+    ModuleBase_Tools::setSpinValue(mySpinBox, aRef->isInitialized() ? aRef->value() : 0);
   }
   return true;
 }
@@ -158,10 +189,9 @@ QList<QWidget*> ModuleBase_WidgetDoubleValue::getControls() const
 
 bool ModuleBase_WidgetDoubleValue::processEnter()
 {
-  bool isModified = mySpinBox->isModified();
+  bool isModified = getValueState() == ModifiedInPP;
   if (isModified) {
     emit valuesChanged();
-    mySpinBox->clearModified();
     mySpinBox->selectAll();
   }
   return isModified;