Code and comment cleanup

fredcooke · Oct 21, 2013 · c3c7505 · c3c7505
1 parent 79f27a5
commit c3c7505
Showing 1 changed file with 3 additions and 30 deletions.
diff --git a/plugins/freeems/freeemscomms.cpp b/plugins/freeems/freeemscomms.cpp
@@ -1825,15 +1825,7 @@ Table2DData* FreeEmsComms::get2DTableData(unsigned short locationid)
 {
 	if (!m_2dTableMap.contains(locationid))
 	{
-		/*Table2DData *data = new FETable2DData();
-		connect(data,SIGNAL(saveSingleDataToRam(unsigned short,unsigned short,unsigned short,QByteArray)),&emsData,SLOT(ramBytesLocalUpdate(unsigned short,unsigned short,unsigned short,QByteArray)));
-		connect(data,SIGNAL(saveSingleDataToFlash(unsigned short,unsigned short,unsigned short,QByteArray)),&emsData,SLOT(flashBytesLocalUpdate(unsigned short,unsigned short,unsigned short,QByteArray)));
-		connect(data,SIGNAL(requestBlockFromRam(unsigned short,unsigned short,unsigned short)),this,SLOT(retrieveBlockFromRam(unsigned short,unsigned short,unsigned short)));
-		connect(data,SIGNAL(requestBlockFromFlash(unsigned short,unsigned short,unsigned short)),this,SLOT(retrieveBlockFromFlash(unsigned short,unsigned short,unsigned short)));
-		connect(data,SIGNAL(requestRamUpdateFromFlash(unsigned short)),this,SLOT(copyFlashToRam(unsigned short)));
-		connect(data,SIGNAL(requestFlashUpdateFromRam(unsigned short)),this,SLOT(copyRamToFlash(unsigned short)));
-		data->setData(locationid,!emsData.hasLocalRamBlock(locationid),emsData.getLocalRamBlock(locationid),m_metaDataParser->get2DMetaData(locationid),false);
-		m_2dTableMap[locationid] = data;*/
+		//This is an error condition
 		return 0;
 	}
 	return m_2dTableMap[locationid];
@@ -1844,16 +1836,7 @@ Table3DData* FreeEmsComms::get3DTableData(unsigned short locationid)
 {
 	if (!m_3dTableMap.contains(locationid))
 	{
-		/*Table3DData *data = new FETable3DData();
-		connect(data,SIGNAL(saveSingleDataToRam(unsigned short,unsigned short,unsigned short,QByteArray)),&emsData,SLOT(ramBytesLocalUpdate(unsigned short,unsigned short,unsigned short,QByteArray)));
-		connect(data,SIGNAL(saveSingleDataToFlash(unsigned short,unsigned short,unsigned short,QByteArray)),&emsData,SLOT(flashBytesLocalUpdate(unsigned short,unsigned short,unsigned short,QByteArray)));
-		connect(data,SIGNAL(requestBlockFromRam(unsigned short,unsigned short,unsigned short)),this,SLOT(retrieveBlockFromRam(unsigned short,unsigned short,unsigned short)));
-		connect(data,SIGNAL(requestBlockFromFlash(unsigned short,unsigned short,unsigned short)),this,SLOT(retrieveBlockFromFlash(unsigned short,unsigned short,unsigned short)));
-		connect(data,SIGNAL(requestRamUpdateFromFlash(unsigned short)),this,SLOT(copyFlashToRam(unsigned short)));
-		connect(data,SIGNAL(requestFlashUpdateFromRam(unsigned short)),this,SLOT(copyRamToFlash(unsigned short)));
-		QLOG_DEBUG() << "Attempting to load table. Data size:" << emsData.getLocalRamBlock(locationid).size();
-		data->setData(locationid,!emsData.hasLocalRamBlock(locationid),emsData.getLocalRamBlock(locationid),m_metaDataParser->get3DMetaData(locationid));
-		m_3dTableMap[locationid] = data;*/
+		//This is an error condition
 		return 0;
 	}
 	return m_3dTableMap[locationid];
@@ -1862,17 +1845,7 @@ RawData* FreeEmsComms::getRawData(unsigned short locationid)
 {
 	if (!m_rawDataMap.contains(locationid))
 	{
-		/*
-		RawData *data = new FERawData();
-		if (emsData.hasLocalRamBlock(locationid))
-		{
-			data->setData(locationid,false,emsData.getLocalRamBlock(locationid));
-		}
-		else
-		{
-			data->setData(locationid,true,emsData.getLocalFlashBlock(locationid));
-		}
-		m_rawDataMap[locationid] = data;*/
+		//This is an error condition
 		return 0;
 	}
 	return m_rawDataMap[locationid];