From 6176b939d6e4186877adb66f33e2bce542ecbd8f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 19 Oct 2017 10:02:13 +0200 Subject: [PATCH 1/3] cross_infill_density_image setting --- resources/definitions/fdmprinter.def.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e953d18865..1d9285441c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5263,6 +5263,16 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, + "cross_infill_density_image": + { + "label": "Cross Infill Density Image", + "description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the infill of the print.", + "type": "str", + "default_value": "", + "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", + "limit_to_extruder": "infill_extruder_nr", + "settable_per_mesh": true + }, "spaghetti_infill_enabled": { "label": "Spaghetti Infill", From 87c1f1a3778e46f3f0927cceb007d39cde6747a1 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 19 Oct 2017 10:57:41 +0200 Subject: [PATCH 2/3] cross_support_density_image setting --- resources/definitions/fdmprinter.def.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1d9285441c..3a42b7b326 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5273,6 +5273,17 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, + "cross_support_density_image": + { + "label": "Cross Fill Density Image for Support", + "description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support.", + "type": "str", + "default_value": "", + "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "spaghetti_infill_enabled": { "label": "Spaghetti Infill", From 1d8a405e8658a95be6ffb6ba81ad7af1c8b8b76f Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 16 May 2018 15:16:16 +0200 Subject: [PATCH 3/3] CURA-5357 Search for license files The old code had the problem that by definition it skipped the `files/` folder and any other dir which of course is where the licenses are. Now, so long as the license is always just called `LICENSE` (which is the convention in open source software), it can be located anywhere. --- cura/CuraPackageManager.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 62ebdb9ff2..0c2c438fcc 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -338,13 +338,7 @@ class CuraPackageManager(QObject): with zipfile.ZipFile(filename) as archive: # Go through all the files and use the first successful read as the result for file_info in archive.infolist(): - is_dir = lambda file_info: file_info.filename.endswith('/') - if is_dir or not file_info.filename.startswith("files/"): - continue - - filename_parts = os.path.basename(file_info.filename.lower()).split(".") - stripped_filename = filename_parts[0] - if stripped_filename in ("license", "licence"): + if file_info.filename.endswith("LICENSE"): Logger.log("d", "Found potential license file '%s'", file_info.filename) try: with archive.open(file_info.filename, "r") as f: