diff --git a/Hardware/3rdparty/bugui b/Hardware/3rdparty/bugui index 9a0bded..995dc6e 160000 --- a/Hardware/3rdparty/bugui +++ b/Hardware/3rdparty/bugui @@ -1 +1 @@ -Subproject commit 9a0bded62d9632d05fac99988a8c53bb5e42b7a4 +Subproject commit 995dc6e2b40dae91b0782dba7f9ce712fec10b53 diff --git a/Hardware/Widgets/EventWidget.cpp b/Hardware/Widgets/EventWidget.cpp index 4e5bee0..16303e5 100644 --- a/Hardware/Widgets/EventWidget.cpp +++ b/Hardware/Widgets/EventWidget.cpp @@ -80,8 +80,7 @@ void EventWidget::on_state_added(Scenario::StateModel& state) void EventWidget::on_state_removed(const Scenario::StateModel& state) { - if (state.eventId() != model.id()) - return; + if (state.eventId() != model.id()) return; remove_widget([&state] (const auto& w) diff --git a/Hardware/Widgets/EventWidget.hpp b/Hardware/Widgets/EventWidget.hpp index b0c9902..eea91a3 100644 --- a/Hardware/Widgets/EventWidget.hpp +++ b/Hardware/Widgets/EventWidget.hpp @@ -5,7 +5,8 @@ namespace Hardware { -struct EventWidget final : ScenarioComponentSpec { explicit EventWidget(Scenario::EventModel& event, diff --git a/Hardware/Widgets/ScenarioComponent.hpp b/Hardware/Widgets/ScenarioComponent.hpp index 1fdca86..c97e99f 100644 --- a/Hardware/Widgets/ScenarioComponent.hpp +++ b/Hardware/Widgets/ScenarioComponent.hpp @@ -32,7 +32,7 @@ protected: , skin{Process::Style::instance()} { } - ScenarioWidget* scenario; + ScenarioWidget* scenario{nullptr}; const Process::Style& skin; }; diff --git a/Hardware/Widgets/ScenarioWidget.hpp b/Hardware/Widgets/ScenarioWidget.hpp index bf7eab7..59a670e 100644 --- a/Hardware/Widgets/ScenarioWidget.hpp +++ b/Hardware/Widgets/ScenarioWidget.hpp @@ -11,6 +11,7 @@ namespace Hardware class ScenarioWidget final : public bugui::container_widget , public QObject + , public Nano::Observer { W_OBJECT(ScenarioWidget) @@ -33,7 +34,7 @@ private: void on_time_sync_added(Scenario::TimeSyncModel& timeSync); void on_time_sync_removed(const Scenario::TimeSyncModel& timeSync); - Scenario::ProcessModel* model; + Scenario::ProcessModel* model{nullptr}; }; } // namespace Hardware diff --git a/Hardware/Widgets/TimeSyncWidget.cpp b/Hardware/Widgets/TimeSyncWidget.cpp index c82fded..e82bf9f 100644 --- a/Hardware/Widgets/TimeSyncWidget.cpp +++ b/Hardware/Widgets/TimeSyncWidget.cpp @@ -79,8 +79,7 @@ void TimeSyncWidget::on_event_added(Scenario::EventModel& event) void TimeSyncWidget::on_event_removed(const Scenario::EventModel& event) { - if (event.timeSync() != model.id()) - return; + if (event.timeSync() != model.id()) return; remove_widget([&event] (const auto& w) diff --git a/Hardware/Widgets/TimeSyncWidget.hpp b/Hardware/Widgets/TimeSyncWidget.hpp index 6d92bba..fb69a89 100644 --- a/Hardware/Widgets/TimeSyncWidget.hpp +++ b/Hardware/Widgets/TimeSyncWidget.hpp @@ -6,7 +6,8 @@ namespace Hardware { -struct TimeSyncWidget final : ScenarioComponentSpec { explicit TimeSyncWidget(Scenario::TimeSyncModel& timeSync,