Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove per-ext IGC specific logic from KML writer #1183

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove per-ext IGC specific logic from KML writer #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions igc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include "grtcirc.h" // for RAD, gcdist, radtometers
#include "src/core/datetime.h" // for DateTime
#include "formspec.h" // for FormatSpecificData, kFsIGC
#include "kml.h" // for KmlFormat::igc_mt_fields_def



Expand All @@ -60,6 +61,19 @@
#define HDRDELIM "~"
#define DATEMAGIC "IGCDATE"

const QVector<KmlFormat::igc_mt_field_t> KmlFormat::igc_mt_fields_def = {
{ IgcFormat::igc_wp_field::igc_enl, "igc_enl", "Engine Noise", "double" },
{ IgcFormat::igc_wp_field::igc_tas, "igc_tas", "True Airspd", "double" },
{ IgcFormat::igc_wp_field::igc_oat, "igc_oat", "Otsd Air Temp", "double" },
{ IgcFormat::igc_wp_field::igc_vat, "igc_vat", "Ttl Enrg Vario", "double" },
{ IgcFormat::igc_wp_field::igc_gsp, "igc_gsp", "Ground Speed", "double" },
{ IgcFormat::igc_wp_field::igc_fxa, "igc_fxa", "Fix Accuracy", "double" },
{ IgcFormat::igc_wp_field::igc_gfo, "igc_gfo", "G Force?", "double" },
{ IgcFormat::igc_wp_field::igc_acz, "igc_acz", "Z Accel", "double" },
{ IgcFormat::igc_wp_field::igc_siu, "igc_siu", "# Of Sats", "double" },
{ IgcFormat::igc_wp_field::igc_trt, "igc_trt", "True Track", "double" },
};

/*
* See if two lat/lon pairs are approximately equal.
* @param lat1 The latitude of coordinate pair 1
Expand Down
90 changes: 37 additions & 53 deletions igc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include "format.h"
#include "gbfile.h" // for gbfprintf, gbfclose, gbfopen, gbfputs, gbfgetstr, gbfile
#include "src/core/datetime.h" // for DateTime
#include "kml.h" // for wp_field

/*
* Notes on IGC extensions:
Expand Down Expand Up @@ -103,6 +102,20 @@ class IgcFormat : public Format
void write() override;
void wr_deinit() override;

enum class igc_wp_field {
igc_enl = 0, // Engine Noise Level
igc_tas, // True Airspeed
igc_vat, // Compensated variometer (total energy)
igc_oat, // Outside Air Temperature
igc_trt, // True Track
igc_gsp, // Ground Speed
igc_fxa, // Fix Accuracy
igc_gfo, // G Force
igc_siu, // Satellites In Use
igc_acz, // Z Acceleration
};
static constexpr int number_igc_wp_fields = static_cast<int>(igc_wp_field::igc_acz) + 1;

private:

/* Types */
Expand Down Expand Up @@ -298,86 +311,97 @@ struct igc_fsdata : public FormatSpecificData {
std::optional<double> acz; // Z Acceleration
std::optional<double> gfo; // G Force?

QList<std::tuple<std::optional<double>*, IgcFormat::igc_wp_field>> ext_list;

// Stores all data as igc_fsdata
bool set_value(IgcFormat::igc_ext_type_t type, double value, Waypoint *wp = nullptr)
{
bool success = true;
switch (type) {
case IgcFormat::igc_ext_type_t::ext_rec_enl:
enl = value;
ext_list.append(std::make_tuple(&enl, IgcFormat::igc_wp_field::igc_enl));
break;
case IgcFormat::igc_ext_type_t::ext_rec_tas:
tas = value;
ext_list.append(std::make_tuple(&tas, IgcFormat::igc_wp_field::igc_tas));
break;
case IgcFormat::igc_ext_type_t::ext_rec_vat:
vat = value;
ext_list.append(std::make_tuple(&vat, IgcFormat::igc_wp_field::igc_vat));
break;
case IgcFormat::igc_ext_type_t::ext_rec_oat:
if (wp){
wp->set_temperature(value);
}
ext_list.append(std::make_tuple(&oat, IgcFormat::igc_wp_field::igc_oat));
oat = value;
break;
case IgcFormat::igc_ext_type_t::ext_rec_trt:
trt = value;
ext_list.append(std::make_tuple(&trt, IgcFormat::igc_wp_field::igc_trt));
break;
case IgcFormat::igc_ext_type_t::ext_rec_gsp:
gsp = value;
ext_list.append(std::make_tuple(&gsp, IgcFormat::igc_wp_field::igc_gsp));
break;
case IgcFormat::igc_ext_type_t::ext_rec_fxa:
fxa = value;
ext_list.append(std::make_tuple(&fxa, IgcFormat::igc_wp_field::igc_fxa));
break;
case IgcFormat::igc_ext_type_t::ext_rec_siu:
if (wp) {
wp->sat = value;
}
siu = value;
ext_list.append(std::make_tuple(&siu, IgcFormat::igc_wp_field::igc_siu));
break;
case IgcFormat::igc_ext_type_t::ext_rec_acz:
acz = value;
ext_list.append(std::make_tuple(&acz, IgcFormat::igc_wp_field::igc_acz));
break;
case IgcFormat::igc_ext_type_t::ext_rec_gfo:
gfo = value;
ext_list.append(std::make_tuple(&gfo, IgcFormat::igc_wp_field::igc_gfo));
break;
default:
success = false;
}
return success;
}

// Not currently used, but already written and left for future use.
std::optional<double> get_value(IgcFormat::igc_ext_type_t defn_type) const
std::optional<double> get_value(IgcFormat::igc_wp_field defn_type) const
{
std::optional<double> ret;
switch (defn_type) {
case IgcFormat::igc_ext_type_t::ext_rec_enl:
case IgcFormat::igc_wp_field::igc_enl:
ret = enl;
break;
case IgcFormat::igc_ext_type_t::ext_rec_tas:
case IgcFormat::igc_wp_field::igc_tas:
ret = tas;
break;
case IgcFormat::igc_ext_type_t::ext_rec_vat:
case IgcFormat::igc_wp_field::igc_vat:
ret = vat;
break;
case IgcFormat::igc_ext_type_t::ext_rec_oat:
case IgcFormat::igc_wp_field::igc_oat:
ret = oat;
break;
case IgcFormat::igc_ext_type_t::ext_rec_trt:
case IgcFormat::igc_wp_field::igc_trt:
ret = trt;
break;
case IgcFormat::igc_ext_type_t::ext_rec_gsp:
case IgcFormat::igc_wp_field::igc_gsp:
ret = gsp;
break;
case IgcFormat::igc_ext_type_t::ext_rec_fxa:
case IgcFormat::igc_wp_field::igc_fxa:
ret = fxa;
break;
case IgcFormat::igc_ext_type_t::ext_rec_siu:
case IgcFormat::igc_wp_field::igc_siu:
ret = siu;
break;
case IgcFormat::igc_ext_type_t::ext_rec_acz:
case IgcFormat::igc_wp_field::igc_acz:
ret = acz;
break;
case IgcFormat::igc_ext_type_t::ext_rec_gfo:
case IgcFormat::igc_wp_field::igc_gfo:
ret = gfo;
break;
default:
Expand All @@ -386,46 +410,6 @@ struct igc_fsdata : public FormatSpecificData {
}
return ret;
}
std::optional<double> get_value(KmlFormat::wp_field defn_type) const
{
std::optional<double> ret;
switch (defn_type) {
case KmlFormat::wp_field::igc_enl:
ret = enl;
break;
case KmlFormat::wp_field::igc_tas:
ret = tas;
break;
case KmlFormat::wp_field::igc_vat:
ret = vat;
break;
case KmlFormat::wp_field::igc_oat:
ret = oat;
break;
case KmlFormat::wp_field::igc_trt:
ret = trt;
break;
case KmlFormat::wp_field::igc_gsp:
ret = gsp;
break;
case KmlFormat::wp_field::igc_fxa:
ret = fxa;
break;
case KmlFormat::wp_field::igc_siu:
ret = siu;
break;
case KmlFormat::wp_field::igc_acz:
ret = acz;
break;
case KmlFormat::wp_field::igc_gfo:
ret = gfo;
break;
default:
fatal("igc.h: igc_fsdata::get_value(KmlFormat::wp_field defn_type): Invalid wp_field\n");
break;
}
return ret;
}
};

#endif // IGC_H_INCLUDED_
Loading
Loading