#include <QKeyEvent>
#include <QLineEdit>
-#include <QToolTip>
+#include <QLocale>
#include <QRegExp>
+#include <QToolTip>
+#include <QApplication>
#include <string>
#include <iostream>
-/*!
- \class ModuleBase_ParamSpinBox
- */
-
-/*!
- \brief Constructor.
-
- Constructs a spin box with 0.0 as minimum value and 99.99 as maximum value,
- a step value of 1.0 and a precision of 2 decimal places.
- The value is initially set to 0.00.
- \param parent parent object
- */
ModuleBase_ParamSpinBox::ModuleBase_ParamSpinBox(QWidget* theParent, int thePrecision)
: ModuleBase_DoubleSpinBox(theParent, thePrecision),
myAcceptVariables(true)
*/
void ModuleBase_ParamSpinBox::stepBy(int steps)
{
- if (hasVariable())
+ if ((!myTextValue.isEmpty()) && hasVariable())
return;
ModuleBase_DoubleSpinBox::stepBy(steps);
{
connect(this, SIGNAL(valueChanged(const QString&)),
this, SLOT(onTextChanged(const QString&)));
-
- //connect(lineEdit(), SIGNAL(textChanged(const QString&)),
- // this, SLOT(onTextChanged(const QString&)));
-
- //connect(lineEdit(), SIGNAL(textChanged(const QString&)),
- // this, SIGNAL(textChanged(const QString&)));
}
-/*!
- \brief This function is called when value is changed.
- */
void ModuleBase_ParamSpinBox::onTextChanged(const QString& text)
{
myTextValue = text;
-
- double value = 0;
- if (isValid(text, value) == Acceptable) {
- myCorrectValue = text;
- }
}
-/*!
- \brief Interpret text entered by the user as a value.
- \param text text entered by the user
- \return mapped value
- \sa textFromValue()
- */
double ModuleBase_ParamSpinBox::valueFromText(const QString& theText) const
{
if (!hasVariable(theText))
return ModuleBase_DoubleSpinBox::valueFromText(theText);
- double aValue = 0;
- findVariable(theText, aValue);
- return aValue;
+ // small hack: return hash of the string to initiate valuesChanged signal
+ return qHash(theText);
+}
+
+QString ModuleBase_ParamSpinBox::textFromValue (double theValue) const
+{
+ if ((!myTextValue.isEmpty()) && hasVariable(myTextValue)){
+ return myTextValue;
+ }
+ return ModuleBase_DoubleSpinBox::textFromValue(theValue);
}
/*!
return ModuleBase_DoubleSpinBox::validate(str, pos);
QValidator::State res = QValidator::Invalid;
-
- // Considering the input text as a variable name
- // Applying Python identifier syntax:
- // either a string starting with a letter, or a string starting with
- // an underscore followed by at least one alphanumeric character
if (isAcceptVariables()) {
- QRegExp varNameMask("[_a-zA-Z][a-zA-Z0-9_]*");
- if (varNameMask.exactMatch(str))
- res = QValidator::Acceptable;
-
- if (res == QValidator::Invalid) {
- varNameMask.setPattern("_");
- if (varNameMask.exactMatch(str))
- res = QValidator::Intermediate;
- }
+ res = QValidator::Acceptable;
}
return res;
}
/*!
\brief This function is used to set a current value for this spinbox.
\param value current value
+
+ The new value is ignored if the spinbox has a variable.
*/
void ModuleBase_ParamSpinBox::setValue(const double value)
{
- ModuleBase_DoubleSpinBox::setValue(value);
+ if (hasVariable())
+ return;
- myCorrectValue = ModuleBase_DoubleSpinBox::textFromValue(value);
- myTextValue = myCorrectValue;
+ myTextValue = ModuleBase_DoubleSpinBox::textFromValue(value);
+ ModuleBase_DoubleSpinBox::setValue(value);
}
/*!
*/
void ModuleBase_ParamSpinBox::setText(const QString& value)
{
+ myTextValue = value;
lineEdit()->setText(value);
}
bool ModuleBase_ParamSpinBox::hasVariable() const
{
- return hasVariable(text());
+ if (myTextValue.isEmpty())
+ return false;
+ return hasVariable(myTextValue);
}
bool ModuleBase_ParamSpinBox::hasVariable(const QString& theText) const
{
- QRegExp varNameMask("([a-z]|[A-Z]|_).*");
- return varNameMask.exactMatch(theText);
+ //const QString aDigitPattern = QString("[-+]?[0-9]*[%1]?[0-9]*([eE][-+]?[0-9]+)?");
+
+ //bool aHasDigit = false;
+ //{
+ // QRegExp varNameMask(aDigitPattern.arg("."));
+ // aHasDigit = varNameMask.exactMatch(theText);
+ //}
+ //if (!aHasDigit)
+ //{
+ // QRegExp varNameMask(aDigitPattern.arg(","));
+ // aHasDigit = varNameMask.exactMatch(theText);
+ //}
+ bool isDouble = false;
+ QLocale::c().toDouble(theText, &isDouble);
+
+// theText.toDouble(&isDouble);
+// if (isDouble) {
+// QLocale aLoc; // create default locale
+// QChar aDecPnt = aLoc.decimalPoint();
+// if (aDecPnt == '.')
+// isDouble = theText.contains(aDecPnt) || (!theText.contains(','));
+// else if (aDecPnt == ',')
+// isDouble = theText.contains(aDecPnt) || (!theText.contains('.'));
+// }
+ return !isDouble;
}
/*!
bool ModuleBase_ParamSpinBox::findVariable(const QString& theName,
double& outValue) const
{
-
- return ModelAPI_Tools::findVariable(theName.toStdString(), outValue);
+ ResultParameterPtr aParam;
+ return ModelAPI_Tools::findVariable(theName.toStdString(), outValue, aParam);
}
/*!
- \brief This function is called when the spinbox recieves key press event.
+ \brief This function is called when the spinbox receives key press event.
*/
-void ModuleBase_ParamSpinBox::keyPressEvent(QKeyEvent* e)
-{
- if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
- QWidget::keyPressEvent(e);
- } else {
- ModuleBase_DoubleSpinBox::keyPressEvent(e);
- }
-}
+//void ModuleBase_ParamSpinBox::keyPressEvent(QKeyEvent* e)
+//{
+// if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
+// QWidget::keyPressEvent(e);
+// } else {
+// ModuleBase_DoubleSpinBox::keyPressEvent(e);
+// }
+//}
/*!
- \brief This function is called when the spinbox recieves show event.
+ \brief This function is called when the spinbox receives show event.
*/
void ModuleBase_ParamSpinBox::showEvent(QShowEvent* theEvent)
{
ModuleBase_DoubleSpinBox::showEvent(theEvent);
- if (hasVariable(myTextValue)) {
+ if ((!myTextValue.isEmpty()) && hasVariable(myTextValue)) {
setText(myTextValue);
}
}
