3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
Jaime van Kessel 2016-04-05 10:28:29 +02:00
commit 6a4b83b54b
8 changed files with 2 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/machines/fdmprinter.json
View file

@ -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",

4
resources/machines/ultimaker2_extended.json
View file

@ -10,10 +10,6 @@
"file_formats": "text/x-gcode",
"inherits": "ultimaker2.json",
"pages": [
"SelectUpgradedPartsUM2"
],
"machine_settings": {
"machine_height": { "default": 315 }
}

17
resources/machines/ultimaker2_extended_olsson.json
View file

@ -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 }
}
}

18
resources/machines/ultimaker2_extended_olsson_025.json
View file

@ -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 }
}
}

19
resources/machines/ultimaker2_extended_olsson_040.json
View file

@ -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 }
}
}

19
resources/machines/ultimaker2_extended_olsson_060.json
View file

@ -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 }
}
}

19
resources/machines/ultimaker2_extended_olsson_080.json
View file

@ -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 }
}
}

80
resources/qml/WizardPages/SelectUpgradedPartsUM2.qml
View file

@ -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; }
}