GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,533 Commits 289 Branches 260 Tags
Commit Graph

751 Commits

Author SHA1 Message Date
Ghostkeeper
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities 
CURA-5879 experimental qualities
 2018-11-28 11:34:21 +01:00
Jaime van Kessel
94c4366194 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 17:55:13 +01:00
Lipu Fei
2c8ed99281 Add is_experimental to Qt models and QMLs 
CURA-5879
 2018-11-27 15:50:03 +01:00
Jaime van Kessel
854755277c Fix styling of comments 
Because sentences should start with capitals
 2018-11-27 14:37:01 +01:00
Jaime van Kessel
3ad1802ab6 Prevent a KeyError from messing 
CURA-5978
 2018-11-27 14:34:29 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders 
CURA-5978
 2018-11-27 08:45:45 +01:00
Diego Prado Gesto
692868a0b4 Create a function that given a printer type name, it will return and 
abbreviated name.

Contributes to CURA-5942.
 2018-11-22 15:45:38 +01:00
Remco Burema
3dab627670
Merge pull request #4618 from Ultimaker/CURA-5834_fix_material_model_update 
CURA-5834 Fix material model update
 2018-10-23 14:54:34 +02:00
Diego Prado Gesto
94ef0b92fe Fix typo in the getCompatibleMaterialDiameter function. 
Contributes to CURA-5834.
 2018-10-23 10:25:13 +02:00
Lipu Fei
cbd8c8739d Merge from master 2018-10-23 08:08:37 +02:00
Lipu Fei
eef7be3ed6 Use empty string for empty build plate 
CURA-5844

Or there can be a configuration mismatch.
 2018-10-22 11:54:13 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Lipu Fei
59704e4c0e Make sure that a machine's default actions are added before it gets activated 
CURA-5812
 2018-10-19 09:58:06 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Jaime van Kessel
3b70e5eb6b Fix typing 
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
 2018-09-27 20:01:55 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Lipu Fei
ddc5d983a1 Fix single extrusion machines without an ExtruderStack 
CURA-5736
 2018-09-18 13:35:25 +02:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +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
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
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
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
066a00653a Add one more layer to the decision tree 2018-08-02 17:15:34 +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
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
Jack Ha
111a3556d2 Fixed possible errors and typing error. CURA-5389 2018-07-09 11:42:30 +02:00
Jack Ha
5af5aa9e35 Added reset profiles/materials and uninstall functionality and dialog. CURA-5389 2018-07-09 09:57:31 +02:00
Jack Ha
675c5064ed Added checkPackageUsageAndUninstall and the package usage check. No confirmation dialog yet 2018-07-05 11:47:06 +02:00
Diego Prado Gesto
762a1b1bfd Fix code-style 2018-07-03 12:06:06 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all 
CURA-5334 Add extruder definitions for all single-extrusion machines
 2018-07-02 15:56:45 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Ian Paschal
680e98fb28 Removed duplicate '.self' 2018-07-02 13:11:01 +02:00
Diego Prado Gesto
0692192d58 Merge branch '3.4' 2018-07-02 09:10:57 +02:00
Diego Prado Gesto
56c7c6f2b2 CURA-5518 Check whether the the findDefinitionContainers return any 
element or not.
 2018-06-29 10:41:54 +02:00
Diego Prado Gesto
554a3fd908 Merge branch 'master' into mypy_fixes 
Conflicts:
cura/Backups/Backup.py
cura/Settings/ExtruderManager.py
cura/Settings/MachineManager.py
 2018-06-13 11:53:02 +02:00
Diego Prado Gesto
6e364f0895 CURA-5330 Fix typing and code-style in the ContainerNode and all the 
related children, and QualityGroup and its children.
Also fix the related calls in the managers.
 2018-06-13 10:55:57 +02:00
Diego Prado Gesto
2e174e75fa CURA-5330 Add typing checks to the MachineManager 2018-06-12 16:28:39 +02:00
Jack Ha
5f53195578 CURA-5334 factor out the need for material_diameter in machine definition for getMaterialNodeByType 2018-06-12 11:40:19 +02:00
Jack Ha
44e9d1e334 CURA-5334 factor out the need for material_diameter in machine definition for getDefaultMaterial 2018-06-12 11:25:02 +02:00
Jack Ha
b3f6e5c9e0 CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant 2018-06-11 15:52:28 +02:00
Lipu Fei
74e3785a03 Fix material update upon loading a machine 
CURA-5327
 2018-06-11 13:42:38 +02:00
Diego Prado Gesto
e5e96bc600 Merge branch 'master' into mypy_fixes 
Contributes to CURA-5330
 2018-06-08 15:29:22 +02:00