3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing

Browse source 
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
This commit is contained in:
Arjen Hiemstra 2016-07-07 11:29:18 +02:00
commit d8555fe57d
25 changed files with 311 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/bq_hephestos_2.def.json
View file

@ -14,7 +14,7 @@
},
"overrides": {
"machine_start_gcode": { "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\nM109 S{material_print_temperature} ;Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
"machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature} ; Heat up extruder while leveling\nM800 ; Custom GCODE to fire start print procedure\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
"machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" },
"machine_width": { "default_value": 210 },
"machine_depth": { "default_value": 297 },

38
resources/definitions/fdmprinter.def.json
View file

@ -410,7 +410,7 @@
},
"skin_line_width":
{
"label": "Top/bottom Line Width",
"label": "Top/Bottom Line Width",
"description": "Width of a single top/bottom line.",
"unit": "mm",
"minimum_value": "0.0001",
@ -926,7 +926,8 @@
"description": "Retract the filament when the nozzle is moving over a non-printed area. ",
"type": "bool",
"default_value": true,
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_amount": {
"label": "Retraction Distance",
@ -937,7 +938,8 @@
"minimum_value_warning": "-0.0001",
"maximum_value_warning": "10.0",
"enabled": "retraction_enable",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_speed": {
"label": "Retraction Speed",
@ -949,7 +951,8 @@
"maximum_value": "299792458000",
"maximum_value_warning": "100",
"enabled": "retraction_enable",
"settable_per_mesh": true,
"settable_per_mesh": false,
"settable_per_extruder": true,
"children": {
"retraction_retract_speed": {
"label": "Retraction Retract Speed",
@ -962,7 +965,8 @@
"maximum_value_warning": "100",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_prime_speed": {
"label": "Retraction Prime Speed",
@ -975,7 +979,8 @@
"maximum_value_warning": "100",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
}
}
},
@ -988,7 +993,8 @@
"minimum_value_warning": "-0.0001",
"maximum_value_warning": "5.0",
"enabled": "retraction_enable",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_min_travel": {
"label": "Retraction Minimum Travel",
@ -1000,7 +1006,8 @@
"minimum_value": "0",
"maximum_value_warning": "10",
"enabled": "retraction_enable",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_count_max": {
"label": "Maximum Retraction Count",
@ -1010,7 +1017,8 @@
"maximum_value_warning": "100",
"type": "int",
"enabled": "retraction_enable",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_extrusion_window": {
"label": "Minimum Extrusion Distance Window",
@ -1022,7 +1030,8 @@
"maximum_value_warning": "retraction_amount * 2",
"value": "retraction_amount",
"enabled": "retraction_enable",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_hop_enabled": {
"label": "Z Hop when Retracted",
@ -1030,7 +1039,8 @@
"type": "bool",
"default_value": false,
"enabled": "retraction_enable",
"settable_per_mesh": true,
"settable_per_mesh": false,
"settable_per_extruder": true,
"children": {
"retraction_hop_only_when_collides": {
"label": "Z Hop Only Over Printed Parts",
@ -1038,7 +1048,8 @@
"type": "bool",
"default_value": false,
"enabled": "retraction_enable and retraction_hop_enabled and travel_avoid_other_parts",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"retraction_hop": {
"label": "Z Hop Height",
@ -1049,7 +1060,8 @@
"minimum_value_warning": "-0.0001",
"maximum_value_warning": "10",
"enabled": "retraction_enable and retraction_hop_enabled",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
}
}
},

2
resources/definitions/ultimaker2_extended.def.json
View file

@ -16,7 +16,7 @@
"overrides": {
"machine_height": {
"default_value": 315
"default_value": 305
}
}
}

2
resources/definitions/ultimaker2_extended_plus.def.json
View file

@ -15,7 +15,7 @@
"overrides": {
"machine_height": {
"default_value": 313
"default_value": 305
},
"machine_show_variants": {
"default_value": true

2
resources/qml/JobSpecs.qml
View file

@ -24,7 +24,7 @@ Rectangle {
UM.I18nCatalog { id: catalog; name:"cura"}
property variant printDuration: PrintInformation.currentPrintTime
property real printMaterialAmount: PrintInformation.materialAmount
property real printMaterialAmount: PrintInformation.materialAmounts[0]
height: childrenRect.height
color: "transparent"

4
resources/qml/MonitorButton.qml
View file

@ -22,9 +22,9 @@ Rectangle
{
if(!printerConnected)
return UM.Theme.getColor("status_offline")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
return UM.Theme.getColor("status_busy")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
return UM.Theme.getColor("status_ready")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
return UM.Theme.getColor("status_paused")

3
resources/qml/Preferences/MachinesPage.qml
View file

@ -71,10 +71,11 @@ UM.ManagementPage
elide: Text.ElideRight
}
Row
Flow
{
id: machineActions
anchors.left: parent.left
anchors.right: parent.right
anchors.top: machineName.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height

10
resources/qml/Sidebar.qml
View file

@ -101,12 +101,16 @@ Rectangle
iconSource: {
if(!printerConnected)
return UM.Theme.getIcon("tab_monitor")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
return UM.Theme.getIcon("tab_monitor_busy")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
return UM.Theme.getIcon("tab_monitor_connected")
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
return UM.Theme.getIcon("tab_monitor_paused")
else if (Cura.MachineManager.printerOutputDevices[0].jobState != "error")
return UM.Theme.getIcon("tab_monitor_connected")
else if (Cura.MachineManager.printerOutputDevices[0].jobState == "error")
return UM.Theme.getIcon("tab_monitor_stopped")
else
return UM.Theme.getIcon("tab_monitor")
}
checkable: true
checked: monitoringPrint

4
resources/qml/SidebarHeader.qml
View file

@ -15,7 +15,7 @@ Column
id: base;
property int totalHeightHeader: childrenRect.height
property int currentExtruderIndex: -1;
property int currentExtruderIndex:ExtruderManager.activeExtruderIndex;
spacing: UM.Theme.getSize("default_margin").height
@ -93,7 +93,7 @@ Column
{
base.currentExtruderIndex = -1;
forceActiveFocus()
ExtruderManager.setActiveExtruderIndex(0);
ExtruderManager.setActiveExtruderIndex(base.currentExtruderIndex);
}
}

3
resources/qml/SidebarSimple.qml
View file

@ -371,7 +371,7 @@ Item
{
id: infillDensity
containerStackId: Cura.MachineManager.activeMachineId
containerStackId: Cura.MachineManager.activeStackId
key: "infill_sparse_density"
watchedProperties: [ "value" ]
storeIndex: 0
@ -406,6 +406,7 @@ Item
watchedProperties: [ "value" ]
storeIndex: 0
}
UM.SettingPropertyProvider
{
id: supportExtruderNr