Formatting fixes, and fix for not being able to load freeems plugin f…

…or a MOC error
fredcooke · Nov 20, 2013 · 74a2d6d · 74a2d6d
1 parent fccfc50
commit 74a2d6d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git 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<QString> getConfigList()=0;
-    for (int i=0;i<emsComms->getConfigList().size();i++)
-    {
-        parameterView->addConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i]));
-        for (int j=0;j<m_wizardList.size();j++)
-        {
-            m_wizardList[i]->addConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i]));
-        }
-    }
+	for (int i=0;i<emsComms->getConfigList().size();i++)
+	{
+		parameterView->addConfig(emsComms->getConfigList()[i],emsComms->getConfigData(emsComms->getConfigList()[i]));
+		for (int j=0;j<m_wizardList.size();j++)
+		{
+			m_wizardList[j]->addConfig(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
@@ -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
@@ -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<QPair<QString,double> > calc)
+FEConfigData::FEConfigData(QString name,QString type, QString override,unsigned short locationid, unsigned short size,unsigned short elementsize,unsigned short offset, QList<QPair<QString,double> > calc) : ConfigData()
 {
     m_name = name;
     m_type = type;

diff --git 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
@@ -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<QString> getConfigList();
+	ConfigData* getConfigData(QString name);
+	QList<QString> getConfigList();
 	void writeAllRamToRam();
 protected:
 	void run();
@@ -154,8 +154,8 @@ class FreeEmsComms : public EmsComms
 	QMap<unsigned short,Table2DData*> m_2dTableMap;
 	QMap<unsigned short,Table3DData*> m_3dTableMap;
 	QMap<unsigned short,RawData*> m_rawDataMap;
-    QMap<unsigned short,QList<ConfigData*> > m_locIdToConfigListMap;
-    QMap<QString,ConfigData*> m_configMap;
+	QMap<unsigned short,QList<ConfigData*> > m_locIdToConfigListMap;
+	QMap<QString,ConfigData*> m_configMap;
 	PacketDecoder *m_packetDecoder;
 	QMap<QString,QString> m_interrogationMetaDataMap;
 	void sendNextInterrogationPacket();