Fix auto conf of QgsDateTimeEditWrapper

Patrick Valsecchi · Patrick Valsecchi · commit 5eb70d3382c7 · 2016-09-07T10:32:31.000+02:00
diff --git a/src/gui/editorwidgets/qgsdatetimeeditconfig.cpp b/src/gui/editorwidgets/qgsdatetimeeditconfig.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsdatetimeeditconfig.h"
 #include "qgsdatetimeeditfactory.h"
+#include "qgsvectorlayer.h"
 
 QgsDateTimeEditConfig::QgsDateTimeEditConfig( QgsVectorLayer* vl, int fieldIdx, QWidget* parent )
     : QgsEditorConfigWidget( vl, fieldIdx, parent )
@@ -119,9 +120,26 @@ QgsEditorWidgetConfig QgsDateTimeEditConfig::config()
 }
 
 
+QString QgsDateTimeEditConfig::defaultFormat( const QVariant::Type type )
+{
+  switch ( type )
+  {
+    case QVariant::DateTime:
+      return QGSDATETIMEEDIT_DATETIMEFORMAT;
+      break;
+    case QVariant::Time:
+      return QGSDATETIMEEDIT_TIMEFORMAT;
+      break;
+    default:
+      return QGSDATETIMEEDIT_DATEFORMAT;
+  }
+}
+
+
 void QgsDateTimeEditConfig::setConfig( const QgsEditorWidgetConfig &config )
 {
-  const QString fieldFormat = config.value( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QgsField fieldDef = layer()->fields().at( field() );
+  const QString fieldFormat = config.value( "field_format", defaultFormat( fieldDef.type() ) ).toString();
   mFieldFormatEdit->setText( fieldFormat );
 
   if ( fieldFormat == QGSDATETIMEEDIT_DATEFORMAT )
@@ -133,7 +151,7 @@ void QgsDateTimeEditConfig::setConfig( const QgsEditorWidgetConfig &config )
   else
     mFieldFormatComboBox->setCurrentIndex( 3 );
 
-  QString displayFormat = config.value( "display_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  QString displayFormat = config.value( "display_format", defaultFormat( fieldDef.type() ) ).toString();
   mDisplayFormatEdit->setText( displayFormat );
   if ( displayFormat == mFieldFormatEdit->text() )
   {
diff --git a/src/gui/editorwidgets/qgsdatetimeeditconfig.h b/src/gui/editorwidgets/qgsdatetimeeditconfig.h
@@ -41,6 +41,13 @@ class GUI_EXPORT QgsDateTimeEditConfig : public QgsEditorConfigWidget, private U
   public:
     QgsEditorWidgetConfig config() override;
     void setConfig( const QgsEditorWidgetConfig &config ) override;
+
+    /**
+     * Get the default format in fonction of the type
+     * @param type the field type
+     * @return the date/time format
+     */
+    static QString defaultFormat( const QVariant::Type type );
 };
 
 #endif // QGSDATETIMEEDITCONFIG_H
diff --git a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
@@ -81,8 +81,9 @@ QString QgsDateTimeEditFactory::representValue( QgsVectorLayer* vl, int fieldIdx
     return settings.value( "qgis/nullValue", "NULL" ).toString();
   }
 
-  const QString displayFormat = config.value( "display_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
-  const QString fieldFormat = config.value( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QgsField field = vl->fields().at( fieldIdx );
+  const QString displayFormat = config.value( "display_format", QgsDateTimeEditConfig::defaultFormat( field.type() ) ).toString();
+  const QString fieldFormat = config.value( "field_format", QgsDateTimeEditConfig::defaultFormat( field.type() ) ).toString();
 
   QDateTime date = QDateTime::fromString( value.toString(), fieldFormat );
 
@@ -120,7 +121,7 @@ unsigned int QgsDateTimeEditFactory::fieldScore( const QgsVectorLayer* vl, int f
   const QgsField field = vl->fields().field( fieldIdx );
   const QVariant::Type type = field.type();
   const QgsEditorWidgetConfig config = vl->editFormConfig().widgetConfig( field.name() );
-  if ( type == QVariant::DateTime || config.contains( "field_format" ) )
+  if ( type == QVariant::DateTime || type == QVariant::Date || type == QVariant::Time || config.contains( "field_format" ) )
   {
     return 20;
   }
diff --git a/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp b/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
@@ -18,6 +18,7 @@
 #include "qgsmessagelog.h"
 #include "qgslogger.h"
 #include "qgsdatetimeedit.h"
+#include "qgsdatetimeeditconfig.h"
 
 #include <QDateTimeEdit>
 #include <QDateEdit>
@@ -62,7 +63,7 @@ void QgsDateTimeEditWrapper::initWidget( QWidget *editor )
     return;
   }
 
-  const QString displayFormat = config( "display_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QString displayFormat = config( "display_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();
   mQDateTimeEdit->setDisplayFormat( displayFormat );
 
   const bool calendar = config( "calendar_popup", false ).toBool();
@@ -110,7 +111,7 @@ void QgsDateTimeEditWrapper::showIndeterminateState()
 
 void QgsDateTimeEditWrapper::dateTimeChanged( const QDateTime& dateTime )
 {
-  const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();
   emit valueChanged( dateTime.toString( fieldFormat ) );
 }
 
@@ -131,7 +132,7 @@ QVariant QgsDateTimeEditWrapper::value() const
     }
   }
 
-  const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();
 
   if ( mQgsDateTimeEdit )
   {
@@ -148,7 +149,7 @@ void QgsDateTimeEditWrapper::setValue( const QVariant &value )
   if ( !mQDateTimeEdit )
     return;
 
-  const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();
   const QDateTime date = field().type() == QVariant::DateTime ? value.toDateTime() : QDateTime::fromString( value.toString(), fieldFormat );
 
   if ( mQgsDateTimeEdit )
diff --git a/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp
@@ -20,6 +20,7 @@
 #include "qgsvectorlayer.h"
 #include "qgsdatetimeedit.h"
 #include "qcalendarwidget.h"
+#include "qgsdatetimeeditconfig.h"
 
 #include <QSettings>
 
@@ -45,7 +46,7 @@ QVariant QgsDateTimeSearchWidgetWrapper::value() const
   if ( ! mDateTimeEdit )
     return QDateTime();
 
-  const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+  const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( layer()->fields().at( mFieldIdx ).type() ) ).toString();
   return mDateTimeEdit->dateTime().toString( fieldFormat );
 }
 
@@ -151,7 +152,7 @@ void QgsDateTimeSearchWidgetWrapper::initWidget( QWidget* editor )
   {
     mDateTimeEdit->setAllowNull( false );
 
-    const QString displayFormat = config( "display_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();
+    const QString displayFormat = config( "display_format", QgsDateTimeEditConfig::defaultFormat( layer()->fields().at( mFieldIdx ).type() ) ).toString();
     mDateTimeEdit->setDisplayFormat( displayFormat );
 
     const bool calendar = config( "calendar_popup", false ).toBool();

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ QString QgsDateTimeEditFactory::representValue( QgsVectorLayer* vl, int fieldIdx`
`81`	`81`	`return settings.value( "qgis/nullValue", "NULL" ).toString();`
`82`	`82`	`}`
`83`	`83`
`84`		`- const QString displayFormat = config.value( "display_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();`
`85`		`- const QString fieldFormat = config.value( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();`
	`84`	`+ const QgsField field = vl->fields().at( fieldIdx );`
	`85`	`+ const QString displayFormat = config.value( "display_format", QgsDateTimeEditConfig::defaultFormat( field.type() ) ).toString();`
	`86`	`+ const QString fieldFormat = config.value( "field_format", QgsDateTimeEditConfig::defaultFormat( field.type() ) ).toString();`
`86`	`87`
`87`	`88`	`QDateTime date = QDateTime::fromString( value.toString(), fieldFormat );`
`88`	`89`
`@@ -120,7 +121,7 @@ unsigned int QgsDateTimeEditFactory::fieldScore( const QgsVectorLayer* vl, int f`
`120`	`121`	`const QgsField field = vl->fields().field( fieldIdx );`
`121`	`122`	`const QVariant::Type type = field.type();`
`122`	`123`	`const QgsEditorWidgetConfig config = vl->editFormConfig().widgetConfig( field.name() );`
`123`		`- if ( type == QVariant::DateTime \|\| config.contains( "field_format" ) )`
	`124`	`+ if ( type == QVariant::DateTime \|\| type == QVariant::Date \|\| type == QVariant::Time \|\| config.contains( "field_format" ) )`
`124`	`125`	`{`
`125`	`126`	`return 20;`
`126`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include "qgsmessagelog.h"`
`19`	`19`	`#include "qgslogger.h"`
`20`	`20`	`#include "qgsdatetimeedit.h"`
	`21`	`+#include "qgsdatetimeeditconfig.h"`
`21`	`22`
`22`	`23`	`#include <QDateTimeEdit>`
`23`	`24`	`#include <QDateEdit>`
`@@ -62,7 +63,7 @@ void QgsDateTimeEditWrapper::initWidget( QWidget *editor )`
`62`	`63`	`return;`
`63`	`64`	`}`
`64`	`65`
`65`		`- const QString displayFormat = config( "display_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();`
	`66`	`+ const QString displayFormat = config( "display_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();`
`66`	`67`	`mQDateTimeEdit->setDisplayFormat( displayFormat );`
`67`	`68`
`68`	`69`	`const bool calendar = config( "calendar_popup", false ).toBool();`
`@@ -110,7 +111,7 @@ void QgsDateTimeEditWrapper::showIndeterminateState()`
`110`	`111`
`111`	`112`	`void QgsDateTimeEditWrapper::dateTimeChanged( const QDateTime& dateTime )`
`112`	`113`	`{`
`113`		`- const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();`
	`114`	`+ const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();`
`114`	`115`	`emit valueChanged( dateTime.toString( fieldFormat ) );`
`115`	`116`	`}`
`116`	`117`
`@@ -131,7 +132,7 @@ QVariant QgsDateTimeEditWrapper::value() const`
`131`	`132`	`}`
`132`	`133`	`}`
`133`	`134`
`134`		`- const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();`
	`135`	`+ const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();`
`135`	`136`
`136`	`137`	`if ( mQgsDateTimeEdit )`
`137`	`138`	`{`
`@@ -148,7 +149,7 @@ void QgsDateTimeEditWrapper::setValue( const QVariant &value )`
`148`	`149`	`if ( !mQDateTimeEdit )`
`149`	`150`	`return;`
`150`	`151`
`151`		`- const QString fieldFormat = config( "field_format", QGSDATETIMEEDIT_DATEFORMAT ).toString();`
	`152`	`+ const QString fieldFormat = config( "field_format", QgsDateTimeEditConfig::defaultFormat( field().type() ) ).toString();`
`152`	`153`	`const QDateTime date = field().type() == QVariant::DateTime ? value.toDateTime() : QDateTime::fromString( value.toString(), fieldFormat );`
`153`	`154`
`154`	`155`	`if ( mQgsDateTimeEdit )`