Commit graph

6505 commits

Author SHA1 Message Date
Jaime van Kessel
09025edffa
Convert some class functions to static
Since they didn't access any class attributes, there is no need for them to be classMethods
2019-09-06 17:22:40 +02:00
Jaime van Kessel
94b6f7864f
Add some tests for XMLMaterialProfile 2019-09-06 17:19:23 +02:00
Jaime van Kessel
608ca3e92a
Convert some functions to static 2019-09-06 15:18:50 +02:00
Ghostkeeper
f5aa2921ff
Add space before comments
Some pause commands on some printers (looking at you, Repetier) seem to require a space after it, which is not obvious to the user. So we'll put a space there for them.

Fixes #6295.
2019-09-06 14:35:29 +02:00
Diego Prado Gesto
4e086054a5 Merge branch '4.3' 2019-09-06 12:57:47 +02:00
Ghostkeeper
b20e5bfd98
Don't display any message if setting is empty
Contributes to issue CURA-6759.
2019-09-06 12:42:15 +02:00
Ghostkeeper
c1b4bcebec
Add message while pausing
This way you can display instructions during the print.

Implements issue CURA-6759.
2019-09-06 12:41:09 +02:00
Chris ter Beke
7ff7ab53bf
Merge pull request #6313 from Ultimaker/CS-171_add_r2_support
CS-171 Add R2 support
2019-09-06 11:53:55 +02:00
Ian Paschal
f49cf8dfd5 Fix typo
CS-171
2019-09-06 11:30:42 +02:00
Ian Paschal
7674905f1c Extend found_machine_type_identifiers to include R2
CS-171
2019-09-06 11:23:28 +02:00
Simon Edwards
f53031f6b9
Merge pull request #6311 from Ultimaker/CS-284_fix_crash_missing_printer_configuration
Check if printerConfiguration is actually set before trying to access it
2019-09-06 10:30:25 +02:00
Jaime van Kessel
0235ad6930
Check gltf extension against lower() filename
CURA-6739
2019-09-06 09:51:26 +02:00
ChrisTerBeke
5f480f753c Add fixme note to hardcoded extruder count 2019-09-06 09:50:15 +02:00
ChrisTerBeke
549b724a4f Use 2 extruders at all times for now 2019-09-06 09:37:43 +02:00
ChrisTerBeke
ab3f627177 Check if printerConfiguration is actually set before trying to access it 2019-09-05 18:01:04 +02:00
Jaime van Kessel
9d5ee286b4
Merge branch 'CURA-6537_ui_feedback_on_invalid_firmware' of github.com:Ultimaker/Cura 2019-09-05 16:10:30 +02:00
Chris ter Beke
e02f0f1480
Merge pull request #6302 from Ultimaker/fix-job-sending
Print job uploading
2019-09-05 14:43:56 +02:00
Lipu Fei
46a15762aa Add doc for the need of filename in processGCodeStream() 2019-09-05 14:19:48 +02:00
Lipu Fei
5644721073 Fix UFPReader due to gcode reader readFromStream() change 2019-09-05 14:17:49 +02:00
ChrisTerBeke
210843a7bb Improve adding/connecting to output devices 2019-09-05 10:47:15 +02:00
ChrisTerBeke
4364d94423 Reduce logging and network activity during print job upload 2019-09-04 18:54:53 +02:00
Diego Prado Gesto
79aefa950f
Merge pull request #6298 from bkp23/master
Fixed PauseAtHeight.py to resume at starting height
2019-09-04 15:54:15 +02:00
Lipu Fei
b67944cac1 Fix workaround for GLTF loading
CURA-6739
2019-09-04 15:25:58 +02:00
Lipu Fei
cadbde7b92 Add workaround for GLTF loading
CURA-6739
2019-09-04 14:33:24 +02:00
Diego Prado Gesto
f051c48b9e Add a printer to the list of translation IDs
Contributes to CURA-6742.
2019-09-04 14:11:57 +02:00
B. Perry
6ed57838a9 Fixed PauseAtHeight.py to resume at starting height 2019-09-03 14:02:52 -06:00
ChrisTerBeke
abb1d5d5eb
Merge branch 'master' into CS-278_ignore_material_empty
* master:
  Do not trigger slicing if there's no slicable object
  Fix regex in FlavorParser
2019-09-03 21:30:34 +02:00
ChrisTerBeke
ed616789cb
Remove debug print statement 2019-09-03 21:22:13 +02:00
ChrisTerBeke
86d87acd5b
Filter out configurations for empty materials 2019-09-03 21:21:06 +02:00
Lipu Fei
0524796145 Do not trigger slicing if there's no slicable object
CURA-6604
2019-09-03 20:01:41 +02:00
Lipu Fei
09dc209956 Fix regex in FlavorParser 2019-09-03 20:01:41 +02:00
Ghostkeeper
e2ed6f03e2
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-09-03 16:42:45 +02:00
Lipu Fei
d154c98476
Merge pull request #6288 from Ultimaker/feature_bottom_face
Align Face To Build-Plate
2019-09-03 16:14:48 +02:00
Ghostkeeper
a9adceec87
Merge branch 'mb-fix-backend-plugin-crash' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-backend-plugin-crash 2019-09-03 16:14:26 +02:00
Remco Burema
d9b10e7180 Merge branch 'feature_bottom_face' of https://github.com/Ultimaker/Cura into feature_bottom_face 2019-09-03 16:04:38 +02:00
Lipu Fei
a07e88125f Fix typing
CURA-6713
2019-09-03 15:58:42 +02:00
Remco Burema
70332978fd Less cryptic max face-id.
part of CURA-6745
2019-09-03 15:48:31 +02:00
Lipu Fei
44db4216bc Rename to getEndFaceSelectionId()
CURA-6745
2019-09-03 15:44:43 +02:00
Ghostkeeper
2f917c2841
Change definition ID upon reading profile
Implements CURA-6713.
2019-09-03 15:38:41 +02:00
Remco Burema
503a24f7a1 Make magic value into funtion (max face-id).
part of CURA-6745
2019-09-03 15:08:41 +02:00
Jaime van Kessel
24474b4434 Made too broad exception handling more specific 2019-09-02 09:52:36 +02:00
Jaime van Kessel
a2e2c541e5 Merge branch 'CURA-6604_fix_load_gcode' of github.com:Ultimaker/Cura 2019-09-02 09:48:43 +02:00
Remco Burema
b97015a354 Added 'align selected face with buildplate' feature.
Alt-click to select a face. See the (identically named) 'feature_bottom_face' branch in Uranium for more indepth information.
2019-09-02 00:17:14 +02:00
Jaime van Kessel
87e0b8629a Add convenience script for running complete coverage 2019-08-30 16:32:11 +02:00
Lipu Fei
743b8cd156 Fix multi extrusion gcode loading
CURA-6604
2019-08-30 15:53:25 +02:00
Jaime van Kessel
9b45b56e61 Fix simulation view not showing bars for g-code 2019-08-30 11:43:59 +02:00
Jaime van Kessel
3fa2fefdef Merge branch 'CURA-6643_f5_to_reload_gcode' of github.com:Ultimaker/Cura 2019-08-30 11:39:41 +02:00
Mark Burton
41d7a705e6 Avoid crash due to race in CuraEngineBackend. 2019-08-29 21:35:13 +01:00
Ghostkeeper
b734d34af3
Add typing for lists that it can't auto-detect
Contributes to issue CURA-6739.
2019-08-29 16:22:18 +02:00
Ghostkeeper
bac77c0609
Add support for ZAE files
Contributes to issue CURA-6739.
2019-08-29 15:52:34 +02:00