GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,129 Commits 294 Branches 267 Tags
Commit Graph

461 Commits

Author SHA1 Message Date
Ian Paschal
413965a0ee Fighting muscle memory 2018-07-09 11:51:53 +02:00
Ian Paschal
ac0192f01f Improve fixes 2018-07-09 11:29:25 +02:00
Mark
8e7399c442 Add correct typing 2018-07-06 10:56:09 +02:00
Ian Paschal
75d5828f5f
Merge branch 'master' into fix_tests_cura_engine_backend 2018-07-06 09:48:07 +02:00
Ian Paschal
3321b23925 Fixes for UM3NetworkPrinting 2018-07-05 16:31:56 +02:00
Diego Prado Gesto
c738f306fb Fix style in some components 2018-07-05 14:35:12 +02:00
Diego Prado Gesto
3c57068cf4 CURA-5034 Fix a typo in the method call. 2018-07-03 10:38:44 +02:00
Ian Paschal
adc7fc58e9 Fixed method naming conflict 2018-07-02 13:53:35 +02:00
Ian Paschal
b55abee783 Code style did not rename this variable 2018-07-02 13:05:22 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Ghostkeeper
e717abf499
Fix typing related to Network Printing 
Contributes to issue CURA-5330.
 2018-06-15 16:53:45 +02:00
Diego Prado Gesto
7eba868574 CURA-5330 Fix typing and code style in the UM3NetworkPrinting plugin 2018-06-14 15:41:12 +02:00
Ghostkeeper
b2cd0ffc0f
Make createFormParts public 
Because the postFormWithParts function is public and it needs these parts that can (or should) only be created with this function.

Contributes to issue CURA-5034.
 2018-06-12 15:44:22 +02:00
Ghostkeeper
2e005a09ac
Remove unused import 
Contributes to issue CURA-5034.
 2018-06-12 15:41:52 +02:00
Ghostkeeper
d87166d5c2
Don't reconnect when getting printer data 
I think I accidentally added this during debugging at some point this sleepy morning.

Contributes to issue CURA-5034.
 2018-06-12 15:40:47 +02:00
Ghostkeeper
da5e4c11a4
Override connect() rather than connecting to connection state signal 
This is much more lean and a bit more semantic.

Contributes to issue CURA-5034.
 2018-06-12 15:40:10 +02:00
Ghostkeeper
a4171dd561
Also sync when connecting with printer 
Though right now it seems to sync way too often. I don't know why it keeps connecting.

Contributes to issue CURA-5034.
 2018-06-12 13:56:21 +02:00
Ghostkeeper
194bb5e8c8
Also send built-in profiles 
The printer firmware won't add them currently so we're sending these profiles to their doom. However a later firmware update might fix this so we can make older Cura versions send the profiles as well so that it is forward compatible.

Contributes to issue CURA-5034.
 2018-06-12 13:45:58 +02:00
Ghostkeeper
0a557fdb79
Send material per GUID with highest version number 
If you have multiple materials with the same GUID (in the case of custom profiles) then we want to send only the material with the highest version number and only the base material.

Contributes to issue CURA-5034.
 2018-06-12 13:42:03 +02:00
Ghostkeeper
2dcb185a32
First ask the printer which profiles it already has 
Only let the printer have one profile per GUID and make sure it's the one with the highest version.

Contributes to issue CURA-5034.
 2018-06-12 12:50:33 +02:00
Ghostkeeper
0da7ad3946
Use material.fdm_material.xml.sig for signature file names 
Just put the .sig after the entire file instead of replacing the extension.

Contributes to issue CURA-5034.
 2018-06-11 16:01:16 +02:00
Ghostkeeper
abf77da4c4
Send to cluster API 
Not the normal printer API. That won't work without authentication.

Contributes to issue CURA-5034.
 2018-06-11 16:01:16 +02:00
Ghostkeeper
4e46963f58
Also send signature file if it exists 
The files are not placed there yet when unpacking a package, as far as I know. Next time.

Contributes to issue CURA-5034.
 2018-06-08 16:07:17 +02:00
Ghostkeeper
4727340ae4
Send only original files 
When we re-serialize them, the XML file will not be exactly the same so the signature will fail to match. We need to send the original bytes.

This changes the behaviour: It now sends all non-default files instead of all files that were loaded fully.

Contributes to issue CURA-5034.
 2018-06-08 16:02:00 +02:00
Ghostkeeper
ddb80be1ec
Send materials asynchronously 
This way we won't block the interface while those materials are sending.

Contributes to issue CURA-5034.
 2018-06-08 15:06:06 +02:00
Ghostkeeper
63f5c8346a
Implement API call to send material profile 
It seems to work now. I don't know if the material actually arrives but from this end it seems to send it at least.

Contributes to issue CURA-5034.
 2018-06-08 14:33:13 +02:00
Ghostkeeper
82a34b49eb
Add function to send material profiles to cluster 
This only works for cluster.

Contributes to issue CURA-5034.
 2018-06-08 13:55:29 +02:00
Ghostkeeper
4c1149643f
Remove unused import 
Contributes to issue CURA-5034.
 2018-06-08 13:08:34 +02:00
Jack Ha
49e49bfa58 Merge branch '3.4' 2018-06-07 09:34:30 +02:00
Diego Prado Gesto
ece2729744 CURA-5445 Remove the action when the Finish button is clicked. The 
button will just close the dialog.
 2018-06-06 19:02:40 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
 2018-06-06 14:54:26 +02:00
Jaime van Kessel
91a66d1290 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-31 17:21:27 +02:00
Jaime van Kessel
c988e0eccb Also added "none" to the state list of prints_jobs not to be matched with printers 2018-05-31 17:20:53 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Jaime van Kessel
416f695610 Canceling sending job to cluster no longer results in "still sending print" message. 
Previously it would always show this, requiring a restart of Cura before print could be sent. CL-913
 2018-05-31 11:52:36 +02:00
Diego Prado Gesto
b7fe43e68c Merge branch 'master' into WIP_improve_initialization 2018-05-23 11:36:12 +02:00
Diego Prado Gesto
eea9b7ab46 CURA-5254 Keep track of the latest manual entry key, so it is then 
selected in the list.
 2018-05-22 12:05:33 +02:00
Aleksei S
fc01811792 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-18 17:22:54 +02:00
Aleksei S
314f913510 Remove extra "if" statement and unused code 2018-05-18 17:21:59 +02:00
ChrisTerBeke
e7f70d68c7 Focus on IP address field when adding networked printer 2018-05-18 17:19:14 +02:00
Diego Prado Gesto
8ad409ff55
Merge branch 'master' into WIP_improve_initialization 2018-05-14 15:15:02 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point 
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
 2018-05-11 08:50:42 +02:00
Ian Paschal
0accdc6320 Cura-5296 Use separate packages.json files in app and user data 2018-05-08 11:54:19 +02:00
Diego Prado Gesto
8c4dc1cc2b CURA-5264 Don't need the if statement since the hardware-typeid is the 
right value to look at and it is in the firmware api.
 2018-05-04 14:59:59 +02:00
Aleksei S
c5e9acf664 Fix: Manually added printer by ip address shows proper printer type 
CURA-5264
 2018-05-03 17:14:56 +02:00
Ghostkeeper
16de8cac0f
Fix undefined variable 
Contributes to issue CURA-5143.
 2018-04-24 10:38:50 +02:00
Lipu Fei
0852cd2c20 WIP: Fix hanging upon send gz 2018-04-24 10:34:08 +02:00
Lipu Fei
37bcf1694d Remove translation wrapper for unnecessary parts 
CURA-5221
 2018-04-23 12:00:05 +02:00
Lipu Fei
f92985b4ac Add Ultimaker S5 for printer type detection 
CURA-5221
 2018-04-23 11:57:01 +02:00