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

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7038

Browse Source
This commit is contained in:
Dimitriovski 2019-12-31 14:44:09 +01:00
commit daee57d31e
No known key found for this signature in database
GPG Key ID: 4E62757E2B0D304D
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/definitions/fdmprinter.def.json
View File

@ -7650,7 +7650,7 @@
"default_value": 50, "default_value": 50,
"minimum_value": "1", "minimum_value": "1",
"minimum_value_warning": "25", "minimum_value_warning": "25",
"maximum_value": "100", "maximum_value_warning": "100",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"small_feature_speed_factor_0": "small_feature_speed_factor_0":
@ -7663,7 +7663,7 @@
"value": "small_feature_speed_factor", "value": "small_feature_speed_factor",
"minimum_value": "1", "minimum_value": "1",
"minimum_value_warning": "25", "minimum_value_warning": "25",
"maximum_value": "100", "maximum_value_warning": "100",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }

3
resources/qml/Settings/SettingView.qml
View File

@ -222,7 +222,6 @@ Item
ListView ListView
{ {
id: contents id: contents
spacing: UM.Theme.getSize("default_lining").height
cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
@ -251,7 +250,7 @@ Item
id: delegate id: delegate
width: scrollView.width width: scrollView.width
height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height : - contents.spacing height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height + 2 * UM.Theme.getSize("default_lining").height : 0
Behavior on height { NumberAnimation { duration: 100 } } Behavior on height { NumberAnimation { duration: 100 } }
opacity: provider.properties.enabled === "True" ? 1 : 0 opacity: provider.properties.enabled === "True" ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } } Behavior on opacity { NumberAnimation { duration: 100 } }

35
run_mypy.py
View File

@ -1,8 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import sys import sys
import subprocess from multiprocessing.dummy import Pool
from functools import partial
from subprocess import call
# A quick Python implementation of unix 'where' command. # A quick Python implementation of unix 'where' command.
def where(exe_name: str, search_path: str = os.getenv("PATH")) -> str: def where(exe_name: str, search_path: str = os.getenv("PATH")) -> str:
@ -62,21 +63,23 @@ def main():
mods = ["cura"] + plugins + findModules("plugins/VersionUpgrade") mods = ["cura"] + plugins + findModules("plugins/VersionUpgrade")
success_code = 0 success_code = 0
for mod in mods:
print("------------- Checking module {mod}".format(**locals())) pool = Pool(2) # Run two commands at once
if sys.platform == "win32":
result = subprocess.run([mypy_module, "-p", mod, "--ignore-missing-imports"]) if sys.platform == "win32":
else: commands = ["%s -p %s --ignore-missing-imports" % (mypy_module, mod) for mod in mods]
result = subprocess.run([sys.executable, mypy_module, "-p", mod, "--ignore-missing-imports"])
if result.returncode != 0:
print("\nModule {mod} failed checking. :(".format(**locals()))
success_code = 1
if success_code:
print("\n\nSome modules failed checking!")
else: else:
print("\n\nDone checking. All is good.") commands = ["%s %s -p %s --ignore-missing-imports" % (sys.executable, mypy_module, mod) for mod in mods]
for i, returncode in enumerate(pool.imap(partial(call, shell=True), commands)):
if returncode != 0:
print("\nCommand %s failed checking. :(" % commands[i])
success_code = 1
if success_code:
print("MYPY check was compleded, but did not pass")
else:
print("MYPY check was compleded and passed with flying colors")
return success_code return success_code
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())