Added an internal OR switch to every drawstop (#2012)

Author: oleg68

src/grandorgue/combinations/model/GOCombination.cpp

@@ -455,7 +455,7 @@ bool GOCombination::Push(
         m_ElementStates[i] != BOOL3_DEFAULT
         && (!extraSet || extraSet->find(i) == extraSet->end())) {
         r_ElementDefinitions[i].control->SetCombinationState(
-          to_bool(m_ElementStates[i]));
+          to_bool(m_ElementStates[i]), m_CombinationStateName);
         used |= to_bool(m_ElementStates[i]);
       }
     }

src/grandorgue/combinations/model/GOCombination.h

@@ -58,6 +58,7 @@ class GOCombination : public GOSaveableObject, public GOSaveableToYaml {
 protected:
   const std::vector<GOCombinationDefinition::Element> &r_ElementDefinitions;
   bool m_Protected;
+  wxString m_CombinationStateName;
 
   void EnsureElementStatesAllocated();
 
@@ -135,6 +136,13 @@ class GOCombination : public GOSaveableObject, public GOSaveableToYaml {
     GOOrganModel &organModel, const GOCombinationDefinition &cmbDef);
   virtual ~GOCombination();
 
+  const wxString &GetCombinationStateName() const {
+    return m_CombinationStateName;
+  }
+  void SetCombinationStateName(const wxString &combinationStateName) {
+    m_CombinationStateName = combinationStateName;
+  }
+
   bool IsEmpty() const;
   GOBool3 GetElementState(unsigned no) const { return m_ElementStates[no]; }
   void GetExtraSetState(ExtraElementsSet &extraSet);

src/grandorgue/combinations/model/GOCombinationElement.h

@@ -8,10 +8,12 @@
 #ifndef GOCOMBINATIONELEMENT_H
 #define GOCOMBINATIONELEMENT_H
 
+class wxString;
+
 class GOCombinationElement {
 public:
   virtual bool GetCombinationState() const = 0;
-  virtual void SetCombinationState(bool on) = 0;
+  virtual void SetCombinationState(bool on, const wxString &stateName) = 0;
   virtual bool IsControlledByUser() const = 0;
 };
 

src/grandorgue/dialogs/GOStopsDialog.cpp

@@ -139,7 +139,7 @@ void GOStopsDialog::OnElementChanging(wxCommandEvent &event) {
     = static_cast<GOCombinationElement *>(pCheck->GetClientData());
 
   if (pE)
-    pE->SetCombinationState(event.IsChecked());
+    pE->SetCombinationState(event.IsChecked(), wxEmptyString);
 }
 
 void GOStopsDialog::ControlChanged(GOControl *pControl) {

src/grandorgue/model/GODrawStop.cpp

@@ -132,13 +132,6 @@ void GODrawstop::Save(GOConfigWriter &cfg) {
   GOButtonControl::Save(cfg);
 }
 
-void GODrawstop::SetButtonState(bool on) {
-  if (IsEngaged() == on)
-    return;
-  Display(on);
-  SetDrawStopState(on);
-}
-
 void GODrawstop::Reset() {
   if (IsReadOnly())
     return;
@@ -147,21 +140,35 @@ void GODrawstop::Reset() {
   SetButtonState(m_GCState > 0 ? true : false);
 }
 
-void GODrawstop::SetDrawStopState(bool on) {
-  if (IsActive() == on)
-    return;
-  if (IsReadOnly()) {
-    Display(on);
+void GODrawstop::SetInternalState(bool on, const wxString &stateName) {
+  bool &internalState = m_InternalStates[stateName];
+
+  if (internalState != on) {
+    internalState = on;
+
+    bool resState = false;
+
+    for (const auto &intState : m_InternalStates)
+      resState = resState || intState.second;
+    if (m_ActiveState != resState) {
+      Display(resState);
+      // must be before calling m_ControlledDrawstops[i]->Update();
+      m_ActiveState = resState;
+      OnDrawstopStateChanged(resState);
+      for (auto *pDrawstop : m_ControlledDrawstops)
+        pDrawstop->Update(); // reads m_ActiveState
+    }
   }
-  m_ActiveState = on;
-  OnDrawstopStateChanged(on);
-  for (unsigned i = 0; i < m_ControlledDrawstops.size(); i++)
-    m_ControlledDrawstops[i]->Update();
 }
 
-void GODrawstop::SetCombinationState(bool on) {
+void GODrawstop::SetButtonState(bool on) {
+  if (IsEngaged() != on)
+    SetDrawStopState(on);
+}
+
+void GODrawstop::SetCombinationState(bool on, const wxString &stateName) {
   if (!IsReadOnly())
-    SetButtonState(on);
+    SetInternalState(on, stateName);
 }
 
 void GODrawstop::StartPlayback() {

src/grandorgue/model/GODrawStop.h

@@ -8,6 +8,9 @@
 #ifndef GODRAWSTOP_H
 #define GODRAWSTOP_H
 
+#include <unordered_map>
+
+#include <wx/hashmap.h>
 #include <wx/string.h>
 
 #include "combinations/model/GOCombinationElement.h"
@@ -29,13 +32,16 @@ class GODrawstop : public GOButtonControl, virtual public GOCombinationElement {
   static const struct IniFileEnumEntry m_function_types[];
   GOFunctionType m_Type;
   int m_GCState;
+  std::unordered_map<wxString, bool, wxStringHash, wxStringEqual>
+    m_InternalStates;
   bool m_ActiveState;
   std::vector<GODrawstop *> m_ControlledDrawstops;
   std::vector<GODrawstop *> m_ControllingDrawstops;
 
   bool IsControlledByUser() const override { return !IsReadOnly(); }
 
-  void SetDrawStopState(bool on);
+  void SetInternalState(bool on, const wxString &stateName);
+  void SetDrawStopState(bool on) { SetInternalState(on, wxEmptyString); }
 
 protected:
   /*
@@ -71,7 +77,7 @@ class GODrawstop : public GOButtonControl, virtual public GOCombinationElement {
   virtual void SetButtonState(bool on) override;
   virtual void Update();
   void Reset();
-  void SetCombinationState(bool on) override;
+  void SetCombinationState(bool on, const wxString &stateName) override;
 };
 
 #endif