mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-20 05:44:23 +02:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
c6cc34c73f | |||
ddc0e60517 | |||
48dcc6655b | |||
f0be0d6774 |
@ -1,4 +1,4 @@
|
||||
version: 8.7.{build}
|
||||
version: 8.8.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
@ -3,7 +3,7 @@ unix:!macx {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 8.7
|
||||
VERSION = 8.8
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
|
@ -9,7 +9,7 @@ Unicode true
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "8.7"
|
||||
!define VERSION "8.8"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}.exe"
|
||||
|
@ -9,7 +9,7 @@ Unicode true
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "8.7"
|
||||
!define VERSION "8.8"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||
|
@ -679,7 +679,8 @@ void GUI::createGraphTabs()
|
||||
_tabs.append(new TemperatureGraph(_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)));
|
||||
}
|
||||
|
||||
@ -880,7 +881,6 @@ void GUI::loadData(const Data &data)
|
||||
paths = _mapView->loadData(data);
|
||||
|
||||
GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget());
|
||||
int index = _graphTabWidget->currentIndex();
|
||||
|
||||
for (int i = 0; i < paths.count(); i++) {
|
||||
PathItem *pi = paths.at(i);
|
||||
@ -890,8 +890,8 @@ void GUI::loadData(const Data &data)
|
||||
for (int j = 0; j < graphs.count(); j++)
|
||||
pi->addGraph(graphs.at(j).at(i));
|
||||
|
||||
if (gt && index >= 0) {
|
||||
pi->setGraph(index);
|
||||
if (gt) {
|
||||
pi->setGraph(_tabs.indexOf(gt));
|
||||
pi->setMarkerPosition(gt->sliderPosition());
|
||||
}
|
||||
}
|
||||
@ -1726,19 +1726,12 @@ void GUI::graphChanged(int index)
|
||||
if (index < 0)
|
||||
return;
|
||||
|
||||
_mapView->setGraph(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,
|
||||
SLOT(setMarkerPosition(qreal)));
|
||||
_mapView->setGraph(_tabs.indexOf(gt));
|
||||
|
||||
if (_lastGraphTab)
|
||||
gt->setSliderPosition(_lastGraphTab->sliderPosition());
|
||||
|
||||
_lastGraphTab = gt;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user