Switches: update colour wheel preset format

Store presets as a single list of 9*5 doubles for each output type,
rather than as nine individual setting paths with five preset values
each.

Contributes to #2534

Author: blammit

components/dialogs/ColorWheelDialog.qml

@@ -180,15 +180,15 @@ ModalDialog {
 
 			ColorPresetModel {
 				id: rgbPresetModel
-				settingUid: Global.systemSettings.serviceUid + "/Settings/Gui2/SwitchPane/Preset/RGB"
+				settingUid: Global.systemSettings.serviceUid + "/Settings/Gui2/Switchpane/Preset/RGB"
 			}
 			ColorPresetModel {
 				id: rgbWPresetModel
-				settingUid: Global.systemSettings.serviceUid + "/Settings/Gui2/SwitchPane/Preset/RGBW"
+				settingUid: Global.systemSettings.serviceUid + "/Settings/Gui2/Switchpane/Preset/RGBW"
 			}
 			ColorPresetModel {
 				id: cctPresetModel
-				settingUid: Global.systemSettings.serviceUid + "/Settings/Gui2/SwitchPane/Preset/CCT"
+				settingUid: Global.systemSettings.serviceUid + "/Settings/Gui2/Switchpane/Preset/CCT"
 			}
 		}
 

components/switches/delegates/SwitchableOutputCardDelegate_color.qml

@@ -99,21 +99,6 @@ FocusScope {
 			uid: root.switchableOutput.uid + "/ValidTypes"
 		}
 
-		// TODO remove these /Preset/* items - these add dummy presets that will actually
-		// provided by the default settings on the system.
-		VeQuickItem {
-				uid: Global.systemSettings.serviceUid + "/Settings/Gui2/SwitchPane/Preset/RGB/0"
-				Component.onCompleted: setValue([96, 89, 82, 0, 0 ]) // green
-		}
-		VeQuickItem {
-				uid: Global.systemSettings.serviceUid + "/Settings/Gui2/SwitchPane/Preset/CCT/0"
-				Component.onCompleted: setValue([210, 29, 93, 0, 4700 ]) // light blue
-		}
-		VeQuickItem {
-				uid: Global.systemSettings.serviceUid + "/Settings/Gui2/SwitchPane/Preset/RGBW/0"
-				Component.onCompleted: setValue([57, 100, 100, 0, 0 ]) // yellow
-		}
-
 		Component {
 			id: colorDialogComponent
 

data/mock/conf/services/switch-controls-tester.json

@@ -525,5 +525,10 @@
         "/SwitchableOutput/color_dimmer_rgbw/Settings/ValidFunctions": 2,
         "/SwitchableOutput/color_dimmer_rgbw/State": 1,
         "/SwitchableOutput/color_dimmer_rgbw/Status": 9
+    },
+    "com.victronenergy.settings": {
+        "/Settings/Gui2/Switchpane/Preset/RGB": [96,89,82,0,0,210,29,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        "/Settings/Gui2/Switchpane/Preset/RGBW": [57,100,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+        "/Settings/Gui2/Switchpane/Preset/CCT": [210,29,93,0,4700,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
     }
 }

src/colordimmerdata.cpp

@@ -40,7 +40,11 @@ void getStorageColorData(const QVariantList &colorData, QColor *color, qreal *wh
 		const qreal h = variantToReal(colorData.value(0));
 		const qreal s = variantToReal(colorData.value(1));
 		const qreal v = variantToReal(colorData.value(2));
-		color->setHsvF(FastUtils::create()->scaleNumber(h, 0, 359, 0, 1), s / 100, v / 100);
+		if (h == 0 && s == 0 && v == 0) {
+			*color = QColor();
+		} else {
+			color->setHsvF(FastUtils::create()->scaleNumber(h, 0, 359, 0, 1), s / 100, v / 100);
+		}
 	}
 	if (white) {
 		*white = variantToReal(colorData.value(3));
@@ -51,11 +55,17 @@ void getStorageColorData(const QVariantList &colorData, QColor *color, qreal *wh
 }
 void addStorageColorData(QList<double> *colorData, const QColor color, qreal white, qreal colorTemperature)
 {
-	float h, s, v;
-	color.getHsvF(&h, &s, &v);
-	colorData->append(FastUtils::create()->scaleNumber(h, 0, 1, 0, 359));
-	colorData->append(s * 100);
-	colorData->append(v * 100);
+	if (color.isValid()) {
+		float h, s, v;
+		color.getHsvF(&h, &s, &v);
+		colorData->append(FastUtils::create()->scaleNumber(h, 0, 1, 0, 359));
+		colorData->append(s * 100);
+		colorData->append(v * 100);
+	} else {
+		colorData->append(0);
+		colorData->append(0);
+		colorData->append(0);
+	}
 	colorData->append(white);
 	colorData->append(colorTemperature);
 }
@@ -286,18 +296,12 @@ void ColorPresetModel::save()
 		return;
 	}
 
+	QList<double> colorData;
 	for (int i = 0; i < m_colors.count(); ++i) {
-		if (VeQItem *presetItem = m_settingItem->itemGetOrCreate(QString::number(i))) {
-			const ColorInfo &info = m_colors.at(i);
-			if (info.color.isValid()) {
-				QList<double> colorData;
-				::addStorageColorData(&colorData, info.color, info.white, info.colorTemperature);
-				presetItem->setValue(QVariant::fromValue(colorData));
-			} else {
-				presetItem->setValue(QVariant());
-			}
-		}
+		const ColorInfo &info = m_colors.at(i);
+		::addStorageColorData(&colorData, info.color, info.white, info.colorTemperature);
 	}
+	m_settingItem->setValue(QVariant::fromValue(colorData));
 }
 
 void ColorPresetModel::reload()
@@ -317,20 +321,20 @@ void ColorPresetModel::reload()
 		emit countChanged();
 	}
 
-	static const int presetCount = 9;
-	beginInsertRows(QModelIndex(), 0, presetCount - 1);
-	for (int i = 0; i < presetCount; ++i) {
+	// Expect 9 groups of presets, where each preset is made up of 5 values
+	static const int valuesPerPreset = 5;
+	static const int presetGroupCount = 9;
+	QVariantList colorData = m_settingItem->getValue().toList();
+	beginInsertRows(QModelIndex(), 0, presetGroupCount - 1);
+	for (int presetGroupIndex = 0; presetGroupIndex < presetGroupCount; ++presetGroupIndex) {
 		QColor color;
 		qreal white = 0;
 		qreal colorTemperature = 0;
-		if (VeQItem *presetItem = m_settingItem->itemGet(QString::number(i))) {
-			const QVariantList colorData = presetItem->getValue().toList();
-			if (!colorData.isEmpty()) {
-				::getStorageColorData(colorData, &color, &white, &colorTemperature);
-			}
-		}
+		::getStorageColorData(colorData.mid(presetGroupIndex * valuesPerPreset, valuesPerPreset),
+				&color, &white, &colorTemperature);
 		m_colors.append({ color, white, colorTemperature });
 	}
+
 	endInsertRows();
 	emit countChanged();
 }