Format number strings with field precision for display in attribute t…

…able, attribute dialog and editor
qgis · Mar 16, 2013 · 6361d19 · 6361d19
1 parent 3703910
commit 6361d19
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -341,13 +341,13 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
     if ( i >= fields.count() )
       continue;
 
-    QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << attrs[i].toString() );
+    QString value = fields[i].displayString( attrs[i] );
+    QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << value );
 
     attrItem->setData( 0, Qt::DisplayRole, vlayer->attributeDisplayName( i ) );
     attrItem->setData( 0, Qt::UserRole, fields[i].name() );
     attrItem->setData( 0, Qt::UserRole + 1, i );
 
-    QVariant value = attrs[i];
     attrItem->setData( 1, Qt::UserRole, value );
 
     switch ( vlayer->editType( i ) )
@@ -358,12 +358,12 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
         continue;
 
       case QgsVectorLayer::ValueMap:
-        value = vlayer->valueMap( i ).key( value.toString(), QString( "(%1)" ).arg( value.toString() ) );
+        value = vlayer->valueMap( i ).key( value, QString( "(%1)" ).arg( value ) );
         break;
 
       case QgsVectorLayer::Calendar:
-        if ( value.canConvert( QVariant::Date ) )
-          value = value.toDate().toString( vlayer->dateFormat( i ) );
+        if ( attrs[i].canConvert( QVariant::Date ) )
+          value = attrs[i].toDate().toString( vlayer->dateFormat( i ) );
         break;
 
       default:

diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -110,3 +110,17 @@ void QgsField::setComment( const QString & comment )
 {
   mComment = comment;
 }
+
+QString QgsField::displayString( const QVariant& v ) const
+{
+  switch ( mType )
+  {
+    case QVariant::Double:
+      if ( mPrecision > 0 )
+      {
+        return QString::number( v.toDouble(), 'f', mPrecision );
+      }
+    default:
+      return v.toString();
+  }
+}
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
@@ -122,6 +122,9 @@ class CORE_EXPORT QgsField
       */
     void setComment( const QString & comment );
 
+    /**Formats string for display*/
+    QString displayString( const QVariant& v ) const;
+
   private:
 
     //! Name

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -605,8 +605,9 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     return role == Qt::DisplayRole ? rowId : QVariant();
 
   int fieldId = mAttributes[ index.column()];
+  const QgsField& field = mLayer->pendingFields()[ fieldId ];
 
-  QVariant::Type fldType = mLayer->pendingFields()[ fieldId ].type();
+  QVariant::Type fldType = field.type();
   bool fldNumeric = ( fldType == QVariant::Int || fldType == QVariant::Double );
 
   if ( role == Qt::TextAlignmentRole )
@@ -656,8 +657,7 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     }
   }
 
-
-  return val.toString();
+  return field.displayString( val );
 }
 
 bool QgsAttributeTableModel::setData( const QModelIndex &index, const QVariant &value, int role )

diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
@@ -1002,7 +1002,7 @@ bool QgsAttributeEditor::setValue( QWidget *editor, QgsVectorLayer *vl, int idx,
       }
       else
       {
-        text = value.toString();
+        text = field.displayString( value );
       }
 
       if ( le )