3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 302 branches 270 tags 770 MiB
Commit graph

2372 commits

Author SHA1 Message Date
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
Jack Ha
955ed00c39 CURA-5334 added big phat error when single extruder printer does not have correct extruder 2018-06-11 16:56:35 +02:00
Jack Ha
24844edd90 CURA-5334 fix typo in method name _fixSingleExtrusionMachineExtruderDefinition 2018-06-11 16:10:25 +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
Lipu Fei
7a6e711276 Update SettingOverrideDecorator upon extruder enabled/disabled 
CURA-5456

When an extruder gets disabled, the SettingOverrideDecorator should
update its associated extruder to an enabled one so the whole setup can
be sliced.
 2018-06-11 13:29:36 +02:00
Lipu Fei
a04bf7d814 Merge remote-tracking branch 'origin/3.4' 2018-06-11 11:32:51 +02:00
Lipu Fei
310a99fba7 Fix deepcopy in SettingOverrideDecorator 
Obvious mistake...
 2018-06-11 11:32:25 +02:00
Lipu Fei
c779795618 Remove unnecessary updateMaterialForDiameter() 
CURA-5327
 2018-06-11 10:55:10 +02:00
Lipu Fei
8ea3c879f4 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-11 10:48:22 +02:00
Lipu Fei
553e9bcdc2
Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-06-11 09:11:38 +02:00
Lipu Fei
19b02cd6e8 Use MachineManager to update material container 
CURA-5327

The old update function in ExtruderManager is not functioning correctly.
 2018-06-11 08:13:16 +02:00
Lipu Fei
dfdda24093 Update extruder definition if necessary 
CURA-5334
 2018-06-11 07:23:53 +02:00
Lipu Fei
cecd7b55a1 No need to fix material diameter or nozzle size 
CURA-5334
 2018-06-08 17:05:31 +02:00
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and 
QualityProfilesDropDownMenuModel
 2018-06-08 17:02:59 +02:00
Diego Prado Gesto
e5e96bc600 Merge branch 'master' into mypy_fixes 
Contributes to CURA-5330
 2018-06-08 15:29:22 +02:00
Ghostkeeper
8202b62343
Merge branch '3.4' 2018-06-07 11:38:13 +02:00
Ghostkeeper
624bbbeb4a
Account for the fact that createMachine can return None 
Contributes to issue CURA-5337.
See also #3787.
 2018-06-07 11:37:48 +02:00
Jack Ha
f828c135f8 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-07 11:35:09 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
 2018-06-06 14:54:26 +02:00
Jack Ha
17b127e8c1 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-06 11:00:09 +02:00
Lipu Fei
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +02:00