From 29b242c70349cbd67aacc3e4f1206630d22c54eb Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Mon, 17 Jun 2013 15:58:26 -0700
Subject: Converting the device_info list into a Qt data structure

This data structure was quite fragile and made 'undo' when editing
rather hard to implement. So instead I decided to turn this into a
QMultiMap which seemed like the ideal data structure for it.

This map holds all the dive computer related data indexed by the model. As
QMultiMap it allows multiple entries per key (model string) and
disambiguates between them with the deviceId.

This commit turned out much larger than I wanted. But I didn't manage to
find a clean way to break it up and make the pieces make sense.

So this brings back the Ok / Cancel button for the dive computer edit
dialog. And it makes those two buttons actually do the right thing (which
is what started this whole process). For this to work we simply copy the
map to a working copy and do all edits on that one - and then copy that
over the 'real' map when we accept the changes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qthelper.cpp | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 qthelper.cpp

(limited to 'qthelper.cpp')

diff --git a/qthelper.cpp b/qthelper.cpp
new file mode 100644
index 000000000..9c74a74cf
--- /dev/null
+++ b/qthelper.cpp
@@ -0,0 +1,82 @@
+#include "qthelper.h"
+
+DiveComputerList::DiveComputerList()
+{
+
+}
+
+DiveComputerList::~DiveComputerList()
+{
+	dcMap.~QMap();
+}
+
+bool DiveComputerNode::operator == (const DiveComputerNode &a) const {
+	return this->model == a.model &&
+			this->deviceId == a.deviceId &&
+			this->firmware == a.firmware &&
+			this->serialNumber == a.serialNumber &&
+			this->nickName == a.nickName;
+}
+
+bool DiveComputerNode::operator !=(const DiveComputerNode &a) const {
+	return !(*this == a);
+}
+
+bool DiveComputerNode::changesValues(const DiveComputerNode &b) const
+{
+	if (this->model != b.model || this->deviceId != b.deviceId) {
+		qDebug("DiveComputerNodes were not for the same DC");
+		return false;
+	}
+	return (b.firmware != "" && this->firmware != b.firmware) ||
+			(b.serialNumber != "" && this->serialNumber != b.serialNumber) ||
+			(b.nickName != "" && this->nickName != b.nickName);
+}
+
+const DiveComputerNode *DiveComputerList::getExact(QString m, uint32_t d)
+{
+	if (dcMap.contains(m)) {
+		QList<DiveComputerNode> values = dcMap.values(m);
+		for (int i = 0; i < values.size(); i++)
+			if (values.at(i).deviceId == d)
+				return &values.at(i);
+	}
+	return NULL;
+}
+
+const DiveComputerNode *DiveComputerList::get(QString m)
+{
+	if (dcMap.contains(m)) {
+		QList<DiveComputerNode> values = dcMap.values(m);
+		return &values.at(0);
+	}
+	return NULL;
+}
+
+void DiveComputerList::addDC(QString m, uint32_t d, QString n, QString s, QString f)
+{
+	if (m == "" || d == 0)
+		return;
+	const DiveComputerNode *existNode = this->getExact(m, d);
+	DiveComputerNode newNode(m, d, s, f, n);
+	if (existNode) {
+		if (newNode.changesValues(*existNode)) {
+			if (n != "" && existNode->nickName != n)
+				qDebug("new nickname %s for DC model %s deviceId 0x%x", n.toUtf8().data(), m.toUtf8().data(), d);
+			if (f != "" && existNode->firmware != f)
+				qDebug("new firmware version %s for DC model %s deviceId 0x%x", f.toUtf8().data(), m.toUtf8().data(), d);
+			if (s != "" && existNode->serialNumber != s)
+				qDebug("new serial number %s for DC model %s deviceId 0x%x", s.toUtf8().data(), m.toUtf8().data(), d);
+		} else {
+			return;
+		}
+		dcMap.remove(m, *existNode);
+	}
+	dcMap.insert(m, newNode);
+}
+
+void DiveComputerList::rmDC(QString m, uint32_t d)
+{
+	const DiveComputerNode *existNode = this->getExact(m, d);
+	dcMap.remove(m, *existNode);
+}
-- 
cgit v1.2.3-70-g09d2