Commit graph

7988 commits

Author SHA1 Message Date
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property 2019-09-13 17:27:16 +02:00
Ghostkeeper
cc27392ab0
Don't use material groups to update metadata
The material groups are not filled any more in the material manager so this fails.
This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference.

The function becomes a lot simpler though. And it works again.

Contributes to issue CURA-6600.
2019-09-13 14:42:27 +02:00
Ghostkeeper
bb0c9c80dc
Don't use material groups to find just the root container
Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well.

Contributes to issue CURA-6600.
2019-09-13 14:42:27 +02:00
Ghostkeeper
882e60bf95
Fix typing of application
Because CuraApplication has the getMachineManager() function and such, not UM.Application.

Discovered during work on CURA-6600.
2019-09-13 14:42:26 +02:00
Nino van Hooff
d6872a65bd Fix infillOnlyCheckbox not representing mesh type
Not a bug but a feature: When the overlays button is clicked, the infill
mesh type is set and the checkbox checked

CURA-6683
2019-09-13 13:36:30 +02:00
Remco Burema
756c21cd19 Remove extra empty lines in ChangeAtZ-scipt output. 2019-09-13 13:33:06 +02:00
Nino van Hooff
44fbcaeb3a Fix Settings lines positioning for Per Object Settings
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
667e5f8e18 Fix reference error in POS
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
606faf54c2 Remove unnecessary component initialization
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
fe0e1e5aba Remove unnecessary ; line endings in QML
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
90fefac37f Remove redundant rows from POS QML
CuRA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
184a72f7ab Bind current_mesh_type to UM.ActiveTool.properties.getValue("MeshType")
CURA-6683
2019-09-13 13:26:00 +02:00
Remco Burema
ef0f5988a2 Fix 3MF-workspace-reading: Variants where not loaded properly.
part of CURA-6600
2019-09-13 12:59:54 +02:00
ChrisTerBeke
55cdb07c1c Fix loading popup image on windows 2019-09-13 11:12:13 +02:00
ChrisTerBeke
5dfb8216df Fix loading popup image on windows 2019-09-13 11:06:34 +02:00
Lipu Fei
bbde75491d Fix version number in upgrade from 4.1 to 4.2 2019-09-13 10:52:41 +02:00
ChrisTerBeke
e8b48a299b Store in preferences if the user wants to hide the message 2019-09-13 10:45:42 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +02:00
Jaime van Kessel
febe953226
Don't assert if there are already 7 containers in stack
CURA-6599

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2019-09-13 09:29:49 +02:00
Diego Prado Gesto
bca68c6db0 Merge branch 'feature_intent' into feature_intent_container_tree 2019-09-13 09:02:51 +02:00
Diego Prado Gesto
d38e60ce06 Merge branch 'master' into feature_intent 2019-09-13 09:02:30 +02:00
Ghostkeeper
9c47fc8e70
Use container tree to get quality definition of printer
Contributes to issue CURA-6600.
2019-09-12 16:15:40 +02:00
Ghostkeeper
b8ab04df4a
Correct type of logged item 2019-09-12 15:58:09 +02:00
Ghostkeeper
3a3aeb92a9
Log errors rather than printing them
This way we can debug them if a user sends us the logs.
2019-09-12 15:45:10 +02:00
Ghostkeeper
2d2bf9e279
Use logger for errors instead of printing them to stdout
This way they will show up in users' logs.
2019-09-12 15:25:01 +02:00
Jaime van Kessel
5db122aff6
Merge branch 'master' of github.com:Ultimaker/Cura into CURA--6683_icons_per_object_settings 2019-09-12 15:01:11 +02:00
Chris ter Beke
08e088e607
Merge pull request #6340 from Ultimaker/CS-59_new_printers_found_popup
CS-59: Message when new cloud printers were added to your account
2019-09-12 11:59:44 +02:00
ChrisTerBeke
07672fd569 Show message when new cloud printers were added to your account but not in Cura yet 2019-09-12 11:04:05 +02:00
Jaime van Kessel
06103b98d5
Ensure that quality_changes get their intent_category set in upgrade
CURA-6599
2019-09-12 10:30:16 +02:00
Jaime van Kessel
958d3698db
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-12 09:50:39 +02:00
Remco Burema
533e0f762f Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-09-11 17:34:49 +02:00
Remco Burema
00b02f95f9 Nix 3mf-read signal-postphoning, which prevented connects.
This fix was originally made to fix CURA-5056, but it turns out it now gives warnings and possibly messes up 3mf reading instead of fixing it, since it prevents the connection of new listeners to those signals.
After removal, the original file this was reported against still loads instead of the crash it was reported to give in the ticket (reproduction rate supposedly 100%) so the removal probably doesn't mess things up.

part of CURA-6600
2019-09-11 17:34:44 +02:00
Ghostkeeper
2b96543cd3
Store intent category in metadata of quality_changes as well
This is necessary in order to restore it properly.

Contributes to issue CURA_6600.
2019-09-11 16:58:11 +02:00
Jaime van Kessel
5e4f673ec2
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-11 16:10:12 +02:00
Ghostkeeper
f6089ed627
Don't use material manager to get list of materials to send
The material manager is no longer populated so it wouldn't send any materials any more.

This is probably faster anyway since it doesn't need to go back to the container registry for every file.

Contributes to issue CURA-6600.
2019-09-11 15:43:35 +02:00
Ian Paschal
72ba6153c2 Boyscout some stuff
CS-158
2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1 Reduce progress bar length
CS-158
2019-09-11 14:50:42 +02:00
Ian Paschal
07a5213ea6 Reduce text size to 12pt from 14pt
CS-158
2019-09-11 14:50:15 +02:00
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-10 15:07:57 +02:00
Ghostkeeper
ef8b9e98d1
Remove calls to quality manager's private functions
It should never have been called that way.

Contributes to issue CURA-6600.
2019-09-10 14:47:36 +02:00
Diego Prado Gesto
190984462b Merge branch '4.3' 2019-09-10 14:17:31 +02:00
Lipu Fei
cfeefe365d
Merge pull request #6328 from Ultimaker/fix_select_face
CURA-6754 / CURA-6761 Fix Select Face
2019-09-10 14:05:41 +02:00
Ghostkeeper
9b05624b8d
Merge branch '4.3' 2019-09-10 14:04:09 +02:00
Nino van Hooff
42a3e1227a Use explicit types for mesh_type qml properties
CURA-6683
2019-09-10 13:37:05 +02:00
Nino van Hooff
0ba1bfbe4f Enable Per Object Settings when extruder is in Recommended mode 2019-09-10 13:37:05 +02:00
Nino van Hooff
6101afa68b Remove redundant namespace usages 2019-09-10 13:37:05 +02:00
Nino van Hooff
812eeab07a Show infill checkbox only for overhang mesh types 2019-09-10 13:37:05 +02:00
Nino van Hooff
760234f69b Per Object Settings qml for icon buttons 2019-09-10 13:37:05 +02:00
Nino van Hooff
a457265c07 Update the Support Eraser icon size 2019-09-10 13:37:05 +02:00
Nino van Hooff
789ebc4df8 Update the Support Eraser (support blocker) icon 2019-09-10 13:37:05 +02:00