Commit graph

12854 commits

Author SHA1 Message Date
Jaime van Kessel
d46eafa968 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-15 15:56:28 +02:00
Jaime van Kessel
7a43164654 Both material weights & lengths are now exposed
CURA-1038
2016-07-15 15:49:25 +02:00
Tim Kuipers
8029139358 JSON fix: making max gradual infill steps lower to allow for engine not crashing when setting the infill to a low percentage (CURA-836) 2016-07-15 13:54:56 +02:00
Tim Kuipers
a52095df0e JSON fix: disabled prime location by default (CURA-1816) 2016-07-15 13:32:43 +02:00
Tim Kuipers
942539981b JSON fix: moved prime location to category platform_adhesion (CURA-1816) 2016-07-15 13:30:17 +02:00
Tim Kuipers
026fd3e2dd feat: tetrahedral infill (CURA-1925) 2016-07-15 12:57:37 +02:00
Tim Kuipers
42d400d436 JSON feat: cubic isometric infill (CURA-1723) 2016-07-15 12:52:33 +02:00
Tim Kuipers
29457ab11f JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723)
just putting this commit under that issue so that it will be reviewed...
2016-07-15 12:52:14 +02:00
Tim Kuipers
3e97e008af JSON fix: gradual infill has max value; warning value may be a bit lower (CURA-836) 2016-07-14 18:54:54 +02:00
Tim Kuipers
5964856991 JSON fix: n_infill_steps ==> gradual_infill_steps (CURA-836) 2016-07-14 18:54:47 +02:00
Tim Kuipers
528aa2d961 JSON feat: Gradual Infill Steps and Gradual Infill Step Height (CURA-836) 2016-07-14 18:54:40 +02:00
Ghostkeeper
1c37dc2d3d
Better warning values for extruder prime pos
Based on the machine dimensions and nozzle position.

Contributes to issue CURA-1816.
2016-07-14 09:13:37 +02:00
fieldOfView
daf03b0a7b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-14 08:57:13 +02:00
fieldOfView
2c5644ff08 Only show Machine Actions for the currently active machine
Many machine actions act on the currently active printer, because they don't have a pointer to the printer selected on the Printer manager.
2016-07-14 08:55:53 +02:00
Jaime van Kessel
c92b2bc385 Changed order of setting properties
CURA-1842
2016-07-13 17:22:54 +02:00
Tim Kuipers
779f66967e JSON fix: support speed was only enabled when roofs were enabled 2016-07-12 14:48:40 +02:00
Ghostkeeper
dc7ca47be9 Fix setting enabling for support roof
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
2016-07-12 14:45:09 +02:00
Tim Kuipers
878bf35356 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-07-12 14:43:10 +02:00
Tim Kuipers
7d2ae57f86 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-07-12 14:41:10 +02:00
Tim Kuipers
94acf810d0 JSON fix: redo all commits (squashed) which got undone in merge
Merge branch 'feature_firmware_travel_settings'  c755479b1b
overwrote fdmprinter.def.json with the feature branch version, rather than merging it with the master version.

This commit is just fdmprinter.def.json as it was at 2c09fc4a67
2016-07-12 14:38:39 +02:00
Ghostkeeper
f63acc98b8
Fix setting enabling for support roof
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
2016-07-12 13:47:25 +02:00
Tim Kuipers
26612e17b6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-12 11:22:37 +02:00
Tim Kuipers
c755479b1b Merge branch 'feature_firmware_travel_settings' 2016-07-12 11:22:32 +02:00
fieldOfView
a7cfe1b5af Emphasize settings that have a value in the user or quality profile
(in a subtle way)
2016-07-11 21:15:09 +02:00
fieldOfView
cd09017328 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 17:26:19 +02:00
fieldOfView
151bf1f8de Make style of sections on the Materials page match sections on the profiles page
CURA-342
2016-07-11 17:25:59 +02:00
Tim Kuipers
5d256e5e59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-11 16:44:04 +02:00
Tim Kuipers
2c09fc4a67 JSON fix: infill mesh order defaults to higher than for normal meshes (CURA-833) 2016-07-11 16:43:55 +02:00
Arjen Hiemstra
5393beb8de Fix binding loop warnings that would sometimes occur when editing Brand entry
Contributes to CURA-342
2016-07-11 16:41:57 +02:00
Ghostkeeper
c3d395b71d
Define extruder_prime_pos_* in fdmextruder too
We need to have it in both, because it needs to be changed by the inheriting definitions (so it needs to be defined in fdmextruder) but it also needs to be defined for single-extrusion printers (so it needs to be in fdmprinter). I copied these definitions from fdmprinter.

Contributes to issue CURA-1816.
2016-07-11 16:29:39 +02:00
fieldOfView
7a63f957cb More gracefully handle cases where no profile is selected in the profiles list 2016-07-11 15:48:41 +02:00
Arjen Hiemstra
4d2d889604 Do not complain when currentItem is null
Contributes to CURA-342
2016-07-11 14:57:28 +02:00
Arjen Hiemstra
d6ba70c552 Do not try to set a material's metadata when we know it has not changed
Contributes to CURA-342
2016-07-11 14:57:28 +02:00
fieldOfView
3bdffd83cd Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 14:54:19 +02:00
fieldOfView
4aa95ab317 Prevent showing custom profiles twice and fix separator in the profiles dropdown
CURA-1887
2016-07-11 14:54:08 +02:00
Jaime van Kessel
5638246fa2 Merge branch 'feature_cubic_isometric_infill' of github.com:Ultimaker/Cura 2016-07-11 14:40:54 +02:00
Ghostkeeper
f424097387
Improve defaults for raft settings
These better defaults and formulas are coming from Paul, one of our material testers.
2016-07-11 14:01:45 +02:00
Arjen Hiemstra
898c621b6f Recreate editingFinished signal behaviour without using TextArea::editingFinished
Apparently, editingFinished was only added in Qt 5.6, so we cannot use
it. So we have to manually recreate the behaviour.

Contributes to CURA-342
2016-07-11 11:36:21 +02:00
fieldOfView
c01b7091c8 Wait until the nozzle temperature is reached before starting to print
CURA-1794
2016-07-09 18:14:16 +02:00
Jaime van Kessel
8a4ea5c710 Added warnings to top/bottom thickness if it exceeds machine height
CURA-1706
2016-07-08 15:26:41 +02:00
Jaime van Kessel
91a3e90dfe Merge branch 'feature_ux_dialogs' of github.com:Ultimaker/Cura 2016-07-08 13:23:44 +02:00
Ghostkeeper
21ae73fca0
Capitalise Euclidean dimension names
X, Y and Z.

Contributes to issue CURA-1816.
2016-07-08 11:53:58 +02:00
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog
Contributes to CURA-1730 and CURA-1850
2016-07-08 11:24:37 +02:00
fieldOfView
2f3ffe2a18 Fix tabs when automatically switching to the monitor tab (on print start)
CURA-1036
2016-07-08 11:22:07 +02:00
Tim Kuipers
802e0b14b2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-08 00:01:20 +02:00
Tim Kuipers
6cdab33eb6 JSON fix: negative angles for conical overhang are possible (CURA-1412) 2016-07-07 23:59:19 +02:00
fieldOfView
08f2143790 Simplify showing each material length individually
CURA-1687
2016-07-07 23:58:14 +02:00
fieldOfView
c4a2e659e3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 22:17:55 +02:00
fieldOfView
9c492342cb Show each material length individually
CURA-1687
2016-07-07 22:17:35 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00