GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,841 Commits 288 Branches 260 Tags
Commit Graph

14841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
eda0d34fd9
Call from QtApplication instead of Application 
Because we're using createQmlComponent which is only in QtApplication.

Contributes to issue CURA-5330.
 2018-06-15 11:21:59 +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
01a645e726
Use only CuraApplication 
It was complaining that getMachineManager doesn't exist, because that is in CuraApplication instead of UM.Application. I removed all references to UM.Application so that the imports are a bit simpler.

Contributes to issue CURA-5330.
 2018-06-15 10:28:07 +02:00
Diego Prado Gesto
b309e93767 CURA-5330 Fix typing in the VersionUpgrade plugin 2018-06-14 16:54:22 +02:00
Diego Prado Gesto
dc4556647a CURA-5330 Fix code style in XmlMaterialProfile plugin 2018-06-14 16:49:26 +02:00
Diego Prado Gesto
a184fad8ee CURA-5330 Add typing to the USBPrinting plugin 2018-06-14 15:57:30 +02:00
Diego Prado Gesto
7eba868574 CURA-5330 Fix typing and code style in the UM3NetworkPrinting plugin 2018-06-14 15:41:12 +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
eb65a11e18 CURA-5330 Fix code style and typing in Toolbox plugin 2018-06-13 18:22:27 +02:00
Diego Prado Gesto
0a21ce44b0 CURA-5330 Fix code style and typing in GCodeReader plugin 2018-06-13 17:36:04 +02:00
Diego Prado Gesto
51888d86fe CURA-5330 Fix typing check 2018-06-13 17:13:33 +02:00
Ghostkeeper
5bf553c63c
Merge branch 'mypy_fixes' of ssh://github.com/Ultimaker/Cura into mypy_fixes 2018-06-13 17:03:31 +02:00
Diego Prado Gesto
eca23e5b5d CURA-5330 Fix typing in 3MFReader plugin 2018-06-13 16:48:08 +02:00
Diego Prado Gesto
f2768fd761 CURA-5330 Fix typing in the Backups 2018-06-13 16:35:48 +02:00
Diego Prado Gesto
f700a39547 CURA-5330 Fix type checking in ContainerNodes 2018-06-13 16:10:11 +02:00
Diego Prado Gesto
803d945fb6 CURA-5330 Add assertions when the networkmanager is not None after creating it. 2018-06-13 13:35:17 +02:00
Diego Prado Gesto
d03b0e610b CURA-5330 Fix typing in the PreviewPass 2018-06-13 11:56:53 +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
3a00ddb01d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-13 11:33:20 +02:00
Diego Prado Gesto
981eed313c FindNodePlacement should find a placement for the node, but not creating 
a new node.
 2018-06-13 11:28:20 +02:00
Lipu Fei
439ea79c60 Add message for unable to slice due to disabled extruders 
CURA-5456
 2018-06-13 11:09:20 +02:00
Diego Prado Gesto
f1b0c6238f CURA-5330 Add return type to some constructors 2018-06-13 11:01:30 +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 7a6e7112765c386c7d1ac1ac52fce132b67240ba.
 2018-06-13 10:34:01 +02:00
Lipu Fei
880e098031 Revert "Fix for code style checks" 
CURA-5456

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

This reverts commit c5d48a3a9a87f9ecdecb6466f6a057bb58f24b55.
 2018-06-13 10:33:46 +02:00
Diego Prado Gesto
f860b9c99e CURA-5330 Fix typing in GenericOutputController 2018-06-13 09:07:34 +02:00
Diego Prado Gesto
221cd3e73e CURA-5330 Fix typing in SingleInstance 2018-06-13 09:06: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
3a8756efa5 CURA-5330 Fix typing in the Arranger 2018-06-13 08:53:01 +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
e6d3fd548d CURA-5330 Fix some typing in the MachineManager 2018-06-12 16:52:10 +02:00
Diego Prado Gesto
5cd464c5de CURA-5330 Fix some typing issues in QualityProfilesDropDownMenuModel and 
SettingInheritanceManager.
 2018-06-12 16:35:46 +02:00
Lipu Fei
3bb65a2760 No need to deepcopy before auto-arrange 2018-06-12 16:32:47 +02:00
Diego Prado Gesto
2e174e75fa CURA-5330 Add typing checks to the MachineManager 2018-06-12 16:28:39 +02:00
Diego Prado Gesto
b9a94a1025 Adjust the slider label width a bit to look ok in macOS 2018-06-12 13:40:28 +02:00
Diego Prado Gesto
7cd0f57f22 Make the slider label width adjustable depending on the number of digits of 
the total number of layers.
 2018-06-12 13:32:54 +02:00
Diego Prado Gesto
c31d329657 Remove preference 'arrange models on load' since it was experimental and 
now the arranger makes the job.
 2018-06-12 13:20:20 +02:00
Diego Prado Gesto
c5d48a3a9a CURA-5456 Fix some code-style 2018-06-12 11:21:36 +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
Diego Prado Gesto
3be58e7d6b CURA-5462 Change Low name to Normal 2018-06-11 17:04:18 +02:00
Jack Ha
fa93d47d5b Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 17:00:51 +02:00
Jack Ha
89c84eb93b CURA-5327 fix crash when changing material diameter 2018-06-11 17:00:43 +02:00
Andreea Scorojitu
8cd46d2b58 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-06-11 16:59:21 +02:00
Diego Prado Gesto
bdd215ec8d
Merge pull request #3916 from Ultimaker/formulafy_speed_settings2 
CURA-5342 replace speed setting constants in profiles to formulas
 2018-06-11 16:51:01 +02:00
Diego Prado Gesto
335d3d4329 Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 15:55:22 +02:00