1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-26 12:10:49 +01:00

Compare commits

..

No commits in common. "6ce0b032956b21630c899d245e00108547d975c5" and "ad178db57e3097029cb65756490cdc0b6d1e5ac7" have entirely different histories.

3 changed files with 10 additions and 19 deletions

View File

@ -442,15 +442,6 @@ void GraphView::clear()
_sliderPos = 0; _sliderPos = 0;
_zoom = 1.0; _zoom = 1.0;
removeItem(_xAxis);
removeItem(_yAxis);
removeItem(_xAxisLabel);
removeItem(_yAxisLabel);
removeItem(_slider);
removeItem(_info);
removeItem(_grid);
removeItem(_message);
_scene->setSceneRect(0, 0, 0, 0); _scene->setSceneRect(0, 0, 0, 0);
} }

View File

@ -1307,14 +1307,14 @@ void GUI::statistics()
+ l.toString(_areaCount) + "<br>"); + l.toString(_areaCount) + "<br>");
if (_dateRange.first.isValid()) { if (_dateRange.first.isValid()) {
QString format = l.dateFormat(QLocale::ShortFormat);
if (_dateRange.first == _dateRange.second) if (_dateRange.first == _dateRange.second)
text.append("<b>" + tr("Date") + ":</b> " text.append("<b>" + tr("Date") + ":</b> "
+ l.toString(_dateRange.first, QLocale::ShortFormat) + "<br>"); + _dateRange.first.toString(format) + "<br>");
else else
text.append("<b>" + tr("Date") + ":</b> " text.append("<b>" + tr("Date") + ":</b> "
+ QString("%1 - %2").arg(l.toString(_dateRange.first, + QString("%1 - %2").arg(_dateRange.first.toString(format),
QLocale::NarrowFormat), l.toString(_dateRange.second, _dateRange.second.toString(format)) + "<br>");
QLocale::NarrowFormat)) + "<br>");
} }
if (distance() > 0) if (distance() > 0)
@ -1372,13 +1372,14 @@ void GUI::statistics()
if (_dateRange.first.isValid()) { if (_dateRange.first.isValid()) {
if (_dateRange.first == _dateRange.second) { if (_dateRange.first == _dateRange.second) {
QString format = l.dateFormat(QLocale::LongFormat);
text.append("<tr><td>" + tr("Date") + ":</td><td>" text.append("<tr><td>" + tr("Date") + ":</td><td>"
+ l.toString(_dateRange.first, QLocale::ShortFormat) + "</td></tr>"); + _dateRange.first.toString(format) + "</td></tr>");
} else { } else {
QString format = l.dateFormat(QLocale::ShortFormat);
text.append("<tr><td>" + tr("Date") + ":</td><td>" text.append("<tr><td>" + tr("Date") + ":</td><td>"
+ QString("%1 - %2").arg(l.toString(_dateRange.first, + QString("%1 - %2").arg(_dateRange.first.toString(format),
QLocale::NarrowFormat), l.toString(_dateRange.second, _dateRange.second.toString(format)) + "</td></tr>");
QLocale::NarrowFormat)) + "</td></tr>");
} }
} }

View File

@ -24,8 +24,7 @@ ToolTip TrackItem::info() const
if (_movingTime > 0) if (_movingTime > 0)
tt.insert(tr("Moving time"), Format::timeSpan(_movingTime)); tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
if (!_date.isNull()) if (!_date.isNull())
tt.insert(tr("Date"), l.toString(_date.toTimeZone(_timeZone), tt.insert(tr("Date"), l.toString(_date.toTimeZone(_timeZone)));
QLocale::ShortFormat));
if (!_links.isEmpty()) { if (!_links.isEmpty()) {
QString links; QString links;
for (int i = 0; i < _links.size(); i++) { for (int i = 0; i < _links.size(); i++) {