From e081b199fa514ca70f2563fab0ceb26b044e2e68 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Sun, 5 Mar 2023 02:08:44 +0100 Subject: [PATCH] Unified set all faders methods --- PresetsSettingsPage.qml | 4 ++-- patternmaker.cpp | 42 ++--------------------------------------- patternmaker.h | 3 +-- 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/PresetsSettingsPage.qml b/PresetsSettingsPage.qml index d012f66..e9116e6 100644 --- a/PresetsSettingsPage.qml +++ b/PresetsSettingsPage.qml @@ -172,11 +172,11 @@ ColumnLayout { RowLayout { Button { text: qsTr('Alle auf\n0 setzen'); - onPressed: patternMaker.setAllFadersLow() + onPressed: patternMaker.setAllFaders(0) } Button { text: qsTr('Alle auf\nMaximum setzen'); - onPressed: patternMaker.setAllFadersMax() + onPressed: patternMaker.setAllFaders(255) } } diff --git a/patternmaker.cpp b/patternmaker.cpp index 471387d..cccdc8a 100644 --- a/patternmaker.cpp +++ b/patternmaker.cpp @@ -24,7 +24,7 @@ void PatternMaker::setController(DmxController *controller) emit controllerChanged(m_controller); } -void PatternMaker::setAllFadersLow() +void PatternMaker::setAllFaders(quint8 value) { if (!m_controller) { @@ -52,45 +52,7 @@ void PatternMaker::setAllFadersLow() sliderState.reserve(deviceType.registers.size()); for (const auto ®ister_ : deviceType.registers) - sliderState.push_back(0); - } - } - - sliderStates.push_back(std::move(sliderState)); - } - - m_controller->setSliderStates(std::move(sliderStates)); -} - -void PatternMaker::setAllFadersMax() -{ - if (!m_controller) - { - qDebug() << "hilfe" << __LINE__; - return; - } - - const auto &devices = m_controller->lightProject().devices; - - sliders_state_t sliderStates; - sliderStates.reserve(devices.size()); - - for (const auto &device : devices) - { - std::vector sliderState; - - if (device.deviceTypeId != -1) - { - const auto deviceTypePtr = m_controller->lightProject().deviceTypes.findById(device.deviceTypeId); - if (!deviceTypePtr) - qWarning() << "hilfe" << __LINE__; - else - { - const auto &deviceType = *deviceTypePtr; - sliderState.reserve(deviceType.registers.size()); - - for (const auto ®ister_ : deviceType.registers) - sliderState.push_back(255); + sliderState.push_back(value); } } diff --git a/patternmaker.h b/patternmaker.h index 4ecc1a2..10c0d9a 100644 --- a/patternmaker.h +++ b/patternmaker.h @@ -18,8 +18,7 @@ public: const DmxController *controller() const { return m_controller; } void setController(DmxController *controller); - Q_INVOKABLE void setAllFadersLow(); - Q_INVOKABLE void setAllFadersMax(); + Q_INVOKABLE void setAllFaders(quint8 value); Q_INVOKABLE void setPattern(int n, int k, DeviceTypeRegisterType registerType, quint8 value); Q_INVOKABLE void setRainbow(float phase, float advancePerLamp, int advanceEveryNLamp);