Moved firmware meta data to its own window

fredcooke · Nov 22, 2013 · 340f6a3 · 340f6a3
1 parent c644431
commit 340f6a3
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 43 deletions.
diff --git a/core/core.pro b/core/core.pro
@@ -109,7 +109,8 @@ SOURCES += src/main.cpp\
     src/tablewidgetdelegate.cpp \
     src/parameterview.cpp \
     src/parameterwidget.cpp \
-    src/wizardview.cpp
+    src/wizardview.cpp \
+    src/firmwaremetadata.cpp
 
 
 HEADERS  += src/mainwindow.h \
@@ -151,7 +152,8 @@ HEADERS  += src/mainwindow.h \
     datapacketdecoder.h \
     src/parameterview.h \
     src/parameterwidget.h \
-    src/wizardview.h
+    src/wizardview.h \
+    src/firmwaremetadata.h
 
 FORMS    += src/mainwindow.ui \
     src/comsettings.ui \
@@ -169,7 +171,8 @@ FORMS    += src/mainwindow.ui \
     src/readonlyramview.ui \
     src/emsstatus.ui \
     src/configview.ui \
-    src/parameterview.ui
+    src/parameterview.ui \
+    src/firmwaremetadata.ui
 SUBDIRS += plugins
 OTHER_FILES += \
     README.md \

diff --git a/core/src/emsinfo.ui b/core/src/emsinfo.ui
@@ -15,18 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_6">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,3">
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="2">
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <item>
-          <widget class="QTableWidget" name="tableWidget"/>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
+    <layout class="QVBoxLayout" name="verticalLayout_2" stretch="3">
      <item>
       <widget class="QTableWidget" name="locationIdInfoTableWidget"/>
      </item>

diff --git a/core/src/emsinfoview.cpp b/core/src/emsinfoview.cpp
@@ -28,12 +28,6 @@ EmsInfoView::EmsInfoView(QWidget *parent) : QWidget(parent)
 {
 	ui.setupUi(this);
 
-
-	ui.tableWidget->setColumnCount(2);
-	ui.tableWidget->setColumnWidth(0,200);
-	ui.tableWidget->setColumnWidth(1,400);
-	ui.tableWidget->horizontalHeader()->hide();
-	ui.tableWidget->verticalHeader()->hide();
 	connect(ui.locationIdInfoTableWidget,SIGNAL(cellDoubleClicked(int,int)),this,SLOT(locationInfoWidgetDoubleClicked(int,int)));
 }
 void EmsInfoView::normalViewClicked()
@@ -243,25 +237,6 @@ void EmsInfoView::locationIdInfo(unsigned short locationid,QString title,MemoryL
 
 	ui.locationIdInfoTableWidget->resizeColumnsToContents();
 }
-void EmsInfoView::setInterrogationData(QMap<QString,QString> datamap)
-{
-	for (QMap<QString,QString>::const_iterator i=datamap.constBegin();i!=datamap.constEnd();i++)
-	{
-		for (int j=0;j<ui.tableWidget->rowCount();j++)
-		{
-			if (ui.tableWidget->item(j,0)->text() == i.key())
-			{
-				ui.tableWidget->item(j,1)->setText(i.value());
-				return;
-			}
-		}
-		ui.tableWidget->setRowCount(ui.tableWidget->rowCount()+1);
-		ui.tableWidget->setItem(ui.tableWidget->rowCount()-1,0,new QTableWidgetItem(i.key()));
-		ui.tableWidget->setItem(ui.tableWidget->rowCount()-1,1,new QTableWidgetItem(i.value()));
-	}
-}
-
-
 EmsInfoView::~EmsInfoView()
 {
     //delete ui;

diff --git a/core/src/emsinfoview.h b/core/src/emsinfoview.h
@@ -37,7 +37,7 @@ class EmsInfoView : public QWidget
 	explicit EmsInfoView(QWidget *parent = 0);
 	~EmsInfoView();
 	void clear();
-	void setInterrogationData(QMap<QString,QString> datamap);
+
 protected:
 	void closeEvent(QCloseEvent *event);
 public slots:

diff --git a/core/src/firmwaremetadata.cpp b/core/src/firmwaremetadata.cpp
@@ -0,0 +1,41 @@
+#include "firmwaremetadata.h"
+
+
+FirmwareMetaData::FirmwareMetaData(QWidget *parent) : QWidget(parent)
+{
+	ui.setupUi(this);
+	ui.tableWidget->setColumnCount(2);
+	ui.tableWidget->setColumnWidth(0,200);
+	ui.tableWidget->setColumnWidth(1,400);
+	ui.tableWidget->horizontalHeader()->hide();
+	ui.tableWidget->verticalHeader()->hide();
+
+}
+
+FirmwareMetaData::~FirmwareMetaData()
+{
+}
+void FirmwareMetaData::setInterrogationData(QMap<QString,QString> datamap)
+{
+	for (QMap<QString,QString>::const_iterator i=datamap.constBegin();i!=datamap.constEnd();i++)
+	{
+		for (int j=0;j<ui.tableWidget->rowCount();j++)
+		{
+			if (ui.tableWidget->item(j,0)->text() == i.key())
+			{
+				ui.tableWidget->item(j,1)->setText(i.value());
+				return;
+			}
+		}
+		ui.tableWidget->setRowCount(ui.tableWidget->rowCount()+1);
+		ui.tableWidget->setItem(ui.tableWidget->rowCount()-1,0,new QTableWidgetItem(i.key()));
+		ui.tableWidget->setItem(ui.tableWidget->rowCount()-1,1,new QTableWidgetItem(i.value()));
+	}
+}
+
+void FirmwareMetaData::closeEvent(QCloseEvent *event)
+{
+	event->ignore();
+	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
+}
diff --git a/core/src/firmwaremetadata.h b/core/src/firmwaremetadata.h
@@ -0,0 +1,26 @@
+#ifndef FIRMWAREMETADATA_H
+#define FIRMWAREMETADATA_H
+
+#include <QWidget>
+#include <QMdiSubWindow>
+#include <QCloseEvent>
+#include "ui_firmwaremetadata.h"
+
+
+class FirmwareMetaData : public QWidget
+{
+	Q_OBJECT
+
+public:
+	explicit FirmwareMetaData(QWidget *parent = 0);
+	~FirmwareMetaData();
+	void setInterrogationData(QMap<QString,QString> datamap);
+protected:
+	void closeEvent(QCloseEvent *event);
+private:
+	Ui::FirmwareMetaData ui;
+signals:
+	void windowHiding(QMdiSubWindow *parent);
+};
+
+#endif // FIRMWAREMETADATA_H
diff --git a/core/src/firmwaremetadata.ui b/core/src/firmwaremetadata.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FirmwareMetaData</class>
+ <widget class="QWidget" name="FirmwareMetaData">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>712</width>
+    <height>331</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Firmware Metadata</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTableWidget" name="tableWidget"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/core/src/mainwindow.cpp b/core/src/mainwindow.cpp
@@ -189,6 +189,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 	connect(ui.actionEnable_Datalogs,SIGNAL(triggered()),this,SLOT(menu_enableDatalogsClicked()));
 	connect(ui.actionDisable_Datalog_Stream,SIGNAL(triggered()),this,SLOT(menu_disableDatalogsClicked()));
 	connect(ui.actionParameter_View,SIGNAL(triggered()),this,SLOT(menu_windows_ParameterViewClicked()));
+	connect(ui.actionFirmware_Metadata,SIGNAL(triggered()),this,SLOT(menu_windows_firmwareMetadataClicked()));
 	ui.actionInterrogation_Progress->setEnabled(false);
 
 
@@ -261,6 +262,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 		dataGauges->setFile("gauges.qml");
 	}
 
+	firmwareMetaData = new FirmwareMetaData();
+	firmwareMetaMdiWindow = ui.mdiArea->addSubWindow(firmwareMetaData);
+	firmwareMetaMdiWindow->setGeometry(firmwareMetaData->geometry());
+	firmwareMetaMdiWindow->hide();
+	firmwareMetaMdiWindow->setWindowTitle(firmwareMetaData->windowTitle());
+
 	dataTables = new TableView();
 	tablesMdiWindow = ui.mdiArea->addSubWindow(dataTables);
 	tablesMdiWindow->setGeometry(dataTables->geometry());
@@ -339,6 +346,12 @@ void MainWindow::menu_windows_ParameterViewClicked()
 	QApplication::postEvent(parameterMdiWindow, new QEvent(QEvent::Show));
 	QApplication::postEvent(parameterMdiWindow, new QEvent(QEvent::WindowActivate));
 }
+void MainWindow::menu_windows_firmwareMetadataClicked()
+{
+	firmwareMetaMdiWindow->show();
+	QApplication::postEvent(firmwareMetaMdiWindow, new QEvent(QEvent::Show));
+	QApplication::postEvent(firmwareMetaMdiWindow, new QEvent(QEvent::WindowActivate));
+}
 
 void MainWindow::menu_file_saveOfflineDataClicked()
 {
@@ -1439,7 +1452,8 @@ void MainWindow::playLogButtonClicked()
 }
 void MainWindow::interrogationData(QMap<QString,QString> datamap)
 {
-	emsInfo->setInterrogationData(datamap);
+	firmwareMetaData->setInterrogationData(datamap);
+	//emsInfo->setInterrogationData(datamap);
 }
 
 void MainWindow::interfaceVersion(QString version)

diff --git a/core/src/mainwindow.h b/core/src/mainwindow.h
@@ -44,6 +44,7 @@
 #include "aboutview.h"
 //#include "memorylocation.h"
 #include "interrogateprogressview.h"
+#include "firmwaremetadata.h"
 #include "table2ddata.h"
 #include "readonlyramview.h"
 #include "emsstatus.h"
@@ -111,11 +112,13 @@ class MainWindow : public QMainWindow
 	PacketStatusView *packetStatus;
 	AboutView *aboutView;
 	EmsStatus *statusView;
+	FirmwareMetaData *firmwareMetaData;
 	InterrogateProgressView *progressView;
 	QList<int> interrogationSequenceList;
 	QMap<unsigned short,QWidget*> m_rawDataView;
 	QMap<unsigned short,ConfigView*> m_configDataView;
 	QMdiSubWindow *tablesMdiWindow;
+	QMdiSubWindow *firmwareMetaMdiWindow;
 	QMdiSubWindow *interrogateProgressMdiWindow;
 	QMdiSubWindow *emsMdiWindow;
 	QMdiSubWindow *flagsMdiWindow;
@@ -197,6 +200,7 @@ private slots:
 	void menu_windows_PacketStatusClicked();
 	void menu_windows_interrogateProgressViewClicked();
 	void menu_windows_ParameterViewClicked();
+	void menu_windows_firmwareMetadataClicked();
 	void menu_settingsClicked();
 	void menu_connectClicked();
 	void menu_aboutClicked();

diff --git a/core/src/mainwindow.ui b/core/src/mainwindow.ui
@@ -79,7 +79,7 @@
     <addaction name="actionEMS_Status"/>
     <addaction name="actionInterrogation_Progress"/>
     <addaction name="actionParameter_View"/>
-    <addaction name="separator"/>
+    <addaction name="actionFirmware_Metadata"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -205,6 +205,11 @@
     <string>Parameter View</string>
    </property>
   </action>
+  <action name="actionFirmware_Metadata">
+   <property name="text">
+    <string>Firmware Metadata</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>