GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 00:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-02-22 13:50:16 +01:00
commit 905787b9b3
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View File

@ -98,7 +98,7 @@ UM.Dialog
RadioButton RadioButton
{ {
id: dontSendButton id: dontSendButton
text: catalog.i18nc("@text:window", "I don't want to send these data") text: catalog.i18nc("@text:window", "I don't want to send this data")
exclusiveGroup: group exclusiveGroup: group
onClicked: onClicked:
{ {
@ -108,7 +108,7 @@ UM.Dialog
RadioButton RadioButton
{ {
id: allowSendButton id: allowSendButton
text: catalog.i18nc("@text:window", "Allow sending these data to Ultimaker and help us improve Cura") text: catalog.i18nc("@text:window", "Allow sending this data to Ultimaker and help us improve Cura")
exclusiveGroup: group exclusiveGroup: group
onClicked: onClicked:
{ {

8
resources/definitions/mendel90.def.json
View File

@ -5,7 +5,7 @@
"metadata": "metadata":
{ {
"visible": true, "visible": true,
"author": "Bo Herrmannsen", "author": "Wilmer Gaona",
"manufacturer": "Nophead", "manufacturer": "Nophead",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "mendel90_platform.stl", "platform": "mendel90_platform.stl",
@ -23,10 +23,10 @@
"overrides": { "overrides": {
"machine_name": { "default_value": "Mendel90" }, "machine_name": { "default_value": "Mendel90" },
"machine_start_gcode": { "machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\nM107 ;start with the fan off\nG1 X90 Y200 F6000 ;go to the middle of the front\nG1 Z0.05 ;close to the bed\nG1 Z0.3 ;lift Z\n" "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n"
}, },
"machine_end_gcode": { "machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Y200 F5000 ;Move Y to middle of bed cooling fan\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S420 ;Wait 7 mins\nM42 P42 S0 ;Turn off bed cooling fan\nG1 Y10 F5000 ;Move Y to front\nM84 ;steppers off\n" "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Z200 X-100 F9000 ; go to top\nG1 Y100 F5000 ;Move Y to back\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S10 ;Wait 10 seconds\nM42 P42 S0 ;Turn off bed cooling fan\nM84 ;steppers off\n"
}, },
"material_bed_temp_wait": { "material_bed_temp_wait": {
"default_value": true "default_value": true
@ -47,7 +47,7 @@
"default_value": true "default_value": true
}, },
"machine_center_is_zero": { "machine_center_is_zero": {
"default_value": false "default_value": true
}, },
"machine_extruder_count": { "machine_extruder_count": {
"default_value": 1 "default_value": 1

9
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View File

@ -124,6 +124,15 @@ Item
} }
} }
// Can't use 'item: ...activeExtruderIndex' directly apparently, see also the comment on the previous block.
onVisibleChanged:
{
if (tabBar.visible)
{
tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex);
}
}
//When the model of the extruders is rebuilt, the list of extruders is briefly emptied and rebuilt. //When the model of the extruders is rebuilt, the list of extruders is briefly emptied and rebuilt.
//This causes the currentIndex of the tab to be in an invalid position which resets it to 0. //This causes the currentIndex of the tab to be in an invalid position which resets it to 0.
//Therefore we need to change it back to what it was: The active extruder index. //Therefore we need to change it back to what it was: The active extruder index.