Commit graph

4854 commits

Author SHA1 Message Date
Jack Ha
163929196d Removed commented out code. CURA-3497 2017-04-25 08:50:22 +02:00
Jack Ha
c91bc015e4 Removed unused variables. CURA-3497 2017-04-25 08:43:44 +02:00
Arjen Hiemstra
ada614e413 Workaround a tiny display issue with checkable MenuItems
If there are no changes to make, we still need to reset the selected
extruders. This is a workaround for checked menu items being deselected
while they actually should still be selected.

Contributes to CURA-3609
2017-04-24 17:11:37 +02:00
Arjen Hiemstra
89310cb41e Select the group when right clicking an object that is part of a group
Instead of selecting the individual object.

Contributes to CURA-3609
2017-04-24 17:10:00 +02:00
Arjen Hiemstra
86d3cbadca Also search through groups when figuring out the extruders of the selection
Contributes to CURA-3609
2017-04-24 17:09:18 +02:00
Arjen Hiemstra
b4c557679c Change the selected extruder for all child nodes of a group
Instead of setting the extruder for the group node, go through all
children and set their extruders instead. Fixes extruder selection on
groups.

Contributes to CURA-3609
2017-04-24 17:08:19 +02:00
Jack Ha
765ddefd7f Reverse lookup TypeIndexMap is now also a dict. CURA-3497 2017-04-24 16:09:00 +02:00
Jaime van Kessel
01f33d3f28 Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu
Add Extruders to Context Menu and Refactor
2017-04-24 14:55:57 +02:00
Arjen Hiemstra
27256cae9e Revert import change 2017-04-24 13:12:36 +02:00
Arjen Hiemstra
8c4ec804e7 Add type hinting to _onContextMenuRequested 2017-04-24 13:12:21 +02:00
Arjen Hiemstra
78603bed63 Rename setSelectionExtruder to setExtruderForSelection
This matches more closely with the naming of the other selection
actions.
2017-04-24 13:12:00 +02:00
Arjen Hiemstra
e571b8aeac Remove superfluous return statement 2017-04-24 13:11:16 +02:00
Arjen Hiemstra
49bdb78219 Use cura. for imports instead of relative imports`
Matches the style of the rest of the file.
2017-04-24 13:11:04 +02:00
Jaime van Kessel
fb0df3109c Fixed inhertiance manager getting update from a Category setting 2017-04-24 13:10:33 +02:00
Jaime van Kessel
2297a6e80b Fixed inhertiance manager crashing if there is no parent 2017-04-24 13:05:39 +02:00
fieldOfView
2ca24ba7e6 Restore both material and variant to match 1st extruder when switching to single extrusion 2017-04-22 11:20:55 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Arjen Hiemstra
3d5e535b69 Select the object underneath the cursor on context menu request
Contributes to CURA-3609
2017-04-20 17:53:05 +02:00
Arjen Hiemstra
05e1de2fb3 Deprecate the delete/multiply/center methods in CuraApplication
Since they should no longer be used by the UI.

Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
9fd0239cd5 Add a selectedObjectExtruders property to ExtruderManager
It exposes a list of the extruders used by the current selection.

Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
5f65cb25c6 Add a setSelectionExtruder method to CuraActions
Can be used to set the extruder used for the selection

Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
61f542c215 Add a SetObjectExtruderOperation class
It handles setting an extruder for an object.

Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
b56802a523 Add a deleteSelection method to CuraActions
It does the same as CuraApplication::deleteSelection but this is a
better place for it.

Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
c21895de97 Add a multiplySelection method to CuraActions
Contributes to CURA-3609
2017-04-20 17:41:53 +02:00
Arjen Hiemstra
905e59354b Change MultiplyObjectsJob to work on a list of objects
This makes MultiplyObjectsJob able to handle a list of objects instead
of a single object ID.

Contributes to CURA-3609
2017-04-20 17:41:53 +02:00
Arjen Hiemstra
97fd35c21d Add a centerSelection method to CuraActions
Can be used to center all selected objects.

Contributes to CURA-3609
2017-04-20 17:41:53 +02:00
Arjen Hiemstra
8e95c894fb Add material and variant names to ExtruderModel
Contributes to CURA-3609
2017-04-20 17:41:53 +02:00
Arjen Hiemstra
ab1044de7b Some more documentation 2017-04-19 14:41:32 +02:00
jack
2cd3565d4b Merge pull request #1672 from Ultimaker/feature_CURA-3529_upgrade_cura_dir
CURA-3529: Set dir names in config to allow UM detect old cura dir
2017-04-19 13:28:49 +02:00
Arjen Hiemstra
7a907aa713 Deprecate addMachineExtruders/createExtruderTrain 2017-04-18 17:42:40 +02:00
Arjen Hiemstra
0467a8688a Make the UM3 work properly 2017-04-18 17:42:20 +02:00
Arjen Hiemstra
0a0353da82 Move code to set default variant/material/quality to CuraContainerStack
This allows us to eventually make sure everything uses the same code.
2017-04-18 17:41:48 +02:00
Arjen Hiemstra
8682eb1486 Document CuraContainerStack 2017-04-18 17:40:12 +02:00
Arjen Hiemstra
f1b5098a0a Document CuraStackBuilder 2017-04-18 17:38:44 +02:00
Arjen Hiemstra
edc5b8b84e Register extruders with ExtruderManager
For backward compatibility
2017-04-18 17:38:09 +02:00
Arjen Hiemstra
de57546020 Document ExtruderStack 2017-04-18 17:37:52 +02:00
Arjen Hiemstra
8e1580d8d9 Document GlobalStack 2017-04-18 17:37:26 +02:00
Arjen Hiemstra
af3f340fc2 Handle the fact that findContainers might end up returning None
Since we now do not necessarily have a container with the specified
type.
2017-04-18 17:37:05 +02:00
fieldOfView
4d96e6931d Store definition changes containers in a folder named definition_changes 2017-04-18 15:08:46 +02:00
fieldOfView
6e0221636d Save definition_changes in their own folder 2017-04-15 20:03:09 +02:00
Jaime van Kessel
53ecaba7f2 Added more typing.
These typing hints should have prevented the previous issue from happening
2017-04-14 14:21:36 +02:00
Jaime van Kessel
09d624dcfe Fixed accidental switch of function properties 2017-04-14 14:15:43 +02:00
Jaime van Kessel
397b08ce6d Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura 2017-04-14 11:22:35 +02:00
Jaime van Kessel
437c78711d Added typing to all singletons
This greatly helps with pycharms ability to do auto code completion
2017-04-13 16:32:17 +02:00
Arjen Hiemstra
0fee41d519 Allow CuraStackBuilder to determine the "default" variant/material/quality 2017-04-13 01:39:11 +02:00
Arjen Hiemstra
b87e7c46bf Use the normal empty container for quality changes as well 2017-04-13 01:37:45 +02:00
Arjen Hiemstra
33301c835b Use CuraStackBuilder::createMachine when adding a new machine 2017-04-13 01:37:26 +02:00
Arjen Hiemstra
f154db13b1 Add a createMachine method to CuraStackBuilder that creates a complete machine 2017-04-13 01:37:01 +02:00
Arjen Hiemstra
df8bba6c96 Add "machine" metadata entry when setting the next stack for an extruder 2017-04-13 01:33:22 +02:00
fieldOfView
db6cdad956 Filter preferred materials by approximate material diameter 2017-04-12 23:27:34 +02:00