From efdd92d358926cbc88fd30b5db587827b2d908d9 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 4 Apr 2016 14:27:19 +0200 Subject: [PATCH 1/2] JSON: fix: hide alternate skin rotation when skin pattern is concentric (CURA-1235) --- resources/machines/fdmprinter.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 1695df01bc..1e3073647a 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1905,7 +1905,8 @@ "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", "type": "boolean", "default": false, - "visible": false + "visible": false, + "enabled": "top_bottom_pattern != \"concentric\"" }, "support_conical_enabled": { "label": "Conical Support", From 78038e90b8c6550821507a6064e56604f87ce751 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 5 Apr 2016 09:52:33 +0200 Subject: [PATCH 2/2] Removed Olsson block upgrade option from UM2Extended --- resources/machines/ultimaker2_extended.json | 4 - .../machines/ultimaker2_extended_olsson.json | 17 ---- .../ultimaker2_extended_olsson_025.json | 18 ----- .../ultimaker2_extended_olsson_040.json | 19 ----- .../ultimaker2_extended_olsson_060.json | 19 ----- .../ultimaker2_extended_olsson_080.json | 19 ----- .../WizardPages/SelectUpgradedPartsUM2.qml | 80 ------------------- 7 files changed, 176 deletions(-) delete mode 100644 resources/machines/ultimaker2_extended_olsson.json delete mode 100644 resources/machines/ultimaker2_extended_olsson_025.json delete mode 100644 resources/machines/ultimaker2_extended_olsson_040.json delete mode 100644 resources/machines/ultimaker2_extended_olsson_060.json delete mode 100644 resources/machines/ultimaker2_extended_olsson_080.json delete mode 100644 resources/qml/WizardPages/SelectUpgradedPartsUM2.qml diff --git a/resources/machines/ultimaker2_extended.json b/resources/machines/ultimaker2_extended.json index 72b2ad53e6..0cd5ff0002 100644 --- a/resources/machines/ultimaker2_extended.json +++ b/resources/machines/ultimaker2_extended.json @@ -10,10 +10,6 @@ "file_formats": "text/x-gcode", "inherits": "ultimaker2.json", - "pages": [ - "SelectUpgradedPartsUM2" - ], - "machine_settings": { "machine_height": { "default": 315 } } diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json deleted file mode 100644 index d144a97014..0000000000 --- a/resources/machines/ultimaker2_extended_olsson.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "ultimaker2_extended_olsson_base", - "version": 1, - "name": "Ultimaker 2 Extended with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "machine_settings": { - "machine_height": { "default": 313 }, - "machine_show_variants": { "default": true } - } -} diff --git a/resources/machines/ultimaker2_extended_olsson_025.json b/resources/machines/ultimaker2_extended_olsson_025.json deleted file mode 100644 index ea09020363..0000000000 --- a/resources/machines/ultimaker2_extended_olsson_025.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "ultimaker2_extended_olsson", - "version": 1, - "name": "Ultimaker 2 Extended with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_extended_olsson.json", - "variant": "0.25 mm", - "profiles_machine": "ultimaker2_olsson", - "machine_settings": { - "machine_nozzle_size": { "default": 0.25 }, - "machine_nozzle_tip_outer_diameter": { "default": 0.8 } - } -} diff --git a/resources/machines/ultimaker2_extended_olsson_040.json b/resources/machines/ultimaker2_extended_olsson_040.json deleted file mode 100644 index dfbd4a94d9..0000000000 --- a/resources/machines/ultimaker2_extended_olsson_040.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "ultimaker2_extended_olsson", - "version": 1, - "name": "Ultimaker 2 Extended with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_extended_olsson.json", - - "variant": "0.4 mm", - "profiles_machine": "ultimaker2_olsson", - "machine_settings": { - "machine_nozzle_size": { "default": 0.40 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.05 } - } -} diff --git a/resources/machines/ultimaker2_extended_olsson_060.json b/resources/machines/ultimaker2_extended_olsson_060.json deleted file mode 100644 index 30d1cc082c..0000000000 --- a/resources/machines/ultimaker2_extended_olsson_060.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "ultimaker2_extended_olsson", - "version": 1, - "name": "Ultimaker 2 Extended with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_extended_olsson.json", - - "variant": "0.6 mm", - "profiles_machine": "ultimaker2_olsson", - "machine_settings": { - "machine_nozzle_size": { "default": 0.60 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.25 } - } -} diff --git a/resources/machines/ultimaker2_extended_olsson_080.json b/resources/machines/ultimaker2_extended_olsson_080.json deleted file mode 100644 index 04fe80337c..0000000000 --- a/resources/machines/ultimaker2_extended_olsson_080.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "ultimaker2_extended_olsson", - "version": 1, - "name": "Ultimaker 2 Extended with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "file_formats": "text/x-gcode", - "visible": false, - "inherits": "ultimaker2_extended_olsson.json", - - "variant": "0.8 mm", - "profiles_machine": "ultimaker2_olsson", - "machine_settings": { - "machine_nozzle_size": { "default": 0.80 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.35 } - } -} diff --git a/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml b/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml deleted file mode 100644 index 79404492f0..0000000000 --- a/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) 2015 Ultimaker B.V. -// Cura is released under the terms of the AGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Window 2.1 - -import UM 1.1 as UM - -Item -{ - id: wizardPage - property string title - - SystemPalette{id: palette} - UM.I18nCatalog { id: catalog; name:"cura"} - - property variant wizard: null; - - Connections - { - target: wizardPage.wizard - onNextClicked: //You can add functions here that get triggered when the final button is clicked in the wizard-element - { - if(wizardPage.wizard.lastPage == true){ - wizardPage.wizard.visible = false - } - } - } - - Component.onDestruction: - { - if (hotendCheckBox.checked == true){ - switch(UM.MachineManager.getMachineDefinitionType()) { - case "ultimaker2": - UM.MachineManager.setMachineDefinitionType("ultimaker2_olsson") - break; - case "ultimaker2_extended": - UM.MachineManager.setMachineDefinitionType("ultimaker2_extended_olsson") - break; - } - } - } - Label - { - id: pageTitle - width: parent.width - text: catalog.i18nc("@title", "Select Upgraded Parts") - wrapMode: Text.WordWrap - font.pointSize: 18 - } - Label - { - id: pageDescription - anchors.top: pageTitle.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - width: parent.width - wrapMode: Text.WordWrap - text: catalog.i18nc("@label","To assist you in having better default settings for your Ultimaker. Cura would like to know which upgrades you have in your machine:") - } - - Item - { - id: pageCheckboxes - height: childrenRect.height - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.top: pageDescription.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - width: parent.width - UM.Theme.getSize("default_margin").width - CheckBox - { - id: hotendCheckBox - text: catalog.i18nc("@option:check","Olsson Block") - checked: false - } - } - - ExclusiveGroup { id: printerGroup; } -}