root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00
Code Issues Projects Releases Activity

Replaced remaining qreals in Coordinates logic

Browse Source
This commit is contained in:
Martin Tůma 2018-04-15 10:42:06 +02:00
parent d31bf80885
commit 4b776c8cc1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/rectc.cpp
View File

@ -43,29 +43,29 @@ RectC RectC::operator|(const RectC &r) const
if (r.isNull()) if (r.isNull())
return *this; return *this;
qreal l1 = _tl.lon(); double l1 = _tl.lon();
qreal r1 = _tl.lon(); double r1 = _tl.lon();
if (_br.lon() - _tl.lon() < 0) if (_br.lon() - _tl.lon() < 0)
l1 = _br.lon(); l1 = _br.lon();
else else
r1 = _br.lon(); r1 = _br.lon();
qreal l2 = r._tl.lon(); double l2 = r._tl.lon();
qreal r2 = r._tl.lon(); double r2 = r._tl.lon();
if (r._br.lon() - r._tl.lon() < 0) if (r._br.lon() - r._tl.lon() < 0)
l2 = r._br.lon(); l2 = r._br.lon();
else else
r2 = r._br.lon(); r2 = r._br.lon();
qreal t1 = _tl.lat(); double t1 = _tl.lat();
qreal b1 = _tl.lat(); double b1 = _tl.lat();
if (_br.lat() - _tl.lat() < 0) if (_br.lat() - _tl.lat() < 0)
t1 = _br.lat(); t1 = _br.lat();
else else
b1 = _br.lat(); b1 = _br.lat();
qreal t2 = r._tl.lat(); double t2 = r._tl.lat();
qreal b2 = r._tl.lat(); double b2 = r._tl.lat();
if (r._br.lat() - r._tl.lat() < 0) if (r._br.lat() - r._tl.lat() < 0)
t2 = r._br.lat(); t2 = r._br.lat();
else else
@ -85,15 +85,15 @@ RectC RectC::operator&(const RectC &r) const
if (isNull() || r.isNull()) if (isNull() || r.isNull())
return RectC(); return RectC();
qreal l1 = _tl.lon(); double l1 = _tl.lon();
qreal r1 = _tl.lon(); double r1 = _tl.lon();
if (_br.lon() - _tl.lon() < 0) if (_br.lon() - _tl.lon() < 0)
l1 = _br.lon(); l1 = _br.lon();
else else
r1 = _br.lon(); r1 = _br.lon();
qreal l2 = r._tl.lon(); double l2 = r._tl.lon();
qreal r2 = r._tl.lon(); double r2 = r._tl.lon();
if (r._br.lon() - r._tl.lon() < 0) if (r._br.lon() - r._tl.lon() < 0)
l2 = r._br.lon(); l2 = r._br.lon();
else else
@ -102,15 +102,15 @@ RectC RectC::operator&(const RectC &r) const
if (l1 > r2 || l2 > r1) if (l1 > r2 || l2 > r1)
return RectC(); return RectC();
qreal t1 = _tl.lat(); double t1 = _tl.lat();
qreal b1 = _tl.lat(); double b1 = _tl.lat();
if (_br.lat() - _tl.lat() < 0) if (_br.lat() - _tl.lat() < 0)
t1 = _br.lat(); t1 = _br.lat();
else else
b1 = _br.lat(); b1 = _br.lat();
qreal t2 = r._tl.lat(); double t2 = r._tl.lat();
qreal b2 = r._tl.lat(); double b2 = r._tl.lat();
if (r._br.lat() - r._tl.lat() < 0) if (r._br.lat() - r._tl.lat() < 0)
t2 = r._br.lat(); t2 = r._br.lat();
else else