Commit graph

8941 commits

Author SHA1 Message Date
Ghostkeeper
9132a025d6
Merge branch 'feature_CURA-3810_material_info_button' of https://github.com/LipuFei/Cura into LipuFei-feature_CURA-3810_material_info_button 2017-05-30 13:32:03 +02:00
Lipu Fei
8af1cc886f Use .definition to access DefinitionContainer in qml
CURA-3810
2017-05-30 12:49:12 +02:00
Lipu Fei
7be05229d8 Fix material info button tooltip position
CURA-3810
2017-05-30 11:47:49 +02:00
Lipu Fei
9333ed1e35 Update copyright in comments
CURA-3810
2017-05-30 09:16:58 +02:00
Lipu Fei
68bd5a6e37 Use Item and anchors to set material row layout
CURA-3810
2017-05-30 09:16:28 +02:00
Lipu Fei
3a3d9afc24 Use "button" style for material info button
CURA-3810
2017-05-29 18:06:42 +02:00
Lipu Fei
c80e1b67a5 Only show material info button for multi-extrusion machines
CURA-3810
2017-05-29 18:00:46 +02:00
Tim Kuipers
3b62c4a59a fix: changelog attribution to community members (CURA-3879) 2017-05-29 16:31:11 +02:00
Tim Kuipers
b01f1bdbb3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 16:27:09 +02:00
Ghostkeeper
e0326bbb9b
Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-05-29 15:55:08 +02:00
Lipu Fei
585bc78892 Only set material for imported quality profile if there is an active material
CURA-3881

CuraContainerRegistry._activeMaterialId() can return an empty string
if there is no active material, and in this case, importing a custom
quality file will fail.
2017-05-29 15:52:29 +02:00
Lipu Fei
b797fcc74d Use global stack to evaluate limit_to_extruder value
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
2017-05-29 15:44:57 +02:00
Ghostkeeper
50c4b88050 Let global stack handle limit to extruder
Contributes to issue CURA-3738.
2017-05-29 15:44:24 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix
CURA-3810
2017-05-29 15:23:52 +02:00
Lipu Fei
9b67fa94b4 Add material info button to show Ultimaker.com materials page
CURA-3810

Add a new info button for materials. When a user clicks on the button,
it will open the materials information page on the Ultimaker website.
2017-05-29 14:52:05 +02:00
Lipu Fei
8ede981a2c Set version in <fdmmaterial> when saving XML material files
CURA-3884
2017-05-29 14:19:52 +02:00
Arjen Hiemstra
9bda7dbaae Error out when trying to import a profile witha quality_type we dont have
Rather than successfully importing the profile and then not showing
anything, we now display an error. Not the perfect solution but the
easiest for now.

Contributes to #1873
2017-05-24 15:43:49 +02:00
Ghostkeeper
ce6814d45d Add default for colour code of material
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
2017-05-24 15:20:59 +02:00
Jaime van Kessel
e6f61f3bbc When trying to convert None to RGBA, log it and return a usable default
contributes to #1869
2017-05-24 11:38:38 +02:00
Lipu Fei
da39ab8093 Remove duplicate "enabled" for "infill_angles" 2017-05-23 13:34:50 +02:00
Lipu Fei
9a08e0cc27 Only use <fdmmaterial version> for detecting material file version
CURA-3540
2017-05-23 11:51:31 +02:00
Ghostkeeper
1f33a0d4cd
Use per-parameter-value compression for signals
This will only emit one signal for each unique combination of parameters.

Contributes to issue CURA-3803.
2017-05-22 15:36:46 +02:00
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
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
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
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
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
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
Lipu Fei
593697e0ed Fix XML material upgrade
CURA-3756
2017-05-19 10:18:13 +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