From 391533e939c9e6e59eaabfd068893983f7a1e712 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 11 Jul 2017 17:09:59 +0200 Subject: [PATCH 1/3] Slice info is now sent by https --- plugins/SliceInfoPlugin/SliceInfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 83f17dcb27..a51e96aa9c 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -31,7 +31,7 @@ catalog = i18nCatalog("cura") # The data is only sent when the user in question gave permission to do so. All data is anonymous and # no model files are being sent (Just a SHA256 hash of the model). class SliceInfo(Extension): - info_url = "http://stats.ultimaker.com/api/cura" + info_url = "https://stats.ultimaker.com/api/cura" def __init__(self): super().__init__() From bcd93522a2cf73dbe2a49ca98ce10b4eb20684f0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 13 Jul 2017 08:44:42 +0200 Subject: [PATCH 2/3] Use bool instead of str for default_value of fill_outline_gaps CURA-4023 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e4252fbc67..d48581b250 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1139,7 +1139,7 @@ "label": "Print Thin Walls", "description": "Print pieces of the model which are horizontally thinner than the nozzle size.", "type": "bool", - "default_value": "false", + "default_value": false, "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, From 6cae41376618abd72c38b528ecbf6aed0e3caaeb Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 13 Jul 2017 08:58:39 +0200 Subject: [PATCH 3/3] Treat initial_layer_line_width_factor as a percentage instead of factor CURA-4036 initial_layer_line_width_factor is a percentage ranging from 0 to 100, so when calculating the prime tower position, we need to divide it by 100. --- resources/definitions/ultimaker3.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 81cf9efd91..b86e29c2d7 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -70,7 +70,7 @@ "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, "prime_tower_position_x": { "default_value": 175 }, - "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - (extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0))) - 1" }, + "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - (extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0))) - 1" }, "prime_tower_wipe_enabled": { "default_value": false }, "prime_blob_enable": { "enabled": true },