feedc0de/scheincommander
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed register groups sliders being offset when a new register group was inserted

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-02-22 21:48:35 +01:00
parent 51d21f68ef
commit 38c5223075
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dmxcontroller.h
View File

@ -26,6 +26,8 @@ public:
Q_INVOKABLE bool saveProject(const QUrl &url); Q_INVOKABLE bool saveProject(const QUrl &url);
Q_INVOKABLE void setRegisterGroupSlider(int registerGroupId, quint8 value); Q_INVOKABLE void setRegisterGroupSlider(int registerGroupId, quint8 value);
std::vector<quint8> &registerGroupStates() { return m_registerGroupStates; }
const std::vector<quint8> &registerGroupStates() const { return m_registerGroupStates; }
LightProject &lightProject() { return m_lightProject; } LightProject &lightProject() { return m_lightProject; }
const LightProject &lightProject() const { return m_lightProject; } const LightProject &lightProject() const { return m_lightProject; }

32
registergroupsmodel.cpp
View File

@ -241,9 +241,18 @@ bool RegisterGroupsModel::insertRows(int row, int count, const QModelIndex &pare
beginInsertRows({}, row, row+count-1); beginInsertRows({}, row, row+count-1);
{ {
QMutexLocker locker{&m_controller->mutex()}; QMutexLocker locker{&m_controller->mutex()};
auto iter = std::begin(registerGroups) + row;
for (auto i = 0; i < count; i++) {
iter = registerGroups.insert(iter, RegisterGroupConfig{ .id=id++, .name="<neu>" }) + 1; auto iter = std::begin(registerGroups) + row;
for (auto i = 0; i < count; i++)
iter = registerGroups.insert(iter, RegisterGroupConfig{ .id=id++, .name="<neu>" }) + 1;
}
if (auto &registerGroupStates = m_controller->registerGroupStates(); registerGroupStates.size() > row)
{
registerGroupStates.insert(std::begin(registerGroupStates) + row, count, {});
// emit m_controller->registerGroupStatesChanged(registerGroupStates);
}
} }
endInsertRows(); endInsertRows();
@ -293,9 +302,20 @@ bool RegisterGroupsModel::removeRows(int row, int count, const QModelIndex &pare
beginRemoveRows({}, row, row+count-1); beginRemoveRows({}, row, row+count-1);
{ {
QMutexLocker locker{&m_controller->mutex()}; QMutexLocker locker{&m_controller->mutex()};
auto begin = std::begin(registerGroups) + row;
auto end = begin + count; {
registerGroups.erase(begin, end); auto begin = std::begin(registerGroups) + row;
auto end = begin + count;
registerGroups.erase(begin, end);
}
if (auto &registerGroupStates = m_controller->registerGroupStates(); registerGroupStates.size() > row)
{
auto begin = std::begin(registerGroupStates) + row;
auto end = begin + std::min<size_t>(count, registerGroupStates.size() - row + count);
registerGroupStates.erase(begin, end);
//emit m_controller->registerGroupStatesChanged(registerGroupStates);
}
} }
endRemoveRows(); endRemoveRows();