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

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

Browse Source
This commit is contained in:
Tamara Hogenhout 2015-10-16 11:02:27 +02:00
commit 4ffbfcf69f
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/machines/fdmprinter.json
View File

@ -275,7 +275,8 @@
"description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.",
"type": "boolean",
"default": false,
"visible": false
"visible": false,
"inherit": false
},
"top_bottom_thickness": {
"label": "Bottom/Top Thickness",
@ -469,7 +470,7 @@
"zigzag": "Zig Zag"
},
"default": "grid",
"inherit_function": "'lines' if parent_value > 25 else 'grid'"
"inherit_function": "'lines' if infill_sparse_density > 25 else 'grid'"
},
"infill_overlap": {
"label": "Infill Overlap",
@ -1379,7 +1380,7 @@
"description": "The gap between the final raft layer and the first layer of the object. Only the first layer is raised by this amount to lower the bonding between the raft layer and the object. Makes it easier to peel off the raft.",
"unit": "mm",
"type": "float",
"default": 0.22,
"default": 0.35,
"enabled": "adhesion_type == \"raft\""
},
"raft_surface_layers": {
@ -1435,7 +1436,7 @@
"description": "The distance between the raft lines for the interface raft layer. The spacing of the interface should be quite wide, while being dense enough to support the surface raft layers.",
"unit": "mm",
"type": "float",
"default": 2,
"default": 1.0,
"enabled": "adhesion_type == \"raft\""
},
"raft_base_thickness": {
@ -1459,7 +1460,7 @@
"description": "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate.",
"unit": "mm",
"type": "float",
"default": 5,
"default": 3.0,
"enabled": "adhesion_type == \"raft\""
},
"raft_speed": {

17
resources/qml/Cura.qml
View File

@ -649,6 +649,11 @@ UM.MainWindow
onAccepted:
{
//Because several implementations of the file dialog only update the folder
//when it is explicitly set.
var f = folder;
folder = f;
UM.MeshFileHandler.readLocalFile(fileUrl)
openDialog.sendMeshName(fileUrl.toString())
}
@ -683,18 +688,22 @@ UM.MainWindow
Component.onCompleted:
{
UM.Theme.load(UM.Resources.getPath(UM.Resources.Themes, "cura"))
visible = true;
addMachineTimer.start();
}
Timer
{
id: addMachineTimer;
id: startupTimer;
interval: 100;
repeat: false;
running: true;
onTriggered:
{
if(UM.MachineManager.activeMachineInstance == "")
if(!base.visible)
{
base.visible = true;
restart();
}
else if(UM.MachineManager.activeMachineInstance == "")
{
addMachineWizard.firstRun = true;
addMachineWizard.open();