From 3c9d191a6e0f0cec5a44849e98ee517ec676b07c Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 16 Sep 2019 14:57:45 +0200
Subject: [PATCH] Add separate definition for Ultimaker 2 with Olsson block

This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.

By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.

Contributes to issue CURA-6775.
---
 resources/definitions/ultimaker2_olsson.def.json     | 12 ++++++++++++
 ...0.25.inst.cfg => ultimaker2_olsson_0.25.inst.cfg} |  2 +-
 ...2_0.4.inst.cfg => ultimaker2_olsson_0.4.inst.cfg} |  2 +-
 ...2_0.6.inst.cfg => ultimaker2_olsson_0.6.inst.cfg} |  2 +-
 ...2_0.8.inst.cfg => ultimaker2_olsson_0.8.inst.cfg} |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 resources/definitions/ultimaker2_olsson.def.json
 rename resources/variants/{ultimaker2_0.25.inst.cfg => ultimaker2_olsson_0.25.inst.cfg} (86%)
 rename resources/variants/{ultimaker2_0.4.inst.cfg => ultimaker2_olsson_0.4.inst.cfg} (85%)
 rename resources/variants/{ultimaker2_0.6.inst.cfg => ultimaker2_olsson_0.6.inst.cfg} (85%)
 rename resources/variants/{ultimaker2_0.8.inst.cfg => ultimaker2_olsson_0.8.inst.cfg} (85%)

diff --git a/resources/definitions/ultimaker2_olsson.def.json b/resources/definitions/ultimaker2_olsson.def.json
new file mode 100644
index 0000000000..ad0da1bbcc
--- /dev/null
+++ b/resources/definitions/ultimaker2_olsson.def.json
@@ -0,0 +1,12 @@
+{
+    "version": 2,
+    "name": "Ultimaker 2 with Olsson Block",
+    "inherits": "ultimaker2",
+    "metadata": {
+        "has_variants": true
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 with Olsson Block" }
+    }
+}
diff --git a/resources/variants/ultimaker2_0.25.inst.cfg b/resources/variants/ultimaker2_olsson_0.25.inst.cfg
similarity index 86%
rename from resources/variants/ultimaker2_0.25.inst.cfg
rename to resources/variants/ultimaker2_olsson_0.25.inst.cfg
index a844b28ad7..04b03b40c6 100644
--- a/resources/variants/ultimaker2_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_olsson_0.25.inst.cfg
@@ -1,7 +1,7 @@
 [general]
 name = 0.25 mm
 version = 4
-definition = ultimaker2
+definition = ultimaker2_olsson
 
 [metadata]
 setting_version = 9
diff --git a/resources/variants/ultimaker2_0.4.inst.cfg b/resources/variants/ultimaker2_olsson_0.4.inst.cfg
similarity index 85%
rename from resources/variants/ultimaker2_0.4.inst.cfg
rename to resources/variants/ultimaker2_olsson_0.4.inst.cfg
index 4f66962a7c..4a5986db5f 100644
--- a/resources/variants/ultimaker2_0.4.inst.cfg
+++ b/resources/variants/ultimaker2_olsson_0.4.inst.cfg
@@ -1,7 +1,7 @@
 [general]
 name = 0.4 mm
 version = 4
-definition = ultimaker2
+definition = ultimaker2_olsson
 
 [metadata]
 setting_version = 9
diff --git a/resources/variants/ultimaker2_0.6.inst.cfg b/resources/variants/ultimaker2_olsson_0.6.inst.cfg
similarity index 85%
rename from resources/variants/ultimaker2_0.6.inst.cfg
rename to resources/variants/ultimaker2_olsson_0.6.inst.cfg
index 2b73baf1ad..0cfe375ca4 100644
--- a/resources/variants/ultimaker2_0.6.inst.cfg
+++ b/resources/variants/ultimaker2_olsson_0.6.inst.cfg
@@ -1,7 +1,7 @@
 [general]
 name = 0.6 mm
 version = 4
-definition = ultimaker2
+definition = ultimaker2_olsson
 
 [metadata]
 setting_version = 9
diff --git a/resources/variants/ultimaker2_0.8.inst.cfg b/resources/variants/ultimaker2_olsson_0.8.inst.cfg
similarity index 85%
rename from resources/variants/ultimaker2_0.8.inst.cfg
rename to resources/variants/ultimaker2_olsson_0.8.inst.cfg
index 70bdc42b35..82765cc0e4 100644
--- a/resources/variants/ultimaker2_0.8.inst.cfg
+++ b/resources/variants/ultimaker2_olsson_0.8.inst.cfg
@@ -1,7 +1,7 @@
 [general]
 name = 0.8 mm
 version = 4
-definition = ultimaker2
+definition = ultimaker2_olsson
 
 [metadata]
 setting_version = 9