3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 05:07:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28475 commits 306 branches 270 tags 779 MiB
Commit graph

6981 commits

Author SHA1 Message Date
Jaime van Kessel
41c953112a
Make animation time instead of update dependant 
CURA-6823
 2019-12-24 12:53:19 +01:00
Nino van Hooff
d110d04c36 Make loading messages more consistent and cleanup usages. 
CURA-6823
 2019-12-24 10:43:21 +01:00
Nino van Hooff
07fb775ac1 Preload theme in QtApplication 
Fixes an error where theme was loaded before the engine is initialized

CURA-6823
 2019-12-24 09:51:37 +01:00
Nino van Hooff
6a0fba060e Add loading hint for replacing the global stack 
Displayed as a splash message when the application is starting,
logged (not displayed to the user) otherwise

CURA-6823
 2019-12-23 17:32:20 +01:00
Nino van Hooff
81976cfd1a Add a few splash loading messages for a better sense of progress 
CURA-6823
 2019-12-23 16:31:55 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4' 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
 2019-12-23 16:26:25 +01:00
Ghostkeeper
15ba762847
Fix spelling of error message in the log 
Found during investigation of #6828.
 2019-12-20 09:54:07 +01:00
ninovanhooff
4773c4eaf3
Merge pull request #6803 from Ultimaker/sentry_crash_integration 
Sentry crash integration
 2019-12-19 14:29:07 +01:00
Jaime van Kessel
0295113b31
Add user (identified by MAC) & ensure that no personal info is in server_name 2019-12-19 11:23:39 +01:00
Kostas Karmas
cf6540f91d Fix qualities lookup for custom materials 
Search the qualities of the custom material based on the base_file
and not based on the id.

CURA-7070
 2019-12-18 16:44:19 +01:00
Lipu Fei
6c9b8f992f Fix quality search with material base_file 
CURA-7070
 2019-12-18 15:39:17 +01:00
Lipu Fei
4b313c2dac Fix formatting 
CURA-7070
 2019-12-18 15:38:23 +01:00
Kostas Karmas
50b8ff2352
Fix check that finds the extruder in a position 
CURA-7048
 2019-12-17 10:55:28 +01:00
Kostas Karmas
a1d7eefc42
Fix PPA crashing on single-extruder printers 
The machine manager was leading to a crash when trying to enable
the second extruder in single-extrusion printers, because the check
for the second extruder was not correctly implemented. This commit
fixes that issue by checking if the global stack has the specified
extruder. If it does not, then the function returns while logging the
issue.

CURA-7048
 2019-12-17 10:55:28 +01:00
Ghostkeeper
a9849be1b2
Code style: Space around binary operators 2019-12-16 13:15:40 +01:00
Jaime van Kessel
4de28bed28
Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration 2019-12-16 11:28:04 +01:00
Jaime van Kessel
c15599f1c4
Add some extra info to crash handler screen 2019-12-16 11:23:12 +01:00
Jaime van Kessel
8fa6239365
Fix spelling mistake 2019-12-16 11:08:09 +01:00
Jaime van Kessel
157a25a992
Fix minor codestyle issues 2019-12-16 11:06:48 +01:00
ninovanhooff
f77832315a
Merge branch 'master' into CURA-6127_settings_lost_when_sync_to_diff_printer_type 2019-12-16 09:48:32 +01:00
Remco Burema
76401d78a9
Sentry: Add locale (both cura and os) to tags. 2019-12-13 16:53:17 +01:00
Kostas Karmas
409dc98299 Keep global settings on sync to diff printer type 
In addition to the per-extruder user changes, copy the global user
changes to the new_machine.

CURA-6127
 2019-12-13 15:00:22 +01:00
Jaime van Kessel
9d62a281f7
Remove unused imports 2019-12-13 14:56:02 +01:00
Remco Burema
44e7cb7108
Replace deprecated code. 2019-12-13 13:52:24 +01:00
ninovanhooff
a6946fa3d9
Merge branch 'master' into CURA-7011_enterprise_visual_cues 2019-12-13 11:44:34 +01:00
Kostas Karmas
2b6b7a1f81 Fix lost settings on sync to diff printer type 
When syncing to a different printer type only the global user changes
where kept, while the per-extruder user changes were not copied at all,
since the extruder list is empty before the new machine becomes active.

This commit fixes this problem by keeping a copy of the per-extruder
user changes before the new machine (of different type) is activated.
The copied user changes are then transfered to the new global stack
after the new machine is set as active.

CURA-6127
 2019-12-13 11:30:34 +01:00
Remco Burema
4d8c19ccc8
Always add Enterprise to name if Enterprise version. 
part of CURA-7011
 2019-12-12 14:37:18 +01:00
Remco Burema
382d177a3b
Merge branch 'master' into CURA-7012_manage_materials_third_party_printers 2019-12-12 14:06:39 +01:00
Nino van Hooff
cef0ae349d
Fix selecting a new material for a base file on container deletion 
CURA-7023
 2019-12-11 17:17:57 +01:00
Jaime van Kessel
0f69c8d5f0
Merge branch 'CURA-7023_wrong_submaterial_container' of github.com:Ultimaker/Cura 2019-12-11 17:17:29 +01:00
Nino van Hooff
171609f9de Refactor: Add "Enterprise" to the app display name. 
CURA-7011
 2019-12-11 16:25:57 +01:00
Nino van Hooff
2e4ee73d2f Add "Enterprise" to the app display name. 
Will also end up in the main window title and at the top of
the debug log. app_name remains unchanged.

CURA-7011
 2019-12-11 16:21:35 +01:00
Nino van Hooff
6725e28c07 Connect materialsChanged signal for printers without variants 
Fixes duplicated materials not showing up for third party printers

CURA-7012
 2019-12-11 11:55:25 +01:00
Lipu Fei
0cb27774d6
Merge branch 'master' into pre_sliced_base_filename 2019-12-11 10:46:04 +01:00
Lipu Fei
07df020d12
Merge branch 'master' into CURA-7023_wrong_submaterial_container 2019-12-11 10:45:22 +01:00
Nino van Hooff
cbfa45dd25 Update enterprise splash screen background 
CURA-7011
 2019-12-10 16:27:30 +01:00
Nino van Hooff
d09f3492db Add enterprise splash screen. 
Added it as a png, which might be a bit overkill but it could also
could be hard getting strokes / shadows exactly right otherwise. Also
Allows for more visual distinction of the background later

CURA-7011
 2019-12-10 15:59:57 +01:00
Nino van Hooff
da6d4e6186 Log app display name, version, api version and build type when starting 
Only build type was requested, but I figured: why not all the things?
Also fixes an arg typo

CURA-7011
 2019-12-10 15:57:15 +01:00
Kostas Karmas
da1a5d1be6 Log error on failed machine creation 
An error message will be generated when machine creation fails
while switching printer types in the printer configuration menu.

CURA-6127
 2019-12-10 14:44:31 +01:00
Nino van Hooff
38935a1d02 Fix selecting a new material for a base file on container deletion 
CURA-7023
 2019-12-10 13:53:26 +01:00
Jaime van Kessel
1b80ec8fff
Fix incorrect casing 
Minor issue and I didn't want to send it back to todo *again* because of it.

CURA-6522
 2019-12-10 13:14:54 +01:00
Jaime van Kessel
f66b1e6fde
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack 2019-12-10 13:06:37 +01:00
Nino van Hooff
dd8993e88c revert 0 buildvolume edgedisallowedsize for one_at_a_time 
Turns out that the artificial disallowed area around the inside of the
build volume was necessary to take the brim into account when deciding
whether a model was outside the buildvolume.
The issue for which I removed this in the first place seems not to be
an issue anymore due to other commits

Reverts and e5fb9fb8 and e5c9bca
CURA-6522
 2019-12-06 12:17:21 +01:00
Nino van Hooff
f4c68f4e71 Fix two mypy warnings 
CURA-6522
 2019-12-06 11:47:07 +01:00
Nino van Hooff
2d8a415a69 Use the printing area (hull + adhesion for one-at-a-time) instead of 
convex hull for build volume collision detection. The convex hull is
not suitable for this purpose because for one-at-a-time it includes the
machine head polygon, which should be allowed to travel outside the
build volume

CURA-6522
 2019-12-06 11:08:55 +01:00
Jaime van Kessel
4811f15a7b
Merge pull request #6662 from Ultimaker/CURA-6981_add_build_type 
CURA-6981 Add build_type into crash reports and stats
 2019-12-05 15:09:38 +01:00
Jaime van Kessel
b77de636d4
Prevent crashes when a variant could not be found 
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).

Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually

CURA-6992
 2019-12-05 14:19:18 +01:00
Jaime van Kessel
cd7f0e8a76
Fix case where a global profile would be recognised as a extruder profile 
CURA-6991
 2019-12-05 14:17:55 +01:00
Jaime van Kessel
95cffb6710
Fix machine duplication when switching configuration 2019-12-05 14:06:52 +01:00
Nino van Hooff
fc060f7724 Do not show any object shadows in all_at_once mode. 
Also DRYed up the one_at_a_time check

CURA-6522
 2019-12-04 15:33:31 +01:00