5136 Commits

Author SHA1 Message Date
Jaime van Kessel
dccf18c4e7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 17:23:20 +02:00
Jaime van Kessel
8e07a94d68 Use the right settings for wipe & avoid distances
CURA-2407
2016-09-26 17:22:49 +02:00
fieldOfView
cdba3640a0 Move showing eject success message until after the safe to remove message is hidden
CURA-2341
2016-09-26 16:10:57 +02:00
Jack Ha
962381be59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 16:06:47 +02:00
Jack Ha
e038016ead Comment. CURA-2232, CURA-2274 2016-09-26 16:06:36 +02:00
Arjen Hiemstra
c92dfc8af3 Remove "ExtraBold" font variant from Theme
For some reason, on OSX ExtraBold seems to replace Regular font style. Since
it is unused anyway, just drop the ExtraBold for now.

Contributes to CURA-879
2016-09-26 15:23:36 +02:00
Jaime van Kessel
4299dbb90b Force refresh display when activating profile
CURA-2448
2016-09-26 15:22:23 +02:00
Jaime van Kessel
87b0063266 Ooze & draft shield distances are now only used if greater than brim / skirt
CURA-2407
2016-09-26 13:51:42 +02:00
Jaime van Kessel
efd3fc3487 Added check to see if a SceneNode has vertices before adding it
CURA-2460
2016-09-26 13:13:31 +02:00
Jaime van Kessel
3f9024aeff Added selftest for all objects in 3mf file
CURA-2460
2016-09-26 13:03:45 +02:00
Jaime van Kessel
d7cf65258f Minor codestyle changes 2016-09-26 12:55:17 +02:00
Jack Ha
f3f1bf664a Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 11:26:13 +02:00
Jack Ha
1cc5d699c4 Update build volume (including prime tower visualization) after quality change. CURA-2274 and CURA-2232 2016-09-26 11:26:03 +02:00
fieldOfView
3d7680a983 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-26 10:58:57 +02:00
fieldOfView
3d61b7fb75 Prevent signal storm when changing a property
Contributes to CURA-2429
2016-09-26 10:58:15 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Thomas Karl Pietrowski
10d2d7902e Updating the comment about the "settings" keyword
Contributes to CURA-1445
2016-09-24 10:19:26 +02:00
Aldo Hoeben
281f9e18a3 Merge pull request #994 from Ultimaker/optimise_machine_switch
Speed up switching between multiextrusion machines
2016-09-23 12:01:17 +02:00
fieldOfView
f23af4f295 Optimise icons
Mostly done using svgo:
svgo -f resources/themes/cura/icons --pretty --enable=removeDimensions
2016-09-23 11:50:50 +02:00
fieldOfView
774eadc7d1 Recolor toolbar icons
While cleaning up the theme icons I discovered that the toolbar icons were incorrectly relying on the color specified in the icon.
2016-09-23 10:40:49 +02:00
Thomas Karl Pietrowski
db6702fbbc CURA-1445: Sending bundle of serialized data
After an discussion with the developers at YM, we decided to send all data in one keyword.
So now all data is bundled into a JSON dictionary, where "" is the global_container_stack and it's containers go into the same JSON, too, by using their IDs as keywords.
More on JIRA...

Contributes to CURA-1445

Includes/Fixes #1013
2016-09-22 18:24:01 +02:00
Thomas Karl Pietrowski
1cda5ae163 Merge remote-tracking branch 'upstream/thopiekar-sliceinfo-hotfix' into master-CURA-1445 2016-09-22 18:14:29 +02:00
fieldOfView
1895cd7062 Fix layerview shade for single extrusion printers
CURA-2025
2016-09-22 17:16:08 +02:00
fieldOfView
c3d8b6fb8c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 16:52:41 +02:00
fieldOfView
e9d44a07cc Fix up layout of Per Model Settings panel 2016-09-22 16:52:29 +02:00
Jaime van Kessel
0d8dd08830 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-22 16:38:20 +02:00
Jaime van Kessel
0b6c196659 Moved getAllExtruderValues to extruder manager
CURA-2407
2016-09-22 16:36:27 +02:00
Ghostkeeper
8bf8a483ec
Code style: Spaces around binary operators
Contributes to issue CURA-2407.
2016-09-22 16:07:48 +02:00
Jaime van Kessel
e0109a1857 Infill wipe distance and travel avoid distance are now also taken into account
CURA-2407
2016-09-22 16:00:18 +02:00
Jaime van Kessel
2820ef6236 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-22 15:42:43 +02:00
Jaime van Kessel
4141a87887 BuildVolume now takes the extra line by extra extruders into account
CURA-2407
2016-09-22 15:42:04 +02:00
Ghostkeeper
15792b8f09
Code style: Spaces around binary operators
Also the equal-sign in key-word arguments, though that goes against PEP8, but that's in our code style documentation.

Contributes to issue CURA-2319.
2016-09-22 15:33:17 +02:00
fieldOfView
10af3ee5ab More defensive coding to prevent division by zero
CURA-2443
2016-09-22 15:16:39 +02:00
Jaime van Kessel
4e3384e640 Merging with groups no longer causes devision by zero
CURA-2443
2016-09-22 14:33:01 +02:00
Jaime van Kessel
7a85430f70 Merging no longer crashes if node has no meshdata
CURA-2443
2016-09-22 14:25:00 +02:00
Jaime van Kessel
4792aadc3a Platform collision no longer crashes if node has no parent
CURA-2443
2016-09-22 14:11:44 +02:00
fieldOfView
847d6429d0 Speed up switching between multiextrusion machines
ExtruderManager.addMachineExtruders is supposed to create a cache, but this cache was always rebuilt because of an indentation error.
2016-09-22 13:49:18 +02:00
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