3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
23379 commits 305 branches 272 tags 787 MiB
Commit graph

2132 commits

Author SHA1 Message Date
Ghostkeeper
3b36223681
Merge branch '3.5' 2018-09-14 12:40:29 +02:00
Ghostkeeper
e9cdd47a03
Fix types of getGlobalContainerStack call results 
We know in these places that there must be a global stack at this point. So to hide the type error we'll cast it here.
Of course, the danger in this is that someone might call this function that doesn't know about this requirement and calls it when there is potentially no global stack yet. Hopefully they'll discover this crash when that happens then.
 2018-09-14 12:38:16 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Lipu Fei
b27e5a1f77 Fix getActiveExtruderStacks() 
CURA-5719

The dict values can be a random list. We need to fetch the first N
extruders starting from position 0.
 2018-09-12 14:00:36 +02:00
Jaime van Kessel
c84a2213a7 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 11:01:55 +02:00
Diego Prado Gesto
351fe5c5bc Fix style. 2018-09-10 17:25:06 +02:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Lipu Fei
d8421105d4 Fix quality lookup 
CURA-5694

For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
 2018-09-10 14:39:10 +02:00
Lipu Fei
d01ec7872d Fix quality lookup 
CURA-5694

For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
 2018-09-10 14:23:46 +02:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager 
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
 2018-09-07 17:06:18 +02:00
Jaime van Kessel
e6d0a9cc6a Add missing typing 2018-09-07 16:33:44 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Jaime van Kessel
638f9fb941 Remove unused functions 2018-09-07 16:02:54 +02:00
Jaime van Kessel
20ec8828ed Fix incorrect type hinting 
The type hinting indicated that the property was a dict, but it could also be None.
In cases where it was None, it would cause an exception, which was also fixed (since
unpacking None will break)
 2018-09-07 15:32:07 +02:00
Lipu Fei
9aea0e5109 Fix quality lookup logic for extruders 
CURA-5694

 - Add convenience functions into GlobalStack
 - Use "has_variants" and "has_materials" instead of
 "has_variant_materials"
 - Remove "has_variant_materials"
 - For extruder qualities, skip global qualities if the machine has
   variants or materials
 2018-09-06 08:12:55 +02:00
fieldOfView
7b00d6879a Factor out USBPrinterManager singleton 2018-08-22 15:44:11 +02:00
alekseisasin
ff38ee2bed
Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog 
CURA-5649 Do not show gcode.gz as an option in save file dialog
 2018-08-22 14:12:08 +02:00
Lipu Fei
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests 
Fix unit tests
 2018-08-20 10:32:38 +02:00
Lipu Fei
013032279d Better handling of no quality group in CuraStackBuilder 2018-08-17 10:00:28 +02:00
Ghostkeeper
31e283110f
Check first if preferred quality exists 
Fixes #3784.
 2018-08-17 09:31:33 +02:00
Lipu Fei
f42dc24d95 Do not show gcode.gz as an option in save file dialog 
CURA-5649
 2018-08-16 15:16:32 +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
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
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
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
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
Lipu Fei
bd47dfef75 Revert "Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2"" 
This reverts commit 89ed2bcff8.
 2018-08-13 11:23:10 +02:00
Ian Paschal
3fad11e07f Code style fixes 
Contributes to CURA-5595
 2018-08-13 10:45:03 +02:00
Diego Prado Gesto
de1b8edb72 Merge branch 'master' into CURA-5570_beyond_comprehension 2018-08-13 09:57:36 +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
Aleksei S
a1bc2f3ebf Merge branch 'master' into CURA-5595_add_custom_button_to_menu 2018-08-10 15:51:38 +02:00
Ian Paschal
89ed2bcff8 Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2" 
This reverts commit 82e1a7c5fc, reversing
changes made to 1915659393.
 2018-08-10 11:45:25 +02:00
Ian Paschal
82e1a7c5fc
Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2 
CURA-5538 Fix print order for one-at-a-time mode
 2018-08-09 16:16:27 +02:00
Lipu Fei
9239e82b1f Make mypy happy 
CURA-5578
 2018-08-08 12:56:49 +02:00
Lipu Fei
910ffe0ad5 Fix quality reset upon material deletion 
CURA-5621
 2018-08-07 16:15:05 +02:00
Lipu Fei
95481b8560 Fix print order for one-at-a-time mode 2018-08-06 17:23:01 +02:00
Lipu Fei
066a00653a Add one more layer to the decision tree 2018-08-02 17:15:34 +02:00
Lipu Fei
a303f394c8 Move VariantType to VariantType.py 
Less circular dependencies for imports.
 2018-08-02 16:11:55 +02:00
Aleksei S
bf219c3821 Added typing 
CURA-5595
 2018-07-26 13:54:35 +02:00
Aleksei S
40c51249f5 Merge branch 'custom_menuitems_in_sidebar' into CURA-5595_add_custom_button_to_menu 2018-07-26 13:51:07 +02:00
Diego Prado Gesto
51c499b08c When the extruder is being disabled and it is the currently selected 
one, then switch to the default extruder. Also do not allow users to
click in a disabled extruder, only if they want to enable it again.
 2018-07-16 16:26:55 +02:00
Jack Ha
23d4e835ed Merge branch 'master' into CURA-5408-material-profiles 2018-07-12 14:44:50 +02:00
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
Lipu Fei
328fd9081e Merge remote-tracking branch 'origin/master' into remove-package-check 2018-07-10 14:57:46 +02:00
Jack Ha
e7c1d31bee Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408 2018-07-10 13:14:11 +02:00
Lipu Fei
e5a11c1f7b Fix getContainerMetaDataEntry() 
CURA-5408
 2018-07-09 15:12:53 +02:00