Selection priority in Sketch, clear selection when sketch goes from entity to neutral...

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

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index 5f9dc8a5b6d3cbf350ede6b4e0e9bfe43b027e87..e6408e212f2ecb61e774237c7e63b783f01b0f20 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -14,6 +14,7 @@
 #include <ModuleBase_ParamSpinBox.h>
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_WidgetDoubleValue.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <QFormLayout>
 #include <QLabel>
@@ -31,12 +32,11 @@
 #include <iostream>
 #endif
 
-#define APPLY_BY_ENTER_OR_TAB
+//#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);
@@ -45,9 +45,12 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
   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);
 
@@ -88,21 +91,24 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
   myLabel->setToolTip(aTTip);
 
   aControlLay->addRow(myLabel, mySpinBox);
-#ifdef APPLY_BY_ENTER_OR_TAB
-  // Apply widget value change by enter/tab event.
-  connect(mySpinBox, SIGNAL(editingFinished()), this, SIGNAL(valuesChanged()));
   connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
-
-#else
-  connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesChanged()));
-#endif
 }
 
 ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()
 {
 }
 
-bool ModuleBase_WidgetDoubleValue::reset()
+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;
   if (!isUseReset() || isComputedDefault() || mySpinBox->hasVariable()) {
@@ -111,7 +117,7 @@ bool ModuleBase_WidgetDoubleValue::reset()
     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();
@@ -121,7 +127,7 @@ bool ModuleBase_WidgetDoubleValue::reset()
   return aDone;
 }
 
-bool ModuleBase_WidgetDoubleValue::storeValueCustom() const
+bool ModuleBase_WidgetDoubleValue::storeValueCustom()
 {
   DataPtr aData = myFeature->data();
   AttributeDoublePtr aReal = aData->real(attributeID());
@@ -153,6 +159,11 @@ bool ModuleBase_WidgetDoubleValue::restoreValueCustom()
   return true;
 }
 
+void ModuleBase_WidgetDoubleValue::selectContent()
+{
+  mySpinBox->selectAll();
+}
+
 QList<QWidget*> ModuleBase_WidgetDoubleValue::getControls() const
 {
   QList<QWidget*> aList;
@@ -160,7 +171,12 @@ QList<QWidget*> ModuleBase_WidgetDoubleValue::getControls() const
   return aList;
 }
 
-bool ModuleBase_WidgetDoubleValue::isEventProcessed(QKeyEvent* theEvent)
+bool ModuleBase_WidgetDoubleValue::processEnter()
 {
-  return mySpinBox->isEventProcessed(theEvent);
+  bool isModified = getValueState() == ModifiedInPP;
+  if (isModified) {
+    emit valuesChanged();
+    mySpinBox->selectAll();
+  }
+  return isModified;
 }