#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);
this, SLOT(onTextChanged(const QString&)));
}
-/*!
- \brief This function is called when value is changed.
- */
void ModuleBase_ParamSpinBox::onTextChanged(const QString& text)
{
myTextValue = 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)) {
+ if (!hasVariable(theText))
return ModuleBase_DoubleSpinBox::valueFromText(theText);
- }
- // small hack: return length of the string to iniiate valuesChanged signal
- return theText.length();
+
+ // small hack: return hash of the string to initiate valuesChanged signal
+ return qHash(theText);
}
QString ModuleBase_ParamSpinBox::textFromValue (double theValue) const
{
- if (hasVariable(myTextValue)){
+ if ((!myTextValue.isEmpty()) && hasVariable(myTextValue)){
return myTextValue;
}
return ModuleBase_DoubleSpinBox::textFromValue(theValue);
/*!
\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;
myTextValue = ModuleBase_DoubleSpinBox::textFromValue(value);
+ ModuleBase_DoubleSpinBox::setValue(value);
}
/*!
// QRegExp varNameMask(aDigitPattern.arg(","));
// aHasDigit = varNameMask.exactMatch(theText);
//}
- bool aHasDigit = false;
- theText.toDouble(&aHasDigit);
- return !aHasDigit;
-
+ 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;
}
/*!
}
/*!
- \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)
//{
//}
/*!
- \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);
}
}