3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
22028 commits 307 branches 270 tags 779 MiB
Commit graph

2094 commits

Author SHA1 Message Date
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
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection 
CURA-6011
 2018-12-17 10:47:14 +01:00
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value 
CURA-6028
 2018-12-14 16:17:05 +01:00
Lipu Fei
d879cab91a Add all fields for optional extruder in ExtruderModel 
CURA-6015
 2018-12-13 14:12:44 +01:00
Lipu Fei
df0b1c6c77 Fix ExtruderManager creation in MachineManager 
CURA-6015
 2018-12-13 14:12:38 +01:00
Lipu Fei
935f7a2512 Remove unused imports 
CURA-6015
 2018-12-13 14:12:31 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel 
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
 2018-12-11 09:24:22 +01:00
Jaime van Kessel
3132b1f689 Update the extruder Model a whole lot less 
CURA-6016
 2018-12-10 16:56:44 +01:00
Jaime van Kessel
1436301d78 Ensure setActiveExtruderIndex only gets called once when switching machines 
CURA-6016
 2018-12-10 16:20:00 +01:00
Diego Prado Gesto
15f81da95b Do not show the layer height in the header panel when the profile is not supported 2018-12-07 13:47:58 +01:00
Ghostkeeper
05b32548f3
Code style: Start comments with a space 
Contributes to issue CURA-5876.
 2018-12-06 16:27:56 +01:00
Ghostkeeper
82d8410d18
Don't emit enabledChanged signal if it didn't change 
Contributes to issue CURA-5876.
 2018-12-04 13:58:54 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Ghostkeeper
18bb403413
No longer switch away from extruder when disabling 
It feels confusing when this happens.

Contributes to issue CURA-5876.
 2018-11-30 15:42:46 +01:00
Ghostkeeper
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Ghostkeeper
1c96c81ba9
Remove unnecessary extra setMetaDataEntry 
This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end.

Contributes to issue CURA-5876.
 2018-11-30 11:11:17 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities 
CURA-5879 experimental qualities
 2018-11-28 11:34:21 +01:00
Jaime van Kessel
94c4366194 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 17:55:13 +01:00
Lipu Fei
2c8ed99281 Add is_experimental to Qt models and QMLs 
CURA-5879
 2018-11-27 15:50:03 +01:00
Jaime van Kessel
854755277c Fix styling of comments 
Because sentences should start with capitals
 2018-11-27 14:37:01 +01:00
Jaime van Kessel
3ad1802ab6 Prevent a KeyError from messing 
CURA-5978
 2018-11-27 14:34:29 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb Merge branch 'master' into ui_rework_4_0 2018-11-27 11:12:48 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders 
CURA-5978
 2018-11-27 08:45:45 +01:00
Diego Prado Gesto
692868a0b4 Create a function that given a printer type name, it will return and 
abbreviated name.

Contributes to CURA-5942.
 2018-11-22 15:45:38 +01:00
Diego Prado Gesto
20285f26d6 Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-20 11:20:26 +01:00