GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 03:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 290 Branches 260 Tags
Commit Graph

2372 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Arjen Hiemstra
d29ae60d38 Add missing Any import 2017-04-12 12:05:40 +02:00
Arjen Hiemstra
b9dc94e1f6 Override getProperty in ExtruderStack with some additional checks 2017-04-11 17:45:23 +02:00
Arjen Hiemstra
323107ef5c Fix GlobalStack::getProperty 
It used to only consider user values in the "user" containers, now it
also accounts for values in the other instance containers.
 2017-04-11 13:51:01 +02:00
Arjen Hiemstra
73e1af49ee Track which settings we are trying to "resolve" 
This prevents infinite recursions when a resolve function tries to get
its own value.
 2017-04-10 18:06:24 +02:00
Arjen Hiemstra
09e5765f22 Do not try to validate against machine_extruder_count when there is no machine_extruder_count 2017-04-10 18:06:24 +02:00
Ghostkeeper
07d64f2335
Report the type that was found when replacing containers 
Makes it easier to debug.

Contributes to issue CURA-3497.
 2017-04-10 11:18:02 +02:00
Ghostkeeper
cb7c25f92f
Merge branch 'master' into feature_support_top_bottom_speed 2017-04-10 10:52:31 +02:00
Arjen Hiemstra
6827849220 Un-deprecate activeMachine{Name,Id} 
Since it provides too much noise and I do not want to change the code
that uses it right now.
 2017-04-06 17:50:05 +02:00
Arjen Hiemstra
433537a2f0 Add type metadata to Extruder/Global stack 
For backward compatibility with old code that still checks for "type".
 2017-04-06 17:49:22 +02:00
fieldOfView
0c74b4d108 Don't create extruder tabs for "inactive" extruders 
If a printer definition defines more extruders than machine_extruder_count, these are no longer shown as tabs in the sidebar.
 2017-04-06 09:41:15 +02:00
Arjen Hiemstra
608e62e081 Do not try to get resolve when extruder count == 1 or for nonexistant properties 2017-04-06 02:22:45 +02:00
Arjen Hiemstra
1c75a82779 Fix the hacked "getResolveOrValue" to return value always instead of resolve 2017-04-06 02:21:39 +02:00
Arjen Hiemstra
d3d2bdfaeb getResolveOrValue has become obsolete now that stack.getProperty can return a resolve 2017-04-04 17:41:43 +02:00
Arjen Hiemstra
a16b5d73b6 Partial fix for infinite recursion when trying to call getProperty 2017-04-04 17:41:21 +02:00
Arjen Hiemstra
82333a244b Add some initial code to use the new classes to create new machines 2017-04-04 17:40:58 +02:00
Arjen Hiemstra
cbc19b13eb Deprecate the activeMachineName/Id properties in favour of activeMachine 2017-04-04 17:40:34 +02:00
Arjen Hiemstra
7eb5441ebc Add an "activeMachine" property to MachineManager 
Directly exposes the global container stack to QML.
 2017-04-04 17:39:57 +02:00
Arjen Hiemstra
47a388fd2c Introduce a CuraStackBuilder class 
It contains factory functions for creating new stacks with certain
quality/material/variant combinations.
 2017-04-04 17:38:49 +02:00
Lipu Fei
db1c6e4163 Merge pull request #1649 from Ultimaker/fix_setting_speed 
Fix delays when settings change from error to valid
 2017-04-04 14:33:44 +02:00
Arjen Hiemstra
7015702832 Add a change timer to perform the error state checking 
This pulls the checkStackHaveErrors code out of the critical path when
editing settings, instead moving it to be handled later. This greatly
reduces the delay that happens when editing settings.

Fixes CURA-3653
Contributes to #1631
 2017-04-04 13:39:18 +02:00
Jaime van Kessel
6314d872e1 If we find multiple materials for a new extruder, prefer a read only material 
CURA-3147
 2017-03-30 16:07:26 +02:00
Arjen Hiemstra
1f0f8cd6ea Make GlobalStack a subclass of CuraContainerStack 2017-03-30 08:58:21 +02:00
Arjen Hiemstra
202f19a081 Make ExtruderStack a subclass of CuraContainerStack 2017-03-30 08:58:05 +02:00
Arjen Hiemstra
d4400b8674 Introduce a CuraContainerStack that has all the code shared between global and extruder 
Since there is actually quite a lot of it
 2017-03-30 08:57:37 +02:00
Arjen Hiemstra
317576e983 Set container entry to empty if it was not found in the original container 2017-03-28 18:14:16 +02:00