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
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
Arjen Hiemstra
43c7373368
Ignore any files not ending in .qml when adding QML resources
...
Qt 5.8 includes compiled QML caching, which creates .qmlc files on disk.
These shouldn't be added as actual QML objects. In addition, anything
that does not end in .qml is probably not something that can actually be
parsed as QML, so ignore those too.
2017-04-04 17:35:32 +02:00
Ghostkeeper
0dfe3f4109
Merge branch '2.5'
2017-04-04 17:25:50 +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
68f536dc5f
Merge pull request #1538 from Ultimaker/feature_mold
...
Mould
2017-04-04 12:53:33 +02:00
Jack Ha
535330ef51
Added comments. CURA-3239
2017-04-04 10:29:10 +02:00
Jack Ha
3d16c4120e
Added comments. CURA-3239
2017-04-04 09:59:42 +02:00
Jack Ha
1df9066340
Fix error after refactor, added comments
2017-04-04 09:52:07 +02:00
Jack Ha
1ebf947ff2
Added tests for ShapeArray. CURA-3239
2017-04-03 17:03:30 +02:00
Jack Ha
d1b9078657
Added first arranger tests, small refactors. CURA-3239
2017-04-03 16:36:48 +02:00
Jack Ha
892140150a
Fix group models bounds check. CURA-3640
2017-04-03 15:06:40 +02:00
Jack Ha
a83b1dd638
Split ShapeArray from Arranger. CURA-3239
2017-04-03 14:48:31 +02:00
Jack Ha
d6cd37626b
Removed logging, improved spot for left-over object. CURA-3239
2017-04-03 11:47:04 +02:00
Jack Ha
e866c03b50
Fixed multiplyObject group. CURA-3239
2017-04-03 11:12:20 +02:00
Jack Ha
bd874a62ac
Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239
2017-04-03 10:44:53 +02:00
Jack Ha
abb5d1e76e
Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239
2017-04-03 10:40:04 +02:00
Jaime van Kessel
786a4565b7
Added a few plugins to required list
2017-03-31 10:30:13 +02:00
Jaime van Kessel
e0c77231e0
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-30 20:04:18 +02:00
Jaime van Kessel
891aebc366
Removed getBackend from Cura (and onto Uranium)
2017-03-30 20:03:21 +02:00
Lipu Fei
c74ff4b204
Catch exceptions when checking if a file is a project
2017-03-30 19:08:19 +02:00
Jaime van Kessel
0c6d0a0abb
Moved recent files into Uranium
...
USL-41
2017-03-30 18:35:41 +02:00
Jack Ha
9db816b0fc
Funed arranger for better performance. CURA-3239
2017-03-30 17:26:56 +02:00
Jaime van Kessel
dbfa5873ce
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-30 17:03:01 +02:00
Jack Ha
76c1c31cf4
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:27:19 +02:00
Jack Ha
1164805a68
WIP Solved stash apply. CURA-3610
2017-03-30 16:26:39 +02:00
Jack Ha
3135dc7d77
Solved MC
2017-03-30 16:20:08 +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
Jack Ha
fa7a026efe
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:05:07 +02:00
Jack Ha
da5288ea78
Fix updating allowed areas. CURA-3610
2017-03-30 16:04:57 +02:00
Jaime van Kessel
cd5e883010
Build volume now uses IsSlicable decorator to check for scene changes
...
CURA-3608 Fixes #1598
2017-03-30 11:24:01 +02:00
Tim Kuipers
a4272bf7be
Merge branch 'master' into feature_mold
2017-03-30 11:16:27 +02:00
Jaime van Kessel
13561bdb46
material_amounts is now defined in init
...
Somehow this was forgotten, which could cause issues in certain cases.
CURA-3617
2017-03-30 10:47:11 +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
jack
3a255b341f
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:43:41 +02:00
jack
f50c3f430a
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:37:13 +02:00
Jack Ha
099752125b
Arrange all now places biggest objects first. CURA-3239
2017-03-29 10:00:21 +02:00
Jack Ha
f357dea086
Tuned arranger a bit, good enough for proof of concept. CURA-3239
2017-03-29 09:32:29 +02:00
fieldOfView
ba06f06cd0
Optimize code
2017-03-28 20:17:51 +02:00
