diff --git a/core/src/mainwindow.cpp b/core/src/mainwindow.cpp index 9ea43fb..9bfc534 100644 --- a/core/src/mainwindow.cpp +++ b/core/src/mainwindow.cpp @@ -1537,14 +1537,14 @@ void MainWindow::emsCommsConnected() connect(action,SIGNAL(triggered(bool)),view,SLOT(setVisible(bool))); } //virtual QList getConfigList()=0; - for (int i=0;igetConfigList().size();i++) - { - parameterView->addConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i])); - for (int j=0;jaddConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i])); - } - } + for (int i=0;igetConfigList().size();i++) + { + parameterView->addConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i])); + for (int j=0;jaddConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i])); + } + } //New log and settings file here. if (m_memoryInfoMap.size() == 0) { diff --git a/lib/core/configdata.h b/lib/core/configdata.h index 621c49d..fc7963c 100644 --- a/lib/core/configdata.h +++ b/lib/core/configdata.h @@ -64,7 +64,7 @@ class ConfigData : public QObject virtual QVariant value()=0; virtual void setValue(QVariant value)=0; signals: - void update(); + void update(); }; #endif // CONFIGDATA_H diff --git a/plugins/freeems/feconfigdata.cpp b/plugins/freeems/feconfigdata.cpp index a4cc99b..c48f3d1 100644 --- a/plugins/freeems/feconfigdata.cpp +++ b/plugins/freeems/feconfigdata.cpp @@ -3,7 +3,7 @@ FEConfigData::FEConfigData() : ConfigData() { } -FEConfigData::FEConfigData(QString name,QString type, QString override,unsigned short locationid, unsigned short size,unsigned short elementsize,unsigned short offset, QList > calc) +FEConfigData::FEConfigData(QString name,QString type, QString override,unsigned short locationid, unsigned short size,unsigned short elementsize,unsigned short offset, QList > calc) : ConfigData() { m_name = name; m_type = type; diff --git a/plugins/freeems/freeems.pro b/plugins/freeems/freeems.pro index 761a098..229d49e 100644 --- a/plugins/freeems/freeems.pro +++ b/plugins/freeems/freeems.pro @@ -54,6 +54,7 @@ unix { HEADERS += datapacketdecoder.h \ table2ddata.h \ table3ddata.h \ + ../../lib/core/configdata.h \ tabledata.h \ emscomms.h \ memorymetadata.h \ diff --git a/plugins/freeems/freeemscomms.h b/plugins/freeems/freeemscomms.h index 2050843..d2db89a 100644 --- a/plugins/freeems/freeemscomms.h +++ b/plugins/freeems/freeemscomms.h @@ -86,8 +86,8 @@ class FreeEmsComms : public EmsComms Table2DData* get2DTableData(unsigned short locationid); Table3DData* get3DTableData(unsigned short locationid); RawData* getRawData(unsigned short locationid); - ConfigData* getConfigData(QString name); - QList getConfigList(); + ConfigData* getConfigData(QString name); + QList getConfigList(); void writeAllRamToRam(); protected: void run(); @@ -154,8 +154,8 @@ class FreeEmsComms : public EmsComms QMap m_2dTableMap; QMap m_3dTableMap; QMap m_rawDataMap; - QMap > m_locIdToConfigListMap; - QMap m_configMap; + QMap > m_locIdToConfigListMap; + QMap m_configMap; PacketDecoder *m_packetDecoder; QMap m_interrogationMetaDataMap; void sendNextInterrogationPacket();