Let design wizzard use the global selection (#497)

Author: aroffringa

gui/components/visualizationwidget.cpp

@@ -91,14 +91,14 @@ VisualizationWidget::VisualizationWidget(theatre::Management *management,
       sigc::mem_fun(*this, &VisualizationWidget::onButtonRelease));
   signal_motion_notify_event().connect(
       sigc::mem_fun(*this, &VisualizationWidget::onMotion));
-  inializeContextMenu();
+  initializeContextMenu();
   primary_snapshot_ = _management->PrimarySnapshot();
   secondary_snapshot_ = _management->SecondarySnapshot();
   update_connection_ = _eventTransmitter->SignalUpdateControllables().connect(
       [&]() { Update(); });
 }
 
-void VisualizationWidget::inializeContextMenu() {
+void VisualizationWidget::initializeContextMenu() {
   context_menu_.SignalSetFullOn.connect([&]() {
     theatre::SetAllFixtures(*_management, _selectedFixtures, Color::White());
   });
@@ -137,9 +137,10 @@ void VisualizationWidget::initialize() {
 }
 
 void VisualizationWidget::onTheatreChanged() {
-  for (size_t i = _selectedFixtures.size(); i != 0; --i) {
-    if (!_management->GetTheatre().Contains(*_selectedFixtures[i - 1]))
-      _selectedFixtures.erase(_selectedFixtures.begin() + i - 1);
+  const auto iter =
+      std::remove(_selectedFixtures.begin(), _selectedFixtures.end(), nullptr);
+  if (iter != _selectedFixtures.end()) {
+    _selectedFixtures.erase(iter, _selectedFixtures.end());
   }
   Update();
 }
@@ -660,7 +661,6 @@ void VisualizationWidget::onDesignFixtures() {
   std::unique_ptr<DesignWizard> &designWizard = main_window_->GetDesignWizard();
   designWizard = std::make_unique<DesignWizard>();
   designWizard->SetCurrentPath(main_window_->SelectedFolder().FullPath());
-  designWizard->Select(_selectedFixtures);
   designWizard->present();
 }
 

gui/components/visualizationwidget.h

@@ -56,7 +56,7 @@ class VisualizationWidget : public Gtk::DrawingArea {
   VisualizationWidget(const VisualizationWidget &) = delete;
   VisualizationWidget &operator=(const VisualizationWidget &) = delete;
 
-  void inializeContextMenu();
+  void initializeContextMenu();
   void initialize();
   void drawAll(const Cairo::RefPtr<Cairo::Context> &cairo);
   void DrawShapshot(

gui/fixtureselection.h

@@ -32,7 +32,8 @@ class FixtureSelection {
    * If any fixtures are in the selection that no longer exist, remove them.
    */
   void UpdateAfterDelete() {
-    auto iter = std::remove(_selection.begin(), _selection.end(), nullptr);
+    const auto iter =
+        std::remove(_selection.begin(), _selection.end(), nullptr);
     if (iter != _selection.end()) {
       _selection.erase(iter, _selection.end());
       _signalChange.emit();

gui/windows/designwizard.cpp

@@ -4,6 +4,7 @@
 #include <ranges>
 
 #include "gui/eventtransmitter.h"
+#include "gui/fixtureselection.h"
 #include "gui/functions.h"
 #include "gui/instance.h"
 
@@ -96,6 +97,8 @@ DesignWizard::DesignWizard()
 
   add(_mainBox);
   _mainBox.show();
+
+  _fixtureList.Select(Instance::Selection().Selection());
 }
 
 DesignWizard::~DesignWizard() = default;

gui/windows/designwizard.h

@@ -37,11 +37,6 @@ class DesignWizard : public Gtk::Window {
     _currentPath = currentPath;
   }
 
-  void Select(
-      const std::vector<system::ObservingPtr<theatre::Fixture>> &fixtures) {
-    _fixtureList.Select(fixtures);
-  }
-
  private:
   enum Page {
     Page1_SelFixtures,

system/optionalnumber.h

@@ -44,7 +44,10 @@ class OptionalNumber {
   constexpr explicit OptionalNumber(std::nullopt_t) noexcept {}
 
   template <class T = NumberType>
-  constexpr explicit OptionalNumber(T number) noexcept : number_(number) {}
+  requires(!std::is_same_v<
+           T, OptionalNumber<
+                  T>>) constexpr explicit OptionalNumber(T number) noexcept
+      : number_(number) {}
 
   constexpr OptionalNumber(const OptionalNumber<NumberType>& source) noexcept =
       default;
@@ -177,18 +180,22 @@ class OptionalNumber {
 
   constexpr void Reset() noexcept { number_ = UnsetValue; }
 
+  constexpr void Swap(OptionalNumber<NumberType>& other) {
+    // To let OptionalNumber also work with types that may implement their own
+    // swap function, we bring std::swap in but don't call swap explicitly from
+    // the std namespace.
+    using std::swap;
+    swap(other.number_, number_);
+  }
+
  private:
   NumberType number_ = UnsetValue;
 };
 
 template <typename NumberType>
-void swap(OptionalNumber<NumberType>& first,
-          OptionalNumber<NumberType>& second) noexcept {
-  // To let OptionalNumber also work with types that may implement their own
-  // swap function, we bring std::swap in but don't call swap explicitly from
-  // the std namespace.
-  using std::swap;
-  swap(first.number_, second.number_);
+constexpr void swap(OptionalNumber<NumberType>& first,
+                    OptionalNumber<NumberType>& second) noexcept {
+  first.Swap(second);
 }
 
 }  // namespace glight::system