3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 302 branches 270 tags 770 MiB
Commit graph

2372 commits

Author SHA1 Message Date
Jaime van Kessel
5600d5407c Add default if group_name is not set. 
Otherwise we get a crash.

CURA-6153
 2019-02-01 12:02:59 +01:00
Jaime van Kessel
4aaeb8c2d5 Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0 2019-02-01 11:54:35 +01:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Remco Burema
6cd3a5fe3d Show correct printer name in selector-header on disconnect. [CURA-6153] 2019-01-31 15:05:27 +01:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
Jaime van Kessel
3734b980d8 When disabling an extruder due to sync, always show a message. 
Originally it would only show a message if the extruder was actually used,
but this didn't take the flow into account when you would first sync and then load a model.
In that case, the user never got a message and never got any notification that (and why) any of the extruders
got disabled.

CURA-5693
 2019-01-31 11:30:37 +01:00
Jaime van Kessel
e40b730457 Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0 2019-01-31 11:22:00 +01:00
Ian Paschal
389bdeb0c7 Expose configurations the same way as connectivity 
Contributes to CL-1154
 2019-01-31 10:50:14 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Lipu Fei
4f6d53b009 Do not disable all extruders when syncing 
CURA-5693

When syncing with a machine with no material/nozzle, do not disable all
extruders. leave the first one enabled.
 2019-01-31 08:30:41 +01:00
Jaime van Kessel
87070aefce Fixed typing issues for configuredConnectionTypes 
CURA-6159
 2019-01-30 17:17:46 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation 
According to our style. Not just single line comments without anything else.

Contributes to issue CURA-6159.
 2019-01-30 12:52:58 +01:00
Lipu Fei
b70e9c9080 Handle empty hotend and material in config syncing 
CURA-5693

 - Disable an extruder if the config states no material or nozzle for
   it.
 - Show a warning message if an used extruder gets disabled.
 2019-01-29 13:06:38 +01:00
Ghostkeeper
232498980c
Merge branch '4.0' 
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
 2019-01-28 16:45:45 +01:00
Jaime van Kessel
bc8a08bb44 Add documentation to the configuredConnectionTypes 2019-01-28 14:57:24 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types. 
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
 2019-01-28 14:29:41 +01:00
Lipu Fei
173f125d3e Fix merge conflicts 2019-01-24 14:55:29 +01:00
Jaime van Kessel
24fbb1007d Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-16 17:39:43 +01:00
ChrisTerBeke
36e49ee6bb Make activeMachineIsGroup more robust 2019-01-11 16:08:46 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
2a4c66888e Use getNumInstances instead of counting the number of instances in machinemanager 
This should prevent having to initiate the cached values if we only want to know the number of settings.
 2019-01-02 09:39:44 +01:00
Jaime van Kessel
e8febaff59 Remove code duplication 2019-01-02 09:23:20 +01:00
Jaime van Kessel
0b0f674e4b Remove unused code 2019-01-02 09:22:50 +01:00
Jaime van Kessel
e02fcd664c Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 14:34:53 +01:00
Jaime van Kessel
d9d1c93bd0 Use "NotConnected" as default for the connection state 
CURA-6011
 2018-12-31 11:25:23 +01:00
Jaime van Kessel
1277fbabc5 Fix connection type not always being seen correctly 
CURA-6011
 2018-12-31 11:15:03 +01:00
Ghostkeeper
42058a2e8f
Revert "Prevent some unneeded calling of signals" 
This reverts commit 85f10e7c4f.
The second time you start Cura, it won't slice due to the number of extruders being wrong.
 2018-12-24 09:37:17 +01:00
Jaime van Kessel
e4af883f25 Add missing signal 2018-12-21 18:19:34 +01:00
Remco Burema
f62e8b4bb2 Create 'brim for prime tower only' option (see also backend PR). [CURA-5864] 2018-12-21 17:38:30 +01:00
Jaime van Kessel
85f10e7c4f Prevent some unneeded calling of signals 2018-12-21 16:57:52 +01:00
ChrisTerBeke
1012eb7553 Assure bool 2018-12-20 14:48:56 +01:00
ChrisTerBeke
bbddbcde9a cleanup 2018-12-20 14:29:39 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
ChrisTerBeke
0edeb11a78 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 13:14:24 +01:00
Remco Burema
a9f4b70b5c Emit 'number of extruders changed' signal after add machine. [CURA-6045] 2018-12-20 09:53:58 +01:00
ChrisTerBeke
beb68213f4 Remove much logging or use debug level, fix cloud icon not appearing right away 2018-12-19 14:14:44 +01:00
ChrisTerBeke
80d2a78463 Fix optional type for output device 2018-12-19 11:47:41 +01:00
ChrisTerBeke
1b356a3219 Move cloud connection check logic to Python 2018-12-19 11:41:22 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types 
[4.0] Every output device should define its connection type
 2018-12-18 13:23:02 +01:00
Jaime van Kessel
d4bb50886f Merge branch 'CURA-6011_connection_types' of github.com:Ultimaker/Cura into CURA-6011_connection_types 2018-12-18 09:40:20 +01:00
Jaime van Kessel
84a7f2e5a2 Fix review comments 
CURA-6011
 2018-12-18 09:40:08 +01:00
Lipu Fei
6017c2b4d2 Replace isProfileUserCreated with hasCustomQuality 
CURA-6028
 2018-12-18 08:56:56 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Jaime van Kessel
aad7540366 Fix situation where multiple connect configurations would cause issues 
CURA-6011
 2018-12-17 13:31:38 +01:00
Jaime van Kessel
ee74b9f89f Once the connectiontype is recovered, it's converted to a string 
So we need to check if that's the case.
CURA-6011
 2018-12-17 13:09:01 +01:00
Diego Prado Gesto
ab83af3a03 Fix code-style 2018-12-17 12:20:30 +01:00