GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-13 12:01:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,119 Commits 295 Branches 268 Tags
Commit Graph

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lipu Fei
cf0efea4c3 Fix reset to formula button and use new icon 
CURA-5407
 2018-06-13 12:26:26 +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
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
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
Ghostkeeper
dd750ce125
Fix serializing flow-temperature graph 
This graph needs to have its own format in the XML material profiles, which wasn't implemented.

Contributes to issue CURA-5034.
 2018-06-12 16:37:59 +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
Ghostkeeper
d5878772e8
Fix reading flow temperature graph from XML files 
These have their own nice little subtags that we don't even parse.

Contributes to issue CURA-5034.
 2018-06-12 16:12:03 +02:00
Ghostkeeper
b2cd0ffc0f
Make createFormParts public 
Because the postFormWithParts function is public and it needs these parts that can (or should) only be created with this function.

Contributes to issue CURA-5034.
 2018-06-12 15:44:22 +02:00
Ghostkeeper
2e005a09ac
Remove unused import 
Contributes to issue CURA-5034.
 2018-06-12 15:41:52 +02:00
Ghostkeeper
d87166d5c2
Don't reconnect when getting printer data 
I think I accidentally added this during debugging at some point this sleepy morning.

Contributes to issue CURA-5034.
 2018-06-12 15:40:47 +02:00
Ghostkeeper
da5e4c11a4
Override connect() rather than connecting to connection state signal 
This is much more lean and a bit more semantic.

Contributes to issue CURA-5034.
 2018-06-12 15:40:10 +02:00
Ghostkeeper
a4171dd561
Also sync when connecting with printer 
Though right now it seems to sync way too often. I don't know why it keeps connecting.

Contributes to issue CURA-5034.
 2018-06-12 13:56:21 +02:00
Ghostkeeper
194bb5e8c8
Also send built-in profiles 
The printer firmware won't add them currently so we're sending these profiles to their doom. However a later firmware update might fix this so we can make older Cura versions send the profiles as well so that it is forward compatible.

Contributes to issue CURA-5034.
 2018-06-12 13:45:58 +02:00
Ghostkeeper
0a557fdb79
Send material per GUID with highest version number 
If you have multiple materials with the same GUID (in the case of custom profiles) then we want to send only the material with the highest version number and only the base material.

Contributes to issue CURA-5034.
 2018-06-12 13:42:03 +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
Jack Ha
95f7251486 CURA-5334 remove material_diameter from all printer definitions and also from fdmprinter.def.json 2018-06-12 13:39:29 +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
Ghostkeeper
2dcb185a32
First ask the printer which profiles it already has 
Only let the printer have one profile per GUID and make sure it's the one with the highest version.

Contributes to issue CURA-5034.
 2018-06-12 12:50:33 +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
Lipu Fei
b81635ac8e Update setting_version to 5 and add 34 -> 40 upgrade 
CURA-5450

Also update setting_version for all qualities and variants.
 2018-06-12 10:17:35 +02:00
Diego Prado Gesto
3be58e7d6b CURA-5462 Change Low name to Normal 2018-06-11 17:04:18 +02:00
Jack Ha
f775ce815d Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-06-11 17:01:10 +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