Skip to content

Commit

Permalink
Fix project properties shows random dates for project temporal range
Browse files Browse the repository at this point in the history 
when temporal range has not been set
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 13, 2020
1 parent 3b6c4db commit 64329ea
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 84 deletions.
39 changes: 5 additions & 34 deletions src/app/qgsprojectproperties.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -238,24 +238,8 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
QgsDateTimeRange range = QgsProject::instance()->timeSettings()->temporalRange(); QgsDateTimeRange range = QgsProject::instance()->timeSettings()->temporalRange();
QLocale locale; QLocale locale;


mStartDateTimeEdit->setDisplayFormat( mStartDateTimeEdit->setDateTime( range.begin() );
locale.dateTimeFormat( QLocale::ShortFormat ) ); mEndDateTimeEdit->setDateTime( range.end() );
mEndDateTimeEdit->setDisplayFormat(
locale.dateTimeFormat( QLocale::ShortFormat ) );

if ( range.begin().isValid() && range.end().isValid() )
{
mStartDateTimeEdit->setDateTime( range.begin() );
mEndDateTimeEdit->setDateTime( range.end() );

mCurrentRangeLabel->setText( tr( "Current selected range: %1 to %2" ).arg(
mStartDateTimeEdit->dateTime().toString( locale.dateTimeFormat() ),
mEndDateTimeEdit->dateTime().toString( locale.dateTimeFormat() ) ) );
}
else
{
mCurrentRangeLabel->setText( tr( "Project range is not set" ) );
}


mAutoTransaction->setChecked( QgsProject::instance()->autoTransaction() ); mAutoTransaction->setChecked( QgsProject::instance()->autoTransaction() );
title( QgsProject::instance()->title() ); title( QgsProject::instance()->title() );
Expand Down Expand Up @@ -1046,7 +1030,7 @@ void QgsProjectProperties::apply()
QgsProject::instance()->setTrustLayerMetadata( mTrustProjectCheckBox->isChecked() ); QgsProject::instance()->setTrustLayerMetadata( mTrustProjectCheckBox->isChecked() );


// Time settings // Time settings
QDateTime start = mStartDateTimeEdit->dateTime(); QDateTime start = mStartDateTimeEdit->dateTime();
QDateTime end = mEndDateTimeEdit->dateTime(); QDateTime end = mEndDateTimeEdit->dateTime();


QgsProject::instance()->timeSettings()->setTemporalRange( QgsDateTimeRange( start, end ) ); QgsProject::instance()->timeSettings()->setTemporalRange( QgsDateTimeRange( start, end ) );
Expand Down Expand Up @@ -2512,21 +2496,8 @@ void QgsProjectProperties::mButtonAddColor_clicked()
void QgsProjectProperties::calculateFromLayersButton_clicked() void QgsProjectProperties::calculateFromLayersButton_clicked()
{ {
const QgsDateTimeRange range = QgsTemporalUtils::calculateTemporalRangeForProject( QgsProject::instance() ); const QgsDateTimeRange range = QgsTemporalUtils::calculateTemporalRangeForProject( QgsProject::instance() );
const QDateTime minDate = range.begin(); mStartDateTimeEdit->setDateTime( range.begin() );
const QDateTime maxDate = range.end(); mEndDateTimeEdit->setDateTime( range.end() );

if ( !minDate.isValid() || !maxDate.isValid() )
return;

mStartDateTimeEdit->setDateTime( minDate );
mEndDateTimeEdit->setDateTime( maxDate );

QLocale locale;
mCurrentRangeLabel->setText( tr( "Current selected range: %1 to %2" ).arg(
mStartDateTimeEdit->dateTime().toString(
locale.dateTimeFormat( QLocale::ShortFormat ) ),
mEndDateTimeEdit->dateTime().toString(
locale.dateTimeFormat( QLocale::ShortFormat ) ) ) );
} }


QListWidgetItem *QgsProjectProperties::addScaleToScaleList( const QString &newScale ) QListWidgetItem *QgsProjectProperties::addScaleToScaleList( const QString &newScale )
Expand Down
91 changes: 41 additions & 50 deletions src/ui/qgsprojectpropertiesbase.ui
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>9</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="mProjOptsGeneral"> <widget class="QWidget" name="mProjOptsGeneral">
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -274,8 +274,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>652</width> <width>671</width>
<height>846</height> <height>865</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
Expand Down Expand Up @@ -897,8 +897,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>663</width> <width>587</width>
<height>164</height> <height>167</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
Expand Down Expand Up @@ -972,8 +972,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>315</width> <width>288</width>
<height>553</height> <height>563</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_12"> <layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -1548,8 +1548,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>191</width> <width>177</width>
<height>55</height> <height>56</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_17"> <layout class="QVBoxLayout" name="verticalLayout_17">
Expand Down Expand Up @@ -1610,8 +1610,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>719</width> <width>643</width>
<height>2767</height> <height>2818</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
Expand Down Expand Up @@ -2881,43 +2881,39 @@
<property name="title"> <property name="title">
<string>Temporal Options</string> <string>Temporal Options</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_22"> <layout class="QGridLayout" name="gridLayout_22" columnstretch="0,1">
<item> <item row="0" column="1">
<widget class="QLabel" name="mCurrentRangeLabel"> <widget class="QgsDateTimeEdit" name="mStartDateTimeEdit">
<property name="styleSheet"> <property name="displayFormat">
<string notr="true">color:rgb(136, 138, 133); <string>M/d/yyyy h:mm AP</string>
</string>
</property> </property>
<property name="text"> <property name="timeSpec">
<string/> <enum>Qt::UTC</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="0">
<widget class="QLabel" name="label_35"> <widget class="QLabel" name="label_35">
<property name="text"> <property name="text">
<string>Start date</string> <string>Start date</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="1">
<widget class="QgsDateTimeEdit" name="mStartDateTimeEdit"> <widget class="QPushButton" name="mCalculateFromLayerButton">
<property name="displayFormat"> <property name="text">
<string>M/d/yyyy h:mm AP</string> <string>Calculate from Layers</string>
</property>
<property name="timeSpec">
<enum>Qt::UTC</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QLabel" name="label_36"> <widget class="QLabel" name="label_36">
<property name="text"> <property name="text">
<string>End date</string> <string>End date</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="1">
<widget class="QgsDateTimeEdit" name="mEndDateTimeEdit"> <widget class="QgsDateTimeEdit" name="mEndDateTimeEdit">
<property name="displayFormat"> <property name="displayFormat">
<string>M/d/yyyy h:mm AP</string> <string>M/d/yyyy h:mm AP</string>
Expand All @@ -2927,13 +2923,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="mCalculateFromLayerButton">
<property name="text">
<string>Calculate from layers</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
Expand Down Expand Up @@ -3002,9 +2991,14 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>QgsCollapsibleGroupBox</class> <class>QgsFilterLineEdit</class>
<extends>QGroupBox</extends> <extends>QLineEdit</extends>
<header>qgscollapsiblegroupbox.h</header> <header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsVariableEditorWidget</class>
<extends>QWidget</extends>
<header>qgsvariableeditorwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
Expand All @@ -3013,6 +3007,12 @@
<header>qgsscrollarea.h</header> <header>qgsscrollarea.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsDateTimeEdit</class> <class>QgsDateTimeEdit</class>
<extends>QDateTimeEdit</extends> <extends>QDateTimeEdit</extends>
Expand All @@ -3024,11 +3024,6 @@
<header>qgscolorbutton.h</header> <header>qgscolorbutton.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QgsOpacityWidget</class> <class>QgsOpacityWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
Expand All @@ -3041,12 +3036,6 @@
<header location="global">qgscolorschemelist.h</header> <header location="global">qgscolorschemelist.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsVariableEditorWidget</class>
<extends>QWidget</extends>
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsDatumTransformTableWidget</class> <class>QgsDatumTransformTableWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
Expand Down Expand Up @@ -3183,6 +3172,8 @@
</tabstops> </tabstops>
<resources> <resources>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
Expand Down

0 comments on commit 64329ea

Please sign in to comment.