3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
22419 commits 313 branches 275 tags 718 MiB
Commit graph

5999 commits

Author SHA1 Message Date
Lipu Fei
045f4c51fa Fix BaseMaterialsModel's QTimer lifecycle 2020-01-07 11:37:37 +01:00
Jaime van Kessel
5083a46c04
Merge branch 'master-sentry_sdk-try-except' of https://github.com/thopiekar/Cura 2020-01-06 15:10:06 +01:00
Jaime van Kessel
e46febfea4
Switch out number of getActiveExtruderStacks for extruderList 
It's essentially the same, but reduces the dependency of MachineManager
on the ExtruderManager
 2020-01-06 14:47:46 +01:00
Jaime van Kessel
55dacee45f
Simplify the numUserSettings count 2020-01-06 14:38:39 +01:00
Jaime van Kessel
6da5216cac
No longer create the machine manager twice 2020-01-06 14:26:32 +01:00
Lipu Fei
5a689c2389 Merge remote-tracking branch 'origin/master' into CURA-6387_http_request_manager 2020-01-06 11:15:37 +01:00
Jaime van Kessel
3e6723f378
Remove unneeded update calls 2020-01-03 14:16:34 +01:00
Jaime van Kessel
7954f6633f
Let IntentModel update on a timer 
This prevents some double updates
 2020-01-03 14:13:13 +01:00
Jaime van Kessel
5da77472e7
Add some timers to sceneChanged 2020-01-03 10:17:54 +01:00
Lipu Fei
55d31b9846 Move HttpRequestManager to Uranium 
CURA-6387
 2020-01-03 08:59:29 +01:00
Lipu Fei
e98cf83cb3 Add HttpNetworkRequestManager to CuraApplication 
CURA-6387
 2020-01-03 08:59:29 +01:00
Lipu Fei
8d86ca8eee Add HttpNetworkRequestManager 
CURA-6387
 2020-01-03 08:59:29 +01:00
Thomas Karl Pietrowski
ba5a0b0085 SentrySDK: Turn on deep integration on demand 
Only whenever the sentry_sdk module is there functions of this module will be used.
The only changes, which were needed to be made, are done on cura_app.py and cura.CrashHandler.
Whenever the module is not available, it's functions will be omitted.

The if-clauses could happen earlier, but this at least the bare minimum, and, to be honest, on Ultimaker's distribution it won't speed up anything.
I expect the if-clause to take the same amount of runtime sooner or later. The check is the same and it should be on Ultimaker's distribution always be "True".

Signed-off-by: Thomas Karl Pietrowski <thopiekar@gmail.com> (github: thopiekar)
 2020-01-02 22:22:44 +01:00
Remco Burema
56cf2339f2
First initialize error checking. 
Change the order of initialization, so the MachineErrorChecker already has its signals attached when the first machine gets loaded.
The increased number of 'processEvents'-calls exposed this oversight by allowing it to run out of order.
(MachineErrorChecker initializes the has-errors field to True if no check has been done yet.)
 2020-01-02 14:55:46 +01:00
Jaime van Kessel
8b393317ff
Add "all" as a setting visibility preset 
CURA-7082
 2020-01-02 10:51:40 +01:00
Jaime van Kessel
0862fd493e
Fix some tests not cleaning up correctly after themselves 
The PrintInformation test wasn't cleaning up after itself correclty. This
left some stuff behind that the other tests were using. Since this is bad (as at that point
tests can influence other tests), i've fixed that
 2019-12-24 16:20:09 +01:00
Jaime van Kessel
642cc0c6d1
Merge pull request #6850 from Ultimaker/CURA-6823_improve_splash_screen_responsiveness 
CURA-6823_improve_splash_screen_responsiveness
 2019-12-24 14:10:36 +01:00
Jaime van Kessel
62c54d3f3e
Add few more processEvents to make updating of splashscreen a bit smoother 
CURA-6823
 2019-12-24 13:36:04 +01:00
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