3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
18800 commits 306 branches 270 tags 779 MiB
Commit graph

4854 commits

Author SHA1 Message Date
Jaime van Kessel
aa0c8c75ee Add a sane default to connection type 
CURA-6011
 2018-12-18 09:45:26 +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
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin 
Remove unused file.

Contributes to CURA-6005.
 2018-12-18 07:17:37 +01:00
ChrisTerBeke
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 15:46:28 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6 
Increment API version to 6
 2018-12-17 15:43:09 +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
Daniel Schiavini
34f56b046a STAR-322: Review comments 2018-12-17 13:13:44 +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
Daniel Schiavini
9eb743bcb8 STAR-322: Making mypy happy 2018-12-17 12:01:10 +01:00
Daniel Schiavini
9f4b7bd703 STAR-322: Improving logging and cluster connection 2018-12-17 11:28:16 +01:00
Diego Prado Gesto
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +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
Daniel Schiavini
9086105204 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-17 10:38:29 +01:00
ChrisTerBeke
d900648f99 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 09:28:22 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6 
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
 2018-12-14 17:29:02 +01:00
Jaime van Kessel
b8a4d8e80d Remove the cluster connection type 
CURA-6011
 2018-12-14 17:14:56 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model 
CURA-6011
 2018-12-14 17:10:58 +01:00
Daniel Schiavini
3194a6d0bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-14 16:17:36 +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
ChrisTerBeke
2772b3bcbd Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:10:20 +01:00
Daniel Schiavini
e815d5da8f STAR-322: Avoiding lambdas and direct callbacks to avoid gc 2018-12-14 16:02:28 +01:00
Daniel Schiavini
2f08854097 STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished 2018-12-14 14:50:15 +01:00
Lipu Fei
a02bccf74d Fix NozzleModel to work with new ListModel data update 
CURA-6015

ListModels should not modify items directly. All ListModels should use
setItems() and the insertions/removals/modifications will be done in
setItems() itself.
 2018-12-14 13:00:06 +01:00
Daniel Schiavini
4dc8edb996 STAR-322: Fixing the multipart upload 2018-12-14 12:48:40 +01:00
Lipu Fei
cd3a9e02d6 Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash 2018-12-14 11:45:51 +01:00
Lipu Fei
a18203b286 Fix typing 
CURA-6011
 2018-12-14 11:37:32 +01:00
Lipu Fei
4252b95603 Make ConnectionType Enum type accessible to QML 
CURA-6011
 2018-12-14 11:28:21 +01:00
Lipu Fei
a1ad7851d9 Merge remote-tracking branch 'origin/4.0' into CURA-6011_connection_types 2018-12-14 11:11:40 +01:00
Lipu Fei
99cee1dfe7 Use double-quotes for custom type hinting in functions 
CURA-6011
 2018-12-14 10:54:54 +01:00
Lipu Fei
8bb8ae8652 Rename ConnectionType.none to ConnectionType.Unknown 
CURA-6011

Cannot use None
 2018-12-14 10:48:26 +01:00
Lipu Fei
3e1993d876 Rename Enum name to camal cases 
CURA-6011
 2018-12-14 10:11:10 +01:00
Lipu Fei
644944bc41 Remove unused function setConnectionType() 
CURA-6011
 2018-12-14 10:00:21 +01:00
Lipu Fei
0aa49270eb Remove unused function checkConnectionType() 
CURA-6011
 2018-12-14 09:57:43 +01:00
Lipu Fei
6bf39a32a9 Rename Enum names to camal cases 
CURA-6011
 2018-12-14 09:56:10 +01:00
ChrisTerBeke
e1f95c6ec1 Merge branch 'master' into STAR-322_cloud-connection 2018-12-14 09:24:56 +01:00
Ghostkeeper
3f3cd5e334
Remove broken load of PrepareSidebar.qml 
This file no longer exists. Loading it gives a warning.
 2018-12-13 16:32:49 +01:00
Aleksei S
973970a895 Every print ouput device should define its connection type(usb, network, cluster and etc) 
CURA-6011
 2018-12-13 16:00:12 +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
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
Jaime van Kessel
0a6c1a7c14 Fix CLIENT_ID (again) 
It got messed up in a merge again. Ugh.
 2018-12-13 13:12:57 +01:00
ChrisTerBeke
36f5150d94 Fix merge conflict 2018-12-13 11:48:35 +01:00
ChrisTerBeke
f72b58386b Also use CuraConstants for account API root 2018-12-13 11:46:11 +01:00
ChrisTerBeke
6150bd665a Merge branch 'master' into STAR-322_cloud-connection 2018-12-12 14:04:59 +01:00