1222 Commits

Author SHA1 Message Date
Ghostkeeper
8c0e21f0d5
Don't crash if mesh loading fails
Some plug-ins (like the OBJReader) return None then.

Fixes Sentry issue CURA-14P.
2020-09-03 17:52:44 +02:00
Jaime van Kessel
ff21761d92
Add log line for when attempting to read a local file
Contributes to #8286
2020-09-01 16:51:12 +02:00
Nino van Hooff
816aaafc19 Revert changes for CURA-5479
It was decided that functionality present in existing plugins is
sufficient. No need to replicate it in our own codebase and
take on the burden of maintenance

CURA-5479
2020-07-07 16:11:03 +02:00
Nino van Hooff
c50f7aa455 Add a print job name setting to general preferences
CURA-5479
2020-06-30 17:04:03 +02:00
Ghostkeeper
ba8cb4ce4a
Don't pre-load engine before other plug-ins
This was a fix for the post-processing plug-in that's no longer required.
It was also only applied when running from source, so obviously it's not required or we'd have seen it in the builds.
2020-06-19 16:12:36 +02:00
Jaime van Kessel
c58ef1b531
Fix mypy issues
CURA-7418
2020-06-15 14:20:34 +02:00
Jaime van Kessel
f6e9bc7c3c
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7418-update-profile-window 2020-06-15 14:10:20 +02:00
Jaime van Kessel
a7e7ddf4b5
Add the digital factory button
CURA-7418
2020-06-15 13:33:47 +02:00
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
2020-06-10 12:50:03 +02:00
Kostas Karmas
f26445a914 Fix mypy complaint
CURA-7454
2020-06-09 16:01:38 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
2020-06-09 15:20:15 +02:00
Kostas Karmas
f0dda6553b Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:04:54 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
2020-06-09 13:41:30 +02:00
Jaime van Kessel
773edfd533
Prevent crash when camera tool was not found 2020-06-08 10:24:59 +02:00
Ghostkeeper
ac98caee54
Remove debugging code 2020-06-05 19:35:25 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
c6e6c76962 Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/Account.py
#	plugins/SimulationView/SimulationView.py
2020-05-15 13:38:37 +02:00
Jaime van Kessel
580bd13a76
Prevent crash if icon was not found
Fixes CURA-A2
2020-05-13 11:16:26 +02:00
Jaime van Kessel
384f92a516
Prevent crashes when loading objects before initialization is done
Fixes CURA-7J
2020-05-13 11:12:11 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
# Conflicts:
#	cura/API/Account.py
2020-05-12 14:59:01 +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
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
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
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
Kostas Karmas
aab2257574 Up the setting version to 14 in CuraApplication
CURA-7421
2020-05-04 13:06:19 +02:00
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
2020-04-29 13:31:45 +02:00
Jelle Spijker
679739d09d
Applied requested changes proposed by @ninovanhooff
Fixed a couple of missed double quotes, trailing and leading spaces, to long comment lines
2020-04-27 20:09:00 +02:00
Kostas Karmas
c8e86175cd Create a DiscoveredUltimakerPrintersModel in the CuraApplication
CURA-7022
2020-04-24 19:16:24 +02:00
Jelle Spijker
6aedab78dc
Converted comments in dir Cura/cura to rst style
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura directory using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.
2020-04-21 16:58:45 +02:00
Ghostkeeper
f6479840f6
Fix calculation of infill wipe distance starting from infill location
Subtract the thickness of the walls from this setting. This most likely ends up negative and thus not counting because it's maxed with something that starts at 0.
I've also simplified this algorithm a bit. Easier to follow if you ask me.

Done as a 5 minute fix.
2020-04-14 17:59: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
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
4495cea8a4 Remove type of job to avoid type error
If the type of the job is mentioned, the CI/CD system complains about
reading the "private" variable _node of the job.

CURA-7333
2020-04-03 11:20:09 +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
Kostas Karmas
5bdcc2e5ba Add type to objects_in_filenames
CURA-7333
2020-04-01 18:41:04 +02:00
Kostas Karmas
99a762bcb9 Avoid warning for object in position 0
CURA-7333
2020-04-01 17:42:26 +02:00
Kostas Karmas
97199d72ad Reload nodes based on object index
Refactored the code in order to extract the index of the node inside
the file and then use that index to reload the correct object from the
file.

CURA-7333
2020-04-01 17:08:30 +02:00
Ghostkeeper
e2e69f6646
Increment setting version to 13
Contributes to issue CURA-7282.
2020-04-01 15:14:01 +02:00
Kostas Karmas
b118a46630 Remove TODO message from 3mf reload function
CURA-7333
2020-03-31 18:02:13 +02:00
Kostas Karmas
134541ee6e Fix reloading multiple objects from 3mf file
CURA-7333
2020-03-31 17:57:23 +02:00
Ghostkeeper
8422172000
Increment setting version to 12
This is necessary for the version upgrade to run.

Contributes to issue CURA-7328.
2020-03-30 11:54:18 +02:00
Remco Burema
3c50b78e68
Fix: Definitions could be partly saved between backup restore and quit.
part of CURA-7325
2020-03-26 18:19:47 +01:00
Nino van Hooff
96ed85f9c0 Move UltimakerCloudAuthentication and UltimakerCloudScope
...to their own module
Fixes an import error where UltimakerCloudScope was used my both the
Toolbox and CuraDrive plugins

CURA-7150
2020-03-12 17:48:54 +01:00
Lipu Fei
b03f666bf5 WIP: Make it work with Python 3.7 packaing 2020-02-07 23:14:47 +01:00
Jaime van Kessel
9e94875733
Merge branch 'feature_value_from_container_function' of https://github.com/fieldOfView/Cura 2020-02-04 16:47:45 +01:00