23772 Commits

Author SHA1 Message Date
Ghostkeeper
1946615fff
Fix asynchronous bug if job gets cancelled
If the print job happens to get cancelled right after checking if the index is correct, but before actually reading the line, it would get an IndexError when trying to read the line since cancelling the job clears the _gcode list.
This prevents that asynchronous issue by using the internal check in the list access to check that, and just uses an exception to check whether it's reached the end.

Fixes Sentry issue CURA-QC.
2020-05-11 17:36:24 +02:00
Ghostkeeper
5ccf8e412d
Merge branch 'maukcc-master' 2020-05-11 14:10:19 +02:00
Ghostkeeper
bf8b01efe3
Fix preferred quality type
This quality type is the only one available.
2020-05-11 14:10:08 +02:00
Ghostkeeper
98a5321b2b
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.
2020-05-11 14:03:54 +02:00
Konstantinos Karmas
ff8e037f4c
Merge pull request #7704 from Ultimaker/CURA-7429_fix_image_reader_peak_height
CURA-7429_fix_image_reader_peak_height
2020-05-11 13:58:11 +02:00
jelle Spijker
b032101e55
Updated comments in cura/OAuth2
Used DOX_2_RST.py to convert doxygen style comments to sphinx style comments
2020-05-11 13:16:29 +02:00
sm3dp
d4e8d1eba9 change polygon properties 2020-05-11 19:10:30 +08:00
sm3dp
f7c2f92f82 remove some useless property and change platform mesh name 2020-05-11 18:12:03 +08:00
Ghostkeeper
40056c9a04
Update to setting_version 15
Due to a merge conflict that Git couldn't detect, these are immediately outdated. Let's update them to 15.

Since I knew this would be coming, I didn't change the maximum deviation last time, so now I also don't need to change it back.

Contributes to issue CURA-7384.
2020-05-11 11:43:37 +02:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
f6ad144add
Merge branch '64bittuning-master'
Fixes CURA-7384.
2020-05-11 11:40:47 +02:00
Ghostkeeper
0bb65c86ec
Fix default quality level
Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers.
2020-05-11 11:40:14 +02:00
Ghostkeeper
7210dd308c
Rename Tronxy quality profiles to something more specific to Tronxy
To Cura the folder doesn't matter. It only reads the filenames and uses those as unique IDs. So for these filenames we'd like to have an ID that is more speciic to this printer to prevent people from crashing.
I'm guessing that the author here already encountered that problem. He copied the files from Creality which has the same problem. However Creality profiles are already published and will be much harder to change the names since they would need to be changed in a version upgrade.

Contributes to issue CURA-7384.
2020-05-11 11:39:26 +02:00
Konstantinos Karmas
6ea37603f2
Merge pull request #7715 from Ultimaker/CURA-7420_fix_version_upgrader
New version upgrade for 4.7
2020-05-11 11:07:44 +02:00
Ghostkeeper
a0f4305420
Remove warnings that will never be visible
This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled.

Contributes to issue CURA-7384.
2020-05-11 11:02:37 +02:00
Ghostkeeper
156925d48e
Update to setting_version 14
This is necessary before merging since these profiles would otherwise still need to be updated during runtime.

Contributes to issue CURA-7384.
2020-05-11 10:51:44 +02:00
Ghostkeeper
454bff174c
Add correct name of settings guide to ignore list 2020-05-11 09:58:19 +02:00
Ghostkeeper
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02:00
Konstantinos Karmas
0bcb3348da
Merge pull request #7707 from Ultimaker/CURA-7245_fix_bundled_package_sync
CURA-7245_fix_bundled_package_sync
2020-05-11 09:49:19 +02:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +02:00
Jelle Spijker
a503149452
Merge remote-tracking branch 'origin/doxygen_to_restructuredtext_comments' into doxygen_to_restructuredtext_comments 2020-05-08 19:00:47 +02:00
Jelle Spijker
120541a8db
Updated comments in Models
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Model directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.

 Note: dox_2rst.py struggles with decorated functions.
2020-05-08 18:59:38 +02:00
Nino van Hooff
a09cd0e63e Convert doxygen to rst for Prepare, Preview, RemovableOutputDevice 2020-05-08 17:37:49 +02:00
Peter Felecan
5f08fbd83a Addition of the I3 Metal Motion printer by eMotionTech and the afferent extruder. 2020-05-08 17:11:28 +02:00
Kostas Karmas
1e2764278e Remove unnecessary os.path.basename call 2020-05-08 16:58:33 +02:00
Kostas Karmas
856bd86cd1 Add test for platform mesh sizes <=1MB
As a result of Cura and Cookies discussion, we decided to limit the
sizes of platform meshes to less than 1MB. This test checks that
during the CI/CD process and displays an assertion error when a
mesh excludes this limit.
2020-05-08 16:51:13 +02:00
Nino van Hooff
a4fe3d7685 Convert doxygen to rst for POS, MonitorStage, PostProcessing 2020-05-08 16:28:07 +02:00
Nino van Hooff
553b09b6cf Convert doxygen to rst for GcodeWriter, LegacyProfileReader,
MachineSettingsAction, ModelChecker
2020-05-08 16:20:55 +02:00
Nino van Hooff
40327c4259 Convert doxygen to rst for GcodeReader, GcodeGzReader/Writer,
GCodeProfileReader
2020-05-08 15:58:51 +02:00
Nino van Hooff
6ca9b4678e Convert doxygen to rst for Firmware update plugins 2020-05-08 15:46:02 +02:00
Nino van Hooff
54d2fe95d1 Convert doxygen to rst for CuraProfileReader/Writer 2020-05-08 15:43:12 +02:00
Jelle Spijker
d69bf84424
Updated comments in Backup
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Backup directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.
2020-05-08 15:39:16 +02:00
Ghostkeeper
6478cee411
Add a page about the build volume 2020-05-08 15:35:08 +02:00
Nino van Hooff
176919eee0 Merge branch 'master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	plugins/CuraEngineBackend/CuraEngineBackend.py
#	plugins/CuraEngineBackend/StartSliceJob.py
2020-05-08 15:31:23 +02:00
Nino van Hooff
797d6ed438 Convert doxygen to rst for CuraEngineBackend 2020-05-08 15:23:51 +02:00
Nino van Hooff
8f3827d5ae Convert doxygen to rst for 3MFReader/Writer and AMFReader 2020-05-08 15:14:39 +02:00
Ghostkeeper
62b49e2459
Add category about the 3D scene 2020-05-08 14:46:32 +02:00
Ghostkeeper
17af83bc19
Also test for the normal Version number
It rarely changes so it's less of a problem, but you never know.
2020-05-08 12:18:48 +02:00
Ghostkeeper
6baca9eaa2
Also test intent profiles
Contributes to issue CURA-7420.
2020-05-08 12:13:06 +02:00
Ghostkeeper
e16dac0708
Update profile that was outdated since Cura 4.0
Contributes to issue CURA-7420.
2020-05-08 11:34:10 +02:00
Ghostkeeper
c61f3b04ba
Add test for all built-in profiles being up to date
So we had several hundred files outdated already. It's happened before. It shaln't happen again.

This test fails right now because there is one file still on setting_version 6.

Contributes to issue CURA-7420.
2020-05-08 11:26:37 +02:00
Ghostkeeper
8f9408a76f
Apply version upgrade maximum deviation change to built-in profiles
For some this is not exactly restored as their original since this setting is limited to micron precision as well.

Contributes to issue CURA-7420.
2020-05-08 11:15:55 +02:00
Ghostkeeper
3527c16716
Upgrade containers that were forgotten to upgrade from setting_version 13
This is why it was upgrading them as if from the profile importer...

Contributes to issue CURA-7420.
2020-05-08 11:13:15 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML
Provides a single source of truth

CURA-7290
2020-05-08 11:09:48 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15
Once more into the fray.

Contributes to issue CURA-7420.
2020-05-08 09:43:02 +02:00
Ghostkeeper
c3c144345b
Add version upgrade to halve the maximum deviation once again
As explained in the comment. We reverted a change in 4.6, so we must unrevert it in master again.

Contributes to issue CURA-7420.
2020-05-08 09:30:54 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6'
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
2020-05-08 09:10:02 +02:00
Remco Burema
23cdf871c1
Add comments: Why a matrix4x4 and not a sampler1d?
part of CURA-7426
2020-05-07 18:55:55 +02:00
fieldOfView
cdc5c8948c Simplify single instance preference
The Preferences have already been initialized in QTApplication.initialize to get the language to use in the splashscreen.
2020-05-07 18:13:23 +02:00
fieldOfView
1b34449242 Add a preference to use a single instance for loading files
Contributes to #7664
2020-05-07 17:29:18 +02:00