Handle variable precision in range dlg

qgis · Oct 22, 2021 · d98c99e · d98c99e
1 parent 6a22e1f
commit d98c99e
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 3 deletions.
diff --git a/python/gui/auto_generated/qgsludialog.sip.in b/python/gui/auto_generated/qgsludialog.sip.in
@@ -35,6 +35,7 @@ Returns the upper value.
 .. versionadded:: 3.21
 %End
     void setUpperValue( const QString &val );
+
 };
 
 /************************************************************************

diff --git a/src/gui/qgsludialog.cpp b/src/gui/qgsludialog.cpp
@@ -22,6 +22,9 @@ QgsLUDialog::QgsLUDialog( QWidget *parent, Qt::WindowFlags fl )
   : QDialog( parent, fl )
 {
   setupUi( this );
+
+  connect( mLowerEdit, qOverload<double>( &QgsDoubleSpinBox::valueChanged ), this, [ this ]( double value ) { setDecimalPlaces( mLowerEdit, value ); } );
+  connect( mUpperEdit, qOverload<double>( &QgsDoubleSpinBox::valueChanged ), this, [ this ]( double value ) { setDecimalPlaces( mUpperEdit, value ); } );
 }
 
 QString QgsLUDialog::lowerValue() const
@@ -46,10 +49,34 @@ double QgsLUDialog::upperValueDouble() const
 
 void QgsLUDialog::setLowerValue( const QString &val )
 {
-  mLowerEdit->setValue( QLocale().toDouble( val ) );
+  bool ok;
+  const double value { QLocale().toDouble( val, &ok )};
+  mLowerEdit->setValue( value );
+  if ( ok )
+  {
+    setDecimalPlaces( mLowerEdit, value );
+  }
 }
 
 void QgsLUDialog::setUpperValue( const QString &val )
 {
-  mUpperEdit->setValue( QLocale().toDouble( val ) );
+  bool ok;
+  const double value { QLocale().toDouble( val, &ok )};
+  mUpperEdit->setValue( value );
+  if ( ok )
+  {
+    setDecimalPlaces( mUpperEdit, value );
+  }
+}
+
+void QgsLUDialog::setDecimalPlaces( QgsDoubleSpinBox *widget, double value ) const
+{
+  const QString strVal { QVariant( value ).toString() };
+  const int dotPosition( strVal.indexOf( '.' ) );
+  int decimals {2};
+  if ( dotPosition >= 0 )
+  {
+    decimals = std::max<int>( 2, strVal.length() - dotPosition - 1 );
+    widget->setDecimals( decimals );
+  }
 }
diff --git a/src/gui/qgsludialog.h b/src/gui/qgsludialog.h
@@ -48,6 +48,10 @@ class GUI_EXPORT QgsLUDialog: public QDialog, private Ui::QgsLUDialogBase
      */
     double upperValueDouble() const;
     void setUpperValue( const QString &val );
+
+  private:
+
+    void setDecimalPlaces( QgsDoubleSpinBox *widget, double value ) const;
 };
 
 #endif
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -508,7 +508,20 @@ QWidget *QgsCategorizedRendererViewItemDelegate::createEditor( QWidget *parent,
     case QVariant::Type::Double:
     {
       editor = new QgsDoubleSpinBox( parent );
-      editor->setDecimals( 12 );
+      bool ok;
+      const QVariant value = index.data( QgsCategorizedSymbolRendererWidget::CustomRoles::ValueRole );
+      int decimals {2};
+      if ( value.toDouble( &ok ); ok )
+      {
+        const QString strVal { value.toString() };
+        const int dotPosition( strVal.indexOf( '.' ) );
+        if ( dotPosition >= 0 )
+        {
+          decimals = std::max<int>( 2, strVal.length() - dotPosition - 1 );
+        }
+      }
+      editor->setDecimals( decimals );
+      editor->setClearValue( 0 );
       editor->setMaximum( std::numeric_limits<double>::max() );
       editor->setMinimum( std::numeric_limits<double>::lowest() );
       break;
@@ -517,6 +530,7 @@ QWidget *QgsCategorizedRendererViewItemDelegate::createEditor( QWidget *parent,
     {
       editor = new QgsDoubleSpinBox( parent );
       editor->setDecimals( 0 );
+      editor->setClearValue( 0 );
       editor->setMaximum( std::numeric_limits<int>::max() );
       editor->setMinimum( std::numeric_limits<int>::min() );
       break;
@@ -525,6 +539,7 @@ QWidget *QgsCategorizedRendererViewItemDelegate::createEditor( QWidget *parent,
     {
       editor = new QgsDoubleSpinBox( parent );
       editor->setDecimals( 0 );
+      editor->setClearValue( 0 );
       editor->setMaximum( std::numeric_limits<char>::max() );
       editor->setMinimum( std::numeric_limits<char>::min() );
       break;
@@ -533,6 +548,7 @@ QWidget *QgsCategorizedRendererViewItemDelegate::createEditor( QWidget *parent,
     {
       editor = new QgsDoubleSpinBox( parent );
       editor->setDecimals( 0 );
+      editor->setClearValue( 0 );
       editor->setMaximum( std::numeric_limits<unsigned int>::max() );
       editor->setMinimum( 0 );
       break;
@@ -541,6 +557,7 @@ QWidget *QgsCategorizedRendererViewItemDelegate::createEditor( QWidget *parent,
     {
       editor = new QgsDoubleSpinBox( parent );
       editor->setDecimals( 0 );
+      editor->setClearValue( 0 );
       editor->setMaximum( static_cast<double>( std::numeric_limits<qlonglong>::max() ) );
       editor->setMinimum( std::numeric_limits<qlonglong>::min() );
       break;
@@ -549,6 +566,7 @@ QWidget *QgsCategorizedRendererViewItemDelegate::createEditor( QWidget *parent,
     {
       editor = new QgsDoubleSpinBox( parent );
       editor->setDecimals( 0 );
+      editor->setClearValue( 0 );
       editor->setMaximum( static_cast<double>( std::numeric_limits<unsigned long long>::max() ) );
       editor->setMinimum( 0 );
       break;