sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32158 from signedav/null-strings-datetime

Browse Source 
Null representation in QgsDateTimeEdit on getting focus
This commit is contained in:
signedav 2019-10-11 21:20:32 +02:00 committed by GitHub
commit 172956adb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 191 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/gui/auto_generated/editorwidgets/qgsdatetimeedit.sip.in
View File

@ -115,6 +115,8 @@ Signal emitted whenever the value changes.
virtual void focusOutEvent( QFocusEvent *event );
virtual void focusInEvent( QFocusEvent *event );
virtual void wheelEvent( QWheelEvent *event );
virtual void showEvent( QShowEvent *event );

29
src/gui/editorwidgets/qgsdatetimeedit.cpp
View File

@ -60,7 +60,7 @@ void QgsDateTimeEdit::clear()
{
if ( mAllowNull )
{
displayNull();
displayCurrentDate();
// Check if it's really changed or crash, see GH #29937
if ( ! dateTime().isNull() )
@ -76,10 +76,6 @@ void QgsDateTimeEdit::clear()
disconnect( this, &QDateTimeEdit::dateTimeChanged, this, &QgsDateTimeEdit::changed );
emit dateTimeChanged( QDateTime() );
connect( this, &QDateTimeEdit::dateTimeChanged, this, &QgsDateTimeEdit::changed );
// otherwise, NULL is not displayed in the line edit
// this might not be the right way to do it
clearFocus();
}
}
@ -160,6 +156,20 @@ void QgsDateTimeEdit::focusOutEvent( QFocusEvent *event )
}
}
void QgsDateTimeEdit::focusInEvent( QFocusEvent *event )
{
if ( mAllowNull && mIsNull && !mCurrentPressEvent )
{
QAbstractSpinBox::focusInEvent( event );
displayCurrentDate();
}
else
{
QDateTimeEdit::focusInEvent( event );
}
}
void QgsDateTimeEdit::wheelEvent( QWheelEvent *event )
{
// dateTime might have been set to minimum in calendar mode
@ -215,10 +225,18 @@ void QgsDateTimeEdit::displayNull( bool updateCalendar )
// a date selected in calendar widget
QDateTimeEdit::setDateTime( minimumDateTime() );
}
lineEdit()->setCursorPosition( lineEdit()->text().length() );
lineEdit()->setText( QgsApplication::nullRepresentation() );
connect( this, &QDateTimeEdit::dateTimeChanged, this, &QgsDateTimeEdit::changed );
}
void QgsDateTimeEdit::displayCurrentDate()
{
disconnect( this, &QDateTimeEdit::dateTimeChanged, this, &QgsDateTimeEdit::changed );
QDateTimeEdit::setDateTime( QDateTime::currentDateTime() );
connect( this, &QDateTimeEdit::dateTimeChanged, this, &QgsDateTimeEdit::changed );
}
void QgsDateTimeEdit::resetBeforeChange( int delta )
{
QDateTime dt = QDateTime::currentDateTime();
@ -255,6 +273,7 @@ void QgsDateTimeEdit::setDateTime( const QDateTime &dateTime )
if ( !dateTime.isValid() || dateTime.isNull() )
{
clear();
displayNull();
}
// Check if it's really changed or crash, see GH #29937
else if ( dateTime != QgsDateTimeEdit::dateTime() )

12
src/gui/editorwidgets/qgsdatetimeedit.h
View File

@ -104,6 +104,7 @@ class GUI_EXPORT QgsDateTimeEdit : public QDateTimeEdit
protected:
void mousePressEvent( QMouseEvent *event ) override;
void focusOutEvent( QFocusEvent *event ) override;
void focusInEvent( QFocusEvent *event ) override;
void wheelEvent( QWheelEvent *event ) override;
void showEvent( QShowEvent *event ) override;
@ -119,8 +120,17 @@ class GUI_EXPORT QgsDateTimeEdit : public QDateTimeEdit
QString mOriginalStyleSheet = QString();
QAction *mClearAction;
/**
* write the null value representation to the line edit without changing the value
* \param updateCalendar Flag if calendar is open and minimum date needs to be set
*/
void displayNull( bool updateCalendar = false );
/**
* write the current date into the line edit without changing the value
*/
void displayCurrentDate();
//! reset the value to current date time
void resetBeforeChange( int delta );
@ -139,6 +149,8 @@ class GUI_EXPORT QgsDateTimeEdit : public QDateTimeEdit
{
setMinimumDateTime( QDateTime::fromString( QStringLiteral( "0100-01-01" ), Qt::ISODate ) );
}
friend class TestQgsDateTimeEdit;
};
#endif // QGSDATETIMEEDIT_H

4
src/gui/editorwidgets/qgsdatetimeeditwrapper.h
View File

@ -24,6 +24,7 @@
SIP_NO_FILE
class QgsDateTimeEdit;
class TestQgsDateTimeEdit;
/**
* \ingroup gui
@ -77,6 +78,9 @@ class GUI_EXPORT QgsDateTimeEditWrapper : public QgsEditorWidgetWrapper
private:
void updateValues( const QVariant &value, const QVariantList & = QVariantList() ) override;
friend class TestQgsDateTimeEdit;
};
#endif // QGSDATETIMEEDITWRAPPER_H

147
tests/src/gui/testqgsdatetimeedit.cpp
View File

@ -18,6 +18,8 @@
#include "qdatetime.h"
#include <qgsdatetimeedit.h>
#include <qgsdatetimeeditwrapper.h>
#include <qgsdatetimefieldformatter.h>
class TestQgsDateTimeEdit: public QObject
{
@ -29,6 +31,13 @@ class TestQgsDateTimeEdit: public QObject
void cleanup(); // will be called after every testfunction.
void nullValues();
void focus();
private:
std::unique_ptr<QgsDateTimeEditWrapper> widget1; // For field 0
std::unique_ptr<QgsDateTimeEditWrapper> widget2; // For field 1
std::unique_ptr<QgsDateTimeEditWrapper> widget3; // For field 2
std::unique_ptr<QgsVectorLayer> vl;
};
@ -42,6 +51,27 @@ void TestQgsDateTimeEdit::cleanupTestCase()
void TestQgsDateTimeEdit::init()
{
vl = qgis::make_unique<QgsVectorLayer>( QStringLiteral( "Point?crs=epsg:4326" ),
QStringLiteral( "myvl" ),
QLatin1Literal( "memory" ) );
// add fields
QList<QgsField> fields;
fields.append( QgsField( "date1", QVariant::Date ) );
fields.append( QgsField( "date2", QVariant::Date ) );
fields.append( QgsField( "date3", QVariant::Date ) );
vl->dataProvider()->addAttributes( fields );
vl->updateFields();
QVERIFY( vl.get() );
QVERIFY( vl->isValid() );
widget1 = qgis::make_unique<QgsDateTimeEditWrapper>( vl.get(), 0, nullptr, nullptr );
widget2 = qgis::make_unique<QgsDateTimeEditWrapper>( vl.get(), 1, nullptr, nullptr );
widget3 = qgis::make_unique<QgsDateTimeEditWrapper>( vl.get(), 2, nullptr, nullptr );
QVERIFY( widget1.get() );
QVERIFY( widget2.get() );
QVERIFY( widget3.get() );
}
void TestQgsDateTimeEdit::cleanup()
@ -79,5 +109,122 @@ void TestQgsDateTimeEdit::nullValues()
delete timeEdit;
}
void TestQgsDateTimeEdit::focus()
{
QgsApplication::setNullRepresentation( QString( "nope" ) );
QWidget *w = new QWidget(); //required for focus events
QApplication::setActiveWindow( w );
QVariantMap cfg;
cfg.insert( QStringLiteral( "AllowNull" ), true );
widget1->setConfig( cfg );
QgsDateTimeEdit *dateedit1 = qobject_cast<QgsDateTimeEdit *>( widget1->createWidget( w ) );
QVERIFY( dateedit1 );
widget1->initWidget( dateedit1 );
widget1->setValue( QVariant::Date );
widget2->setConfig( cfg );
QgsDateTimeEdit *dateedit2 = qobject_cast<QgsDateTimeEdit *>( widget2->createWidget( w ) );
QVERIFY( dateedit2 );
widget2->initWidget( dateedit2 );
widget2->setValue( QVariant::Date );
widget3->setConfig( cfg );
QgsDateTimeEdit *dateedit3 = qobject_cast<QgsDateTimeEdit *>( widget3->createWidget( w ) );
QVERIFY( dateedit3 );
widget3->initWidget( dateedit3 );
widget3->setValue( QVariant::Date );
QVERIFY( widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( !dateedit1->hasFocus() );
QVERIFY( !dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit2->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
dateedit1->setFocus();
QVERIFY( widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( dateedit1->hasFocus() );
QVERIFY( !dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QDateTime::currentDateTime().toString( QgsDateTimeFieldFormatter::DATE_FORMAT ) );
QCOMPARE( dateedit2->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
dateedit2->setFocus();
QVERIFY( widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( !dateedit1->hasFocus() );
QVERIFY( dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit2->text(), QDateTime::currentDateTime().toString( QgsDateTimeFieldFormatter::DATE_FORMAT ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
dateedit3->setFocus();
QVERIFY( widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( !dateedit1->hasFocus() );
QVERIFY( !dateedit2->hasFocus() );
QVERIFY( dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit2->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit3->text(), QDateTime::currentDateTime().toString( QgsDateTimeFieldFormatter::DATE_FORMAT ) );
dateedit1->setFocus();
dateedit1->setDateTime( QDateTime::fromString( QStringLiteral( "1955-11-12" ), QgsDateTimeFieldFormatter::DATE_FORMAT ) );
QVERIFY( !widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( dateedit1->hasFocus() );
QVERIFY( !dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QStringLiteral( "1955-11-12" ) );
QCOMPARE( dateedit2->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
dateedit2->setFocus();
QVERIFY( !widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( !dateedit1->hasFocus() );
QVERIFY( dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QStringLiteral( "1955-11-12" ) );
QCOMPARE( dateedit2->text(), QDateTime::currentDateTime().toString( QgsDateTimeFieldFormatter::DATE_FORMAT ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
dateedit1->setFocus();
dateedit1->clear();
QVERIFY( widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( dateedit1->hasFocus() );
QVERIFY( !dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QDateTime::currentDateTime().toString( QgsDateTimeFieldFormatter::DATE_FORMAT ) );
QCOMPARE( dateedit2->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
dateedit2->setFocus();
QVERIFY( widget1->value().isNull() );
QVERIFY( widget2->value().isNull() );
QVERIFY( widget3->value().isNull() );
QVERIFY( !dateedit1->hasFocus() );
QVERIFY( dateedit2->hasFocus() );
QVERIFY( !dateedit3->hasFocus() );
QCOMPARE( dateedit1->text(), QStringLiteral( "nope" ) );
QCOMPARE( dateedit2->text(), QDateTime::currentDateTime().toString( QgsDateTimeFieldFormatter::DATE_FORMAT ) );
QCOMPARE( dateedit3->text(), QStringLiteral( "nope" ) );
}
QGSTEST_MAIN( TestQgsDateTimeEdit )
#include "testqgsdatetimeedit.moc"

4
tests/src/gui/testqgsrangewidgetwrapper.cpp
View File

@ -382,14 +382,14 @@ void TestQgsRangeWidgetWrapper::test_focus()
QgsDoubleSpinBox *editor1 = qobject_cast<QgsDoubleSpinBox *>( widget1->createWidget( w ) );
QVERIFY( editor1 );
widget1->initWidget( editor1 );
widget3->setValue( QVariant( QVariant::Double ) );
widget1->setValue( QVariant( QVariant::Double ) );
//QgsDoubleSpinBox
widget2->setConfig( cfg );
QgsDoubleSpinBox *editor2 = qobject_cast<QgsDoubleSpinBox *>( widget2->createWidget( w ) );
QVERIFY( editor2 );
widget2->initWidget( editor2 );
widget3->setValue( QVariant( QVariant::Double ) );
widget2->setValue( QVariant( QVariant::Double ) );
//QgsSpinBox
widget3->setConfig( cfg );