Commit graph

1674 commits

Author SHA1 Message Date
Ghostkeeper
1a4d71c3f8
Save last-opened file path as local-file format
It's stored in the format of '/home/user/Models/Basic' rather than 'file:///home/user/Models/Basic'. The QML FileDialog class expects the latter format though.

Contributes to issue CURA-3297.
2017-01-31 17:42:32 +01:00
Jack Ha
5a2aa8846b Added extruder count detection to layer view. CURA-3273 2017-01-30 13:29:35 +01:00
Jack Ha
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +01:00
Simon Edwards
eb43806d7a Merge branch 'master' into python_type_hinting 2017-01-27 15:37:30 +01:00
Jack Ha
4af902671f Scale large models by default off. CURA-3289 2017-01-26 09:26:32 +01:00
Jaime van Kessel
092f42ef28 Revert "Only emit signal when the active extruder actually changes"
This reverts commit 4e8fb254f6.
2017-01-25 16:20:10 +01:00
Jack Ha
06a42d98ee Fix PrintInformation if somehow no active material container is found 2017-01-25 16:06:13 +01:00
Jack Ha
3a2438937d Removed crappy legend 2017-01-25 12:46:07 +01:00
jack
26ad2c8f6e Merge pull request #1378 from fieldOfView/feature_layerview_legend
Layerview Legend
2017-01-25 11:53:41 +01:00
Jack Ha
a52cb2fa63 Compatibility mode scale line type colors 2017-01-25 09:48:36 +01:00
Jack Ha
5fff1f6657 Cleanup 2017-01-25 09:27:22 +01:00
Jack Ha
6625938a2b Cleanup __color_map in LayerPolygon 2017-01-25 09:24:40 +01:00
fieldOfView
878ccc679c Add a legend to Layer View 2017-01-24 23:24:52 +01:00
fieldOfView
f0333e2184 Fix typo 2017-01-24 23:18:46 +01:00
Ghostkeeper
a8efde9450 Merge pull request #1243 from fieldOfView/feature_material_cost
Implement material cost
2017-01-24 15:54:57 +01:00
Jaime van Kessel
4e8fb254f6 Only emit signal when the active extruder actually changes 2017-01-24 13:14:10 +01:00
fieldOfView
5e121e4039 Use themeable colors for layerdata 2017-01-23 22:11:38 +01:00
fieldOfView
45c8083423 Use themeable colors in Solid, Xray & Layer view 2017-01-23 22:08:27 +01:00
Simon Edwards
d5c96c1aae Removed a line of debug. 2017-01-18 13:49:18 +01:00
Simon Edwards
4fecf55b3b Use double quotes instead of singles. 2017-01-17 20:56:50 +01:00
Simon Edwards
1b43e4981e Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.) 2017-01-17 16:57:37 +01:00
Jack Ha
abe7a8e9a3 Merge branch 'master' into layer_view3_cleanup 2017-01-17 15:16:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Jack Ha
b2d7b82dd3 Preference Center camera set to default off. CURA-2908 2017-01-13 09:16:04 +01:00
Simon Edwards
16a748e0d6 Merge pull request #1326 from Ultimaker/big_flame_graph
Support for the Big Flame Graph profiler
2017-01-12 14:25:18 +01:00
Simon Edwards
8d146d92b3 Merge branch '2.4' 2017-01-12 13:26:25 +01:00
Simon Edwards
98bad05b7b Take materials which are sub-type into account when looking for quality profiles.
CURA-3235 Duplicate profile broken when using Ultimaker materials other than default
2017-01-12 13:25:05 +01:00
awhiemstra
a2e00bd560 Merge pull request #1336 from fieldOfView/fix_center_zero_tower_pos
Fix prime disallowed areas when center is zero
2017-01-12 10:28:53 +01:00
fieldOfView
1d308f2042 Fix the disallowed area for the prime tower and prime are when center_is_zero 2017-01-11 18:04:25 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
fieldOfView
6f06e9b320 Update material costs in slice info area when changing material settings
(without reslicing)
2017-01-09 15:24:20 +01:00
Victor Larchenko
33cd386556 D6: Fixed layers and line widths 2017-01-05 13:04:32 -05:00
fieldOfView
a83c397d69 Show material cost in Job Specs area...
...if weight/price information is available
2017-01-03 11:05:32 +01:00
fieldOfView
7516fb6056 Store cost & weight as preference values independent of material definition
Users need to be able to set these values independent of the xml definition, as it is not a material property but something that depends on the reseller etc. It must also be settable for read-only materials.
2017-01-03 11:05:31 +01:00
Jack Ha
e57de296e7 Readded accidently removed stuff 2017-01-03 10:14:34 +01:00
Jack Ha
f0e0d65635 Finishing up compatibility mode 2017-01-02 14:56:31 +01:00
Jack Ha
93137fcc91 Added compatibility mode - old layer view is now also available 2017-01-02 12:56:18 +01:00
Jack Ha
6271774528 Added all kinds of options to layer view 2016-12-30 15:32:06 +01:00
Jack Ha
fc4c60b0dc Added layer view options 2016-12-30 14:31:53 +01:00
Jack Ha
1217281727 Busy with layer_view options 2016-12-29 16:49:00 +01:00
Jack Ha
0f2fb86cd9 Layer shader now uses own attribute for line dimensions instead of misusing uvs. 2016-12-28 15:20:14 +01:00
Jack Ha
8d2b3654a4 Layer thickness now as array 2016-12-28 13:15:42 +01:00
Jack Ha
9904dad07b Added line thickness to layer view 2016-12-28 11:30:59 +01:00
Victor Larchenko
485e81731f D6: Fixed file naming, removed spaces and fixed decoration calls 2016-12-23 15:53:17 -05:00
Youness Alaoui
9e85d6c894 Fix GCodeReader-feature related _readMeshfinished to match changes upstream.
The job.getResult() now returns a list of nodes now, so we need to loop
over those nodes instead of taking it as a single node value.
2016-12-23 15:53:17 -05:00
Victor Larchenko
cb428c70de D6: Moved backend pausing to itself 2016-12-23 15:53:17 -05:00
Victor Larchenko
b967f045fe D6: Removed unused file 2016-12-23 15:53:17 -05:00
Victor Larchenko
67ab0cab41 D6: Changed decorator and swapping to LayerView 2016-12-23 15:53:17 -05:00
Victor Larchenko
647c2f15ba D6: Changed Decorator 2016-12-23 15:53:17 -05:00
Victor Larchenko
90f7cebbbb D6: Fixed gcode loading to scene while undo/redo 2016-12-23 15:53:17 -05:00