Implementation to handle variable datalog formats from plugins

Handling is added so a plugin can change datalog format in the middle of incoming data, and it will automatically repopulate the Numeric data table view
fredcooke · Apr 17, 2014 · 6aac0eb · 6aac0eb
1 parent 1901cc9
commit 6aac0eb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/core/src/mainwindow.cpp b/core/src/mainwindow.cpp
@@ -703,6 +703,7 @@ void MainWindow::setPlugin(QString plugin)
 	connect(emsComms,SIGNAL(interrogationData(QMap<QString,QString>)),this,SLOT(interrogationData(QMap<QString,QString>)),Qt::QueuedConnection);
 	connect(emsComms,SIGNAL(memoryDirty()),statusView,SLOT(setEmsMemoryDirty()));
 	connect(emsComms,SIGNAL(memoryClean()),statusView,SLOT(setEmsMemoryClean()));
+	connect(emsComms,SIGNAL(datalogDescriptor(QString)),this,SLOT(datalogDescriptor(QString)));
 	emsComms->setBaud(m_comBaud);
 	emsComms->setPort(m_comPort);
 	emsComms->setLogsEnabled(m_saveLogs);
@@ -2116,3 +2117,7 @@ void MainWindow::emsMemoryClean()
 {
 
 }
+void MainWindow::datalogDescriptor(QString data)
+{
+	Q_UNUSED(data)
+}
diff --git a/core/src/mainwindow.h b/core/src/mainwindow.h
@@ -249,6 +249,7 @@ private slots:
 	void subMdiWindowActivated(QMdiSubWindow* window);
 	void emsMemoryDirty();
 	void emsMemoryClean();
+	void datalogDescriptor(QString data);
 
 };
 

diff --git a/core/src/tableview.cpp b/core/src/tableview.cpp
@@ -43,13 +43,20 @@ void TableView::closeEvent(QCloseEvent *event)
 void TableView::passDecoder(DataPacketDecoder *decoder)
 {
 	dataPacketDecoder = decoder;
+	dataFormatChanged();
+	connect(dataPacketDecoder,SIGNAL(dataFormatChanged()),this,SLOT(dataFormatChanged()));
+}
+void TableView::dataFormatChanged()
+{
+	m_nameToIndexMap.clear();
+	ui.tableWidget->clearContents();
 	ui.tableWidget->setRowCount(dataPacketDecoder->fieldSize());
 	for (int i=0;i<dataPacketDecoder->fieldSize();i++)
 	{
-        m_nameToIndexMap[dataPacketDecoder->getFieldName(i)] = i;
-        ui.tableWidget->setItem(i,0,new QTableWidgetItem(dataPacketDecoder->getFieldName(i)));
+		m_nameToIndexMap[dataPacketDecoder->getFieldName(i)] = i;
+		ui.tableWidget->setItem(i,0,new QTableWidgetItem(dataPacketDecoder->getFieldName(i)));
 		ui.tableWidget->setItem(i,1,new QTableWidgetItem("0"));
-        ui.tableWidget->setItem(i,2,new QTableWidgetItem(dataPacketDecoder->getFieldDescription(i)));
+		ui.tableWidget->setItem(i,2,new QTableWidgetItem(dataPacketDecoder->getFieldDescription(i)));
 	}
 }
 

diff --git a/core/src/tableview.h b/core/src/tableview.h
@@ -47,6 +47,7 @@ class TableView : public QWidget
 	void closeEvent(QCloseEvent *event);
 private slots:
 	void guiUpdateTimerTick();
+	void dataFormatChanged();
 signals:
 	void windowHiding(QMdiSubWindow *parent);
 };