Skip to content

Fix Channel Check grouping bugs #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielskeenan wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix Channel Check grouping bugs #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16ccf25
Teach doBlink about grouping.
danielskeenan Mar 10, 2026
1605510
Changes in grouping immediately affect output.
danielskeenan Mar 10, 2026
038d89d
Grouping is in effect as soon as transmission begins.
danielskeenan Mar 10, 2026
1c1cc6d
Channel check level change affects entire group.
danielskeenan Mar 10, 2026
194286d
Fix off-by-one.
danielskeenan Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions src/ui/transmitwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ transmitwindow::transmitwindow(int universe, QWidget * parent)
m_slotCount = MAX_DMX_ADDRESS;
ui->sbSlotCount->setValue(m_slotCount);
ui->sbSlotCount->setWrapping(true);

ui->sbFadeRangeEnd->setMinimum(MIN_DMX_ADDRESS);
ui->sbFadeRangeEnd->setMaximum(m_slotCount);
ui->sbFadeRangeEnd->setValue(m_slotCount);
Expand Down Expand Up @@ -561,21 +561,7 @@ void transmitwindow::on_cbCcPap_toggled(bool checked)

void transmitwindow::on_lcdNumber_valueChanged(int value)
{
if (m_sender)
{
// Update levels.
const auto grouping = ui->sbGrouping->value();
const uint16_t maxAddress = value - 1 + grouping;

m_sender->setLevelRange(0, m_slotCount - 1, 0);
for (auto channel = value - 1; channel < std::min(MAX_DMX_ADDRESS, maxAddress); channel++)
{
m_sender->setLevel(channel, ui->slChannelCheck->value());
}

// Update priorities if requested.
updateChanCheckPap(value - 1, grouping);
}
updateChanCheckLevel(value - 1, ui->sbGrouping->value(), ui->slChannelCheck->value());
}

void transmitwindow::on_lcdNumber_toggleOff()
Expand All @@ -592,22 +578,16 @@ void transmitwindow::on_lcdNumber_toggleOff()

void transmitwindow::on_slChannelCheck_valueChanged(int value)
{
int address = ui->lcdNumber->value();

if (m_sender)
{
m_sender->setLevel(address - 1, value);
}
updateChanCheckLevel(ui->lcdNumber->intValue() - 1, ui->sbGrouping->value(), value);
}

void transmitwindow::on_btnCcBlink_pressed()
{
if (m_blinkTimer->isActive())
{
m_blinkTimer->stop();
int address = ui->lcdNumber->value();
ui->blinkIndicator->setPixmap(QPixmap());
if (m_sender) m_sender->setLevel(address - 1, ui->slChannelCheck->value());
updateChanCheckLevel(ui->lcdNumber->intValue() - 1, ui->sbGrouping->value(), ui->slChannelCheck->value());
}
else
{
Expand All @@ -619,21 +599,27 @@ void transmitwindow::on_btnCcBlink_pressed()
ui->btnCcBlink->setFont(font);
}

void transmitwindow::on_sbGrouping_valueChanged(int value)
{
updateChanCheckLevel(ui->lcdNumber->intValue() - 1, value, ui->slChannelCheck->value());
}

void transmitwindow::doBlink()
{
int address = ui->lcdNumber->value();
m_blink = !m_blink;

quint8 level;
if (m_blink)
{
ui->blinkIndicator->setPixmap(QPixmap(":/icons/record.png"));
if (m_sender) m_sender->setLevel(address - 1, ui->slChannelCheck->value());
level = ui->slChannelCheck->value();
}
else
{
ui->blinkIndicator->setPixmap(QPixmap());
if (m_sender) m_sender->setLevel(address - 1, 0);
level = 0;
}
updateChanCheckLevel(ui->lcdNumber->intValue() - 1, ui->sbGrouping->value(), level);
}

void transmitwindow::on_tabWidget_currentChanged(int index)
Expand All @@ -650,9 +636,11 @@ void transmitwindow::on_tabWidget_currentChanged(int index)
{
case tabChannelCheck:
{
auto address = ui->lcdNumber->value() - 1;
m_sender->setLevel(address, ui->slChannelCheck->value());
updateChanCheckPap(address, ui->sbGrouping->value());
const auto address = ui->lcdNumber->intValue() - 1;
const auto grouping = ui->sbGrouping->value();
const auto value = ui->slChannelCheck->value();
updateChanCheckLevel(address, grouping, value);
updateChanCheckPap(address, grouping);

ui->lcdNumber->setFocus();
break;
Expand Down Expand Up @@ -1003,13 +991,28 @@ void transmitwindow::updateChanCheckPap(int address, int length)
}

std::array<quint8, MAX_DMX_ADDRESS> ccPap{0};
for (int i = address; i < std::min(address+length, DMX_SLOT_MAX); i++)
for (int i = address; i < std::min(address + length, DMX_SLOT_MAX); i++)
{
ccPap[i] = m_perAddressPriorities[i];
}
m_sender->setPerChannelPriorities(ccPap.data());
}

void transmitwindow::updateChanCheckLevel(int address, int length, quint8 value)
{
if (m_sender)
{
// Update levels.
const uint16_t endAddress = address + length;

m_sender->setLevelRange(0, m_slotCount - 1, 0);
m_sender->setLevelRange(address, std::min(MAX_DMX_ADDRESS, endAddress) - 1, value);

// Update priorities if requested.
updateChanCheckPap(address, length);
}
}

void transmitwindow::updateFadeRangePap()
{
if (ui->cbPriorityMode->currentIndex() != static_cast<int>(PriorityMode::PER_ADDRESS)
Expand Down
2 changes: 2 additions & 0 deletions src/ui/transmitwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ protected slots:
void on_tabWidget_currentChanged(int index);
void on_slChannelCheck_valueChanged(int value);
void on_btnCcBlink_pressed();
void on_sbGrouping_valueChanged(int value);
void on_dlFadeRate_valueChanged(int value);
void on_dlDwellTime_valueChanged(int value);
void doBlink();
Expand Down Expand Up @@ -106,6 +107,7 @@ private slots:
void setLevel(int address, int value);
void updatePerChanPriorityButton();
void updateChanCheckPap(int address, int length);
void updateChanCheckLevel(int address, int length, quint8 value);
void updateFadeRangePap();
Ui::transmitwindow * ui = nullptr;
ConfigurePerChanPrioDlg * m_perChannelDialog = nullptr;
Expand Down
Loading