diff options
Diffstat (limited to 'logic/mappings.cpp')
| -rw-r--r-- | logic/mappings.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/logic/mappings.cpp b/logic/mappings.cpp index d7764375..57673540 100644 --- a/logic/mappings.cpp +++ b/logic/mappings.cpp @@ -1,20 +1,20 @@ #include "mappings.hpp" -Map::Map(QString primary, QString secondary, int max_x, int max_y, axis_opts& opts) : +#include <utility> + +Map::Map(const QString& spline_name, const QString& alt_spline_name, axis_opts& opts) : opts(opts), - name1(primary), - name2(secondary), - spline_main(max_x, max_y, primary), - spline_alt(max_x, max_y, secondary) + name(spline_name), + alt_name(alt_spline_name), + spline_main(spline_name, opts.prefix(), opts.axis()), + spline_alt(alt_spline_name, opts.prefix(), opts.axis()) { - spline_main.set_max_input(opts.clamp); - spline_alt.set_max_input(opts.clamp); } -void Map::save(QSettings& s) +void Map::save() { - spline_main.save(s); - spline_alt.save(s); + spline_main.save(); + spline_alt.save(); } void Map::load() @@ -23,13 +23,14 @@ void Map::load() spline_alt.reload(); } -Mappings::Mappings(std::vector<axis_opts*> opts) : + +Mappings::Mappings(axis_opts_impl::axis_opts** opts) : axes { - Map("spline-X", "alt-spline-X", 100, 75, *opts[TX]), - Map("spline-Y", "alt-spline-Y", 100, 75, *opts[TY]), - Map("spline-Z", "alt-spline-Z", 100, 75, *opts[TZ]), - Map("spline-yaw", "alt-spline-yaw", 180, 180, *opts[Yaw]), - Map("spline-pitch", "alt-spline-pitch", 180, 180, *opts[Pitch]), - Map("spline-roll", "alt-spline-roll", 180, 180, *opts[Roll]) + { "spline-X", "alt-spline-X", *opts[TX] }, + { "spline-Y", "alt-spline-Y", *opts[TY] }, + { "spline-Z", "alt-spline-Z", *opts[TZ] }, + { "spline-yaw", "alt-spline-yaw", *opts[Yaw] }, + { "spline-pitch", "alt-spline-pitch",*opts[Pitch] }, + { "spline-roll", "alt-spline-roll", *opts[Roll] } } {} |