6996 Commits

Author SHA1 Message Date
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
Tim Kuipers
fb92e50262 JSON fix: fixed all start/end gcode references to settings and non-existent variables 2016-11-11 16:28:43 +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
Jaime van Kessel
99e753d3be Added loading of preferences form workspace
CURA-1263
2016-11-11 13:31:36 +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
Jaime van Kessel
413d788c0c Fixed copypaste mistake
CURA-1263
2016-11-11 10:46:54 +01:00
Jaime van Kessel
4a2f07c363 Definitions & materials are now loaded from workspace
CURA-1263
2016-11-11 10:39:54 +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
Tim Kuipers
e40abb5d37 feat: cool_fan_speed_0 (CURA-2182) 2016-11-10 16:42:09 +01:00
Jaime van Kessel
b92ca508bb Stacks are now loaded from workspace file
CURA-1263
2016-11-10 15:42:20 +01:00
Jaime van Kessel
611572c324 Extruder stack is now saved (instead of the material being saved as the stack)
CURA-1263
2016-11-10 14:11:33 +01:00
Tim Kuipers
98bbeae055 lil: rounding error 2016-11-10 13:47:09 +01:00
Tim Kuipers
b86d8b4815 removed default setting 2016-11-10 13:47:09 +01:00
Tim Kuipers
967e5c5776 fix: makerbot output file format: x3g 2016-11-10 13:47:09 +01:00
Tim Kuipers
bba74328f1 fix: Deltabot manufacturer 2016-11-10 13:47:09 +01:00
Jaime van Kessel
1f21957cb4 Fixed issue with per-object settings in 3mf reader
CURA-1263 and CURA-382
2016-11-10 11:46:13 +01:00
Jaime van Kessel
d477630cce Updated documentation
CURA-1263
2016-11-10 11:34:12 +01:00
Jaime van Kessel
3ab283bfed Saving workspace now works when there are no meshes to save
CURA-1263
2016-11-10 11:29:47 +01:00
Jaime van Kessel
61d1199abf The entire machine is now saved to 3mf file when saving workspace
CURA-1263
2016-11-10 11:27:25 +01:00
Jaime van Kessel
54040d4c99 Moved 3mf writer here from Uranium
CURA-1263
2016-11-10 10:39:20 +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
Vincent Marchetti
9449d30d87 Modify reading of Coordinate/@point attribute to allow comma separators 2016-11-09 09:44:10 -05:00
Jaime van Kessel
f57a17577f Added workspace save option to menu
CURA-1263
2016-11-09 14:14:22 +01:00
Jaime van Kessel
304696c809 OutputDevices now take file_handler into account
CURA-1263
2016-11-09 14:03:57 +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
fieldOfView
eeff3b65ec Change wording from "duplicate" to "multiply" 2016-11-09 09:27:44 +01:00