Skip to content

Commit

Permalink
fix typo and doc
Browse files Browse the repository at this point in the history
  • Loading branch information
vcloarec authored and nyalldawson committed May 20, 2020
1 parent 267af1e commit 24ee358
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/app/mesh/qgsmeshlayerproperties.cpp
Expand Up @@ -95,9 +95,9 @@ QgsMeshLayerProperties::QgsMeshLayerProperties( QgsMapLayer *lyr, QgsMapCanvas *
delete mOptsPage_3DView; // removes both the "3d view" list item and its page
#endif

mComboBoxTemporalDatasetMatchingMethod->addItem( tr( "Find closest dataset before requested time" ),
mComboBoxTemporalDatasetMatchingMethod->addItem( tr( "Find Closest Dataset Before Requested Time" ),
QgsMeshDataProviderTemporalCapabilities::FindClosestDatasetBeforeStartRangeTime );
mComboBoxTemporalDatasetMatchingMethod->addItem( tr( "Find closest dataset from requested time (after or before)" ),
mComboBoxTemporalDatasetMatchingMethod->addItem( tr( "Find Closest Dataset From Requested Time (After or Before)" ),
QgsMeshDataProviderTemporalCapabilities::FindClosestDatasetFromStartRangeTime );

// update based on lyr's current state
Expand Down
6 changes: 3 additions & 3 deletions src/core/mesh/qgsmeshdataprovidertemporalcapabilities.h
Expand Up @@ -35,12 +35,12 @@ class CORE_EXPORT QgsMeshDataProviderTemporalCapabilities: public QgsDataProvide
public:

/**
* Method to use when requesting a tempral dataset from a time
* Method for selection of temporal mesh dataset from a range time
**/
enum MatchingTemporalDatasetMethod
{
FindClosestDatasetBeforeStartRangeTime, //! Find the closest dataset which have its time before the requested start range time
FindClosestDatasetFromStartRangeTime //! Find the closest dataset before or after the requested start range time
FindClosestDatasetBeforeStartRangeTime, //! Finds the closest dataset which have its time before the requested start range time
FindClosestDatasetFromStartRangeTime //! Finds the closest dataset before or after the requested start range time
};

/**
Expand Down
25 changes: 18 additions & 7 deletions src/ui/mesh/qgsmeshlayerpropertiesbase.ui
Expand Up @@ -200,7 +200,7 @@
<enum>QFrame::Plain</enum>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="mOptsPage_Information">
<layout class="QVBoxLayout" name="verticalLayout_20">
Expand Down Expand Up @@ -567,6 +567,9 @@ border-radius: 2px;</string>
</item>
<item row="0" column="3">
<widget class="QDateTimeEdit" name="mTemporalDateTimeReference">
<property name="toolTip">
<string>Reference time used to render mesh dataset when using temporal range or temporal animation</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
Expand Down Expand Up @@ -623,7 +626,7 @@ border-radius: 2px;</string>
<item row="1" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Time unit</string>
<string>Time Unit</string>
</property>
</widget>
</item>
Expand All @@ -641,7 +644,11 @@ border-radius: 2px;</string>
</spacer>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="mTemporalProviderTimeUnitComboBox"/>
<widget class="QComboBox" name="mTemporalProviderTimeUnitComboBox">
<property name="toolTip">
<string>Default time unit of mesh data provider is hour, change to override the time unit</string>
</property>
</widget>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -680,7 +687,7 @@ border-radius: 2px;</string>
<item row="0" column="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Layer Time Reference</string>
<string>Layer Reference Time</string>
</property>
</widget>
</item>
Expand All @@ -694,12 +701,16 @@ border-radius: 2px;</string>
<item row="2" column="2">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Matching dataset Method</string>
<string>Dataset Matching Method</string>
</property>
</widget>
</item>
<item row="2" column="3" colspan="3">
<widget class="QComboBox" name="mComboBoxTemporalDatasetMatchingMethod"/>
<item row="2" column="3" colspan="4">
<widget class="QComboBox" name="mComboBoxTemporalDatasetMatchingMethod">
<property name="toolTip">
<string>Method for selection of temporal mesh dataset from a range time</string>
</property>
</widget>
</item>
</layout>
</widget>
Expand Down

0 comments on commit 24ee358

Please sign in to comment.