Commit graph

10057 commits

Author SHA1 Message Date
Ghostkeeper
bec43d5b9a
Make sure that the preferred material name variable exists
Another small bug I found when looking through this MachineManager code. My IDE was complaining that the preferred_material_name was not always initialised and that preferred_material was an unused variable.

Doesn't contribute to issue CURA-3803.
2017-05-22 15:36:46 +02:00
Jaime van Kessel
cc3402ab81 Added RunTime exception catching for image_reply
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
2017-05-22 14:50:03 +02:00
Jaime van Kessel
f9f0fa852f Added RunTime exception catching for image_reply
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
2017-05-22 14:48:42 +02:00
Jaime van Kessel
c474642744 Removed debug ID
CURA-3814
2017-05-22 14:25:29 +02:00
Jaime van Kessel
92192ff411 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-22 14:10:27 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder
This is more in line with the other properties

CURA-3814
2017-05-22 14:05:10 +02:00
Ghostkeeper
c14294d1f7
Merge branch '2.6'
Conflicts:
cura/Settings/ExtrudersModel.py

Contributes to issue CURA-3803.
2017-05-22 14:02:48 +02:00
Ghostkeeper
5f0fb3f9bd
Don't squash signals updating materials and variants
These may have different parameters, such as which machine and extruder they are updating the material and variant of. If we only pass the last signal on, then we're missing the update of other extruders.

Contributes to issue CURA-3803.
2017-05-22 14:01:58 +02:00
Ghostkeeper
8c166ea770
Use CuraContainerStack.definition instead of ContainerStack.getBottom()
We know now that it must be a Cura Container Stack. This should be a bit faster, and makes the error message I was getting a bit more clear.

Contributes to issue CURA-3803.
2017-05-22 14:01:58 +02:00
Ghostkeeper
5ae02fb4c6
Listen to changes on all extruders
Not just the active extruder. The non-active extruder may change when loading a project file which happened to have the same printer (so no new printer is created) and the same material and variant in the active extruder but not the same material or variant in another extruder.

Contributes to issue CURA-3803.
2017-05-22 14:01:58 +02:00
Ghostkeeper
6315947156
Modify parameter types from DefinitionContainer to DefinitionContainerInterface
It may also be any other class that implements the Definition Container Interface.

Not really related to CURA-3803 but I'm putting it there anyway as I found it during that development.
2017-05-22 14:01:57 +02:00
Arjen Hiemstra
8e5cfd9566 Add last missing settings that should still use extruderValue
Contributes to CURA-3738
2017-05-22 13:57:08 +02:00
Jaime van Kessel
b69ced5766 Set color of "Not Overriden" option to white
CURA-3814
2017-05-22 13:45:28 +02:00
Jaime van Kessel
20cb3ea01f Added "optional_extruder" setting type
CURA-3814
2017-05-22 13:24:41 +02:00
Jaime van Kessel
4d853d5d52 Build volume no longer gives issue if -1 is provided as an int
CURA-3814
2017-05-22 13:22:03 +02:00
Ghostkeeper
a13ec0072f
Merge branch '2.6' 2017-05-19 16:00:23 +02:00
Ghostkeeper
07f5b9b5bb
Set TPU skin overlap to 5%
For the 0.8mm profiles the variants specify 5%, so we remove it from those profiles. The 0.4mm variants specify 15% so for those we need to override it.
2017-05-19 15:57:54 +02:00
Ghostkeeper
1db6e354b5
Set travel avoid distance for TPU to 0.5mm
With TPU the material gets dragged along a lot when moving outside of the object. We want to reduce that.
2017-05-19 15:57:54 +02:00
Ghostkeeper
39986baa2f
Remove redundant travel avoid distance settings
The UM3 definition sets the setting to 3mm. Nothing else sets it to another value except FDM Printer. I left the UM3 setting in and removed all travel_avoid_distance settings in the UM3 profiles.
2017-05-19 15:57:53 +02:00
Ghostkeeper
600428a0a3
Disable Z-hop for all TPU profiles
This gives better results, and we don't want to offer dual-extrusion options for TPU at first anyway.
2017-05-19 15:57:53 +02:00
Lipu Fei
df36c7a18b Check global_stack before updating in SettingInheritanceManager
CURA-3756
2017-05-19 15:24:09 +02:00
Lipu Fei
862cbe0211 Check global_stack before updating in SettingInheritanceManager
CURA-3756
2017-05-19 15:23:30 +02:00
Lipu Fei
a386e6d867 Dump stacktrace for all threads in CrashReport
CURA-3836

This helps debugging issues like CURA-3836
2017-05-19 15:00:54 +02:00
Lipu Fei
430508c185 Dump stacktrace for all threads in CrashReport
CURA-3836

This helps debugging issues like CURA-3836
2017-05-19 15:00:22 +02:00
Ghostkeeper
76a9a9a9ab
Erase changed hotends/materials after applying changes
Otherwise we may only change one of the extruders next time, and it'll still have the other change in this dictionary from the previous time we are syncing from the printer.

Contributes to issue CURA-3788.
2017-05-19 14:39:22 +02:00
Jaime van Kessel
81d03a1683 Fixed order of pva profiles
CURA-3845
2017-05-19 14:00:40 +02:00
Jaime van Kessel
336e411f00 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-19 13:54:55 +02:00
Jaime van Kessel
4b826b747b Added exception handling to XML parsing
CURA-3843
2017-05-19 13:54:31 +02:00
Lipu Fei
9ff7852055 Only use limit_to_extruder when the extruder exists
CURA-3756
2017-05-19 13:37:38 +02:00
Jaime van Kessel
75b3f08318 Removed unneeded logging
THis caused a massive logging spam
2017-05-19 13:09:41 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.

Contributes to issue CURA-3839.
2017-05-19 12:30:17 +02:00
Lipu Fei
5a6049ddea Change XmlMaterialUpgrader to use UNIX EOLs
CURA-3756
2017-05-19 11:06:01 +02:00
Lipu Fei
7089460861 Minor refactoring for XMLMaterial upgrade
CURA-3756
2017-05-19 11:05:16 +02:00
maukcc
0fccad875a Delete UM3 profiles 2017-05-19 10:46:34 +02:00
Jaime van Kessel
c43a71084c Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-19 10:40:09 +02:00
Jaime van Kessel
475455d473 Definition changes are now also upgraded
CURA-3837
2017-05-19 10:39:37 +02:00
maukcc
e035358474 Revert "update"
This reverts commit 8a027340c5.
2017-05-19 10:36:15 +02:00
Lipu Fei
593697e0ed Fix XML material upgrade
CURA-3756
2017-05-19 10:18:13 +02:00
maukcc
5a3fc68185 update 2017-05-19 09:10:17 +02:00
Ghostkeeper
bccd4187a3
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-18 16:49:17 +02:00
Ghostkeeper
7cb8e549f4
Merge branch 'feature_mold_roof' 2017-05-18 16:47:51 +02:00
Jaime van Kessel
f2f83750c2 Type is now always added when deserializing profiles to g-code
CURA-3829
2017-05-18 16:42:11 +02:00
Arjen Hiemstra
7e4f983cd6 Fix support settings that need their inheritance value from different extruders
Contributes to CURA-3738
2017-05-18 15:34:50 +02:00
Lipu Fei
870d6fe76a Use position number to get extruders for overriding in project loading
CURA-3756
2017-05-18 14:34:37 +02:00
fieldOfView
a134779627 Fix creating conflicting machine names 2017-05-18 13:52:20 +02:00
Arjen Hiemstra
89adc46142 Make limit_to_extruder update properly when value changes happen
Contributes to CURA-3738
2017-05-18 12:46:06 +02:00
Jaime van Kessel
b16913ec3d Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-18 10:49:43 +02:00
Jaime van Kessel
898da21a7b Added missing super call
CURA-3832
2017-05-18 10:49:05 +02:00
Lipu Fei
5ed89525fb selectedObjectExtruders should handle no extruder case
CURA-3756
2017-05-18 10:29:55 +02:00
Lipu Fei
cbdddd0b16 Ignore "quality" and "variant" containers in project loading
CURA-3756
2017-05-18 10:28:02 +02:00