Merge branch 'unstable' into trackhat-ui

Sponsored-by: TrackHat

* unstable: (112 commits)
  Revert "accela: try more complex deadzone algorithm"
  pt: add wiki link for calibration instructions
  qfc: more gray colors when graph is disabled
  qfc, mapping: disallow editing and change color when checkbox disabled
  qfc: don't allow editing when disabled
  plugin-support: workaround multiple copies of modules
  accela: change translation gain
  accela: change rotation gain
  pt: change extraction code
  freepie-udp: add license
  freepie-udp: update
  accela: try more complex deadzone algorithm
  accela: add helpful comment
  accela: revert to more quadratic spline at start
  also save if save pending when start tracking
  ui: force saving if saving timer is pending
  accela: slightly more linear function
  pose-widget: simplify
  freepie-udp: nix harmless warning
  pose-widget: add comment
  simple-mat: add __restrict for GNU
  ui: save settings on a timer
  ui: show a warning if configuration directory can't be used
  aruco: tune min/max marker size
  win32-joystick: fix duplicate device name selection logic
  ui: no need to reset settings on tracking start
  ui: save profile when combobox text changes, not merely index
  ui: save current tracker/filter/proto, not last
  win32-joystick: fix COM failure path
  win32-joystick: nix unused variable
  win32-joystick: allow for unique selection of joysticks
  qfc: also draw line from function start while moving
  no need to save on tracking start anymore
  save axis opts, not just spline control points
  tracker: change centering order again
  fix typo
  cmake: don't say "opentrack" twice for osx build
  ui: really don't switch profiles while refreshing combobox
  pt: fix type mismatch
  ui: save prior to switching configs
  tracker_rs: adjusted tracker's name
  ui: don't reload settings if config wasn't changed
  ui: save everything before switching profiles
  options: return .ini basename easier
  tracker_rs: more readable icon
  tracker_rs: prevent potential thread starvation
  ui: switch to newly-created config
  ui: decruft
  ui: also bail on new config if its name is ".ini"
  ui: auto-refresh config list
  ui: display up to 20 profiles w/o scrolling
  ui: create an empty config properly in another code branch
  udp-tracker: silence harmless warning
  plugin-support: fix typo
  plugin-support: set more sane RTLD flags
  plugin-support: free modules from address space when needed
  ui: rename symbol to reflect current usage
  ui: move some slots to private
  ui, shortcuts: these are slots, actually
  ui: no need to write anything to new empty config
  ui: avoid potential memory leak
  ft: new game support
  game-data: chomp newlines in extractor
  ui: append extension in the right place
  simple-mat: fix arglist SFINAE
  simple-mat: can use static_cast here
  nix default empty config. it gets created on its own.
  ui: these aren't qt slots
  ui: nix wrong headers
  ui: remove GNU GPL
  ui: simplify condition
  props changed only
  main, ui: store config files in a predefined directory
  pt: show extracted points' areas and success count
  close dialogs on switch to new module
  ...

1 files changed, 22 insertions, 14 deletions

diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp
index e199d005..2e9065b4 100644
--- a/facetracknoir/curve-config.cpp
+++ b/facetracknoir/curve-config.cpp
@@ -20,23 +20,24 @@ MapWidget::MapWidget(Mappings& m, main_settings& s) :
         struct {
             QFunctionConfigurator* qfc;
             Axis axis;
+            QCheckBox* checkbox;
             bool altp;
         } qfcs[] =
         {
-            { ui.rxconfig, Yaw, false },
-            { ui.ryconfig, Pitch, false},
-            { ui.rzconfig, Roll, false },
-            { ui.txconfig, TX, false },
-            { ui.tyconfig, TY, false },
-            { ui.tzconfig, TZ, false },
+            { ui.rxconfig, Yaw,   nullptr, false },
+            { ui.ryconfig, Pitch, nullptr, false },
+            { ui.rzconfig, Roll,  nullptr, false },
+            { ui.txconfig, TX,    nullptr, false },
+            { ui.tyconfig, TY,    nullptr, false },
+            { ui.tzconfig, TZ,    nullptr, false },
 
-            { ui.rxconfig_alt, Yaw, true },
-            { ui.ryconfig_alt, Pitch, true},
-            { ui.rzconfig_alt, Roll, true },
-            { ui.txconfig_alt, TX, true },
-            { ui.tyconfig_alt, TY, true },
-            { ui.tzconfig_alt, TZ, true },
-            { nullptr, Yaw, false }
+            { ui.rxconfig_alt, Yaw,   ui.rx_altp, true },
+            { ui.ryconfig_alt, Pitch, ui.ry_altp, true },
+            { ui.rzconfig_alt, Roll,  ui.rz_altp, true },
+            { ui.txconfig_alt, TX,    ui.tx_altp, true },
+            { ui.tyconfig_alt, TY,    ui.ty_altp, true },
+            { ui.tzconfig_alt, TZ,    ui.tz_altp, true },
+            { nullptr, Yaw, nullptr, false }
         };
 
         for (int i = 0; qfcs[i].qfc; i++)
@@ -45,7 +46,14 @@ MapWidget::MapWidget(Mappings& m, main_settings& s) :
             Mapping& axis = m(qfcs[i].axis);
             Map* conf = altp ? &axis.curveAlt : &axis.curve;
             const auto& name = qfcs[i].altp ? axis.name2 : axis.name1;
-
+            if (altp)
+            {
+                QFunctionConfigurator& qfc = *qfcs[i].qfc;
+                connect(qfcs[i].checkbox, &QCheckBox::toggled,
+                        [&](bool f) -> void {qfc.setEnabled(f); qfc.force_redraw();});
+                qfc.setEnabled(qfcs[i].checkbox->isChecked());
+                qfc.force_redraw();
+            }
             qfcs[i].qfc->setConfig(conf, name);
         }
     }