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

Merge remote-tracking branch 'upstream/master' into pythonpath-fix-reworked

Browse Source
This commit is contained in:
Thomas-Karl Pietrowski 2016-04-19 18:54:27 +02:00
commit e7e1dab53d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/CuraApplication.py
View File

@ -66,9 +66,9 @@ class CuraApplication(QtApplication):
Q_ENUMS(ResourceTypes) Q_ENUMS(ResourceTypes)
def __init__(self): def __init__(self):
Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura")) Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources"))
if not hasattr(sys, "frozen"): if not hasattr(sys, "frozen"):
Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources"))
self._open_file_queue = [] # Files to open when plug-ins are loaded. self._open_file_queue = [] # Files to open when plug-ins are loaded.

4
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -200,8 +200,10 @@ class CuraEngineBackend(Backend):
self._onChanged() self._onChanged()
def _onSocketError(self, error): def _onSocketError(self, error):
super()._onSocketError(error) if Application.getInstance().isShuttingDown():
return
super()._onSocketError(error)
self._terminate() self._terminate()
if error.getErrorCode() not in [Arcus.ErrorCode.BindFailedError, Arcus.ErrorCode.ConnectionResetError, Arcus.ErrorCode.Debug]: if error.getErrorCode() not in [Arcus.ErrorCode.BindFailedError, Arcus.ErrorCode.ConnectionResetError, Arcus.ErrorCode.Debug]:

6
resources/machines/fdmprinter.json
View File

@ -552,7 +552,7 @@
"default": 2, "default": 2,
"min_value": "0", "min_value": "0",
"visible": false, "visible": false,
"inherit_function": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density" "inherit_function": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == \"grid\" else (3 if infill_pattern == \"triangles\" else 1))"
} }
} }
}, },
@ -1237,7 +1237,7 @@
"default": 2.66, "default": 2.66,
"visible": false, "visible": false,
"enabled": "support_enable", "enabled": "support_enable",
"inherit_function": "(support_line_width * 100) / parent_value", "inherit_function": "(support_line_width * 100) / parent_value * (2 if support_pattern == \"grid\" else (3 if support_pattern == \"triangles\" else 1))",
"global_only": true "global_only": true
} }
} }
@ -1372,7 +1372,7 @@
"default": 0.4, "default": 0.4,
"min_value": "0", "min_value": "0",
"visible": false, "visible": false,
"inherit_function": "0 if parent_value == 0 else (support_roof_line_width * 100) / parent_value", "inherit_function": "0 if parent_value == 0 else (support_roof_line_width * 100) / parent_value * (2 if support_roof_pattern == \"grid\" else (3 if support_roof_pattern == \"triangles\" else 1))",
"enabled": "support_roof_enable", "enabled": "support_roof_enable",
"global_only": true "global_only": true
} }