QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Do not force re-generation of GUI model in project editor

Browse Source
This commit is contained in:
Alex Spataru 2024-09-21 14:53:54 -05:00
parent a9a8b42779
commit 2d9d783be8
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/Project/Model.cpp
View File

@ -140,6 +140,14 @@ Project::Model::Model()
}
});
// Ensure toolbar actions are synched with models
connect(this, &Project::Model::groupModelChanged, this,
&Project::Model::editableOptionsChanged);
connect(this, &Project::Model::datasetModelChanged, this,
&Project::Model::editableOptionsChanged);
connect(this, &Project::Model::datasetModelChanged, this,
&Project::Model::datasetOptionsChanged);
// Re-load JSON map file into C++ model
connect(&JSON::Generator::instance(), &JSON::Generator::jsonFileMapChanged,
this, &Project::Model::onJsonLoaded);
@ -714,6 +722,10 @@ void Project::Model::openJsonFile()
*/
void Project::Model::openJsonFile(const QString &path)
{
// Validate path
if (path.isEmpty())
return;
// Open file
QFile file(path);
QJsonDocument document;
@ -2101,6 +2113,8 @@ void Project::Model::onGroupItemChanged(QStandardItem *item)
// Update group
modified = setGroupWidget(groupId, widget);
if (modified)
m_selectedGroup.m_widget = widgetStr;
}
// Re-build tree model
@ -2108,16 +2122,8 @@ void Project::Model::onGroupItemChanged(QStandardItem *item)
if (modified)
setModified(true);
// Select current group again
for (auto i = m_groupItems.constBegin(); i != m_groupItems.constEnd(); ++i)
{
if (i.value().groupId() == groupId)
{
m_selectionModel->setCurrentIndex(i.key()->index(),
QItemSelectionModel::ClearAndSelect);
break;
}
}
// Ensure toolbar items are synched
Q_EMIT editableOptionsChanged();
}
/**
@ -2265,16 +2271,9 @@ void Project::Model::onDatasetItemChanged(QStandardItem *item)
// Mark document as modified
setModified(true);
// Select current DATASET again
for (auto i = m_datasetItems.begin(); i != m_datasetItems.end(); ++i)
{
if (i.value().groupId() == groupId && i.value().datasetId() == datasetId)
{
m_selectionModel->setCurrentIndex(i.key()->index(),
QItemSelectionModel::ClearAndSelect);
break;
}
}
// Ensure toolbar items are synched
Q_EMIT datasetOptionsChanged();
Q_EMIT editableOptionsChanged();
}
//------------------------------------------------------------------------------

8
app/src/Project/Model.h
View File

@ -105,13 +105,13 @@ class Model : public QObject
NOTIFY modifiedChanged)
Q_PROPERTY(quint8 datasetOptions
READ datasetOptions
NOTIFY datasetModelChanged)
NOTIFY datasetOptionsChanged)
Q_PROPERTY(bool currentGroupIsEditable
READ currentGroupIsEditable
NOTIFY groupModelChanged)
NOTIFY editableOptionsChanged)
Q_PROPERTY(bool currentDatasetIsEditable
READ currentDatasetIsEditable
NOTIFY datasetModelChanged)
NOTIFY editableOptionsChanged)
// clang-format on
signals:
@ -123,6 +123,8 @@ signals:
void currentViewChanged();
void projectModelChanged();
void datasetModelChanged();
void datasetOptionsChanged();
void editableOptionsChanged();
void frameParserCodeChanged();
void thunderforestApyKeyChanged();
void groupAdded(const QModelIndex &index);