From 933def40b2ad6e54e911cac3510414d049596172 Mon Sep 17 00:00:00 2001 From: Nicanor Romero Venier Date: Tue, 18 Aug 2015 16:22:32 +0200 Subject: [PATCH 1/9] Modified some settings in profiles --- resources/settings/hephestos.json | 49 +++++++++++----------------- resources/settings/hephestos_xl.json | 47 ++++++++++---------------- resources/settings/witbox.json | 38 ++++++++------------- 3 files changed, 51 insertions(+), 83 deletions(-) diff --git a/resources/settings/hephestos.json b/resources/settings/hephestos.json index 5ff301b07c..5d6bf49ed8 100644 --- a/resources/settings/hephestos.json +++ b/resources/settings/hephestos.json @@ -1,15 +1,15 @@ { - "id": "hephestos", + "id": "bq_hephestos", "version": 1, "name": "BQ Prusa i3 Hephestos", "manufacturer": "BQ", - "author": "other", + "author": "BQ", "platform": "hephestos_platform.stl", "inherits": "fdmprinter.json", "machine_settings": { "machine_start_gcode": { - "default": "; -- START GCODE --\n;Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" + "default": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" }, "machine_end_gcode": { "default": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG1 Z10 ;move extruder up 10 mm\nG90 ;set to absolute positioning\nG1 X0 Y180 F1200 ;expose the platform\nM84 ;turn off steppers\n; -- end of END GCODE --" @@ -33,39 +33,28 @@ "default": "RepRap" }, "machine_platform_offset": { - "default": [0.0, 100.0, 0.0] + "default": [0, 100, 0] } }, - - "overrides": { + "overrides": { "layer_height": { "default": 0.2 }, - "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2 }, - "wall_thickness": { "default": 1.2, "visible": false }, - "top_bottom_thickness": { "default": 0.8, "visible": false }, - "bottom_thickness": { "default": 0.4, "visible": false }, + "layer_height_0": { "default": 0.2, "visible": false }, + "shell_thickness": { "default": 1.0 }, + "wall_thickness": { "default": 1.0, "visible": false }, + "top_bottom_thickness": { "default": 1.0, "visible": false}, + "bottom_thickness": { "default": 1.0, "visible": false }, "material_print_temperature": { "default": 220, "visible": true }, "material_bed_temperature": { "default": 0, "visible": false }, "material_diameter": { "default": 1.75, "visible": true }, - "speed_print": { "default": 40.0 }, - "speed_infill": { "default": 40.0, "visible": false }, - "speed_wall": { "default":35.0, "visible": false }, - "speed_wall_0": { "default": 35.0, "visible": false }, - "speed_wall_x": { "default": 35.0, "visible": false }, - "speed_topbottom": { "default": 35.0, "visible": false }, - "speed_support": { "default": 35.0, "visible": false }, - "speed_travel": { "default": 110.0 }, + "speed_print": { "default": 40.0}, + "speed_infill": { "default": 40.0, "visible": true }, + "speed_wall": { "default": 35.0, "visible": true}, + "speed_topbottom": { "default": 35.0, "visible": true }, + "speed_travel": { "default": 120.0 }, "speed_layer_0": { "default": 20.0, "visible": false }, - "retraction_speed": { "default": 30.0, "visible": true }, - "retraction_retract_speed": { "default": 30.0, "visible": true }, - "retraction_prime_speed": { "default": 30.0, "visible": true }, - "retraction_amount": { "default": 2.0, "visible": true }, - "retraction_hop": { "default": 0.75, "visible": false }, - "skirt_minimal_length": { "default": 150 }, - "raft_base_line_width": { "default": 0.7 }, - "raft_interface_thickness": { "default": 0.2 }, - "support_enable": { "default": true }, - "support_z_distance": { "default": 0.2, "visible": false }, - "support_infill_rate": { "default": 10, "visible": false } + "retraction_speed": { "default": 30.0, "visible": false}, + "retraction_amount": { "default": 2.0, "visible": false }, + "retraction_hop": { "default": 0.075, "visible": false }, + "support_enable": { "default": true } } } diff --git a/resources/settings/hephestos_xl.json b/resources/settings/hephestos_xl.json index 8e52bc03b4..a6849bb8e0 100644 --- a/resources/settings/hephestos_xl.json +++ b/resources/settings/hephestos_xl.json @@ -1,15 +1,15 @@ { - "id": "hephestos_xl", + "id": "bq_hephestos_xl", "version": 1, "name": "BQ Prusa i3 Hephestos XL", "manufacturer": "BQ", - "author": "other", + "author": "BQ", "platform": "hephestos_platform.stl", "inherits": "fdmprinter.json", "machine_settings": { "machine_start_gcode": { - "default": "; -- START GCODE --\n;Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" + "default": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" }, "machine_end_gcode": { "default": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG1 Z10 ;move extruder up 10 mm\nG90 ;set to absolute positioning\nG1 X0 Y180 F1200 ;expose the platform\nM84 ;turn off steppers\n; -- end of END GCODE --" @@ -33,39 +33,28 @@ "default": "RepRap" }, "machine_platform_offset": { - "default": [0.0, 100.0, 0.0] + "default": [0, 100, 0] } }, - "overrides": { "layer_height": { "default": 0.2 }, - "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2 }, - "wall_thickness": { "default": 1.2, "visible": false }, - "top_bottom_thickness": { "default": 0.8, "visible": false }, - "bottom_thickness": { "default": 0.4, "visible": false }, + "layer_height_0": { "default": 0.2, "visible": false }, + "shell_thickness": { "default": 1.0 }, + "wall_thickness": { "default": 1.0, "visible": false }, + "top_bottom_thickness": { "default": 1.0, "visible": false}, + "bottom_thickness": { "default": 1.0, "visible": false }, "material_print_temperature": { "default": 220, "visible": true }, "material_bed_temperature": { "default": 0, "visible": false }, "material_diameter": { "default": 1.75, "visible": true }, - "speed_print": { "default": 40.0 }, - "speed_infill": { "default": 40.0, "visible": false }, - "speed_wall": { "default":35.0, "visible": false }, - "speed_wall_0": { "default": 35.0, "visible": false }, - "speed_wall_x": { "default": 35.0, "visible": false }, - "speed_topbottom": { "default": 35.0, "visible": false }, - "speed_support": { "default": 35.0, "visible": false }, - "speed_travel": { "default": 110.0 }, + "speed_print": { "default": 40.0}, + "speed_infill": { "default": 40.0, "visible": true }, + "speed_wall": { "default": 35.0, "visible": true}, + "speed_topbottom": { "default": 35.0, "visible": true }, + "speed_travel": { "default": 120.0 }, "speed_layer_0": { "default": 20.0, "visible": false }, - "retraction_speed": { "default": 30.0, "visible": true }, - "retraction_retract_speed": { "default": 30.0, "visible": true }, - "retraction_prime_speed": { "default": 30.0, "visible": true }, - "retraction_amount": { "default": 2.0, "visible": true }, - "retraction_hop": { "default": 0.75, "visible": false }, - "skirt_minimal_length": { "default": 150 }, - "raft_base_line_width": { "default": 0.7 }, - "raft_interface_thickness": { "default": 0.2 }, - "support_enable": { "default": true }, - "support_z_distance": { "default": 0.2, "visible": false }, - "support_infill_rate": { "default": 10, "visible": false } + "retraction_speed": { "default": 30.0, "visible": false}, + "retraction_amount": { "default": 2.0, "visible": false }, + "retraction_hop": { "default": 0.075, "visible": false }, + "support_enable": { "default": true } } } diff --git a/resources/settings/witbox.json b/resources/settings/witbox.json index 4e27b5886d..0351dd7e00 100644 --- a/resources/settings/witbox.json +++ b/resources/settings/witbox.json @@ -3,13 +3,13 @@ "version": 1, "name": "BQ Witbox", "manufacturer": "BQ", - "author": "other", + "author": "BQ", "platform": "witbox_platform.stl", "inherits": "fdmprinter.json", "machine_settings": { "machine_start_gcode": { - "default": "; -- START GCODE --\n;Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" + "default": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" }, "machine_end_gcode": { "default": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG90 ;set to absolute positioning\nG1 Z200 ;move the platform to the bottom\nG28 X0 Y0 ;move to the X/Y origin (Home)\nM84 ;turn off steppers\n; -- end of END GCODE --" @@ -38,33 +38,23 @@ }, "overrides": { "layer_height": { "default": 0.2 }, - "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2}, - "wall_thickness": { "default": 1.2, "visible": false }, - "top_bottom_thickness": { "default": 0.8, "visible": false}, - "bottom_thickness": { "default": 0.4, "visible": false }, + "layer_height_0": { "default": 0.2, "visible": false }, + "shell_thickness": { "default": 1.0 }, + "wall_thickness": { "default": 1.0, "visible": false }, + "top_bottom_thickness": { "default": 1.0, "visible": false}, + "bottom_thickness": { "default": 1.0, "visible": false }, "material_print_temperature": { "default": 220, "visible": true }, "material_bed_temperature": { "default": 0, "visible": false }, "material_diameter": { "default": 1.75, "visible": true }, "speed_print": { "default": 40.0}, - "speed_infill": { "default": 40.0, "visible": false }, - "speed_wall": { "default":35.0, "visible": false}, - "speed_wall_0": { "default": 35.0, "visible": false }, - "speed_wall_x": { "default": 35.0, "visible": false }, - "speed_topbottom": { "default": 35.0, "visible": false }, - "speed_support": { "default": 35.0, "visible": false }, + "speed_infill": { "default": 40.0, "visible": true }, + "speed_wall": { "default": 35.0, "visible": true}, + "speed_topbottom": { "default": 35.0, "visible": true }, "speed_travel": { "default": 120.0 }, "speed_layer_0": { "default": 20.0, "visible": false }, - "retraction_speed": { "default": 30.0, "visible": true}, - "retraction_retract_speed": { "default": 30.0, "visible": true }, - "retraction_prime_speed": { "default": 30.0, "visible": true }, - "retraction_amount": { "default": 2.0, "visible": true }, - "retraction_hop": { "default": 0.75, "visible": false }, - "skirt_minimal_length": { "default": 150 }, - "raft_base_line_width": { "default": 0.7 }, - "raft_interface_thickness": { "default": 0.2 }, - "support_enable": { "default": true }, - "support_z_distance": { "default": 0.2, "visible": false }, - "support_infill_rate": { "default": 10, "visible": false } + "retraction_speed": { "default": 30.0, "visible": false}, + "retraction_amount": { "default": 2.0, "visible": false }, + "retraction_hop": { "default": 0.075, "visible": false }, + "support_enable": { "default": true } } } From 856ca783e45e5206530049f8488ba8fb4b572f19 Mon Sep 17 00:00:00 2001 From: Nicanor Romero Venier Date: Mon, 24 Aug 2015 16:10:47 +0200 Subject: [PATCH 2/9] Renamed BQ printer profiles --- resources/settings/{hephestos.json => bq_hephestos.json} | 0 resources/settings/{hephestos_xl.json => bq_hephestos_xl.json} | 0 resources/settings/{witbox.json => bq_witbox.json} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename resources/settings/{hephestos.json => bq_hephestos.json} (100%) rename resources/settings/{hephestos_xl.json => bq_hephestos_xl.json} (100%) rename resources/settings/{witbox.json => bq_witbox.json} (100%) diff --git a/resources/settings/hephestos.json b/resources/settings/bq_hephestos.json similarity index 100% rename from resources/settings/hephestos.json rename to resources/settings/bq_hephestos.json diff --git a/resources/settings/hephestos_xl.json b/resources/settings/bq_hephestos_xl.json similarity index 100% rename from resources/settings/hephestos_xl.json rename to resources/settings/bq_hephestos_xl.json diff --git a/resources/settings/witbox.json b/resources/settings/bq_witbox.json similarity index 100% rename from resources/settings/witbox.json rename to resources/settings/bq_witbox.json From 96c63ef6e9d30bc38efdbfab00d5fba2bb2903c3 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Mon, 24 Aug 2015 17:05:24 +0200 Subject: [PATCH 3/9] 15.10 Restyling of the message stack Contributes to: issue CURA-60 --- resources/themes/cura/icons/cross2.svg | 10 ++++++++++ resources/themes/cura/styles.qml | 9 +++------ resources/themes/cura/theme.json | 3 ++- 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 resources/themes/cura/icons/cross2.svg diff --git a/resources/themes/cura/icons/cross2.svg b/resources/themes/cura/icons/cross2.svg new file mode 100644 index 0000000000..dda0b9d501 --- /dev/null +++ b/resources/themes/cura/icons/cross2.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 0810989304..a2d7fe7c7b 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -205,26 +205,23 @@ QtObject { background:Rectangle { implicitWidth: UM.Theme.sizes.message.width - (UM.Theme.sizes.default_margin.width * 2) implicitHeight: UM.Theme.sizes.progressbar.height - x: UM.Theme.sizes.default_margin.width color: UM.Theme.colors.progressbar_background } progress: Rectangle { color: control.indeterminate ? "transparent" : UM.Theme.colors.progressbar_control - Rectangle{ color: UM.Theme.colors.progressbar_control width: UM.Theme.sizes.progressbar_control.width height: UM.Theme.sizes.progressbar_control.height - x: UM.Theme.sizes.default_margin.width visible: control.indeterminate SequentialAnimation on x { id: xAnim - property int animEndPoint: UM.Theme.sizes.message.width - UM.Theme.sizes.default_margin.width - UM.Theme.sizes.progressbar_control.width + property int animEndPoint: UM.Theme.sizes.message.width - (UM.Theme.sizes.default_margin.width * 2) - UM.Theme.sizes.progressbar_control.width running: control.indeterminate loops: Animation.Infinite - NumberAnimation { from: UM.Theme.sizes.default_margin.width; to: xAnim.animEndPoint; duration: 2000;} - NumberAnimation { from: xAnim.animEndPoint; to: UM.Theme.sizes.default_margin.width; duration: 2000;} + NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;} + NumberAnimation { from: xAnim.animEndPoint; to: 0; duration: 2000;} } } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 413a653d3c..1e3f24e1f2 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -132,7 +132,8 @@ "save_button_background": [249, 249, 249, 255], "message_background": [255, 255, 255, 255], - "message_text": [12, 169, 227, 255], + "message_text": [32, 166, 219, 255], + "message_dismiss": [139, 143, 153, 255], "tool_panel_background": [255, 255, 255, 255] }, From 289f9df67e01d92f544c2c4b27859f742465dc95 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Aug 2015 09:19:30 +0200 Subject: [PATCH 4/9] moved infill_pattern outside density ; made retraction visible by default --- resources/settings/fdmprinter.json | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 4c3b8943a3..5e1537738a 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -448,20 +448,6 @@ "type": "float", "default": 20, "children": { - "infill_pattern": { - "label": "Infill Pattern", - "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", - "type": "enum", - "visible": false, - "options": [ - "Grid", - "Lines", - "Concentric", - "ZigZag" - ], - "default": "Grid", - "inherit_function": "'Lines' if parent_value > 25 else 'Grid'" - }, "infill_line_distance": { "label": "Line distance", "description": "Distance between the printed infill lines.", @@ -473,6 +459,20 @@ } } }, + "infill_pattern": { + "label": "Infill Pattern", + "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", + "type": "enum", + "visible": false, + "options": [ + "Grid", + "Lines", + "Concentric", + "ZigZag" + ], + "default": "Grid", + "inherit_function": "'Lines' if parent_value > 25 else 'Grid'" + }, "infill_overlap": { "label": "Infill Overlap", "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.", @@ -556,7 +556,8 @@ "label": "Enable Retraction", "description": "Retract the filament when the nozzle is moving over a non-printed area. Details about the retraction can be configured in the advanced tab.", "type": "boolean", - "default": true + "default": true, + "visible": true }, "retraction_amount": { "label": "Retraction Distance", From ed60c3c92912cf6c6d0062127abbf5ef94476397 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Aug 2015 10:05:47 +0200 Subject: [PATCH 5/9] JSON: support hammock density and pattern --- resources/settings/fdmprinter.json | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 5e1537738a..faea45add9 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -1282,6 +1282,37 @@ "value": true } }, + "support_roof_density": { + "label": "Hammock Density", + "description": "This controls how densely filled the roofs of the support will be. A higher percentage results in better overhangs, which are more difficult to remove.", + "unit": "%", + "type": "float", + "default": 20, + "children": { + "support_roof_line_distance": { + "label": "Hammock Line Distance", + "description": "Distance between the printed hammock lines.", + "unit": "mm", + "type": "float", + "default": 2, + "visible": false, + "inherit_function": "0 if parent_value == 0 else (support_roof_line_width * 100) / parent_value" + } + } + }, + "support_roof_pattern": { + "label": "Hammock Pattern", + "description": "The pattern with which the hammock is printed.", + "type": "enum", + "visible": false, + "options": [ + "Grid", + "Lines", + "Concentric", + "ZigZag" + ], + "default": "Lines" + }, "support_use_towers": { "label": "Use towers.", "description": "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof.", From 534c277b005deabf004196ad9b0dcbe26722317a Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Tue, 25 Aug 2015 12:20:13 +0200 Subject: [PATCH 6/9] 15.10 restyling of the layerview slider Adds a textfield to the handle for per layer selection and removes the display of the min- and maxvalue Contributes to: issue CURA-60 --- plugins/LayerView/LayerView.qml | 10 +++-- resources/qml/Toolbar.qml | 4 +- resources/themes/cura/styles.qml | 65 ++++++++++++++------------------ resources/themes/cura/theme.json | 16 ++++---- 4 files changed, 44 insertions(+), 51 deletions(-) diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml index 4d0da440d1..9c35b9337c 100644 --- a/plugins/LayerView/LayerView.qml +++ b/plugins/LayerView/LayerView.qml @@ -19,7 +19,7 @@ Item width: 10 height: 250 anchors.right : parent.right - anchors.rightMargin: UM.Theme.sizes.slider_layerview_margin.width + anchors.rightMargin: UM.Theme.sizes.slider_layerview_margin.width/2 orientation: Qt.Vertical minimumValue: 0; maximumValue: UM.LayerView.numLayers; @@ -38,14 +38,16 @@ Item height: UM.Theme.sizes.slider_layerview_background_extension.height color: UM.Theme.colors.slider_text_background } - UM.AngledCornerRectangle { + Rectangle { anchors.right : parent.right anchors.verticalCenter: parent.verticalCenter z: slider.z - 1 - cornerSize: UM.Theme.sizes.default_margin.width; width: UM.Theme.sizes.slider_layerview_background.width height: slider.height + UM.Theme.sizes.default_margin.height * 2 - color: UM.Theme.colors.slider_text_background + color: UM.Theme.colors.tool_panel_background; + border.width: UM.Theme.sizes.default_lining.width + border.color: UM.Theme.colors.lining + MouseArea { id: sliderMouseArea property double manualStepSize: slider.maximumValue / 11 diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index e14dfdc99d..542aceaa15 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -51,7 +51,7 @@ Item { z: parent.z - 1 anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - color: UM.Theme.colors.button_lining + color: UM.Theme.colors.lining } Rectangle { @@ -68,7 +68,7 @@ Item { color: UM.Theme.colors.tool_panel_background; border.width: UM.Theme.sizes.default_lining.width - border.color: UM.Theme.colors.button_lining + border.color: UM.Theme.colors.lining Loader { id: panel diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index a2d7fe7c7b..f5f93bf547 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -67,10 +67,10 @@ QtObject { Rectangle { id: tool_button_background - anchors.top: parent.verticalCenter; + anchors.top: parent.bottom - width: parent.width; - height: control.hovered ? parent.height / 2 + label.height : 0; + width: label.width > parent.width ? label.width : parent.width + height: control.hovered ? label.height : 0; Behavior on height { NumberAnimation { duration: 100; } } opacity: control.hovered ? 1.0 : 0.0; @@ -416,26 +416,6 @@ QtObject { color: UM.Theme.colors.slider_groove_fill; width: (control.value / (control.maximumValue - control.minimumValue)) * parent.width; } - Label { - id: maxValueLabel - visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false - text: control.maximumValue + 1 - font: control.maximumValue > 998 ? UM.Theme.fonts.small : UM.Theme.fonts.default - transformOrigin: Item.BottomLeft - rotation: 90 - x: parent.x + parent.width - maxValueLabel.height - y: control.maximumValue > 998 ? parent.y + UM.Theme.sizes.slider_layerview_smalltext_margin.width : parent.y - } - Label { - id: minValueLabel - visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false - text: '1' - font: control.maximumValue > 998 ? UM.Theme.fonts.small : UM.Theme.fonts.default - transformOrigin: Item.BottomLeft - rotation: 90 - x: parent.x - y: control.maximumValue > 998 ? parent.y + UM.Theme.sizes.slider_layerview_smalltext_margin.width : parent.y - } } handle: Rectangle { id: layerSliderControl @@ -443,26 +423,37 @@ QtObject { height: UM.Theme.sizes.slider_handle.height; color: control.hovered ? UM.Theme.colors.slider_handle_hover : UM.Theme.colors.slider_handle; Behavior on color { ColorAnimation { duration: 50; } } - Label { + TextField { id: valueLabel + property int unremovableSpacing: 5 + property string maxValue: control.maximumValue + 1 + placeholderText: control.value + 1 + onEditingFinished: { + if (valueLabel.text != ''){ + control.value = valueLabel.text - 1 + valueLabel.text = '' + valueLabel.focus = false + } + + } + validator: IntValidator {bottom: 1; top: control.maximumValue + 1;} visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false - text: control.value + 1 anchors.bottom: layerSliderControl.bottom anchors.right: layerSliderControl.left - anchors.bottomMargin: parent.width + UM.Theme.sizes.default_margin.width - font: UM.Theme.fonts.default + anchors.rightMargin: valueLabel.unremovableSpacing / 2 + anchors.bottomMargin: parent.width + (UM.Theme.sizes.default_margin.width / 2) transformOrigin: Item.BottomRight rotation: 90 - Rectangle { - width: (parent.width + UM.Theme.sizes.tooltip_margins.width) < 35 ? 35 : parent.width + UM.Theme.sizes.tooltip_margins.width - height: parent.height + (UM.Theme.sizes.tooltip_margins.height / 2) - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - z: parent.z - 1 - color: UM.Theme.colors.slider_text_background - border.width: 1 - border.color: UM.Theme.colors.slider_groove_fill; - + style: TextFieldStyle{ + textColor: UM.Theme.colors.setting_control_text; + font: UM.Theme.fonts.default; + background: Rectangle { + radius: 0 + implicitWidth: control.maxValue.length * valueLabel.font.pixelSize + implicitHeight: UM.Theme.sizes.slider_handle.height + valueLabel.unremovableSpacing + border.width: 1; + border.color: UM.Theme.colors.slider_groove_border; + } } } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 1e3f24e1f2..6989cdc475 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -54,6 +54,7 @@ "colors": { "sidebar": [255, 255, 255, 255], + "lining": [208, 210, 211, 255], "primary": [12, 169, 227, 255], "primary_hover": [34, 150, 190, 255], @@ -67,10 +68,9 @@ "text_pressed": [12, 169, 227, 255], "button": [139, 143, 153, 255], - "button_hover": [116, 120, 127, 255], - "button_active": [12, 169, 227, 255], + "button_hover": [77, 184, 226, 255], + "button_active": [32, 166, 219, 255], "button_active_hover": [77, 184, 226, 255], - "button_lining": [208, 210, 211, 255], "button_text": [255, 255, 255, 255], "button_disabled": [245, 245, 245, 255], "button_tooltip_text": [35, 35, 35, 255], @@ -107,10 +107,10 @@ "progressbar_control": [12, 169, 227, 255], "slider_groove": [245, 245, 245, 255], - "slider_groove_border": [160, 163, 171, 255], - "slider_groove_fill": [160, 163, 171, 255], - "slider_handle": [12, 169, 227, 255], - "slider_handle_hover": [34, 150, 190, 255], + "slider_groove_border": [139, 143, 153, 255], + "slider_groove_fill": [139, 143, 153, 255], + "slider_handle": [32, 166, 219, 255], + "slider_handle_hover": [77, 182, 226, 255], "slider_text_background": [255, 255, 255, 255], "checkbox": [255, 255, 255, 255], @@ -174,7 +174,7 @@ "slider_groove": [0.5, 0.5], "slider_handle": [1.5, 1.5], - "slider_layerview_background": [6.0, 0.0], + "slider_layerview_background": [4.0, 0.0], "slider_layerview_smalltext_margin": [0.3, 0.00], "slider_layerview_background_extension": [0.0, 2.2], "slider_layerview_margin": [3.0, 3.0], From 34eb78cbaa72e8ecb82c91a4268c0c271fff5492 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Aug 2015 13:10:14 +0200 Subject: [PATCH 7/9] JSON: made every fill option available for all fill types (skin, support, infill) --- resources/settings/fdmprinter.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index faea45add9..87ba60343a 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -391,7 +391,10 @@ "type": "enum", "options": [ "Lines", - "Concentric" + "Grid", + "Triangles", + "Concentric", + "ZigZag" ], "default": "Lines", "visible": false @@ -465,8 +468,9 @@ "type": "enum", "visible": false, "options": [ - "Grid", "Lines", + "Grid", + "Triangles", "Concentric", "ZigZag" ], @@ -1306,8 +1310,9 @@ "type": "enum", "visible": false, "options": [ - "Grid", "Lines", + "Grid", + "Triangles", "Concentric", "ZigZag" ], @@ -1363,8 +1368,10 @@ "description": "Cura supports 3 distinct types of support structure. First is a grid based support structure which is quite solid and can be removed as 1 piece. The second is a line based support structure which has to be peeled off line by line. The third is a structure in between the other two; it consists of lines which are connected in an accordeon fashion.", "type": "enum", "options": [ - "Grid", "Lines", + "Grid", + "Triangles", + "Concentric", "ZigZag" ], "default": "ZigZag", From c83ef32c171775322c899770919223abccd0d5ba Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Aug 2015 13:30:28 +0200 Subject: [PATCH 8/9] changed support roof defaults (now concentric) --- resources/settings/fdmprinter.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 87ba60343a..c6bc121b8b 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -1291,14 +1291,14 @@ "description": "This controls how densely filled the roofs of the support will be. A higher percentage results in better overhangs, which are more difficult to remove.", "unit": "%", "type": "float", - "default": 20, + "default": 100, "children": { "support_roof_line_distance": { "label": "Hammock Line Distance", "description": "Distance between the printed hammock lines.", "unit": "mm", "type": "float", - "default": 2, + "default": 0.4, "visible": false, "inherit_function": "0 if parent_value == 0 else (support_roof_line_width * 100) / parent_value" } @@ -1316,7 +1316,7 @@ "Concentric", "ZigZag" ], - "default": "Lines" + "default": "Concentric" }, "support_use_towers": { "label": "Use towers.", From 4eb37a1cc9dfea0a9a5c8663322502896ac5f68a Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 25 Aug 2015 16:18:12 +0200 Subject: [PATCH 9/9] JSON: feat: infill before walls --- resources/settings/fdmprinter.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index c6bc121b8b..1e534a94f2 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -511,6 +511,13 @@ "inherit_function": "math.floor((parent_value + 0.001) / layer_height)" } } + }, + "infill_before_walls": { + "label": "Infill Before Walls", + "description": "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface.", + "type": "boolean", + "default": true, + "visible": false } } },