summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-17 22:09:24 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-17 22:32:04 +0200
commitfdef1901054e61e5996c59ac09d9a2646cc76341 (patch)
tree30d7af27313acb04be459c309c23091bc9d90df6 /gui
parent62c137157ed04d08e6bcc7a741bcdb046943776f (diff)
spline-widget: save spline control point list using options api
- spline widgets reload when spline bundle reloads - every bundle reloads when profile gets changed Importing old spline settings hasn't been implemented. Control point positions are stored as raw floats. This is bad.
Diffstat (limited to 'gui')
-rw-r--r--gui/main-window.cpp20
-rw-r--r--gui/main-window.hpp2
2 files changed, 1 insertions, 21 deletions
diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index be7ddbe3..b09b70d0 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -122,10 +122,6 @@ MainWindow::MainWindow() :
this, [&]() -> void { qDebug() << "restart tracker"; stopTracker(); startTracker(); },
Qt::QueuedConnection);
- // this sort of makes sense since the cancel button on the mapping window
- // emits this signal.
- connect(s.b_map.get(), &bundle_type::reloading, this, &MainWindow::reload_splines);
-
// tray
{
init_tray_menu();
@@ -262,20 +258,6 @@ void MainWindow::save_modules()
m.b->save();
}
-void MainWindow::load_mappings()
-{
- pose.load_mappings();
- if (mapping_widget)
- mapping_widget->reload();
-}
-
-void MainWindow::load_settings()
-{
- m.b->reload();
- s.b->reload();
- load_mappings();
-}
-
void MainWindow::make_empty_config()
{
QString name;
@@ -644,7 +626,7 @@ void MainWindow::profile_selected(const QString& name)
save_modules();
set_profile(new_name);
set_title();
- load_settings();
+ options::detail::bundler::refresh_all_bundles();
}
}
diff --git a/gui/main-window.hpp b/gui/main-window.hpp
index a74575c9..6923c119 100644
--- a/gui/main-window.hpp
+++ b/gui/main-window.hpp
@@ -78,8 +78,6 @@ class MainWindow : public QMainWindow, private State
return modules.filters().value(ui.iconcomboFilter->currentIndex(), nullptr);
}
- void load_settings();
- void load_mappings();
void updateButtonState(bool running, bool inertialp);
void display_pose(const double* mapped, const double* raw);
void ensure_tray();