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
22028 commits 305 branches 272 tags 787 MiB
Commit graph

2094 commits

Author SHA1 Message Date
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
Aleksei S
77bd6cf749 Read material weight from container 
CURA-5408
 2018-07-09 14:20:51 +02:00
Jack Ha
111a3556d2 Fixed possible errors and typing error. CURA-5389 2018-07-09 11:42:30 +02:00
Jack Ha
bff9a3afb5 Merge branch 'master' into remove-package-check 2018-07-09 11:25:19 +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
f91b6faecc Fix code-styling 2018-07-03 17:57:30 +02:00
Diego Prado Gesto
ff6bc9de4e Fix some more code-style 2018-07-03 13:09:05 +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
Aleksei S
c4fa50a8fc Added icon for custom Menu items 2018-06-25 16:51:40 +02:00
Aleksei S
f577789859 Added extra SettingsModel for a QML 2018-06-23 16:22:33 +02:00
Ghostkeeper
75e5a185d9
Don't unnecessarily cast to a set 
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set.

Contributes to issue CURA-5330.
 2018-06-15 13:07:55 +02:00
Ghostkeeper
6e663ac6f5
Don't call getMachineManager on Uranium's application 
It is a function of CuraApplication.

Contributes to issue CURA-5330.
 2018-06-15 11:15:31 +02:00
Ghostkeeper
c3d4d5eba7
Ignore MyPy errors caused by DepthFirstIterator not being detected as iterator 
MyPy is wrong in this case.

Contributes to issue CURA-5330.
 2018-06-15 11:02:15 +02:00
Ghostkeeper
4418cf3aac
Prevent accessing private _instances variable 
We can get at this via the getProperty function.

Contributes to issue CURA-5330.
 2018-06-15 10:59:41 +02:00
Ghostkeeper
b331736cb2
Let _findInstanceContainerDefinitionId work with DefinitionContainerInterface 
But where it needs the .id field it needs to ignore this type because this works with getattr weirdness.

Contributes to issue CURA-5330.
 2018-06-14 09:58:16 +02:00
Ghostkeeper
eac3c759cd
Cast each container in their stack to actual types 
We know for sure that these containers have those types. We'll accept the risk here that this assumption was wrong.

Contributes to issue CURA-5330.
 2018-06-14 09:58:07 +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
Lipu Fei
b0b4f78cf2 Revert "Update SettingOverrideDecorator upon extruder enabled/disabled" 
CURA-5456

This reverts commit 7a6e711276.
 2018-06-13 10:34:01 +02:00
Lipu Fei
880e098031 Revert "Fix for code style checks" 
CURA-5456

This reverts commit cc11e0a242.
 2018-06-13 10:33:55 +02:00
Lipu Fei
abed6052d0 Revert "CURA-5456 Fix some code-style" 
CURA-5456

This reverts commit c5d48a3a9a.
 2018-06-13 10:33:46 +02:00
Lipu Fei
0c3528a613 Fix missing new quality_changes 
CURA-5471

Otherwise they don't get saved...
 2018-06-13 09:04:05 +02:00
Lipu Fei
1b3706e172 Fix missing new quality_changes 
CURA-5471

Otherwise they don't get saved...
 2018-06-13 08:59:14 +02:00
Diego Prado Gesto
698c72e190 CURA-5330 Fix typing in ExtruderManager and ContainerManager 2018-06-12 17:24:20 +02:00
Diego Prado Gesto
5cd464c5de CURA-5330 Fix some typing issues in QualityProfilesDropDownMenuModel and 
SettingInheritanceManager.
 2018-06-12 16:35:46 +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
Diego Prado Gesto
c5d48a3a9a CURA-5456 Fix some code-style 2018-06-12 11:21:36 +02:00
Diego Prado Gesto
4024391e75 Fix quality profile update 
CURA-5453

))Should take into account that the custom profile being updated may not have a quality_changes container for each stack, and Cura should create one if this is the case, so the user changes results can be stored.
 2018-06-12 10:54:53 +02:00
Lipu Fei
cc11e0a242 Fix for code style checks 
CURA-5456
 2018-06-12 10:50:09 +02:00
Diego Prado Gesto
e554adc1c8 CURA-5453 Remove duplicate line. 2018-06-12 10:40:02 +02:00
Jack Ha
c97f276583 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-06-11 16:56:42 +02:00