GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 12:18:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,644 Commits 290 Branches 260 Tags
Commit Graph

7988 Commits

Author SHA1 Message Date
Ghostkeeper
2e12cc1dc2
Fix missing typing and use American instead of pro'er Bri'ish 
American is Ultimaker's code style too.
 2020-04-10 01:12:13 +02:00
Ghostkeeper
c51647026c
Also make IDs unique 
Took me a while to see why Cura was confusing the extruder stacks. It worked fine during the actual upgrade itself. Then later after the start-up sequence it suddenly re-wrote them wrongly.

Why is there an ID field in here? Shouldn't it just take the file name as the ID? Stupid!
 2020-04-10 00:28:27 +02:00
Ghostkeeper
45d3f8ca6a
Fix typo 
With this it's starting to look like something. It's no longer giving any corruption errors now with any of my test cases. However e1 is still being set to the definition of e3 for some reason.
 2020-04-09 22:12:30 +02:00
Ghostkeeper
c8b6d7ec00
Extruder 1 got duplicated, not extruder 0 2020-04-09 21:58:14 +02:00
Ghostkeeper
851aef68bc
Don't rename empty_quality_changes 
This one doesn't get duplicated since it doesn't actually list the Deltacomb printer.
 2020-04-09 21:54:22 +02:00
Ghostkeeper
519d28a142
Fix upgrading user containers, which list the printer definition rather than the extruder 2020-04-09 21:52:23 +02:00
Ghostkeeper
e38b79fe35
Filenames don't include an extension 
That makes this a lot easier actually.
 2020-04-09 21:36:28 +02:00
Ghostkeeper
4bdea50fd5
Use deepcopies rather than copies to copy parsers 
Turns out that the parsers apparently refer to a lot of subobjects which are crucial here, and they don't implement the normal copy well. Deepcopy it is then.
 2020-04-09 21:26:35 +02:00
Ghostkeeper
accf080fb6
Don't use default= kwarg for dictionary .get function 
It doesn't accept key word arguments.
 2020-04-09 21:22:06 +02:00
Jaime van Kessel
d1337c9e22
Prevent printer from being added twice if it's in cloud and local 
CURA-7055
 2020-04-09 16:39:47 +02:00
Ghostkeeper
1047cdd76c
Catch OSError when actually writing the UFP stream 
This includes getting an error message when we don't have write access any more or when the file was deleted or connection lost while we were writing to it.

Fixes Sentry issue CURA-GX.
 2020-04-09 14:55:14 +02:00
Ghostkeeper
c79d7d89b3
Merge branch '4.6' 2020-04-09 11:29:27 +02:00
Ghostkeeper
d5166030d7
Don't detect retractions if E is almost equal, but rounding errors 
Contributes to issue CURA-7351.
 2020-04-09 11:27:40 +02:00
Ghostkeeper
9b997d421b
Keep current_e updated even if not finding retractions 
Otherwise the new E is never going to be lower than the current E. I don't know how this ever worked then.

Contributes to issue CURA-7351.
 2020-04-09 11:22:05 +02:00
Ghostkeeper
d9649dc3dd
Reduce indentation and complexity by using a pre-check 
Contributes to issue CURA-7351.
 2020-04-09 11:03:10 +02:00
Ghostkeeper
40cb3e37a9
Also actually update global stacks for Deltacomb 
Really hope that this works.
 2020-04-09 01:48:15 +02:00
Ghostkeeper
18ebdfafb7
Upgrade other per-extruder instance containers too 
Global instance containers will also go through this function but won't get picked out by the if statement here.
 2020-04-09 01:23:11 +02:00
Ghostkeeper
2410d05100
Upgrade extruder stacks 
Stupid stuff. All of these containers need to be copied. It's not possible to work this out for all materials properly, since we can't read into these materials what their GUIDs and material types are.
 2020-04-09 01:04:53 +02:00
Nino van Hooff
74253e420a
Merge pull request #7441 from Ultimaker/xray_in_solid_sidequest 
CURA-7262 X-Ray in solid-view (colors instead)
 2020-04-08 15:45:00 +02:00
Nino van Hooff
e43768ebde Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" 
This reverts commit 4f55c8d8
 2020-04-08 11:06:31 +02:00
Ghostkeeper
a5b4b15ae4
Add theoretical upgrade for definition changes 
It's a LOT more work than I thought, because the new printer has 4 extruders instead of 2. That means that files have to be copied for the other two extruders. A big hassle.
 2020-04-08 01:58:03 +02:00
Jaime van Kessel
33b3bb77c3
Fix typing 
List wasn't added, so mypy borked. CURA-7055
 2020-04-07 16:58:08 +02:00
Nino van Hooff
ff017e6a52 Remove unnecessary call to remove printer from qt model 
Since cloud printers are not added to that model anymore

CURA-7055
 2020-04-07 14:44:24 +02:00
Nino van Hooff
99b4b86052 Display max 3 printer names in the printer discover message 
CURA-7055
 2020-04-07 14:43:26 +02:00
Nino van Hooff
22a06fca3b Shorten new cloud printers message 
So the plural form also fits on one line

CURA-7055
 2020-04-07 13:50:24 +02:00
Remco Burema
b7e6b2888a
Actually remove xray error image (because colors). 
part of CURA-7262
 2020-04-07 12:57:07 +02:00
Nino van Hooff
0ec3e0972b Add an image to the cloud printer sync message 
CURA-7055
 2020-04-06 18:01:57 +02:00
Nino van Hooff
b141bb139e Update documentation of _connectToActiveMachine 
CURA-7055
 2020-04-06 15:04:39 +02:00
Nino van Hooff
52ef794c4d Add a Message informing users of progress on cloud syncing printers. 
CURA-7055
 2020-04-06 14:49:45 +02:00
Nino van Hooff
a80a5f36ff Add a Message informing users of progress on cloud syncing printers. 
CURA-7055
 2020-04-06 13:44:48 +02:00
Ghostkeeper
01ec607d40
Merge branch '4.6' 
Conflicts:
	resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.
 2020-04-06 09:20:18 +02:00
Nino van Hooff
4f55c8d832 Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects" 
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
 2020-04-03 15:31:08 +02:00
Jaime van Kessel
ecd24cb446
Merge branch 'simplify_test_v2' of github.com:Ultimaker/Cura 2020-04-03 13:25:01 +02:00
Kostas Karmas
ef4921b72c Merge branch '4.6' 2020-04-03 13:12:07 +02:00
Nino van Hooff
3e46489b6b
Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects 
Cura 7333 fix reloading 3mf files with many objects
 2020-04-03 12:41:22 +02:00
Nino van Hooff
4adf4dceb8 Automatically make discovered printers available to use. 
instead of the list of available printers to be connected

CURA-7055
 2020-04-03 12:02:27 +02:00
Kostas Karmas
8eb48672e1 Use the node id as identifier 
Now that libSavitar allows us to read the object id from the 3mf file,
this id will be propagated as an id inside CuraSceneNodes and it will
be used as an identifier to find the object that has to be refreshed.

CURA-7333
 2020-04-03 11:05:38 +02:00
Ghostkeeper
4f50f42796
Merge branch '4.6' 2020-04-02 17:21:03 +02:00
Jaime van Kessel
6df2f84c07
Prevent crash when releasing released lock 
CURA-C2
 2020-04-02 16:51:32 +02:00
Jaime van Kessel
8ba71fde44
Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura 2020-04-02 14:34:17 +02:00
Remco Burema
8d6cbdf673
Fix long materials title causes misalign. 
CURA-7240
 2020-04-01 17:57:33 +02:00
Remco Burema
07569c6b88
Fix extra line after plugin/materials list. 
CURA-7240
 2020-04-01 17:54:56 +02:00
Ghostkeeper
4edef85346
Code style: Space around binary operators 
Contributes to issue CURA-7240.
 2020-04-01 17:35:40 +02:00
Ghostkeeper
869f26a5ba
Fix crash when entering nonsense numbers like '-' 
We shouldn't accept those in the input field at all in my opinion but that is for another time.

Fixes Sentry issue CURA-F5.
 2020-04-01 16:34:49 +02:00
Ghostkeeper
2aeca3ef8c
Add version upgrade for 4.6 to 4.7 to halve the maximum deviation 
Contributes to issue CURA-7282.
 2020-04-01 15:05:18 +02:00
Ghostkeeper
81df313f3a
Fix documentation for upgrade functions 
There are no settings to rename. That documentation was outdated.
 2020-04-01 14:58:30 +02:00
Remco Burema
90ffa2a772
Explain empty installed materials/plugins brackets. 
part of CURA-7240
 2020-03-31 16:56:45 +02:00
Jaime van Kessel
c764326c25
Fix marketplace installed plugins/materials empty rectangle 
CURA-7240
 2020-03-31 15:57:08 +02:00
konskarm
cbccb08103
Merge pull request #7370 from Ultimaker/CURA-7328_remove_unused_machine_settings 
Remove unused machine settings
 2020-03-31 14:41:41 +02:00
Remco Burema
d89fce6240
Order bundled/installed packages/materials section. 
And other finishing touches.
part of CURA-7240
 2020-03-31 12:02:46 +02:00