5099 Commits

Author SHA1 Message Date
Simon Edwards
983e963dd3 Fix for deleting quality changes profiles.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:59:03 +02:00
Thomas Karl Pietrowski
1fd169c669 SliceInfo: Defining container_serialized as empty, before trying to serialize
While discussing with Jordy about the code I just found a problematic case where sending slice info could fail.
(This shouldn't happen, but..) If the first container is not serializable, then the for-loop will crash because container_serialized is not set for the if clause.
Additionally the if-clause is at the moment useless, because it is always true, because the content of container_serialized gets never resetted.

Contributes to CURA-1445
2016-09-22 11:43:21 +02:00
Jaime van Kessel
89c78fa2da Increased difference between display color for active/inactive extruder
CURA-2025
2016-09-22 11:41:52 +02:00
fieldOfView
fef1cfb5e8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 11:23:06 +02:00
fieldOfView
170a689b59 Select the correct preferred variant for multiextrusion printers
CURA-2424
2016-09-22 11:22:54 +02:00
Simon Edwards
8cbe410e34 Fix for creating profiles via the Create button.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:07:25 +02:00
fieldOfView
9499acf0d5 Fix expand/collapse icon when using the inherit icon to expand a category
CURA-2361
2016-09-22 10:36:38 +02:00
fieldOfView
038c736756 Tweak margins of print monitor 2016-09-22 09:01:07 +02:00
fieldOfView
cd483882eb Shade objects printed with the non-active extruder in solid view
Aid in learnability of CURA-2025 by fixing CURA-2117
2016-09-22 07:44:59 +02:00
Arjen Hiemstra
baa24370f6 Force garbage collection during ProcessSlicedLayersJob
For some reason, Python likes to hold on to LayerData and friends.
Forcing a GC run here will clean them up properly.

Contributes to CURA-2406
2016-09-22 00:57:44 +02:00
Arjen Hiemstra
8e5183bad4 Ensure we remove ProcessLayersJob once it has finished
Since it holds on to a fairly large amount of data.

Contributes to CURA-2406
2016-09-22 00:57:43 +02:00
fieldOfView
57cd7f43db Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-21 21:22:00 +02:00
fieldOfView
9300489796 Shade layerview elements printed with non-active extruder(s)
CURA-2025
2016-09-21 21:21:20 +02:00
Tim Kuipers
d8b1486637 doc: better documentation of limit_to_extruder and resolve properties in the JSON (CURA-2308) 2016-09-21 17:54:47 +02:00
Ghostkeeper
3f85ac264c
Properly serialise the machine instance name
Otherwise we get spaces and unescaped plusses in the file name of the user profile.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Ghostkeeper
ebb9507083
Add extension to new file
The upgrade plug-in can do this because he know that he's upgrading to version 2.3.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Ghostkeeper
7d41c1dcb3
Give canonical name to user settings
All user profiles are named Current settings, so we should just give it the same name as well.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Ghostkeeper
d962cad347
Ensure directory exists to store user profile in
Create it if it doesn't exist. Also fix up the directory to be absolute instead of relative.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Ghostkeeper
c1a593c3d8
Create new user profile upon upgrading machine instance
This defines a new configuration type: 'user', for the user profile.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Ghostkeeper
9501f9b17c
Make VersionUpgradeManager a singleton
This way we can access the manager from anywhere, without adding a getter to CuraApplication or something.

Contributes to issue CURA-844.
2016-09-21 17:34:22 +02:00
Jaime van Kessel
558ffc2c20 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 17:29:19 +02:00
Jaime van Kessel
a94d98dfed X3D reader no longer creates critical exceptions in the rest of cura
CURA-2083
2016-09-21 17:28:38 +02:00
Simon Edwards
46dd4f6093 Fix for duplicating quality changes profiles on the UM2.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 16:51:30 +02:00
Jaime van Kessel
51dee95c8f Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 16:37:39 +02:00
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well
CURA-2424
2016-09-21 16:36:45 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent.
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 15:26:20 +02:00
fieldOfView
45b753082f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-21 15:21:27 +02:00
fieldOfView
dea7192000 Hide build volume message when it no longer applies
CURA-2312
2016-09-21 15:21:16 +02:00
Jaime van Kessel
b7351a56e4 Added forcefull property changed if perobjectsettings extruder was changed
CURA-2319
2016-09-21 15:07:37 +02:00
Jaime van Kessel
70212e2cb7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 15:01:40 +02:00
Jaime van Kessel
6c7a0d73c3 Resolve now also returns value if resolve was undefined
CURA-2319
2016-09-21 15:01:08 +02:00
fieldOfView
326bb0f1f3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-21 14:50:13 +02:00
fieldOfView
7238a7b029 Expand category when clicking its inheritance button
CURA-2361
2016-09-21 14:50:02 +02:00
Jaime van Kessel
c13003c960 Switching between stacks now ensures that right value is used for perobject
CURA-2319
2016-09-21 14:15:48 +02:00
Jaime van Kessel
ddc4c73f8b Updated documentation for perobject visiblity
CURA-2319
2016-09-21 13:56:02 +02:00
Jaime van Kessel
6b613fd86b If the stack number is 0 it's now correctly used by perobject settings
CURA-2319
2016-09-21 13:37:41 +02:00
Jaime van Kessel
e934b2eb74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 13:08:11 +02:00
Jaime van Kessel
7f723632ea Build size is now only changed for one at a time mode if there is more than one object
CURA-2312
2016-09-21 13:07:29 +02:00
Tim Kuipers
9e128aae69 JSON fix: raft_margin had no settable_per information (CURA-2282) 2016-09-21 11:37:21 +02:00
Jaime van Kessel
0aad5ef5ed Prevent exceptions when spine is empty
CURA-2083
2016-09-21 11:33:25 +02:00
Jaime van Kessel
eb1d5e13d0 Only disconnect old stack if we found a new one
CURA-2361
2016-09-21 11:25:57 +02:00
Jaime van Kessel
c6cae8a6eb Ooze shield is now also taken into account for buildVolume
CURA-2407
2016-09-21 09:57:17 +02:00
Jaime van Kessel
48fc957695 We now throw an exception when trying to read legacy profile when multi extrusion machine is selected
CURA-2421
2016-09-21 09:45:05 +02:00
Jaime van Kessel
52b65009d1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 15:11:49 +02:00
Jaime van Kessel
0cfa8c0205 Fixed check for has_variant_materials
CURA-2271
2016-09-20 15:11:20 +02:00
Arjen Hiemstra
b972d26b67 Remove old fdmprinter pot and add new fdmprinter and fdmextruder pot files
Contributes to CURA-2412
2016-09-20 15:01:25 +02:00
Jack Ha
2b4377b509 Fixed update resolvements by moving signal emits. CURA-2232 2016-09-20 14:03:55 +02:00
Jaime van Kessel
a52417f420 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 13:59:29 +02:00
Jaime van Kessel
9ba78dec54 After deletion of material the slection is refreshed
CURA-2388
2016-09-20 13:58:44 +02:00
Tim Kuipers
b47bf3be4f Merge branch 'totalretribution-outer_inset_first' 2016-09-20 13:43:08 +02:00