372 Commits

Author SHA1 Message Date
Simon Edwards
eb43806d7a Merge branch 'master' into python_type_hinting 2017-01-27 15:37:30 +01:00
fieldOfView
45c8083423 Use themeable colors in Solid, Xray & Layer view 2017-01-23 22:08:27 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
fieldOfView
1d308f2042 Fix the disallowed area for the prime tower and prime are when center_is_zero 2017-01-11 18:04:25 +01:00
Ghostkeeper
0e31de3ed9
No longer crash when numeric settings are empty strings
They may temporarily be empty strings while the user is typing, but that currently makes the setting red. However, if we crash during the build plate updating, the front-end gets in some half-updated state in which settings get reset to their previous state every time the user changes anything. So don't crash here.

Contributes to issue CURA-3157.
2016-12-16 16:17:14 +01:00
Arjen Hiemstra
04692d1093 Ignore polygons with length 0 when updating disallowed areas
Contributes to CURA-3148
2016-12-15 16:16:50 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
fieldOfView
eef6a98da7 Fix elliptic buildplate mesh when machine_height != machine_width
Silly y/z mixup.
2016-12-13 10:32:28 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Jaime van Kessel
96f82c1d73 Build volume now works correctly for single extrusion machines
CURA-3105
2016-12-08 10:54:13 +01:00
Jaime van Kessel
d326f175c9 Build volume is now correctly drawn if there is no object & bed adhesion is none
CURA-2625
2016-12-07 12:57:30 +01:00
Jaime van Kessel
2f98917a17 Travel avoid distance is now only used for extruder that actually prints
CURA-2625
2016-12-06 16:39:12 +01:00
Jaime van Kessel
f21bc4fc42 Only add extra line to brim multiple extruders are used 2016-12-02 10:14:59 +01:00
fieldOfView
f7ebed945e Fix creation of indices on elliptic build plate 2016-11-29 14:39:23 +01:00
fieldOfView
68fd0814e5 Minor code-style-related fixes 2016-11-29 12:33:35 +01:00
fieldOfView
ff0f63eb94 Document z fighting hack 2016-11-29 10:44:10 +01:00
fieldOfView
dc33d96e8c Make build plate shapes translatable 2016-11-29 10:42:24 +01:00
fieldOfView
4756168178 Fix elliptic bedshapes (vs circular)
MeshBuilder.addArc only supports circular arcs, not elliptic arcs. To work around this, the resulting MeshData is scaled.
2016-11-29 10:04:53 +01:00
fieldOfView
31ca80d407 Create disallowed areas for polar printers 2016-11-28 23:00:53 +01:00
fieldOfView
70bc8d8889 Fix z-fighting 2016-11-28 23:00:52 +01:00
fieldOfView
2c5a4de264 Draw circular build plate for polar printers 2016-11-28 23:00:52 +01:00
Jaime van Kessel
823993caaf ALways add prime areas
CURA-2625
2016-11-24 17:56:17 +01:00
Jaime van Kessel
1b01455c36 Increased tolerance around prime area
CURA-2934
2016-11-18 16:15:53 +01:00
Jaime van Kessel
d0bae5acd7 Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura 2016-11-18 10:35:06 +01:00
Ghostkeeper
41825231ad
Fix check for if nozzle offset exists
Because an offset of 0 results in False as well.

Contributes to issue CURA-2625.
2016-11-17 09:54:00 +01:00
Ghostkeeper
35a01435d5
Also rebuild when mesh extruder changes
I do not want to add the rebuild() call to the update function itself since there may be other changes to the build volume before we should rebuild (such as raft).

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Ghostkeeper
2492b03c4f
Update disallowed area when object's extruder is changed
This calls _updateDisallowedAreas() but not rebuild(), so the change is not visible at this moment.

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Ghostkeeper
60c8933906
Remove debug print
Oops.

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Ghostkeeper
f0766cbaf3
Update build volume when per-object settings change
Requires some multi-levelled trickery to get the event listeners working. This also assumes that the per-object stack decorator is not deleted at any point unless the mesh is deleted (which is currently a correct assumption). If that ever changes though, the harm is just that the update function is still listening on the deleted decorator's stack.

Contributes to issue CURA-2625.
2016-11-15 13:10:57 +01:00
Ghostkeeper
747ade2382
Remove now-useless variable
I just realised that there were two if statements below each other with the same condition.

Contributes to issue CURA-2625.
2016-11-15 13:10:57 +01:00
Ghostkeeper
9be02fb31f
Recalculate disallowed borders when adding or removing objects
Because the new object may use an extruder that wasn't used so far, and if you remove an object it may remove the need for a certain extruder.

Contributes to issue CURA-2625.
2016-11-15 13:10:57 +01:00
Ghostkeeper
47bb8f9601
Compute disallowed borders with all extruders
It's a bit counter-intuitive, so let me explain. The total build volume is defined as the rectangle around the union of the areas that all extruders can reach. The nozzle offset for the left extruder though is 0,0, so what should the border on the right side be? It should be 18 since there is a nozzle to the right of the left nozzle which has a relative x-offset of 18mm. Therefore we need to compute the relative offsets with each of the other nozzles and create sort of a bounding box around it, and the distance to the edge of that bounding box is the unreachable border on each of the sides.

Contributes to issue CURA-2625.
2016-11-14 17:17:55 +01:00
Ghostkeeper
f0d92873a3
Add nozzle disallowed areas
These disallowed areas are only at nozzle-height, not at head-height. They therefore won't move along with the nozzle offset.

Contributes to issue CURA-2625.
2016-11-14 17:13:24 +01:00
Tim Kuipers
995705f82b fix: don't expand disallowed areas when using none platform adhesion (CURA-759) 2016-11-14 12:36:21 +01:00
Ghostkeeper
519f6e58d2
Remove debug print
This is why it's wise to do a git diff --cached before you commit.

Contributes to issue CURA-2625.
2016-11-14 11:40:25 +01:00
Ghostkeeper
18b2834091
half_machine_width should be halved
Shoot me before I do any further damage, please.

Contributes to issue CURA-2625.
2016-11-14 11:38:47 +01:00
Ghostkeeper
98089e702c
Also offset inner corners of the Y-borders
These should coincide with the inner corners of the X-borders.

Contributes to issue CURA-2625.
2016-11-14 11:28:32 +01:00
Ghostkeeper
5ddc1d9d71
Fix offsetting polygon in single extrusion
In single extrusion, the machine_nozzle_offset_x and machine_nozzle_offset_y were not defined in the used extruder stacks, because the used extruder stack is the global stack.

Contributes to issue CURA-2625.
2016-11-14 10:47:38 +01:00
Ghostkeeper
a72d47c2a4
Fix adding prime tower locations to disallowed areas
Otherwise just a string gets added, which gives an error when the disallowed areas are being built as meshes. The front-end runs again, though the disallowed areas seem to be wrong now.

Contributes to issue CURA-2625.
2016-11-11 17:06:47 +01:00
Ghostkeeper
57f88ea048
Mush disallowed areas of all extruders together
The final result needs to be just a list.

Contributes to issue CURA-2625.
2016-11-11 17:02:01 +01:00
Ghostkeeper
edcf7320f0
Interpret prime tower areas per extruder
The function gives results per extruder now, so we should interpret that instead of crashing.

Contributes to issue CURA-2625.
2016-11-11 17:00:32 +01:00
Ghostkeeper
a8d36c9116
Fix iteration over prime-disallowed areas
Oops. prime_disallowed_areas is a dictionary per extruder.

Contributes to issue CURA-2625.
2016-11-11 16:58:25 +01:00
Ghostkeeper
1c445a1512
Move computing disallowed areas to separate function
The results are checked for intersection in the main update function, and then it crashes because the main function doesn't expect per-extruder disallowed areas yet from the rest.

Contributes to issue CURA-2625.
2016-11-11 16:55:07 +01:00
Ghostkeeper
4b02171db6
Compute disallowed areas per-extruder
This computes the disallowed areas of the machine, the disallowed border and the prime tower per extruder. The prime locations are not yet calculated per extruder, but I'd like to extract it to a function before I try that.

Warning: Cura will not run at this stage. Please await the next commits.

Contributes to issue CURA-2625.
2016-11-11 16:26:58 +01:00
Ghostkeeper
3571ed2d7a
Expand disallowed border beyond build volume
This way we can offset it with the nozzle offset and it would still cover all the way to the edge. The disallowed areas are clipped to the build volume anyway.

Contributes to issue CURA-2625.
2016-11-11 15:44:53 +01:00
Ghostkeeper
ec057c72a6
Compute disallowed border size only once
We pass it on through a parameter instead of computing it again in the function.

Contributes to issue CURA-2625.
2016-11-11 15:16:43 +01:00
Ghostkeeper
bcd4dd3aeb
Fix applying skirt radius to prime locations
This makes the prime locations equal to what it was before.

Contributes to issue CURA-2625.
2016-11-11 15:14:15 +01:00
Ghostkeeper
45db315f77
Fix adding prime locations to final disallowed areas
They were added to several intermediary variables, but not to the final result.

Contributes to issue CURA-2625.
2016-11-11 15:10:39 +01:00
Ghostkeeper
ccccf62bf7
Repair showing build volume
We needed to apply the Minkowski hull on the polygon or it would be disjunct and wouldn't show up in the interface.

Contributes to issue CURA-2625.
2016-11-11 14:18:08 +01:00
Ghostkeeper
41c8371b86
Compute _has_errors only from _error_areas
This way we need fewer intermediary variables. It's also more robust and somewhat more elegant.

Contributes to issue CURA-2625.
2016-11-11 13:09:17 +01:00