Commit graph

2372 commits

Author SHA1 Message Date
Jaime van Kessel
5a25f8e050 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 13:19:34 +02:00
Jaime van Kessel
2e90078ec7 Fix incorrect deprecation message 2019-05-03 13:19:17 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00
Lipu Fei
0cc00efa79 Add doc for group_id
CURA-6483
2019-04-30 12:53:47 +02:00
Lipu Fei
d18c11a2c1 Fix filtering in switchPrinterType()
CURA-6483
2019-04-30 12:46:35 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
2019-04-29 15:53:08 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName()
CURA-6449
2019-04-29 13:28:18 +02:00
Lipu Fei
4948fad87c Merge remote-tracking branch 'origin/4.1' 2019-04-25 13:22:23 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string
CURA-6449
2019-04-25 13:14:28 +02:00
Jaime van Kessel
b1375a9927 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-24 16:17:43 +02:00
Lipu Fei
5fc91e797e Remove mistake code 2019-04-24 13:22:53 +02:00
Lipu Fei
24f28fe03e Calculate AABB for non printing meshes
CURA-6480
2019-04-24 13:06:01 +02:00
Jaime van Kessel
c694e530be Fix changes in per object settings not triggering reslice
Contributes to #5639
2019-04-24 10:45:06 +02:00
Ghostkeeper
6b139a9dce
Merge branch 'deprecate_some_mm_funcs' 2019-04-16 16:29:14 +02:00
Jaime van Kessel
c2a00d6b53 Fix copy paste error
Simple fix that caused crash for getHasVariantBuildplates
2019-04-16 10:53:06 +02:00
Jaime van Kessel
8267ef670a Greatly decrease amount of tickles to the backend for settingOverrideDecorator 2019-04-15 17:59:27 +02:00
Jaime van Kessel
abb13e8992 Prevend unneeded tickles of the backend for setting override decorators 2019-04-15 17:52:13 +02:00
Jaime van Kessel
e8d2e070d8 Dont calculate bounding box for non printing meshes
Fixes #5603
2019-04-15 17:46:54 +02:00
Jaime van Kessel
42b1a0e028 Refactor some small bits of the setting override decorator
There was code duplication and a number of functions that should be private

contributes to #5603
2019-04-15 17:36:55 +02:00
Lipu Fei
8e579d2d68 Update default extruder when applying remote config
CURA-6452
2019-04-15 13:25:24 +02:00
Lipu Fei
ba37812793 Correct some deprecations and remove duplicated code 2019-04-15 09:47:09 +02:00
Lipu Fei
5f7f7f944f Remove use XYZ instead 2019-04-15 09:39:05 +02:00
Remco Burema
d3310be846 Deprecate some MachineManagaer functions.
Note: You need the 'handle_log_once' branch in Uranium to prevent spamming the logs!

part of CURA-6457
2019-04-12 16:19:54 +02:00
Lipu Fei
32fcc79dd8 Fix _shouldResolve()
CURA-6456
2019-04-11 16:34:57 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page
CURA-6057
2019-04-08 13:06:30 +02:00
Jaime van Kessel
e1804e0a47 Merge branch 'CURA-5930_switch_to_first_enabled_extruder' of github.com:Ultimaker/Cura 2019-04-08 11:37:19 +02:00
Jaime van Kessel
fe14024620 Move existNetworkInstances into discover action 2019-04-05 17:49:29 +02:00
Jaime van Kessel
5b818d203a Move a bunch of network only functions out of machine manager
Machine manager is way to big as is, so we need to move more code out of it to
locations where the code is actually used.
2019-04-05 17:45:19 +02:00
Lipu Fei
3adf7d49d0 Switch to the first enabled extruder after setActiveMachine
CURA-5930
2019-04-05 10:51:09 +02:00
Ghostkeeper
93ef8f6c98
Merge branch 'master' into CURA-6440_exclude_support_blocks_in_used_extruders 2019-04-04 16:41:00 +02:00
Ghostkeeper
8c5f871185
Also omit support meshes from used extruders list
Their own extruder doesn't get used necessarily, because these meshes are then printed using the support extruder.

Contributes to issue CURA-6440.
2019-04-04 16:35:48 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden
I think some of us got the spelling of this word wrong in their heads.
2019-04-04 14:39:01 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Lipu Fei
8da1f8fa7d Exclude support blockers in used extruders
CURA-6440
2019-04-02 14:16:57 +02:00
Jaime van Kessel
5e66564c00 Ensure that configurationTypes doesn't crash if a None is in the list
Fixes #5551
2019-04-02 12:05:08 +02:00
Jaime van Kessel
efe8f19109 Return the value for default extruder if the requested one could not be found
This fixes #5535
2019-04-02 11:46:12 +02:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00
Lipu Fei
4a171eebf6 Move models around again
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
2019-03-26 08:29:22 +01:00
Lipu Fei
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
c3c9c53f13 Merge WIP_onboarding 2019-03-20 11:28:30 +01:00
Lipu Fei
da351da611 Update comments for associateActiveMachineWithPrinterDevice() 2019-03-20 10:48:04 +01:00
Lipu Fei
81fbc525e4 Rename ConfigurationModel to PrinterConfigurationModel 2019-03-20 09:52:35 +01:00
Lipu Fei
e555f7da68 Move ConfigurationModel into cura.UI module 2019-03-20 09:51:06 +01:00
Lipu Fei
69eb381f10 Move MaterialOutputModel into cura.UI module 2019-03-20 09:47:44 +01:00
Lipu Fei
49c87a1e1d Move ExtruderConfigurationModel into cura.UI module 2019-03-20 09:44:15 +01:00