Commit graph

12848 commits

Author SHA1 Message Date
fieldOfView
f6ce963b73 Add "Update Current Profile" and "Reset Current Profile" menu items to profile dropdowns
CURA-970
2016-04-28 10:29:51 +02:00
fieldOfView
d7aa8e71bf Rearrange nozzle/material selection into one line
In preparation for CURA-330, where we will need multiple instances of the nozzle/material combo.
2016-04-27 20:29:21 +02:00
fieldOfView
d34c28543b Connect extruder comboboxes with their settings
CURA-790
2016-04-27 11:49:25 +02:00
fieldOfView
4a2b1af9f5 Add reusable style for comboboxes to the theme
CURA-790
2016-04-27 10:28:58 +02:00
fieldOfView
6907c8921e Add (non-functional) extruder selection dropdown to simplemode for multi-extrusion printers
CURA-790
2016-04-27 10:20:11 +02:00
zerr0
3c7ff49be3 Uniqbot by Unimatech machine profile 2016-04-27 13:19:36 +05:00
fieldOfView
a20193a13b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-26 17:19:04 +02:00
fieldOfView
75f4a91800 Tweak button icon size to make the icons look a bit less "chunky" 2016-04-26 17:18:40 +02:00
Jaime van Kessel
4d11bdd366 Changed height
CURA-1429
2016-04-26 12:09:11 +02:00
Ghostkeeper
d65a0a302a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-26 12:00:24 +02:00
Ghostkeeper
fe68be4f62 Merge branch 'connection_rework' 2016-04-26 11:51:09 +02:00
fieldOfView
a2ff775c08 Limit the max_value for extruders to the number of extruders
CuraEngine would crash if instructed to use an extruder that it knows nothing about. Extruders start counting at 0, so max_value is set to machine_extruder_count - 1.

Fixes the crash outlined in CURA-965
2016-04-26 11:19:56 +02:00
Ghostkeeper
27aef006a8 Remove retraction settings from ulti-profile
Paul agreed, this should not be dependent on the quality. It was meant to allow a bit slower prints due to the time it takes to do a retraction, but that is not the bottleneck here. Material hardness is the bottleneck. Grinding is.

Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
c67ae0f1c9 Remove retraction settings from machine definitions
These should be different per material, not per machine.

Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
58d08f2b8d Change default retraction for nozzle switch
This should get overridden by the heat zone length anyway.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
b5f00ffd80 Removed superfluous override from UM2+ definition
The default is line_width * 2 but this defined it as machine_nozzle_size * 2. I talked it over with Tom (who added that line) and he said it was only copied from Paul's profiles. It should've been line width. Makes more sense. It's line_width * 2 so that it can go from an outer wall to the infill without retracting.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
43dff1296c Move retraction distance to material settings
I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
fieldOfView
cde23edfed Prevent wizard pages from closing when they are "accepted" by pressing return.
Also removes some code replication in wizard pages.
CURA-1354
2016-04-25 13:51:22 +02:00
Ghostkeeper
134867f833
Fix indenting tabs -> spaces
Contributes to issue CURA-695.
2016-04-20 17:18:10 +02:00
Tim Kuipers
6799a76a7c JSON fix: combing mode default enum value (CURA-694) 2016-04-20 15:25:23 +02:00
Tim Kuipers
e7e4512fd0 JSON: fix: moved line distance computation from engine to frontend (CURA-1317) 2016-04-19 17:39:30 +02:00
fieldOfView
919e2f55e9 Replace "notice" icon with an icon that is less jarring and differs more in shape with the "reset" icon
Contributes to CURA-1176
2016-04-18 17:39:28 +02:00
Tim Kuipers
1ffcb8419a JSON: Enable Combing ==> Combing Mode (CURA-694) 2016-04-18 16:49:02 +02:00
Jaime van Kessel
8a47903374 Changed namespace of usbprintermanager (QML) to Cura from UM
CURA-1339
2016-04-18 15:03:13 +02:00
Jaime van Kessel
8a94739de0 Raft line widths now inherit from line_width
CURA-695
2016-04-15 16:08:23 +02:00
Jaime van Kessel
ef9be8a2d8 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-15 14:56:24 +02:00
Tom Heijmans
7ce5c6c6bc Fixed inheritance issues 2016-04-15 14:36:13 +02:00
Tom Heijmans
00305f1c53 Updated inheritance functions for um2+ 2016-04-15 13:35:25 +02:00
Tom Heijmans
3776d3c6d2 Updated material & UM2+ profiles 2016-04-15 13:33:30 +02:00
Jaime van Kessel
6b7fb894f8 Added moveHead to usb printing
And ensured that wizard page uses correct version again

CURA-1339
2016-04-14 14:21:22 +02:00
Tim Kuipers
77e719619d JSON fix: indentation only (CURA-1400) 2016-04-14 14:02:26 +02:00
Tim Kuipers
cd7513971b JSON fix: support&platform extruder nr not children of extruder nr (CURA-1400) 2016-04-14 14:01:56 +02:00
Tim Kuipers
7ea02f9d98 JSON fix: Infill Overlap mm didn't default to 0 when infill was too dense (CURA-786) 2016-04-14 13:50:40 +02:00
Tim Kuipers
f426ba3168 changed infill overlap min_value to min_value_warning and made it -50% (CURA-786)
-50% corresponds to the value where the hole in the nozzle just at the boundary of the inner wall
2016-04-14 13:33:00 +02:00
Jaime van Kessel
9ee6323177 wizard now uses correct property
CURA-1339
2016-04-14 13:26:38 +02:00
Jaime van Kessel
6909ed8765 Changed setBed temp to target bed temp
CURA-1339
2016-04-14 13:20:55 +02:00
Tim Kuipers
401e020f9c machine extruder trains now can't be an array anymore (CURA-494) 2016-04-14 13:18:40 +02:00
fieldOfView
003f973ba4 Prevent profiles being added if there is no active machine 2016-04-14 12:29:28 +02:00
fieldOfView
2afea115da Fix width of troubleshooting guide link in Simple mode sidebar 2016-04-14 11:56:36 +02:00
fieldOfView
5c723cc9d6 Fix string comparison in fdmprinter.json
CURA-1394
2016-04-14 11:49:46 +02:00
Jaime van Kessel
0c09df71d9 wizard now sets Target temperature
CURA-1339
2016-04-14 11:09:30 +02:00
Jaime van Kessel
5f2e0ceec8 Fixes so the QML displays right temperatures again
CURA-1339
2016-04-14 11:02:16 +02:00
Ghostkeeper
6223c0e2e9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-13 16:23:27 +02:00
Ghostkeeper
7435010dd4
Code style: No whitespace at end of line
Contributes to issue CURA-494.
2016-04-13 15:59:48 +02:00
Ghostkeeper
f222c870f1
Codestyle: No whitespace at end of line
Contributes to issue CURA-494.
2016-04-13 15:56:56 +02:00
Arjen Hiemstra
9b88f06970 Merge branch '2.1' 2016-04-13 13:53:51 +02:00
Tim Kuipers
592d98d4fd JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:56:34 +02:00
Tim Kuipers
cc06c632a1 JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:50:51 +02:00
Ghostkeeper
ea6a4d5f27
../resources/i18n/nl/fdmprinter.json.po 2016-04-12 17:39:03 +02:00
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
2016-04-12 17:09:32 +02:00