6480 Commits

Author SHA1 Message Date
Jaime van Kessel
68bc75e7a2
Merge branch 'CURA-7501_fix_warning_preloaded_plugins' of github.com:Ultimaker/Cura 2020-11-16 15:24:31 +01:00
Remco Burema
9afbc64934
Merge branch '4.8' 2020-11-10 11:31:53 +01:00
Kostas Karmas
4b35bd1724 Correct the print sequence when discarding the current changes
CURA-7827
2020-11-09 18:10:50 +01:00
Kostas Karmas
fab2c31b4f Cover the last remaining case when setting the print sequence
If for some reason the print sequence is set to one-at-a-time be default in the printer definition
and the number of extruders of the printer is set to >=2, then the print_sequence won't show up in
neither the quality changes nor the user changes, yet it will still have "one-at-a-time" as a
value. In a such case, it will still need to be set to "all-at-once" in the user changes.

This is a theoretical case, as it is very unlikely for a printer to have "one-at-a-time" set by
default in its definition (.def.json) file and still be able to support more than one extruders.
But it is a world full of possibilities out there, so you never know...

CURA-7827
2020-11-09 16:55:43 +01:00
Kostas Karmas
07453e101e Add detailed documentation for _correctPrintSequence function
CURA-7827
2020-11-09 16:32:05 +01:00
Kostas Karmas
2ccdd11098 Properly set the print sequence in the correct container
Previously, the print sequence would be always set to all-at-once in the user container whenever
the second extruder would be enabled. This was causing an interface issue, where the circular
reset-setting arrow would appear next to the setting, even if the quality changes already had the
correct value ("all-at-once").

This is now fixed by checking the following:
- If print_sequence == "one_at_a_time" in the quality (so it is already saved in a quality profile)
then set the print_sequence to "all_at_once" in the user changes so that it will be displayed as
an unsaved change
- If print_sequence == "one_at_a_time" in the user changes container only, meaning that it is not
saved in any quality profiles, then just reset the print_sequence in the user changes, so that it
will have the correct value ("all-at-once") without the reset-setting arrow appearing next to it.

CURA-7827
2020-11-09 16:20:13 +01:00
Kostas Karmas
a1c7ebe1c3 Fix mypy complaints
CURA-7827
2020-11-05 19:04:29 +01:00
Kostas Karmas
845c994cbc Replace f string since it's not available in Python3.5
That should fix the failing test which produces a SyntaxError.

CURA-7827
2020-11-05 17:38:34 +01:00
Kostas Karmas
1a759f81df Change print sequence when the number of enabled extruders changes
Fixes https://github.com/Ultimaker/Cura/issues/8682 while still maintaining the correct behavior for CURA-6914.

CURA-7827
2020-11-05 16:58:47 +01:00
Jaime van Kessel
080832fcf2
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-11-04 11:07:38 +01:00
Kostas Karmas
726175a01d Merge branch '4.8' of https://github.com/Ultimaker/Cura into 4.8 2020-11-04 09:22:42 +01:00
Kostas Karmas
881e4406a4 Ensure the organization_id is None 2020-11-04 09:21:28 +01:00
Jaime van Kessel
526eb8dacd
Gracefully handle exceptions in arrange
CURA-7785
2020-11-03 09:48:54 +01:00
Ghostkeeper
39287264d9
Pynest2d.Point requires integer coordinates
These were floats. Rounding numpy-floats still results in floats so I'm just using int(). The result is rounded down instead of nearest, but the difference is at most 50 nanometres anyway.

Contributes to issue CURA-7501.
2020-10-30 18:12:18 +01:00
Ghostkeeper
ef1952f34c
Fix providing floats to integer parameters
In newer Python versions this results in a warning.

Contributes to issue CURA-7501.
2020-10-30 17:45:57 +01:00
Ghostkeeper
31ee864f04
Disallow printer names that start with a dot
Fixes #8639.
2020-10-30 11:10:46 +01:00
Kostas Karmas
309c5fe9f9 Merge branch '4.8' 2020-10-27 14:42:38 +01:00
Jaime van Kessel
d35d6b087a
Reset the entire transformation when merging
This fixes the issue when the packing algorithm rotated an object

CURA-7796
2020-10-27 13:44:33 +01:00
Konstantinos Karmas
4e6097f499
Revert "Prevent duplicate adding of extruders" 2020-10-27 11:29:08 +01:00
Ghostkeeper
5cfe18d31c
Clarify user-facing string to remove internal terminology
The user doesn't know what a global stack is. This is a message that more clearly specifies what is really happening as far as the user can see.

The global stack may be None if this code is executed while there is no active printer. Normally the only time there is no active printer is:
- during first launch, while in the welcome screen
- during start-up until the profiles have been loaded
- if there was a profile corruption of some kind with the active printer.

So this function should not get called during those times. It probably isn't called except for the last case (in which case it's acceptable I guess).
This change is made after a request from a translator what the hell this means.

Contributes to issue CURA-7783.
2020-10-27 10:54:07 +01:00
Konstantinos Karmas
4804072625
Merge pull request #8553 from Ultimaker/CURA-7501_no_double_adding_extruders
Prevent duplicate adding of extruders
2020-10-26 17:02:51 +01:00
Jaime van Kessel
10ed7c1288
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-10-22 13:41:44 +02:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0
In preparation for release of the 4.8.

CURA-7795
2020-10-22 11:29:25 +02:00
Kostas Karmas
a42c1493b7 Merge branch '4.8' 2020-10-22 11:10:48 +02:00
Konstantinos Karmas
1e005260b4
Merge pull request #8582 from Ultimaker/CURA-7643_fix_prime_tower_overlap
Fix prime tower overlap
2020-10-22 11:02:20 +02:00
Jaime van Kessel
953d363d96
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-10-20 14:20:29 +02:00
Jaime van Kessel
5109bd3684
Fix crash when duplicating node with support blocker
Suggested & reported by smartavonics.

Fixes #8581
2020-10-20 14:19:33 +02:00
Jaime van Kessel
e13ffb597d
Increase resolution of prime tower shadow and use doulbe brim size
It needs to use the double brim size, as it needs to ensure that
it has enough room for it's own brim and any object brim.

The resolution of the circle is increased so that the shadow matches
more with what is actually being printed

CURA-7643
2020-10-20 13:41:35 +02:00
Kostas Karmas
25612d4184 Merge branch '4.8' 2020-10-19 11:34:11 +02:00
Konstantinos Karmas
a2cd21ac49
Merge pull request #8549 from Ultimaker/CURA-7770_Update_setting_after_disable_extruder
Force an re-evaluation of a setting when extruder has been disabled
2020-10-19 11:33:10 +02:00
Jaime van Kessel
ff10eac372
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-10-19 11:02:44 +02:00
Jaime van Kessel
02605f00e5
Merge branch 'CURA-7780_Fix_arrange_message_not_closing_when_arrange_crashes' of github.com:Ultimaker/Cura into 4.8 2020-10-19 10:58:47 +02:00
Ghostkeeper
4b3fda21e2
Prevent duplicate adding of extruders
The addMachineExtruders function assumes that this is a new printer (first time the printer is activated since a restart of Cura) and it needs to add the extruder stacks to it. However most of the time when we're switching, it's not to a new printer. If it's not a new printer, this function would get called anyway and we'd be adding the extruders multiple times. This then does a lot of unnecessary work and eventually fails a couple of calls deep.
This change prevents it from adding the extruders if there are already extruders associated with the printer, thus preventing this unnecessary work (switch is faster) and preventing the error from happening.

Discovered during work on CURA-7501.
2020-10-16 16:09:37 +02:00
Ghostkeeper
df69d543a2
Not logged in for API calls is not a warning
Many requests are made without being logged in, such as to get the list of plug-ins when opening the Marketplace.

Contributes to issue CURA-7501.
2020-10-16 14:15:18 +02:00
Jelle Spijker
3c7422f172
Merge pull request #8536 from Ultimaker/CURA-7717_Add_Essentials_subscription_information_in_slice_data
CURA-7717: Add subscription information in slice data
2020-10-16 13:42:51 +02:00
Ghostkeeper
bf36aae0c0
Add ConsoleLogger as pre-loaded plug-in
This way it gets loaded only once on start-up, which prevents errors that the plug-in was already loaded.

Contributes to issue CURA-7501.
2020-10-16 13:09:41 +02:00
Kostas Karmas
8c1cf89d45 Skip arranging objects that have no convex hull
CURA-7780
2020-10-16 11:31:00 +02:00
Kostas Karmas
148dd26b67 Close "Finding Location" message if arrange crashes
CURA-7780
2020-10-16 11:10:02 +02:00
Jaime van Kessel
50ae33c42d
Force an re-evaluation of a setting when extruder has been disabled
CURA-7770
2020-10-16 10:50:05 +02:00
Kostas Karmas
21b9c0639d Exclude objects outside buildplate from OneAtATimeIterator
CURA-7776
2020-10-14 17:14:38 +02:00
Kostas Karmas
1521430d42 Include all subscription information in the slice data
CURA-7717
2020-10-14 11:43:22 +02:00
Kostas Karmas
095e34fe8d Merge branch 'master' into CURA-7717_Add_Essentials_subscription_information_in_slice_data 2020-10-14 11:34:42 +02:00
Kostas Karmas
c54605a134 Transfer deprecated decorator on __init__ of Arrange
As it cannot decorate a class.

Also, the deprecated decorator has to be applied before the @classmethod.

CURA-7440
2020-10-13 18:06:44 +02:00
Kostas Karmas
ceda3e70bd Include organization id and type of enterprise plan in slice data
CURA-7717
2020-10-13 16:30:29 +02:00
Remco Burema
534b8f74a9
Merge pull request #8503 from Ultimaker/CURA-7440-pynest2d_for_arrange
Swap out arrange for PyNest2d
2020-10-13 11:54:00 +02:00
Kostas Karmas
a0e4e4325d Add missing documentation
CURA-7440
2020-10-12 17:57:00 +02:00
Kostas Karmas
972e2f6716 Fix crash when arranging objects in one-at-a-time mode
Crashing was occuring because node.getPoints() can return None.

CURA-7440
2020-10-12 16:28:28 +02:00
Remco Burema
9f929298d7
Merge pull request #8510 from Ultimaker/CURA-7754_add_disallowed_areas
Mark disallowed areas as disallowed areas
2020-10-09 19:27:26 +02:00
Kostas Karmas
7e77910d10 Make the code of the locked_nodes more readable
CURA-7440
2020-10-09 18:17:10 +02:00
Kostas Karmas
a94ebc6261 Don't arrange locked objects when arrangeAll is called
CURA-7440
2020-10-09 18:09:40 +02:00