Skip to content

Issue#96 : enable default formatting in DoubleTextField #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Issue#96 : enable default formatting in DoubleTextField #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ceb786
Issue#96 : enable default formatting in DoubleTextField
mpoudot Mar 5, 2024
877af78
Initialize new attribute
mpoudot Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/QtUtil/QtDoubleTextField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,24 @@ USE_ENCODING_AUTODETECTION

QtDoubleTextField::QtDoubleTextField (QWidget* parent, bool autoValidation, const char* name)
: QtValidatedTextField (parent, autoValidation, name)
, _keepIosBaseDefault(false)
{
createGui ( );
} // QtDoubleTextField::QtDoubleTextField


QtDoubleTextField::QtDoubleTextField (double value, QWidget* parent, bool autoValidation, const char* name)
: QtValidatedTextField (parent, autoValidation, name)
, _keepIosBaseDefault(false)
{
createGui ( );
setValue (value);
} // QtDoubleTextField::QtDoubleTextField


QtDoubleTextField::QtDoubleTextField (const QtDoubleTextField&)
QtDoubleTextField::QtDoubleTextField (const QtDoubleTextField& field)
: QtValidatedTextField (0, 0)
, _keepIosBaseDefault(field._keepIosBaseDefault)
{
assert (0 && "QtDoubleTextField::QtDoubleTextField is not allowed.");
} // QtDoubleTextField::QtDoubleTextField (const QtDoubleTextField&)
Expand Down Expand Up @@ -102,10 +105,17 @@ void QtDoubleTextField::setValue (double value)
} // if ((value < validator.bottom ( )) || (value > validator.top ( )))

// On évite de perdre des epsilons avec le format d'affichage par défaut des streams c++ :
UTF8String us;
us << (QDoubleValidator::StandardNotation == getNotation ( ) ? ios_base::fixed : ios_base::scientific);
us << IN_UTIL setprecision (validator.decimals ( )) << value;
setText (UTF8TOQSTRING (us));
if (_keepIosBaseDefault)
{
setText (QString::number(value));
}
else
{
UTF8String us;
us << (QDoubleValidator::StandardNotation == getNotation ( ) ? ios_base::fixed : ios_base::scientific);
us << IN_UTIL setprecision (validator.decimals ( )) << value;
setText (UTF8TOQSTRING (us));
}
getValue ( );
} // QtDoubleTextField::setValue

Expand Down Expand Up @@ -156,8 +166,9 @@ QDoubleValidator::Notation QtDoubleTextField::getNotation ( ) const
} // QtDoubleTextField::getNotation


void QtDoubleTextField::setNotation (QDoubleValidator::Notation notation)
void QtDoubleTextField::setNotation (QDoubleValidator::Notation notation, bool keepIosBaseDefault)
{
_keepIosBaseDefault = keepIosBaseDefault;
const QDoubleValidator& old = getValidator ( );
if (notation == old.notation ( ))
return;
Expand Down
4 changes: 3 additions & 1 deletion src/QtUtil/public/QtUtil/QtDoubleTextField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class QtDoubleTextField : public QtValidatedTextField
/**
* @param La notation utilisée.
*/
virtual void setNotation (QDoubleValidator::Notation notation);
virtual void setNotation (QDoubleValidator::Notation notation, bool keepIosBaseDefault = false);


protected :
Expand Down Expand Up @@ -124,6 +124,8 @@ class QtDoubleTextField : public QtValidatedTextField

/** Opérateur de copie. Interdit. */
QtDoubleTextField& operator = (const QtDoubleTextField&);

bool _keepIosBaseDefault;
}; // class QtDoubleTextField


Expand Down