mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-16 11:54:23 +02:00
Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
e26d1abd5a | |||
e80d16bec5 | |||
412ae74bfa | |||
1c472e47b9 | |||
4a725375e2 | |||
383a196414 | |||
f05b51efa6 | |||
a56c02953f | |||
00d3849e4f | |||
c9244c0684 |
@ -1,4 +1,4 @@
|
||||
version: 7.27.{build}
|
||||
version: 7.28.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
@ -3,7 +3,7 @@ unix:!macx {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 7.27
|
||||
VERSION = 7.28
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
|
@ -1327,7 +1327,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="410"/>
|
||||
<source>Show secondary speed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Näytä molemmat samanaikaisesti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="413"/>
|
||||
@ -1342,7 +1342,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="419"/>
|
||||
<source>Show secondary elevation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Näytä molemmat samanaikaisesti</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="462"/>
|
||||
|
@ -1327,7 +1327,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="410"/>
|
||||
<source>Show secondary speed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Afficher la vitesse secondaire</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="413"/>
|
||||
@ -1342,7 +1342,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="419"/>
|
||||
<source>Show secondary elevation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Afficher l’élévation secondaire</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="462"/>
|
||||
@ -1628,7 +1628,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/routeitem.cpp" line="19"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Commentaire</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/routeitem.cpp" line="20"/>
|
||||
@ -1849,7 +1849,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/trackitem.cpp" line="17"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Commentaire</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/trackitem.cpp" line="18"/>
|
||||
@ -1907,7 +1907,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/waypointitem.cpp" line="39"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Commentaire</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/waypointitem.cpp" line="52"/>
|
||||
|
@ -864,6 +864,7 @@
|
||||
<source>%n files</source>
|
||||
<translation>
|
||||
<numerusform>%n fájl</numerusform>
|
||||
<numerusform>%n fájl</numerusform>
|
||||
</translation>
|
||||
</message>
|
||||
</context>
|
||||
@ -1366,7 +1367,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="410"/>
|
||||
<source>Show secondary speed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Másodlagos sebesség mutatása</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="413"/>
|
||||
@ -1381,7 +1382,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="419"/>
|
||||
<source>Show secondary elevation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Másodlagos emelkedés mutatása</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="455"/>
|
||||
@ -1627,7 +1628,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/routeitem.cpp" line="19"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Megjegyzés</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/routeitem.cpp" line="20"/>
|
||||
@ -1848,7 +1849,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/trackitem.cpp" line="17"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Megjegyzés</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/trackitem.cpp" line="18"/>
|
||||
@ -1906,7 +1907,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/waypointitem.cpp" line="39"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Megjegyzés</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/waypointitem.cpp" line="52"/>
|
||||
|
@ -1362,7 +1362,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="410"/>
|
||||
<source>Show secondary speed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Vis sekundær hastighet</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="413"/>
|
||||
@ -1377,7 +1377,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="419"/>
|
||||
<source>Show secondary elevation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Vis sekundær høyde</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="462"/>
|
||||
@ -1628,7 +1628,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/routeitem.cpp" line="19"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Kommentar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/routeitem.cpp" line="20"/>
|
||||
@ -1849,7 +1849,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/trackitem.cpp" line="17"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation type="unfinished">Kommentar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/trackitem.cpp" line="18"/>
|
||||
@ -1907,7 +1907,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/waypointitem.cpp" line="39"/>
|
||||
<source>Comment</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation type="unfinished">Kommentar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/waypointitem.cpp" line="52"/>
|
||||
|
@ -1328,7 +1328,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="410"/>
|
||||
<source>Show secondary speed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Показывать обе одновременно</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="413"/>
|
||||
@ -1343,7 +1343,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="419"/>
|
||||
<source>Show secondary elevation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Показывать обе одновременно</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="462"/>
|
||||
|
@ -1368,7 +1368,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="410"/>
|
||||
<source>Show secondary speed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Показувати обидві одночасно</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="413"/>
|
||||
@ -1383,7 +1383,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="419"/>
|
||||
<source>Show secondary elevation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Показувати обидві одночасно</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/optionsdialog.cpp" line="455"/>
|
||||
|
@ -7,7 +7,7 @@
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "7.27"
|
||||
!define VERSION "7.28"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}.exe"
|
||||
|
@ -7,7 +7,7 @@
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "7.27"
|
||||
!define VERSION "7.28"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||
|
@ -1,3 +1,4 @@
|
||||
#include <QSet>
|
||||
#include <QGraphicsScene>
|
||||
#include <QEvent>
|
||||
#include <QMouseEvent>
|
||||
@ -494,8 +495,23 @@ void GraphView::setPalette(const Palette &palette)
|
||||
_palette = palette;
|
||||
_palette.reset();
|
||||
|
||||
for (int i = 0; i < _graphs.count(); i++)
|
||||
_graphs.at(i)->setColor(_palette.nextColor());
|
||||
QSet<GraphItem*> secondary;
|
||||
for (int i = 0; i < _graphs.count(); i++) {
|
||||
GraphItem *g = _graphs[i];
|
||||
if (g->secondaryGraph())
|
||||
secondary.insert(g->secondaryGraph());
|
||||
}
|
||||
|
||||
for (int i = 0; i < _graphs.count(); i++) {
|
||||
GraphItem *g = _graphs[i];
|
||||
if (secondary.contains(g))
|
||||
continue;
|
||||
|
||||
QColor color(_palette.nextColor());
|
||||
g->setColor(color);
|
||||
if (g->secondaryGraph())
|
||||
g->secondaryGraph()->setColor(color);
|
||||
}
|
||||
}
|
||||
|
||||
void GraphView::setGraphWidth(int width)
|
||||
|
@ -3,7 +3,6 @@
|
||||
|
||||
#include <QGraphicsView>
|
||||
#include <QList>
|
||||
#include <QSet>
|
||||
#include "data/graph.h"
|
||||
#include "palette.h"
|
||||
#include "units.h"
|
||||
|
@ -13,7 +13,7 @@ public:
|
||||
{
|
||||
map->setParent(this);
|
||||
setData(QVariant::fromValue(map));
|
||||
setEnabled(map->isValid());
|
||||
setEnabled(map->isReady());
|
||||
connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded()));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user