3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
18762 commits 312 branches 275 tags 718 MiB
Commit graph

4829 commits

Author SHA1 Message Date
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Ghostkeeper
cf2fcc57ee
Merge branch 'CURA-6237_fix_remove_materials' into 4.0 2019-03-06 09:44:08 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel 
also when the variant container has changed.

Contributes to CURA-6227.
 2019-03-01 14:54:42 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order 
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
 2019-03-01 10:53:55 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
 2019-02-28 16:17:34 +01:00
Jaime van Kessel
38a9206898 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-28 16:01:40 +01:00
Jaime van Kessel
a8128556f3 Don't drop refresh token if request failed 2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f Prevent crash if the connection was lost for auth token 2019-02-28 12:58:41 +01:00
Ghostkeeper
1c6cce316a
Merge branch '4.0' 2019-02-27 11:47:47 +01:00
ChrisTerBeke
9ba342c541 Fix codestyle failure on float conversion 2019-02-27 10:43:15 +01:00
ChrisTerBeke
365f67cbf8 Have some overlap in token expiry to prevent unauthorized issues 2019-02-27 10:32:30 +01:00
Lipu Fei
7291026bec Fix material container removal 
CURA-6237
 2019-02-22 15:13:53 +01:00
Jaime van Kessel
b165b9625f Removed unused code and fix styling for some comments 2019-02-22 15:08:51 +01:00
Jaime van Kessel
5f4907da5c Added tests for NetworkedPrinterOutputDevice 2019-02-22 14:57:22 +01:00
Jaime van Kessel
b5c270f00a Add stubs for MachineManager testing 
It also adds a first test that checks if the setActiveMachine
 2019-02-22 13:49:31 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:50:44 +01:00
Jaime van Kessel
41f2a0e222 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:47:38 +01:00
Jaime van Kessel
7754b8a447 Only instantiate setting menus when it's visible 
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
 2019-02-21 20:20:01 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
fc11286c6c Also ensure that the QualtiyProfilesModel is on a changeTimer on create 2019-02-21 18:38:51 +01:00
Jaime van Kessel
5118953373 Put a change timer on the globalStacks model 
This decreases the time that a first thing is shown on the main screen (as the creation
of the global stack model doesn't block the UI anymore)
 2019-02-21 18:30:23 +01:00
Jaime van Kessel
b64cf1fe1c Remove unneeded signal call 2019-02-21 16:19:16 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Ghostkeeper
3040fde9eb
Merge branch '4.0' 
Conflicts:
	cura/OAuth2/AuthorizationService.py -> Code style change vs. fixing logging in while no internet connection.
 2019-02-21 08:25:21 +01:00
Ian Paschal
cb8804b86a Revert "Add some kaizen changes from #5328" 
This reverts commit 09fe06b8bf.
 2019-02-20 10:46:15 +01:00
Ian Paschal
09fe06b8bf Add some kaizen changes from #5328 
Contributes to CL-1245
 2019-02-20 10:45:36 +01:00
Ian Paschal
a11878b199 Log warning instead of exception if no connection 
Contributes to CL-1245
 2019-02-20 10:40:23 +01:00
Jaime van Kessel
3f18b0b974 Increase agressiveness of short circuit logic; Just check if the node is slicable 
That should also filter out platform, buildVolume and convexHulLNodes
 2019-02-19 18:00:20 +01:00
Jaime van Kessel
b61bf3df4d Only emit signal if the properties actually changed 2019-02-19 17:46:29 +01:00
Jaime van Kessel
aef89e2bd3 Add few more cases where Camera changes caused un-needed updates 2019-02-19 17:40:44 +01:00
Jaime van Kessel
22b70e1a34 Ignore sceneChange signals if the camera triggered them in some places 
These places weren't interested in all changes. They can probably be more
strict, but the camera is a really safe bet (and already greatly decreases
the number of updates, especially when just moving the camera)
 2019-02-19 17:06:48 +01:00
Ghostkeeper
6143906fa4
Add type for message saying it's unable to connect 
Contributes to issue CURA-6231.
 2019-02-19 15:57:09 +01:00
Jaime van Kessel
c35aabd2c4 Add message to indicate that Cura was unable to connect with account server 
This happens when you were logged previously, but currently don't have internet acces.

CURA-6231
 2019-02-19 13:34:04 +01:00
Ghostkeeper
275989d193
Merge branch 'fix_prime_tower_brim_for_raft' 2019-02-18 15:17:48 +01:00
Lipu Fei
64150cc7cf Merge remote-tracking branch 'origin/4.0' 2019-02-18 13:52:27 +01:00
Jaime van Kessel
efeba48ffb Move initializeSettingDefinitions and setting functions to their own function 
This means we don't have to instantiate CuraApplication in the tests anymore
 2019-02-18 09:45:30 +01:00
Jaime van Kessel
75b185d462 Add test for duration messages for printInformation 2019-02-15 16:43:08 +01:00
Jaime van Kessel
4acc480544 Also add tests for configurationModel 2019-02-15 15:27:57 +01:00
Jaime van Kessel
369c64e1b6 Add tests for PrintJobOutputModel & PrinterOutputModel 2019-02-15 15:19:19 +01:00
Lipu Fei
f521fae152 Fix call_on_qt_thread decorator 
CURA-6225

Do thread check in the wrapper function, not outside.
 2019-02-15 15:11:11 +01:00
Jaime van Kessel
2820bc2e8f Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-15 14:08:22 +01:00
Jaime van Kessel
c0d75b38b7 Added test to check if a key in the profile is defined in the definition 2019-02-15 14:06:46 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Ghostkeeper
f3cab17e20
Revert "Check if on main thread for call_on_qt_thread" 
This reverts commit 21099e30cb.
It was causing a segfault when saving UFP files.
 2019-02-15 13:45:23 +01:00
Lipu Fei
21099e30cb Check if on main thread for call_on_qt_thread 
CURA-6225
 2019-02-15 12:51:42 +01:00
Ian Paschal
61b84bdcfc
Merge pull request #5305 from Ultimaker/CL-1250_set_cloud_buildplate 
CL-1250 set cloud build plate
 2019-02-15 10:28:07 +01:00
Lipu Fei
45af26879f
Merge pull request #5298 from Ultimaker/CURA-6120_arrange_child_nodes_fix 
Arrange child-nodes (like blocker) with parents. [CURA-6120]
 2019-02-14 16:05:23 +01:00
Remco Burema
2f5e973836 Partly revert sugested changes for '()'s because line-breaks. [CURA-5864] 2019-02-14 15:01:32 +01:00