mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-12-01 07:01:16 +01:00
Debug stream code cleanup/unification
This commit is contained in:
parent
fda33cc95b
commit
58e1980b0d
@ -1,9 +0,0 @@
|
|||||||
#include "margins.h"
|
|
||||||
|
|
||||||
|
|
||||||
QDebug operator<<(QDebug dbg, const MarginsF &margins)
|
|
||||||
{
|
|
||||||
dbg.nospace() << "MarginsF(" << margins.left() << ", " << margins.top()
|
|
||||||
<< ", " << margins.right() << margins.bottom() << ")";
|
|
||||||
return dbg.maybeSpace();
|
|
||||||
}
|
|
@ -25,6 +25,11 @@ private:
|
|||||||
qreal _left, _top, _right, _bottom;
|
qreal _left, _top, _right, _bottom;
|
||||||
};
|
};
|
||||||
|
|
||||||
QDebug operator<<(QDebug dbg, const MarginsF &margins);
|
inline QDebug operator<<(QDebug dbg, const MarginsF &margins)
|
||||||
|
{
|
||||||
|
dbg.nospace() << "MarginsF(" << margins.left() << ", " << margins.top()
|
||||||
|
<< ", " << margins.right() << margins.bottom() << ")";
|
||||||
|
return dbg.space();
|
||||||
|
}
|
||||||
|
|
||||||
#endif // MARGINS_H
|
#endif // MARGINS_H
|
||||||
|
@ -37,5 +37,5 @@ AngularUnits::AngularUnits(int code)
|
|||||||
QDebug operator<<(QDebug dbg, const AngularUnits &au)
|
QDebug operator<<(QDebug dbg, const AngularUnits &au)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "AngularUnits(" << deg2rad(au._f) << ")";
|
dbg.nospace() << "AngularUnits(" << deg2rad(au._f) << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ Coordinates Datum::fromWGS84(const Coordinates &c) const
|
|||||||
|
|
||||||
QDebug operator<<(QDebug dbg, const Datum &datum)
|
QDebug operator<<(QDebug dbg, const Datum &datum)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "Datum(" << *datum.ellipsoid() << ", " << datum.dx() << ", "
|
dbg.nospace() << "Datum(" << *datum.ellipsoid() << ", " << datum.dx()
|
||||||
<< datum.dy() << ", " << datum.dz() << ")";
|
<< ", " << datum.dy() << ", " << datum.dz() << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -70,5 +70,5 @@ QDebug operator<<(QDebug dbg, const Ellipsoid &ellipsoid)
|
|||||||
{
|
{
|
||||||
dbg.nospace() << "Ellipsoid(" << ellipsoid.radius() << ", "
|
dbg.nospace() << "Ellipsoid(" << ellipsoid.radius() << ", "
|
||||||
<< 1.0 / ellipsoid.flattening() << ")";
|
<< 1.0 / ellipsoid.flattening() << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -187,5 +187,5 @@ QDebug operator<<(QDebug dbg, const GCS &gcs)
|
|||||||
{
|
{
|
||||||
dbg.nospace() << "GCS(" << gcs.datum() << ", " << gcs.primeMeridian()
|
dbg.nospace() << "GCS(" << gcs.datum() << ", " << gcs.primeMeridian()
|
||||||
<< ", " << gcs.angularUnits() << ")";
|
<< ", " << gcs.angularUnits() << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -23,5 +23,5 @@ LinearUnits::LinearUnits(int code)
|
|||||||
QDebug operator<<(QDebug dbg, const LinearUnits &lu)
|
QDebug operator<<(QDebug dbg, const LinearUnits &lu)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "LinearUnits(" << lu._f << ")";
|
dbg.nospace() << "LinearUnits(" << lu._f << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -69,5 +69,5 @@ double PrimeMeridian::fromGreenwich(double val) const
|
|||||||
QDebug operator<<(QDebug dbg, const PrimeMeridian &pm)
|
QDebug operator<<(QDebug dbg, const PrimeMeridian &pm)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "PrimeMeridian(" << pm._pm << ")";
|
dbg.nospace() << "PrimeMeridian(" << pm._pm << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -66,11 +66,11 @@ QDebug operator<<(QDebug dbg, const Projection::Setup &setup)
|
|||||||
<< setup.longitudeOrigin() << ", " << setup.scale() << ", "
|
<< setup.longitudeOrigin() << ", " << setup.scale() << ", "
|
||||||
<< setup.falseEasting() << ", " << setup.falseNorthing() << ", "
|
<< setup.falseEasting() << ", " << setup.falseNorthing() << ", "
|
||||||
<< setup.standardParallel1() << ", " << setup.standardParallel2() << ")";
|
<< setup.standardParallel1() << ", " << setup.standardParallel2() << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
|
||||||
QDebug operator<<(QDebug dbg, const Projection::Method &method)
|
QDebug operator<<(QDebug dbg, const Projection::Method &method)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "Method(" << method.id() << ")";
|
dbg.nospace() << "Method(" << method.id() << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ private:
|
|||||||
inline QDebug operator<<(QDebug dbg, const Tile &tile)
|
inline QDebug operator<<(QDebug dbg, const Tile &tile)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "Tile(" << tile.zoom() << ", " << tile.xy() << ")";
|
dbg.nospace() << "Tile(" << tile.zoom() << ", " << tile.xy() << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TILE_H
|
#endif // TILE_H
|
||||||
|
@ -76,5 +76,5 @@ Transform::Transform(const QList<ReferencePoint> &points)
|
|||||||
QDebug operator<<(QDebug dbg, const ReferencePoint &p)
|
QDebug operator<<(QDebug dbg, const ReferencePoint &p)
|
||||||
{
|
{
|
||||||
dbg.nospace() << "ReferencePoint(" << p.xy << ", " << p.pp << ")";
|
dbg.nospace() << "ReferencePoint(" << p.xy << ", " << p.pp << ")";
|
||||||
return dbg.maybeSpace();
|
return dbg.space();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user