5645 Commits

Author SHA1 Message Date
fieldOfView
e450d10ddb Apply styling to filter field 2016-11-15 10:07:37 +01:00
fieldOfView
479056efef Always show categories when filtering 2016-11-15 10:07:37 +01:00
fieldOfView
f7854225fa Restore expanded categories when clearing filter 2016-11-15 10:07:36 +01:00
Victor Larchenko
829f8893e2 T562: Added searching of settings
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2016-11-15 10:07:36 +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
Ghostkeeper
e9ced745fa
Undo compensation for nozzle offset on right clips
These clips were offset in the measurements because of the problem with the right nozzle not lifting high enough. This undoes that change.

Contributes to issue CURA-2625.
2016-11-14 17:00:09 +01:00
Ghostkeeper
17ade396d7
Move right two clips to head disallowed areas
It turns out that the right nozzle, if lifted, can still hit the clips in very rare cases. But the left nozzle, if the right nozzle is down, will not hit the clips. So the right clips are now part of the static areas just like the switching bay and camera, but the left clips are not.

Contributes to issue CURA-2625.
2016-11-14 16:36:47 +01:00
Ghostkeeper
ef60181232
Change dimensions of Ultimaker 3 and reset nozzle origins
The left nozzle is at the origin again now. And the right nozzle is at an offset of 18mm of that.

Contributes to issue CURA-2625.
2016-11-14 15:51:40 +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
48134619eb
Fix checking if we're single extrusion
We are single extrusion if the extruder count is less than or equal to 1, like in other places throughout Cura.

Contributes to issue CURA-2625.
2016-11-14 10:31:11 +01:00
Ghostkeeper
b8223e3e75
Merge branch 'fieldOfView-fix_blur_settings' 2016-11-14 09:34:15 +01:00
Ghostkeeper
f615d6b0a8 Merge branch 'fix_blur_settings' of https://github.com/fieldOfView/Cura into fieldOfView-fix_blur_settings 2016-11-14 09:32:58 +01:00
Ghostkeeper
8d43f1c5f7
Take first layer extruder into account
Forgot about that one earlier.

Contributes to issue CURA-2625.
2016-11-11 17:18:15 +01:00
Ghostkeeper
ee9caa80a8
Remove dual-extrusion disallowed areas
The idea is that these are now computed through combining the disallowed areas of the two extruders (though that doesn't quite work yet).

Contributes to issue CURA-2625.
2016-11-11 17:15:09 +01:00
Ghostkeeper
066ccc4e51
Remove superfluous disabling of prime location settings
These are already disabled in the definitions of fdmprinter and fdmextruder. It doesn't need to be disabled again.

Contributes to issue CURA-2625.
2016-11-11 17:10:23 +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
Ghostkeeper
cfc9a7b6cf
Move prime tower area generation to separate function
This function is named as if it could later include other printed pieces, but it is meant to only include pieces that have normal bed adhesion, so not the prime locations.

Contributes to issue CURA-2625.
2016-11-11 13:03:34 +01:00
Ghostkeeper
a37ab8f4b1
Use approximated circle for the prime polygons
It's much easier to create, more obvious code, and better approximates the area that we seek to use for our prime location.

Contributes to issue CURA-2625.
2016-11-11 12:46:53 +01:00
Ghostkeeper
3d9eb4f2be
Move prime tower creation code closer to where it's used
The check for collisions is only at the end, and after that it adds the polygon itself. We should keep the code closer together to make it more readable.

Contributes to issue CURA-2625.
2016-11-11 12:01:08 +01:00
Ghostkeeper
42ee87c88f
Rename areas to result_areas
Because we have 'areas', 'disallowed_areas', 'self._disallowed_areas', 'disallowed_polygons', and so on. This should reduce the confusion a bit.

Contributes to issue CURA-2625.
2016-11-11 11:54:50 +01:00
Ghostkeeper
77a6c459d8
Move initialisation of areas closer to where it's used
Makes the code more easy to follow.

Contributes to issue CURA-2625.
2016-11-11 11:53:13 +01:00
Ghostkeeper
b6611b66f8
Remove unused intermediary value
This is not used, unless you take multi-threading into account. In that case though, the actual disallowed areas are only updated at the end of this function, and the _has_errors variable is updated right before then as well, so this way the variable is in an invalid state for a smaller amount of time.

Contributes to issue CURA-2625.
2016-11-11 11:51:32 +01:00
Ghostkeeper
49c5a90d29
Remove unused variable
This one is now moved to the _computeDisallowedAreasStatic function.

Contributes to issue CURA-2625.
2016-11-11 11:48:03 +01:00
Ghostkeeper
1603930c5c
Extract computing static disallowed areas to different function
These disallowed areas will have to move or get duplicated according to which nozzles are used. Eventually we'll want to compute these with their Minkowski additions only when needed (the skirt size changes), not when the used extruders change. This is also part of an effort to make this disallowed area computation a bit better structured. The behaviour should be the same.

Contributes to issue CURA-2625.
2016-11-11 11:41:55 +01:00
fieldOfView
a70e4c8120 Fixed blurSettings
UM.MainWindow does not derive from QML Item, so it does not have a forceActiveFocus() method.

CURA-2835
2016-11-11 10:22:17 +01:00
Ghostkeeper
14e736d9eb
Add function to find the extruders that are used
These are the extruders that are being used by the scene if it would currently be printed. You can ask the extruder stacks for stuff like the nozzle offset. This way we can determine the disallowed areas per extruder.

Contributes to issue CURA-2625.
2016-11-10 19:31:02 +01:00
Jaime van Kessel
e88cbb75f2 Merge pull request #1123 from fieldOfView/fix_start_stop_camera
Remove unused required argument on _startCamera and _stopCamera
2016-11-09 16:42:20 +01:00
fieldOfView
236723fc8d Remove unused required argument on _startCamera and _stopCamera
(they were probably there due to a copy/paste error, see _setJobState)
CURA-2411
2016-11-09 16:20:34 +01:00
Jaime van Kessel
fdbbda07be Merge pull request #1122 from fieldOfView/fix_qml_errors
Fix qml errors
2016-11-09 13:44:42 +01:00
Ghostkeeper
35d714efb3
Merge branch 'feature_retract_at_layer_change' 2016-11-09 13:38:30 +01:00
fieldOfView
189e3e30d9 Fix error about casting undefined to QString 2016-11-09 13:25:04 +01:00
fieldOfView
35a3bdc924 Fix qml error about stopCamera when no printer is connected 2016-11-09 13:18:15 +01:00
Simon Edwards
ba0fba0844 Bump the Python version number for Cura.
CURA-2150 Upgrade to PyQt 5.6 and Python 3.5
2016-11-09 12:56:11 +01:00
Ghostkeeper
4c89e8253f
Merge branch 'fieldOfView-feature_multiply_options' 2016-11-09 10:28:28 +01:00
Ghostkeeper
a34c3954ce Merge branch 'feature_multiply_options' of https://github.com/fieldOfView/Cura into fieldOfView-feature_multiply_options 2016-11-09 10:24:17 +01:00