1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-22 23:04:23 +02:00

Compare commits

..

4 Commits
8.7 ... 8.8

Author SHA1 Message Date
c6cc34c73f Version++ 2021-02-24 00:10:31 +01:00
ddc0e60517 Graphtab->mapview connections can be permanent
(no need to recreate them on every graph change)
2021-02-23 23:12:14 +01:00
48dcc6655b Yet another place with broken graph tab index 2021-02-23 22:55:22 +01:00
f0be0d6774 Fixed broken path<->graph binding setup
fixes #348
2021-02-23 22:35:59 +01:00
5 changed files with 10 additions and 17 deletions

View File

@ -1,4 +1,4 @@
version: 8.7.{build} version: 8.8.{build}
configuration: configuration:
- Release - Release

View File

@ -3,7 +3,7 @@ unix:!macx {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 8.7 VERSION = 8.8
QT += core \ QT += core \
gui \ gui \

View File

@ -9,7 +9,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "8.7" !define VERSION "8.8"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}.exe" OutFile "GPXSee-${VERSION}.exe"

View File

@ -9,7 +9,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "8.7" !define VERSION "8.8"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -679,7 +679,8 @@ void GUI::createGraphTabs()
_tabs.append(new TemperatureGraph(_graphTabWidget)); _tabs.append(new TemperatureGraph(_graphTabWidget));
_tabs.append(new GearRatioGraph(_graphTabWidget)); _tabs.append(new GearRatioGraph(_graphTabWidget));
connect(_tabs.first(), SIGNAL(sliderPositionChanged(qreal)), _mapView, for (int i = 0; i < _tabs.size(); i++)
connect(_tabs.at(i), SIGNAL(sliderPositionChanged(qreal)), _mapView,
SLOT(setMarkerPosition(qreal))); SLOT(setMarkerPosition(qreal)));
} }
@ -880,7 +881,6 @@ void GUI::loadData(const Data &data)
paths = _mapView->loadData(data); paths = _mapView->loadData(data);
GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget()); GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget());
int index = _graphTabWidget->currentIndex();
for (int i = 0; i < paths.count(); i++) { for (int i = 0; i < paths.count(); i++) {
PathItem *pi = paths.at(i); PathItem *pi = paths.at(i);
@ -890,8 +890,8 @@ void GUI::loadData(const Data &data)
for (int j = 0; j < graphs.count(); j++) for (int j = 0; j < graphs.count(); j++)
pi->addGraph(graphs.at(j).at(i)); pi->addGraph(graphs.at(j).at(i));
if (gt && index >= 0) { if (gt) {
pi->setGraph(index); pi->setGraph(_tabs.indexOf(gt));
pi->setMarkerPosition(gt->sliderPosition()); pi->setMarkerPosition(gt->sliderPosition());
} }
} }
@ -1726,19 +1726,12 @@ void GUI::graphChanged(int index)
if (index < 0) if (index < 0)
return; return;
_mapView->setGraph(index);
GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->widget(index)); GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->widget(index));
if (_lastGraphTab)
disconnect(_lastGraphTab, SIGNAL(sliderPositionChanged(qreal)),
_mapView, SLOT(setMarkerPosition(qreal)));
connect(gt, SIGNAL(sliderPositionChanged(qreal)), _mapView, _mapView->setGraph(_tabs.indexOf(gt));
SLOT(setMarkerPosition(qreal)));
if (_lastGraphTab) if (_lastGraphTab)
gt->setSliderPosition(_lastGraphTab->sliderPosition()); gt->setSliderPosition(_lastGraphTab->sliderPosition());
_lastGraphTab = gt; _lastGraphTab = gt;
} }