GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 21:25:56 +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 2016-08-18 12:44:53 +02:00
commit eae2e0da90
5 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/USBPrinting/USBPrinterOutputDevice.py
View File

@ -90,7 +90,6 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._firmware_update_finished = False
self._error_message = None
self._error_code = 0
onError = pyqtSignal()

10
resources/definitions/innovo_inventor.def.json
View File

@ -27,7 +27,7 @@
"default_value": true
},
"machine_center_is_zero": {
"default_value": false
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
@ -56,7 +56,7 @@
"default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position"
},
"machine_end_gcode": {
"default_value": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"
"default_value": "M104 S0\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"
},
"layer_height": {
"default_value": 0.15
@ -65,7 +65,7 @@
"default_value": 0.8
},
"top_bottom_thickness": {
"default_value": 0.3
"default_value": 1.2
},
"material_print_temperature": {
"default_value": 215
@ -95,5 +95,9 @@
"infill_overlap": {
"default_value": 10.0
}
},
"machine_preferences": {
"prefered_profile": "Normal Quality",
"prefered_material": "PLA"
}
}

BIN
resources/meshes/inventor_platform.stl
View File

Binary file not shown.

19
resources/qml/Preferences/GeneralPage.qml
View File

@ -46,11 +46,11 @@ UM.PreferencesPage
UM.Preferences.resetPreference("view/top_layer_count");
topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count"))
if (plugins.model.find("id", "SliceInfoPlugin") > -1) {
if (plugins.find("id", "SliceInfoPlugin") > -1) {
UM.Preferences.resetPreference("info/send_slice_info")
sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
}
if (plugins.model.find("id", "UpdateChecker") > -1) {
if (plugins.find("id", "UpdateChecker") > -1) {
UM.Preferences.resetPreference("info/automatic_update_check")
checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
}
@ -58,6 +58,9 @@ UM.PreferencesPage
Column
{
//: Model used to check if a plugin exists
UM.PluginsModel { id: plugins }
//: Language selection label
UM.I18nCatalog{id: catalog; name:"cura"}
@ -301,7 +304,7 @@ UM.PreferencesPage
}
UM.TooltipArea {
visible: plugins.model.find("id", "UpdateChecker") > -1
visible: plugins.find("id", "UpdateChecker") > -1
width: childrenRect.width
height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?")
@ -316,7 +319,7 @@ UM.PreferencesPage
}
UM.TooltipArea {
visible: plugins.model.find("id", "SliceInfoPlugin") > -1
visible: plugins.find("id", "SliceInfoPlugin") > -1
width: childrenRect.width
height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.")
@ -329,13 +332,5 @@ UM.PreferencesPage
onCheckedChanged: UM.Preferences.setValue("info/send_slice_info", checked)
}
}
//: Invisible list used to check if a plugin exists
ListView
{
id: plugins
model: UM.PluginsModel { }
visible: false
}
}
}

13
resources/qml/SidebarSimple.qml
View File

@ -354,12 +354,11 @@ Item
Component.onCompleted: populateExtruderModel()
}
//: Invisible list used to populate the extrudelModel
ListView
//: Model used to populate the extrudelModel
Cura.ExtrudersModel
{
id: extruders
model: Cura.ExtrudersModel { onModelChanged: populateExtruderModel() }
visible: false
onModelChanged: populateExtruderModel()
}
}
@ -370,10 +369,10 @@ Item
text: catalog.i18nc("@label", "Don't print support"),
color: ""
})
for(var extruderNumber = 0; extruderNumber < extruders.model.rowCount() ; extruderNumber++) {
for(var extruderNumber = 0; extruderNumber < extruders.rowCount() ; extruderNumber++) {
extruderModel.append({
text: catalog.i18nc("@label", "Print using %1").arg(extruders.model.getItem(extruderNumber).name),
color: extruders.model.getItem(extruderNumber).color
text: catalog.i18nc("@label", "Print support using %1").arg(extruders.getItem(extruderNumber).name),
color: extruders.getItem(extruderNumber).color
})
}
}