GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,659 Commits 288 Branches 260 Tags
Commit Graph

24659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jelle Spijker
653c14852b
Removed @-symbols from changelog 
The changelog doesn't use the @-syntax for linking Github users. Removed
@-symbols in front of user names to stay consistent with previous
developer mentions.

Also rephrased the description of allow scrolling through settings-
tooltips.
 2020-10-18 12:01:08 +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
5668eba6b2
Don't use anchors in a Layout context 
The anchors won't work then. They can never mix.
In this case it's easiest to continue with the Layout.

Contributes to issue CURA-7501.
 2020-10-16 15:41:14 +02:00
Ghostkeeper
13d0fbdea7
Don't attempt to send the empty material 
We can't send it because sending it looks up the serialised form on disk, and there is no file for this one on disk.

Contributes to issue CURA-7501.
 2020-10-16 14:32:00 +02:00
Ghostkeeper
6abfa38838
More fixes for PyCapsule_GetPointer race condition 
One of the weirdest errors out there, and as far as I know we're the only ones suffering from it, due to having multiple packages of Python bindings created with Sip as well as having PyQt and different threads.
 2020-10-16 14:26:27 +02:00
Ghostkeeper
26cb661240
Fix PyCapsule_GetPointer error when running tests 
This obscure error happens when a module with Sip bindings is being imported after PyQt. Due to a clash with the Sip versions or something, it then fails on the custom module. Import all of our custom modules with Sip bindings first.
 2020-10-16 14:18:17 +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
Ghostkeeper
8f9e0da400
Fix binding of extruder enable checkbox if there is no active stack 
There was a typo there.

Contributes to issue CURA-7501.
 2020-10-16 14:03:59 +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
Remco Burema
f6bf21c185
Send None instead of '' if no organisation. 
part of CURA-7717
 2020-10-16 13:00:12 +02:00
Ghostkeeper
452fe3972f
Don't cache CuraApplication singleton 
This is causing a crash if self._application is used before the __init__ has finished (or at least passed the definition of self._application). That can happen in this class since some functions are called asynchronously.
It would also make writing tests easier because you can mock the getInstance() function to return a mock object, and only need to monkeypatch that for the function under test rather than also for the constructor.

Fixes Sentry issue CURA-1B5.
 2020-10-16 12:05:21 +02:00
Jaime van Kessel
70d081afaa
Dont immediately show the "not a group host" message 
By delaying a bit, we can ensure that this only happens if the cluster
itself isn't offline

CURA-7360
 2020-10-16 11:45:47 +02:00
Kostas Karmas
82fc05c915 Always add a ConvexHullDecorator to objects loaded from 3MF 
When loading from 3mf, objects outside the buildplate had no ConvexHullDecorator.

CURA-7780
 2020-10-16 11:31:32 +02:00
Kostas Karmas
8c1cf89d45 Skip arranging objects that have no convex hull 
CURA-7780
 2020-10-16 11:31:00 +02:00
Remco Burema
40b8139409
Update change-log with draft 1.3 of release notes for 4.8(-BETA). 2020-10-16 11:20:58 +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
Konstantinos Karmas
e961c6271e
Merge pull request #8508 from Jip-Hop/master 
Update the start gcode in creality_cr10max.def.json
 2020-10-15 12:45:32 +02:00
Ghostkeeper
81217880fd
Merge branch 'CURA-7745-fix-montior-page-hacks' 2020-10-15 09:57:34 +02:00
Kostas Karmas
21b9c0639d Exclude objects outside buildplate from OneAtATimeIterator 
CURA-7776
 2020-10-14 17:14:38 +02:00
Remco Burema
ac239e3e2a
Merge pull request #8533 from Ultimaker/CURA-7771_compensate_for_shrinkage_compensation 
disable material shrinkage percentage
 2020-10-14 14:48:30 +02:00
Kostas Karmas
259d0c0e2d Fix example slice data preview 
CURA-7717
 2020-10-14 12:04:39 +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
jelle Spijker
3dd14872f2
disable material shrinkage percentage 
Contributes to CURA-7771
 2020-10-13 19:58:31 +02:00
Jelle Spijker
c1e69d11a3
Merge pull request #8529 from Ultimaker/CURA-7760_sending_multiple_print_job_notifications 
Catch error when print job upload queue is full
 2020-10-13 18:25:21 +02:00
cataclism
d56fb92ece
Added the Artillery Sidewinder X1 and Genius (#8301) 
* Added the configuration files for the Artillery Printers

Added the configuration files for the Artillery Printers

* Changed version file

* Updated versions, removed machine_head_polygon

* fixed version in some files

* Added generic PLA,PETG,ABS,TPU

* Update resources/definitions/artillery_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/artillery_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* 1st batch of update

* Apply suggestions from code review

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* 2nd batch of changes

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2020-10-13 18:16:58 +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
Ghostkeeper
bcb30caf98
Show error message when print job queue is full on the printer 
Implements issue CURA-7760.
 2020-10-13 17:32:47 +02:00
Ghostkeeper
0e14eef47d
Allow for a callback when the HttpRequestManager doesn't catch the error 
There are really two types of errors that the HttpRequestManager can throw: Errors that it understands and errors that it doesn't understand. We must now intercept an error that it doesn't understand.

Contributes to issue CURA-7760.
 2020-10-13 17:31:53 +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
Ghostkeeper
602e09e8af
Fix printer name in setting 
This really isn't used anywhere in the final g-code but all right then.

Contributes to issue CURA-7767.
 2020-10-12 17:15:25 +02:00
Ghostkeeper
98f92e0f2e
Change tabs into 4 spaces 
This is our code style for these files.

Contributes to issue CURA-7767.
 2020-10-12 17:14:29 +02:00
Ghostkeeper
62129f9066
Merge branch 'master' of https://github.com/FoxExe/Cura-Anycubic-Kossel-support into FoxExe-master 2020-10-12 17:05:35 +02:00
jelle Spijker
d78ddd6c17
Created Print job upload Queue Full Message 
This message is shown to the user in Cura when the digital
factory returns a 409, because the queue is full

CURA-7760 sending multiple printjobs notifications
 2020-10-12 16:55:57 +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
Jaime van Kessel
3ad5219f5d
Simplify the printer state display 
CURA-7745
 2020-10-12 11:06:49 +02:00
Ghostkeeper
f1c34ca386
I wrote this script, not Thopiekar 2020-10-12 11:01:39 +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
Kostas Karmas
d47623d58a Remove duplicate addition of items in the node_items list 
CURA-7440
 2020-10-09 17:19:53 +02:00
Kostas Karmas
f9bd5e3dcd Modify arrange() to optionally create AddSceneNodeOperations 
Then the MultiplyObjectsJob can use the arrange function instead of duplicating the code

CURA-7440
 2020-10-09 17:12:59 +02:00
Kostas Karmas
518003f027 Remove unused variables 
CURA-7440
 2020-10-09 16:03:31 +02:00
Kostas Karmas
eedbcb6a2d Fix z position of objects that end outside the buildplate 
When multiplying objects or inserting objects in the scene that do not fit in the buildplate, those
objects would correctly end up outside the buildplate, but their Z position would be aligned at the
absolute Z=0 of the buildplate.

This commit fixes that by compensating in the z-axis, properly moving the object outside the
buildplate in the correct z-position so that it's bottom is aligned with the original object.

CURA-7440
 2020-10-09 15:59:50 +02:00
Jaime van Kessel
0493fb24df
Add extra human readable strings to asserts 2020-10-09 15:08:27 +02:00