Disabled QsLog logging until I fix the plugin logging issue, and star…

…ted fixing ParameterView to work with the new memory layout

core/core.pro

@@ -16,7 +16,7 @@ CONFIG += console
 
 INCLUDEPATH += $$PWD/../lib/core
 DEPENDPATH += $$PWD/../lib/core
-include(QsLog/QsLog.pri)
+#include(QsLog/QsLog.pri)
 win32-x-g++ { #Linux based crossplatform 32bit build
         message("Building for win32-x-g++")
 	INCLUDEPATH += /home/michael/QtWin32/libs/qwt/include /home/michael/QtWin32/libs/qjson/include
@@ -95,8 +95,6 @@ SOURCES += src/main.cpp\
     src/tablemap3d.cpp \
     src/tablewidget.cpp \
     src/configview.cpp \
-    src/configblock.cpp \
-    src/emsdata.cpp \
     src/tablewidgetdelegate.cpp \
     src/parameterview.cpp \
     src/parameterwidget.cpp
@@ -133,7 +131,6 @@ HEADERS  += src/mainwindow.h \
     src/tablewidget.h \
     src/configview.h \
     src/configblock.h \
-    src/emsdata.h \
     table2ddata.h \
     table3ddata.h \
     memorymetadata.h \

core/src/main.cpp

@@ -23,7 +23,7 @@
 #include <QtGui/QApplication>
 #include "mainwindow.h"
 #include <QString>
-#include "QsLog.h"
+//#include "QsLog.h"
 
 QList<QPair<QString,QString> > getArgs(int argc, char **argv)
 {
@@ -81,6 +81,7 @@ int main(int argc, char *argv[])
 	QApplication a(argc, argv);
 
 	//Init the logger
+#ifdef QLOG_DEBUG()
 	QsLogging::Logger& logger = QsLogging::Logger::instance();
 	logger.setLoggingLevel(QsLogging::DebugLevel);
 #ifdef Q_OS_WIN
@@ -104,7 +105,7 @@ int main(int argc, char *argv[])
 	   QsLogging::DestinationFactory::MakeDebugOutputDestination() );
 	logger.addDestination(debugDestination);
 	logger.addDestination(fileDestination);
-
+#endif
 
 	QString port = "";
 	bool autoconnect = true;

core/src/mainwindow.cpp

@@ -28,7 +28,15 @@
 #include <tableview2d.h>
 #include <qjson/parser.h>
 #include "logloader.h"
-#include "QsLog.h"
+//#include "QsLog.h"
+#ifndef QLOG_DEBUG()
+#define QLOG_INFO() qDebug()
+#define QLOG_TRACE() qDebug()
+#define QLOG_DEBUG() qDebug()
+#define QLOG_ERROR() qDebug()
+#define QLOG_WARN() qDebug()
+#define QLOG_FATAL() qDebug()
+#endif
 #define define2string_p(x) #x
 #define define2string(x) define2string_p(x)
 

core/src/parameterview.cpp

@@ -8,7 +8,7 @@
 ParameterView::ParameterView(QWidget *parent) : QWidget(parent)
 {
 	m_metaData=0;
-	m_emsData = 0;
+	//m_emsData = 0;
 	ui.setupUi(this);
 	connect(ui.parameterTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,SLOT(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
 	connect(ui.parameterTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged()));
@@ -108,7 +108,7 @@ void ParameterView::generateDialog(QString title,QList<DialogField> fieldlist)
 						}
 					}
 				}
-				if (m_emsData)
+/*				if (m_emsData)
 				{
 					if (m_emsData->hasLocalFlashBlock(m_memoryConfigBlockList[j].locationId()))
 					{
@@ -118,15 +118,15 @@ void ParameterView::generateDialog(QString title,QList<DialogField> fieldlist)
 					{
 						widget->updateValue(m_memoryConfigBlockList[j].locationId(),m_emsData->getLocalRamBlock(m_memoryConfigBlockList[j].locationId()));
 					}
-				}
+				}*/
 			}
 		}
 		//fieldlist[i].condition
 	}
 }
 void ParameterView::updateValues()
 {
-	if (!m_emsData)
+	/*if (!m_emsData)
 	{
 		return;
 	}
@@ -140,50 +140,15 @@ void ParameterView::updateValues()
 				paramWidgetList[i]->updateValue(loclist[k],m_emsData->getLocalFlashBlock(loclist[k]));
 			}
 		}
-	}
+	}*/
 	return;
-	for(QMap<QLineEdit*,ConfigBlock>::Iterator i=lineEditToConfigBlockMap.begin();i!=lineEditToConfigBlockMap.end();i++)
-	{
-		if (m_emsData->hasLocalFlashBlock(i.value().locationId()))
-		{
-
-			qDebug() << "Page:" << i.value().locationId();
-			qDebug() << "Offset:" << i.value().offset();
-			qDebug() << "Name:" << i.value().name();
-			QByteArray block = m_emsData->getLocalFlashBlock(i.value().locationId());
-			qDebug() << "Block size:" << block.size();
-			QString valstr = "";
-			for (int k=1;k<block.size();k++)
-			{
-				unsigned int val = (((unsigned char)block[k-1]) << 8) + ((unsigned char)block[k]);
-				if (val == 8000)
-				{
-					qDebug() << "Offset:" << k;
-				}
-			}
-			for (int k=0;k<i.value().size();k++)
-			{
-				unsigned int value = 0;
-				for (int j=0;j<i.value().elementSize();j++)
-				{
-					qDebug() << (unsigned char)block[i.value().offset() + (k * i.value().elementSize()) + j];
-					value += ((unsigned char)block[i.value().offset() + (k * i.value().elementSize()) + j]) << (8 * (i.value().elementSize() - (j+1)));
-				}
-				//userValue = (ecuValue + translate) * scale
-				valstr += QString::number(calcAxis(value,i.value().calc())) + ",";
-			}
-			valstr = valstr.mid(0,valstr.length()-1);
-			i.key()->setText(valstr);
-		}
-
-	}
 }
 
-void ParameterView::passEmsData(EmsData *data)
+/*void ParameterView::passEmsData(EmsData *data)
 {
 	m_emsData = data;
 	updateValues();
-}
+}*/
 
 void ParameterView::passMenuList(MenuSetup menu)
 {

core/src/parameterview.h

@@ -4,7 +4,6 @@
 #include <QWidget>
 #include "ui_parameterview.h"
 #include "configblock.h"
-#include "emsdata.h"
 #include "parameterwidget.h"
 #include "memorymetadata.h"
 #include "menusetup.h"
@@ -16,7 +15,7 @@ class ParameterView : public QWidget
 	void passMenuList(MenuSetup menu);
 	void passConfigBlockList(QMap<QString,QList<ConfigBlock> > blocklist);
 	void generateDialog(QString title,QList<DialogField> fieldlist);
-	void passEmsData(EmsData *data);
+	//void passEmsData(EmsData *data);
 	void passMetaData(MemoryMetaData *metadata);
 	void updateValues();
 	double calcAxis(unsigned short val,QList<QPair<QString,double> > metadata);
@@ -25,7 +24,7 @@ class ParameterView : public QWidget
 	QList<ParameterWidget*> paramWidgetList;
 	QMap<QLineEdit*,ConfigBlock> lineEditToConfigBlockMap;
 	QMap<QWidget*,QList<DialogField> > widgetToFieldMap;
-	EmsData *m_emsData;
+	//EmsData *m_emsData;
 	MenuSetup m_metaMenu;
 	QList<ConfigBlock> m_memoryConfigBlockList;
 	Ui::Form ui;

lib/core/configblock.h

@@ -27,8 +27,19 @@
 class ConfigBlock
 {
 public:
-	ConfigBlock();
-	ConfigBlock(QString name,QString type, QString override,unsigned short locationid, unsigned short size,unsigned short elementsize,unsigned short offset, QList<QPair<QString,double> > calc);
+	ConfigBlock() {}
+	ConfigBlock(QString name,QString type, QString override,unsigned short locationid, unsigned short size,unsigned short elementsize,unsigned short offset, QList<QPair<QString,double> > calc)
+	{
+		m_name = name;
+		m_type = type;
+		m_sizeOverride = override;
+		m_locationId = locationid;
+		m_size = size;
+		m_elementSize = elementsize;
+		m_offset = offset;
+		m_calc = calc;
+	}
+
 	void setName(QString name) { m_name = name; }
 	void setType(QString type) { m_type = type; }
 	void setSizeOverride(QString override) { m_sizeOverride = override; }

lib/core/core.pro

@@ -6,11 +6,11 @@ LIBS += -L/home/michael/QtWin64/lib
         win32:QMAKE_LFLAGS += -shared
 QMAKE_LFLAGS += -static-libgcc -static-libstdc++
 # Input
-SOURCES  += configblock.cpp
+SOURCES  +=
 HEADERS += configdata.h \
            datapacketdecoder.h \
            datatype.h \
-           emscomms.h \
+	   emscomms.h \
            lookupmetadata.h \
            memorylocationinfo.h \
            memorymetadata.h \

plugins/freeems/serialport.h

@@ -29,7 +29,6 @@
 #include <vector>
 #include "serialportstatus.h"
 #include "memorylocationinfo.h"
-
 #ifdef Q_OS_WIN
 #include <windows.h>
 #else