Browse Source

fix windows

QGC4.4
Remek Zajac 5 years ago
parent
commit
3625e9304b
  1. 8
      src/Terrain/TerrainQuery.cc
  2. 8
      src/Terrain/TerrainQuery.h

8
src/Terrain/TerrainQuery.cc

@ -813,7 +813,7 @@ const UnitTestTerrainQuery::Flat10Region UnitTestTerrainQuery::flat10Region{{ @@ -813,7 +813,7 @@ const UnitTestTerrainQuery::Flat10Region UnitTestTerrainQuery::flat10Region{{
pointNemo.longitude() + UnitTestTerrainQuery::regionExtentDeg
}
}};
const double UnitTestTerrainQuery::Flat10Region::elevationMts;
const double UnitTestTerrainQuery::Flat10Region::elevationMts = 10;
const UnitTestTerrainQuery::LinearSlopeRegion UnitTestTerrainQuery::linearSlopeRegion{{
flat10Region.topRight(),
@ -822,9 +822,9 @@ const UnitTestTerrainQuery::LinearSlopeRegion UnitTestTerrainQuery::linearSlopeR @@ -822,9 +822,9 @@ const UnitTestTerrainQuery::LinearSlopeRegion UnitTestTerrainQuery::linearSlopeR
flat10Region.topRight().longitude() + UnitTestTerrainQuery::regionExtentDeg
}
}};
const double UnitTestTerrainQuery::LinearSlopeRegion::minElevationMts;
const double UnitTestTerrainQuery::LinearSlopeRegion::maxElevationMts;
const double UnitTestTerrainQuery::LinearSlopeRegion::dElevationMts;
const double UnitTestTerrainQuery::LinearSlopeRegion::minElevationMts = -100;
const double UnitTestTerrainQuery::LinearSlopeRegion::maxElevationMts = 1000;
const double UnitTestTerrainQuery::LinearSlopeRegion::dElevationMts = maxElevationMts-minElevationMts;
UnitTestTerrainQuery::UnitTestTerrainQuery(TerrainQueryInterface* parent)
:TerrainQueryInterface(parent)

8
src/Terrain/TerrainQuery.h

@ -319,7 +319,7 @@ public: @@ -319,7 +319,7 @@ public:
:QGeoRectangle(region)
{}
static constexpr double elevationMts = 10;
static const double elevationMts;
};
static const Flat10Region flat10Region;
@ -331,9 +331,9 @@ public: @@ -331,9 +331,9 @@ public:
:QGeoRectangle(region)
{}
static constexpr double minElevationMts = -100;
static constexpr double maxElevationMts = 1000;
static constexpr double dElevationMts = maxElevationMts-minElevationMts;
static const double minElevationMts;
static const double maxElevationMts;
static const double dElevationMts;
};
static const LinearSlopeRegion linearSlopeRegion;

Loading…
Cancel
Save