17119 Commits

Author SHA1 Message Date
Jack Ha
f1c8eda532 Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-16 13:45:51 +02:00
Jack Ha
44eb372cb8 Merge branch 'patch-1' 2018-08-16 13:45:33 +02:00
Jack Ha
6c1d380602 Renamed snap_distance to minimum_polygon_circumference and changed the description a bit. CURA-5623 2018-08-16 13:45:27 +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
Jaime van Kessel
7a4c9adc3f
Merge pull request #4238 from Ultimaker/CL-980_gcode_preview_not_visible_with_um3
Send UFP to Ultimakers provided the firmware version is sufficient.
2018-08-16 13:11:08 +02:00
Ian Paschal
e8cda90021 Add favorites to materials menu
Contributes to CURA-5162
2018-08-16 13:04:58 +02:00
Ian Paschal
57d41216e1 Remove dummy favorites
Contributes to CURA-5162
2018-08-16 13:04:17 +02:00
Ian Paschal
8493948ba1 Add a favorite materials model
Contributes to CURA-5162
2018-08-15 14:06:07 +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
Diego Prado Gesto
3d9c7f7eb5
Merge pull request #4216 from Ultimaker/feature_adjust_zoom_to_printer_size
Adjust maximum zoom to printer size
2018-08-15 13:19:46 +02:00
Lipu Fei
c20274e356 Move constant instance containers to a separate file
This way we separate the class/type definitions and the actual
constants.
2018-08-15 11:04:09 +02:00
Ghostkeeper
f1a7b23a5c
Adjust default position of camera based on diagonal size 2018-08-15 09:52:39 +02:00
Ghostkeeper
da39e842f1
Move getting diagonal size out to separate function 2018-08-15 09:25:24 +02:00
Diego Prado Gesto
3a7fff42b5 Fix code style.
Contributes to CURA-5628.
2018-08-15 09:14:37 +02:00
Diego Prado Gesto
ebb0317276 Merge branch 'master' into fix_unit_tests 2018-08-14 17:23:23 +02:00
Diego Prado Gesto
230dac1b9f
Merge pull request #4236 from Ultimaker/UM3extended_variant_fix
Fix UM3extended 0.25 variant file
2018-08-14 17:17:50 +02:00
Diego Prado Gesto
77c5a94db2 Fix some test in the CuraContainerRegistry.
Delete a test that needs a ContainerProvider. We need to discuss if we
want to add it back, depending if we are still keeping the providers.

Contributes to CURA-5628.
2018-08-14 17:14:30 +02:00
Diego Prado Gesto
b85950b128 Fix tests in the ExtruderStack.
Contributes to CURA-5628.
2018-08-14 15:40:11 +02:00
Diego Prado Gesto
e1fd9b03a4 Remove all dependencies of the CuraContainerStack with the
ContainerRegistry.

That will be very helpful for creating unit tests. Also this is not
needed because the next stack is always set in the machine or extruder
manager when switching printers.

Contributes to CURA-5628.
2018-08-14 15:35:00 +02:00
Diego Prado Gesto
ce9782b3af Initialize the empty_container in CuraApplication.
Contributes to CURA-5628.
2018-08-14 15:32:04 +02:00
DavidGergely
05bfee8158 Fix UM3extended 0.25 variant file
Set ultimaker3_extended_aa0.25.inst.cfg to be the same as the ultimaker3_aa0.25.inst.cfg.
2018-08-14 15:26:52 +02:00
Jaime van Kessel
94b9782110 Added preview image to print cluster monitor
CL-894
2018-08-14 14:54:27 +02:00
Diego Prado Gesto
1364370ede Fix global stack tests.
Contributes to CURA-5628.
2018-08-14 13:49:37 +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
Diego Prado Gesto
c8af4f45ce Decouple the creation of the stack containers from the process that add
them to the container registry, that is done in CuraApplication.

That allow us to have access to the empty containers and so we can unit
test easily without mocking up stuff.

Contributes to CURA-5628.
2018-08-14 13:25:56 +02:00
Lipu Fei
746644e6ed Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-14 12:02:23 +02:00
Lipu Fei
5869644b0b Fix typo 2018-08-14 12:02:11 +02:00
Diego Prado Gesto
db7f1242cd Fix some unit tests.
Add fixtures to the conftest file and clean-up the code a bit.

Contributes to CURA-5628
2018-08-14 10:41:38 +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
Diego Prado Gesto
be021b8fac Merge branch 'master' of github.com:Ultimaker/Cura 2018-08-13 17:04:52 +02:00
Diego Prado Gesto
848e99a4ba Don't show the hint message when the buildplate selector is shown.
Contributes to CURA-5570.
2018-08-13 17:04:13 +02:00
Ian Paschal
f91254c7c0 Fix typo in comment 2018-08-13 15:27:01 +02:00
Ghostkeeper
6ffe0a9083
Fix indent and typo 2018-08-13 14:47:51 +02:00
Lipu Fei
e0ad7a9fb4 Add answer commments to some puzzling code 2018-08-13 14:24:25 +02:00
Lipu Fei
8e891b69b0 Move type hinting imports into TYPE_CHECKING block 2018-08-13 13:48:00 +02:00
Lipu Fei
25e6fd8bec Fix incorrect type hinting 2018-08-13 13:47:26 +02:00
Lipu Fei
42b509cd4a Fix a wrong type hinting 2018-08-13 13:44:07 +02:00
Ian Paschal
5ede82eddc
Merge pull request #4233 from Ultimaker/CURA-5538-fix-on-at-a-time
CURA-5538 Fix one at a time
2018-08-13 13:14:30 +02:00
Lipu Fei
d45d6add40 Add collision detection in on-at-a-time iterator 2018-08-13 12:56:41 +02:00
Diego Prado Gesto
152005ab14
Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension
CURA-5570 More decision points in material and quality lookup!
2018-08-13 12:06:29 +02:00
Diego Prado Gesto
b1c073aab6 CURA-5570 Expose the CuraSDKVersion to qml and show the buildplate
selector only when "dev" version is selected.
2018-08-13 11:50:50 +02:00
Lipu Fei
bd47dfef75 Revert "Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2""
This reverts commit 89ed2bcff80a7a414f77c455baa0023c631eae7c.
2018-08-13 11:23:10 +02:00
Diego Prado Gesto
98a0bb5002 CURA-5570 Remove a check that caused empty list of profiles. 2018-08-13 11:15:32 +02:00
alekseisasin
792a275ccf
Merge pull request #4231 from Ultimaker/CURA-5595_code_style_fixes
Code style fixes
2018-08-13 10:47:11 +02:00
Ian Paschal
3fad11e07f Code style fixes
Contributes to CURA-5595
2018-08-13 10:45:03 +02:00
Aleksei S
787948f401 Removed "Preparing" button state
CURA-5551
2018-08-13 10:42:22 +02:00
Diego Prado Gesto
de1b8edb72 Merge branch 'master' into CURA-5570_beyond_comprehension 2018-08-13 09:57:36 +02:00
alekseisasin
7af6672547
Merge pull request #4137 from Ultimaker/CURA-5595_add_custom_button_to_menu
Cura 5595 add custom button to menu
2018-08-13 09:56:32 +02:00
Diego Prado Gesto
825a3cd08f CURA-5570 Fix the configuration sync feature.
It crashed Cura because it was using an outdated signature of the method
getMaterialNodeByType.
2018-08-13 09:55:57 +02:00
Diego Prado Gesto
429cbc11c6
Merge pull request #4210 from fieldOfView/fix_support_eraser_rendering
Fix rendering support eraser cubes
2018-08-10 16:52:39 +02:00