eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename MccCoordinate to MccAngle

Browse Source
This commit is contained in:
Timur A. Fatkhullin
2025-04-21 18:42:21 +03:00
parent 67340d1926
commit 9315018bda
5 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cxx/mount_pz.h
View File

@@ -17,14 +17,14 @@ concept mcc_prohibited_zone_c = requires(T t, const T const_t) {
// check if given coordinates are within the zone
{
t.inZone(std::declval<const MccCoordinate&>(), std::declval<const MccCoordinate&>(),
t.inZone(std::declval<const MccAngle&>(), std::declval<const MccAngle&>(),
std::declval<typename T::pzcoords_kind_t>())
} -> std::convertible_to<bool>;
// a time duration to reach the zone (0 - if already in the zone, chrono::duration<>::max() if never
// reach the zone)
{
t.timeTo(std::declval<const MccCoordinate&>(), std::declval<const MccCoordinate&>(),
t.timeTo(std::declval<const MccAngle&>(), std::declval<const MccAngle&>(),
std::declval<typename T::pzcoords_kind_t>(),
std::declval<const std::chrono::system_clock::time_point&>())
} -> mcc_time_duration_c;
@@ -32,7 +32,7 @@ concept mcc_prohibited_zone_c = requires(T t, const T const_t) {
// a time duration to exit the zone (0 - if already out of the zone, chrono::duration<>::max() if
// never exit the zone)
{
t.timeFrom(std::declval<const MccCoordinate&>(), std::declval<const MccCoordinate&>(),
t.timeFrom(std::declval<const MccAngle&>(), std::declval<const MccAngle&>(),
std::declval<typename T::pzcoords_kind_t>(),
std::declval<const std::chrono::system_clock::time_point&>())
} -> mcc_time_duration_c;
@@ -46,13 +46,13 @@ class MccProhibitedZone
public:
virtual ~MccProhibitedZone() = default;
bool inZone(this auto&& self, const MccCoordinate& x, const MccCoordinate& y)
bool inZone(this auto&& self, const MccAngle& x, const MccAngle& y)
{
return std::forward<decltype(self)>(self).inZoneImpl(x, y);
}
protected:
bool inZoneImpl(const MccCoordinate&, const MccCoordinate&)
bool inZoneImpl(const MccAngle&, const MccAngle&)
{
return false;
}
@@ -61,9 +61,9 @@ protected:
class MccMinAltPZ : public MccProhibitedZone
{
public:
MccMinAltPZ(const MccCoordinate& min_alt) : _minAlt(min_alt) {}
MccMinAltPZ(const MccAngle& min_alt) : _minAlt(min_alt) {}
MccCoordinate minAlt() const
MccAngle minAlt() const
{
return _minAlt;
}
@@ -71,7 +71,7 @@ public:
private:
double _minAlt;
bool inZoneImpl(const MccCoordinate& alt, const MccCoordinate&)
bool inZoneImpl(const MccAngle& alt, const MccAngle&)
{
return alt <= _minAlt;
}
@@ -91,7 +91,7 @@ public:
private:
double _maxAlt;
bool inZoneImpl(const MccCoordinate& alt, const MccCoordinate&)
bool inZoneImpl(const MccAngle& alt, const MccAngle&)
{
return alt >= _maxAlt;
}
@@ -139,11 +139,11 @@ private:
class MccEllipsePZ
{
public:
MccEllipsePZ(const MccCoordinate& xc,
const MccCoordinate& yc,
const MccCoordinate& a,
const MccCoordinate& b,
const MccCoordinate& theta = 0.0)
MccEllipsePZ(const MccAngle& xc,
const MccAngle& yc,
const MccAngle& a,
const MccAngle& b,
const MccAngle& theta = 0.0)
: _xc(xc), _yc(yc), _a(a), _b(b), _theta(theta), _tanXc(std::tan(xc)), _tanYc(std::tan(yc))
{
_tanYc *= std::sqrt(1.0 + _tanXc * _tanXc);
@@ -168,7 +168,7 @@ public:
}
// circle
MccEllipsePZ(const MccCoordinate& xc, const MccCoordinate& yc, const MccCoordinate& a)
MccEllipsePZ(const MccAngle& xc, const MccAngle& yc, const MccAngle& a)
: mcc::MccEllipsePZ(xc, yc, a, a)
{
}
@@ -178,7 +178,7 @@ private:
double _xc, _yc, _a, _b, _theta;
double _tanXc, _tanYc, cxx, cxy, cyy;
bool inZoneImpl(const MccCoordinate& x, const MccCoordinate& y)
bool inZoneImpl(const MccAngle& x, const MccAngle& y)
{
auto tanX = tan(x);
auto tanY = tan(y) * sqrt(1.0 + tanX * tanX);