Merge branch 'master' into feature_enable_disable_extruder

This commit is contained in:
Jack Ha 2018-03-12 09:06:24 +01:00
commit d70cc072e9
478 changed files with 1278 additions and 1379 deletions

View file

@ -6248,7 +6248,6 @@
"description": "Detect bridges and modify print speed, flow and fan settings while bridges are printed.",
"type": "bool",
"default_value": false,
"value": "not support_enable and not support_tree_enable",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": false

View file

@ -2,7 +2,8 @@
"version": 2,
"name": "Tevo Tarantula",
"inherits": "fdmprinter",
"metadata": {
"metadata":
{
"visible": true,
"author": "TheAssassin",
"manufacturer": "Tevo",
@ -11,62 +12,39 @@
"platform": "prusai3_platform.stl"
},
"overrides": {
"machine_name": {
"default_value": "Tevo Tarantula"
},
"machine_heated_bed": {
"default_value": true
},
"machine_width": {
"default_value": 200
},
"machine_height": {
"default_value": 200
},
"machine_depth": {
"default_value": 200
},
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"material_diameter": {
"default_value": 1.75
},
"machine_head_polygon": {
"default_value": [
"overrides":
{
"machine_name": { "default_value": "Tevo Tarantula" },
"machine_heated_bed": { "default_value": true },
"machine_width": { "default_value": 200 },
"machine_height": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_head_polygon":
{
"default_value":
[
[-75, -18],
[-75, 35],
[18, 35],
[18, -18]
]
},
"gantry_height": {
"default_value": 55
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_acceleration": {
"default_value": 500
},
"machine_max_jerk_xy": {
"default_value": 4.0
},
"machine_max_jerk_z": {
"default_value": 0.2
},
"machine_max_jerk_e": {
"default_value": 2.5
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off"
}
"gantry_height": { "default_value": 55 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_acceleration": { "default_value": 2650 },
"machine_max_jerk_xy": { "default_value": 15.0 },
"machine_max_jerk_z": { "default_value": 0.4 },
"machine_max_jerk_e": { "default_value": 5 },
"machine_max_feedrate_x": { "default_value": 255 },
"machine_max_feedrate_y": { "default_value": 225 },
"machine_max_feedrate_z": { "default_value": 3 },
"machine_max_acceleration_x": { "default_value": 2620 },
"machine_max_acceleration_y": { "default_value": 2650 },
"acceleration_print": { "default_value": 2650 },
"machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." },
"machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }
}
}

View file

@ -103,6 +103,7 @@ material_print_temperature_layer_0
material_initial_print_temperature
material_final_print_temperature
material_extrusion_cool_down_speed
default_material_bed_temperature
material_bed_temperature
material_bed_temperature_layer_0
material_diameter

View file

@ -14,6 +14,15 @@ Tab
property string extruderPosition: ""
property var qualityItem: null
property bool isQualityItemCurrentlyActivated:
{
if (qualityItem == null)
{
return false;
}
return qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName;
}
TableView
{
anchors.fill: parent
@ -36,8 +45,8 @@ Tab
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right
text: (styleData.value.substr(0,1) == "=") ? catalog.i18nc("@info:status", "Calculated") : styleData.value
font.strikeout: styleData.column == 1 && setting.user_value != "" && qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName
font.italic: setting.profile_value_source == "quality_changes" || (setting.user_value != "" && qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName)
font.strikeout: styleData.column == 1 && setting.user_value != "" && base.isQualityItemCurrentlyActivated
font.italic: setting.profile_value_source == "quality_changes" || (setting.user_value != "" && base.isQualityItemCurrentlyActivated)
opacity: font.strikeout ? 0.5 : 1
color: styleData.textColor
elide: Text.ElideRight
@ -63,7 +72,7 @@ Tab
{
role: "user_value"
title: catalog.i18nc("@title:column", "Current");
visible: qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName
visible: base.isQualityItemCurrentlyActivated
width: (parent.width * 0.18) | 0
delegate: itemDelegate
}
@ -86,7 +95,7 @@ Tab
{
id: qualitySettings
selectedPosition: base.extruderPosition
selectedQualityItem: base.qualityItem
selectedQualityItem: base.qualityItem == null ? {} : base.qualityItem
}
SystemPalette { id: palette }

View file

@ -36,13 +36,15 @@ Item
text: catalog.i18nc("@title:tab", "Profiles")
}
property var hasCurrentItem: qualityListView.currentItem != null
property var hasCurrentItem: base.currentItem != null
property var currentItem: {
var current_index = qualityListView.currentIndex;
return qualitiesModel.getItem(current_index);
return (current_index == -1) ? null : qualitiesModel.getItem(current_index);
}
property var currentItemName: hasCurrentItem ? base.currentItem.name : ""
property var isCurrentItemActivated: {
if (!base.currentItem) {
return false;
@ -235,7 +237,7 @@ Item
icon: StandardIcon.Question;
title: catalog.i18nc("@title:window", "Confirm Remove")
text: catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(base.currentItem.name)
text: catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(base.currentItemName)
standardButtons: StandardButton.Yes | StandardButton.No
modality: Qt.ApplicationModal
@ -437,6 +439,7 @@ Item
Item
{
anchors.fill: parent
visible: base.currentItem != null
Item // Profile title Label
{
@ -446,7 +449,7 @@ Item
height: childrenRect.height
Label {
text: base.currentItem.name
text: base.currentItemName
font: UM.Theme.getFont("large")
}
}

View file

@ -122,7 +122,7 @@ Column
{
label: catalog.i18nc("@label", "Printing Time")
value: activePrintJob != null ? getPrettyTime(activePrintJob.timeTotal) : ""
width:base.width
width: base.width
visible: activePrinter != null
}

View file

@ -64,11 +64,11 @@ Rectangle
function getPrettyTime(time)
{
var hours = Math.round(time / 3600)
var hours = Math.floor(time / 3600)
time -= hours * 3600
var minutes = Math.round(time / 60);
var minutes = Math.floor(time / 60);
time -= minutes * 60
var seconds = Math.round(time);
var seconds = Math.floor(time);
var finalTime = strPadLeft(hours, "0", 2) + ':' + strPadLeft(minutes,'0',2)+ ':' + strPadLeft(seconds,'0',2);
return finalTime;

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fine
definition = abax_pri3

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Fine
definition = abax_pri3

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fine
definition = abax_pri3

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fine
definition = abax_pri5

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Fine
definition = abax_pri5

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fine
definition = abax_pri5

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fine
definition = abax_titan

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Fine
definition = abax_titan

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fine
definition = abax_titan

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft
definition = anycubic_i3_mega

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = anycubic_i3_mega

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = anycubic_i3_mega

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = builder_premium_small

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Extra Coarse
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal
definition = cartesio

View file

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Coarse Quality
definition = fdmprinter

Some files were not shown because too many files have changed in this diff Show more