Add an option to allow fixture crossing a universe

mcallegari · Nov 17, 2024 · b00ea11 · b00ea11
1 parent 87572c9
commit b00ea11
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 29 deletions.
diff --git a/engine/src/doc.cpp b/engine/src/doc.cpp
@@ -401,7 +401,7 @@ quint32 Doc::createFixtureId()
     return m_latestFixtureId;
 }
 
-bool Doc::addFixture(Fixture* fixture, quint32 id)
+bool Doc::addFixture(Fixture* fixture, quint32 id, bool crossUniverse)
 {
     Q_ASSERT(fixture != NULL);
 
@@ -461,21 +461,28 @@ bool Doc::addFixture(Fixture* fixture, quint32 id)
     for (i = 0; i < fixture->channels(); i++)
     {
         const QLCChannel *channel(fixture->channel(i));
+        quint32 addr = fxAddress + i;
+
+        if (crossUniverse)
+        {
+            uni = floor((fixture->universeAddress() + i) / 512);
+            addr = (fixture->universeAddress() + i) - (uni * 512);
+        }
 
         // Inform Universe of any HTP/LTP forcing
         if (forcedHTP.contains(int(i)))
-            universes.at(uni)->setChannelCapability(fxAddress + i, channel->group(), Universe::HTP);
+            universes.at(uni)->setChannelCapability(addr, channel->group(), Universe::HTP);
         else if (forcedLTP.contains(int(i)))
-            universes.at(uni)->setChannelCapability(fxAddress + i, channel->group(), Universe::LTP);
+            universes.at(uni)->setChannelCapability(addr, channel->group(), Universe::LTP);
         else
-            universes.at(uni)->setChannelCapability(fxAddress + i, channel->group());
+            universes.at(uni)->setChannelCapability(addr, channel->group());
 
         // Apply the default value BEFORE modifiers
-        universes.at(uni)->setChannelDefaultValue(fxAddress + i, channel->defaultValue());
+        universes.at(uni)->setChannelDefaultValue(addr, channel->defaultValue());
 
         // Apply a channel modifier, if defined
         ChannelModifier *mod = fixture->channelModifier(i);
-        universes.at(uni)->setChannelModifier(fxAddress + i, mod);
+        universes.at(uni)->setChannelModifier(addr, mod);
     }
     inputOutputMap()->releaseUniverses(true);
 

diff --git a/engine/src/doc.h b/engine/src/doc.h
@@ -256,7 +256,7 @@ class Doc : public QObject
      * @return true if the fixture was successfully added to doc,
      *         otherwise false.
      */
-    bool addFixture(Fixture* fixture, quint32 id = Fixture::invalidId());
+    bool addFixture(Fixture* fixture, quint32 id = Fixture::invalidId(), bool crossUniverse = false);
 
     /**
      * Delete the given fixture instance from Doc

diff --git a/ui/src/addrgbpanel.cpp b/ui/src/addrgbpanel.cpp
@@ -196,6 +196,11 @@ Fixture::Components AddRGBPanel::components()
     return Fixture::RGB;
 }
 
+bool AddRGBPanel::crossUniverse()
+{
+    return m_crossUniverseCheck->isChecked();
+}
+
 void AddRGBPanel::slotSizeChanged(int)
 {
     checkAddressAvailability();

diff --git a/ui/src/addrgbpanel.h b/ui/src/addrgbpanel.h
@@ -69,6 +69,7 @@ class AddRGBPanel : public QDialog, public Ui_AddRGBPanel
     Type type();
     Direction direction();
     Fixture::Components components();
+    bool crossUniverse();
 
 private:
     /** Check if an address is available for contiguous channels.

diff --git a/ui/src/addrgbpanel.ui b/ui/src/addrgbpanel.ui
@@ -26,7 +26,7 @@
     <x>0</x>
     <y>0</y>
     <width>477</width>
-    <height>452</height>
+    <height>482</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -58,10 +58,10 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="m_nameEdit">
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_6">
           <property name="text">
-           <string>RGB Panel</string>
+           <string>Address</string>
           </property>
          </widget>
         </item>
@@ -72,16 +72,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <widget class="QComboBox" name="m_uniCombo"/>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Address</string>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="1">
          <widget class="QSpinBox" name="m_addressSpin">
           <property name="minimum">
@@ -92,23 +82,40 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_11">
+          <property name="text">
+           <string>Components</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QComboBox" name="m_uniCombo"/>
+        </item>
+        <item row="4" column="1">
          <widget class="QLabel" name="m_addrErrorLabel">
           <property name="text">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;ERROR: Address already used!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_11">
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="m_nameEdit">
           <property name="text">
-           <string>Components</string>
+           <string>RGB Panel</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="1">
+        <item row="5" column="1">
          <widget class="QComboBox" name="m_compCombo"/>
         </item>
+        <item row="3" column="1">
+         <widget class="QCheckBox" name="m_crossUniverseCheck">
+          <property name="text">
+           <string>Allow cross-universe addressing</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>

diff --git a/ui/src/fixturemanager.cpp b/ui/src/fixturemanager.cpp
@@ -1201,19 +1201,28 @@ void FixtureManager::slotAddRGBPanel()
             // Check universe span
             if (address + fxi->channels() > 512)
             {
-                uniIndex++;
+                if (!rgb.crossUniverse())
+                    uniIndex++;
+
                 if (m_doc->inputOutputMap()->getUniverseID(uniIndex) == m_doc->inputOutputMap()->invalidUniverse())
                 {
                     m_doc->inputOutputMap()->addUniverse();
                     m_doc->inputOutputMap()->startUniverses();
                 }
-                address = 0;
+                if (!rgb.crossUniverse())
+                    address = 0;
             }
 
             fxi->setUniverse(m_doc->inputOutputMap()->getUniverseID(uniIndex));
             fxi->setAddress(address);
+            m_doc->addFixture(fxi, Fixture::invalidId(), rgb.crossUniverse());
+
             address += fxi->channels();
-            m_doc->addFixture(fxi);
+            if (address > 512 && rgb.crossUniverse())
+            {
+                address -= 512;
+                uniIndex++;
+            }
 
             if (rgb.type() == AddRGBPanel::ZigZag)
             {