Commit graph

1994 commits

Author SHA1 Message Date
Arjen Hiemstra
b9dc94e1f6 Override getProperty in ExtruderStack with some additional checks 2017-04-11 17:45:23 +02:00
Jaime van Kessel
f56dc3d09e Fixed copying for Linux
CURA-3529
2017-04-11 17:01:16 +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
Lipu Fei
20f28b3fa2 Set dir names in config to allow UM detect old cura dir
CURA-3529
2017-04-11 09:18:19 +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
Jack Ha
c989496a13 Fix load (3mf) groups. Also add convex hull decorator to children of node. CURA-3671 2017-04-10 16:11:42 +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
Jack Ha
3263ca4e2d Revert file permissions. CURA-3670 2017-04-10 11:17:44 +02:00
Jack Ha
3d8e94964b Fixed one_at_a_time and arranger. CURA-3670 2017-04-10 11:16:34 +02:00
Ghostkeeper
cb7c25f92f
Merge branch 'master' into feature_support_top_bottom_speed 2017-04-10 10:52:31 +02:00
Tim Kuipers
4c6f9486be feat: cutting mesh (CURA-966) 2017-04-08 12:49:00 +02:00
Jaime van Kessel
c94b05e0f4 Minor refactor 2017-04-07 16:52:19 +02:00
Jaime van Kessel
670de52ec9 Minor refactor; renamed start_priority to last_priority 2017-04-07 16:45:59 +02:00
Jaime van Kessel
e26ade0e6f Multiplying now also gives a message if it could not find a suitable spot for some objects 2017-04-07 16:40:39 +02:00
Jaime van Kessel
f9fbd8c02e Only push free nodes inside buildplate 2017-04-07 16:22:44 +02:00
Jaime van Kessel
f42efcb7e0 Removed count from findNodePlacement
CURA-3239
2017-04-07 16:16:38 +02:00
Jaime van Kessel
04eca9073a Moved multiply objects to job
CURA=3239
2017-04-07 16:11:23 +02:00
Jaime van Kessel
b2183352b8 Added message if arrange all could not find location for all objects
CURA-3239
2017-04-07 15:19:30 +02:00
Jaime van Kessel
2008383118 Added disallowed areas to arranger
CURA-3239
2017-04-07 15:14:27 +02:00
Jaime van Kessel
552b1ed4e8 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-07 11:03:19 +02:00
Jaime van Kessel
ffa0e3e5e2 CuraApplication now also registers object defined by QTApplication
CURA-3633
2017-04-07 11:02:53 +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
Jack Ha
7ddecc0077 Fixed arranger rotating some models. CURA-3239 2017-04-06 17:09:45 +02:00
Jack Ha
91edf5589e Fixed outside boundary check boo boo. CURA-3239 2017-04-06 16:01:57 +02:00
Jack Ha
203ebcf1a1 Arranger findNodePlacements now places objects on top of build plate. CURA-3239 2017-04-06 14:56:54 +02:00
Jack Ha
ed0fb1b0ab Arrange All now places excessive objects outside build plate. CURA-3239 2017-04-06 09:47:57 +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
4da2de532b Fix saving of Global/Extruder stack
Since we now have proper types for them, we can simplify the save code
2017-04-06 02:21:03 +02:00
Jaime van Kessel
064b823ce3 Arrange job now groups all transformations.
This ensures that we can un & re do the aranging
2017-04-05 16:59:30 +02:00
Jaime van Kessel
03db47afd9 Added progress message to arrangeObjectsJob 2017-04-05 16:42:13 +02:00
Jaime van Kessel
d5682e6e29 ArrangeObjectsJob now yields after each object 2017-04-05 16:26:34 +02:00
Jaime van Kessel
7ea8017bb4 Moved arranging of nodes to it's own job 2017-04-05 16:25:34 +02:00
Jaime van Kessel
1d10caf1ec Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-05 15:26:19 +02:00
Jaime van Kessel
ad4e1b3b18 ConvexHull Scene node no longe re-builds the shader every time it's created
This took about 12ms per object, which was quite noticable if there were multiple objects
2017-04-05 15:25:20 +02:00
Jack Ha
6a3d8504a1 Fix g-code reader after adding arranger. CURA-3239 2017-04-05 14:27:04 +02:00
Jack Ha
30484461cf Faster arranging for same sized objects. CURA-3239 2017-04-05 11:41:18 +02:00
Jack Ha
4c9ec3c22d Better result (but slower) for arranger. CURA-3239 2017-04-05 11:29:57 +02:00
Jack Ha
87577f3e23 Improve ugly code for Arranger. CURA-3239 2017-04-05 11:26:29 +02:00
Jaime van Kessel
4626bc37a9 Improved documentation 2017-04-05 11:05:48 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Jack Ha
4e91d55bdf Fix Arranger bestSpot. CURA-3239 2017-04-05 10:41:54 +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