More model improvements (synchronization)

This commit is contained in:
2023-02-19 03:17:17 +01:00
parent 5334a5a46b
commit 670493191e
3 changed files with 65 additions and 17 deletions

View File

@@ -27,7 +27,7 @@ ColumnLayout {
} }
Button { Button {
text: qsTr("Remove ") text: qsTr("Remove")
onClicked: removeClicked(listView.currentIndex) onClicked: removeClicked(listView.currentIndex)
enabled: listView.currentIndex >= 0 enabled: listView.currentIndex >= 0

View File

@@ -264,20 +264,20 @@ bool DeviceTypeRegistersModel::insertRows(int row, int count, const QModelIndex
if (!m_controller) if (!m_controller)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
if (m_deviceTypeId == -1) if (m_deviceTypeId == -1)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
auto deviceTypePtr = m_controller->lightProject().deviceTypes.findById(m_deviceTypeId); auto deviceTypePtr = m_controller->lightProject().deviceTypes.findById(m_deviceTypeId);
if (!deviceTypePtr) if (!deviceTypePtr)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
auto &deviceType = *deviceTypePtr; auto &deviceType = *deviceTypePtr;
@@ -285,14 +285,14 @@ bool DeviceTypeRegistersModel::insertRows(int row, int count, const QModelIndex
if (row < 0) if (row < 0)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
auto &registers = deviceType.registers; auto &registers = deviceType.registers;
beginInsertRows({}, row, row+count-1); beginInsertRows({}, row, row+count-1);
auto iter = std::begin(registers) + row; auto iter = std::begin(registers) + row;
for (; count > 0; count--) for (auto i = 0; i < count; i++)
iter = registers.insert(iter, DeviceTypeRegisterConfig{ .type = DeviceTypeRegisterType::Dummy }) + 1; iter = registers.insert(iter, DeviceTypeRegisterConfig{ .type = DeviceTypeRegisterType::Dummy }) + 1;
endInsertRows(); endInsertRows();
@@ -316,20 +316,20 @@ bool DeviceTypeRegistersModel::removeRows(int row, int count, const QModelIndex
if (!m_controller) if (!m_controller)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
if (m_deviceTypeId == -1) if (m_deviceTypeId == -1)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
auto deviceTypePtr = m_controller->lightProject().deviceTypes.findById(m_deviceTypeId); auto deviceTypePtr = m_controller->lightProject().deviceTypes.findById(m_deviceTypeId);
if (!deviceTypePtr) if (!deviceTypePtr)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
auto &deviceType = *deviceTypePtr; auto &deviceType = *deviceTypePtr;
@@ -337,7 +337,7 @@ bool DeviceTypeRegistersModel::removeRows(int row, int count, const QModelIndex
if (row < 0) if (row < 0)
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
auto &registers = deviceType.registers; auto &registers = deviceType.registers;
@@ -345,13 +345,13 @@ bool DeviceTypeRegistersModel::removeRows(int row, int count, const QModelIndex
if (row >= registers.size()) if (row >= registers.size())
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
if (row + count > registers.size()) if (row + count > registers.size())
{ {
qWarning() << "hilfe" << __LINE__; qWarning() << "hilfe" << __LINE__;
return true; return false;
} }
beginRemoveRows({}, row, row+count-1); beginRemoveRows({}, row, row+count-1);
@@ -371,17 +371,65 @@ bool DeviceTypeRegistersModel::removeRows(int row, int count, const QModelIndex
void DeviceTypeRegistersModel::otherDeviceTypeRegisterInserted(const DeviceTypeConfig &deviceType, int first, int last) void DeviceTypeRegistersModel::otherDeviceTypeRegisterInserted(const DeviceTypeConfig &deviceType, int first, int last)
{ {
// TODO if (!m_controller)
{
qWarning() << "hilfe" << __LINE__;
return;
}
if (m_deviceTypeId == -1)
{
qWarning() << "hilfe" << __LINE__;
return;
}
if (m_deviceTypeId != deviceType.id)
return;
beginInsertRows({}, first, last);
endInsertRows();
} }
void DeviceTypeRegistersModel::otherDeviceTypeRegisterRemoved(const DeviceTypeConfig &deviceType, int first, int last) void DeviceTypeRegistersModel::otherDeviceTypeRegisterRemoved(const DeviceTypeConfig &deviceType, int first, int last)
{ {
// TODO if (!m_controller)
{
qWarning() << "hilfe" << __LINE__;
return;
}
if (m_deviceTypeId == -1)
{
qWarning() << "hilfe" << __LINE__;
return;
}
if (m_deviceTypeId != deviceType.id)
return;
beginRemoveRows({}, first, last);
endRemoveRows();
} }
void DeviceTypeRegistersModel::otherDeviceTypeRegisterTypeChanged(const DeviceTypeConfig &deviceType, int index, DeviceTypeRegisterType type) void DeviceTypeRegistersModel::otherDeviceTypeRegisterTypeChanged(const DeviceTypeConfig &deviceType, int row, DeviceTypeRegisterType type)
{ {
// TODO if (!m_controller)
{
qWarning() << "hilfe" << __LINE__;
return;
}
if (m_deviceTypeId == -1)
{
qWarning() << "hilfe" << __LINE__;
return;
}
if (m_deviceTypeId != deviceType.id)
return;
const auto index = this->index(row);
emit dataChanged(index, index, { Qt::DisplayRole, Qt::EditRole });
} }
namespace { namespace {

View File

@@ -36,7 +36,7 @@ signals:
private slots: private slots:
void otherDeviceTypeRegisterInserted(const DeviceTypeConfig &deviceType, int first, int last); void otherDeviceTypeRegisterInserted(const DeviceTypeConfig &deviceType, int first, int last);
void otherDeviceTypeRegisterRemoved(const DeviceTypeConfig &deviceType, int first, int last); void otherDeviceTypeRegisterRemoved(const DeviceTypeConfig &deviceType, int first, int last);
void otherDeviceTypeRegisterTypeChanged(const DeviceTypeConfig &deviceType, int index, DeviceTypeRegisterType type); void otherDeviceTypeRegisterTypeChanged(const DeviceTypeConfig &deviceType, int row, DeviceTypeRegisterType type);
private: private:
DmxController *m_controller{}; DmxController *m_controller{};