fix dataManager include
This commit is contained in:
parent
a903f862a9
commit
29ab9aa5f4
|
|
@ -1,5 +1,6 @@
|
|||
#include "itemPropertyDlg.h"
|
||||
#include "propertyContentDlg.h"
|
||||
#include "dataManager.h"
|
||||
#include "ui_itemPropertyDlg.h"
|
||||
|
||||
ItemPropertyDlg::ItemPropertyDlg(QWidget *parent)
|
||||
|
|
@ -47,10 +48,12 @@ void ItemPropertyDlg::loadGroupButton(QMap<QString,groupStateInfo> map)
|
|||
void ItemPropertyDlg::onOkClicked()
|
||||
{
|
||||
//todo:将属性页中的值读取到当前uuid对象
|
||||
for(auto &dlg:groupViews_)
|
||||
QMap<QString, QWidget*>::Iterator iter;
|
||||
for(iter = groupViews_.begin();iter != groupViews_.end();++iter)
|
||||
{
|
||||
PropertyContentDlg* pDlg = qobject_cast<PropertyContentDlg*>(dlg);
|
||||
PropertyContentDlg* pDlg = qobject_cast<PropertyContentDlg*>(iter.value());
|
||||
QMap<QString,propertyStateInfo> mapPro = pDlg->getPropertyValue();
|
||||
DataManager::instance().updateModelData(_curModel,curUuid_,iter.key(),mapPro);
|
||||
}
|
||||
hide();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <QJsonArray>
|
||||
#include "dataManager.h"
|
||||
#include "DataBase.h"
|
||||
#include "dataBase.h"
|
||||
|
||||
DataManager& DataManager::instance()
|
||||
{
|
||||
|
|
@ -117,7 +117,7 @@ void DataManager::initialModelData()
|
|||
|
||||
void DataManager::updateModelData(const QString& sModel,QUuid uuid,const QString& sGroup,QMap<QString,propertyStateInfo> mapPro)
|
||||
{
|
||||
|
||||
_modleDataInfo[sModel].groupInfo[sGroup].mapInfo[uuid] = mapPro; //暂用设定值直接替换旧属性,待测试
|
||||
}
|
||||
|
||||
ModleStateMap& DataManager::modelState()
|
||||
|
|
|
|||
Loading…
Reference in New Issue