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

1839 commits

Author SHA1 Message Date
Jaime van Kessel
03a7833180 Fixed qml warnings (reading from undefined properties) 
CL-893 && CL-894
 2018-08-21 10:14:12 +02:00
Jaime van Kessel
1fa3b60f94 Added rough outline of the redesigned cluster controlItem 
CL-893
 2018-08-17 16:10:23 +02:00
Jaime van Kessel
b074d2bdf3 Added translations for the strings 
CL-894
 2018-08-17 13:41:23 +02:00
Jaime van Kessel
eb7d42a7f8 Added delete button to cluster queue 
CL-894
 2018-08-17 10:49:44 +02:00
Jaime van Kessel
d4aaa73928 Codestyle fixes 
CL-894
 2018-08-17 10:34:14 +02:00
Jaime van Kessel
01b9ba03d4 Added extruder icon 
CL-894
 2018-08-16 16:24:14 +02:00
Jaime van Kessel
5bee561c9c Removed the static placeholders for monitor info 
CL-894
 2018-08-16 15:54:35 +02:00
Jaime van Kessel
0fe0e4ac54 Ensure that the order of the cluster queue is correctly show in monitor tab 
CL-894
 2018-08-16 15:23:16 +02:00
Jaime van Kessel
af4b7c38c7 Removed stray debug print 
CL-894
 2018-08-16 15:04:52 +02:00
Jaime van Kessel
ef00550df6 Added send to top context item 
CL-894
 2018-08-16 15:04:00 +02:00
Jaime van Kessel
28dc918e03 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-16 13:28:57 +02:00
Simon Edwards
e1e9c60016 Send UFP to Ultimakers provided the firmware version is sufficient. 
CL-980
 2018-08-15 13:56:51 +02:00
Jaime van Kessel
94b9782110 Added preview image to print cluster monitor 
CL-894
 2018-08-14 14:54:27 +02:00
Jaime van Kessel
78ebdb13f4 Cluster monitor page now shows queue instead of added printers 
CL-894
 2018-08-14 13:34:05 +02:00
Jaime van Kessel
d46c754616 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-14 09:37:44 +02:00
Ghostkeeper
6ffe0a9083
Fix indent and typo 2018-08-13 14:47:51 +02:00
Ghostkeeper
f91c696e4b
Clarify error message a bit more 
The QA engineer was a bit confused by this one. Let's make the language a bit easier.
 2018-08-10 13:17:20 +02:00
Jaime van Kessel
da23eff2a6 Codestyle changes 2018-08-09 13:28:08 +02:00
Jaime van Kessel
d31df8ec67 Fixed that long printernames overlap other GUI elements 2018-08-09 12:47:49 +02:00
Andreea Scorojitu
41a892796d CURA-5626 Remove UM3 from connection message 
"This printer is not set up to host a group of Ultimaker 3 printers.", Ultimker 3 was removed from the message.
 2018-08-09 09:14:25 +02:00
Lipu Fei
20806eeb72 Refactor some code 
CURA-5612
 2018-08-03 14:37:13 +02:00
Aleksei S
38ce73365a Manually added printers have suffix "( manual)" 2018-08-03 13:45:08 +02:00
Aleksei S
9c8ac6e9ed After switching the Monitor Tab set Null to active output printer 
CURA-5612
 2018-08-03 11:42:55 +02:00
Jaime van Kessel
1cb896904b Fixed missed renames of onFinished keyword 2018-07-24 16:24:28 +02:00
Jaime van Kessel
e89983b171 When dismissing the print window, also reset the "sending_gcode" flag 
CL-913
 2018-07-24 16:17:53 +02:00
Jack Ha
4167f81e3b Fix printer missing from the list after connection; now always adds the field 'hidden' in the metadata, don't know why it worked before. CURA-5574 2018-07-16 13:32:35 +02:00
Jack Ha
2bd8350141 Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
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