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
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
fieldOfView
878ccc679c
Add a legend to Layer View
2017-01-24 23:24:52 +01:00
Ghostkeeper
a8efde9450
Merge pull request #1243 from fieldOfView/feature_material_cost
...
Implement material cost
2017-01-24 15:54:57 +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
a5181f157e
Applied the profiler's pyqtSlot decorator to all of the code.
2017-01-10 13:35:39 +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
93137fcc91
Added compatibility mode - old layer view is now also available
2017-01-02 12:56:18 +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
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
Victor Larchenko
fecf23d66d
D6: Moved extensions to plugin metadata
2016-12-23 15:53:17 -05:00
Victor Larchenko
620a3891da
D6: Moved decorator to cura
2016-12-23 15:53:16 -05:00
Victor Larchenko
3605403314
D6: Moved file loading code
2016-12-23 15:53:16 -05:00
Victor Larchenko
26fe0ddbb5
D6: Refactoring
2016-12-23 15:53:16 -05:00
Victor Larchenko
ba372f69a7
D6: Refactoring
2016-12-23 15:53:16 -05:00
Victor Larchenko
4aa59950ca
D5: Added decorator
2016-12-23 15:53:16 -05:00
Victor Larchenko
c18b3149da
D5: Moved loading files code
2016-12-23 15:53:16 -05:00
Victor Larchenko
cd7979e301
D5: Refactoring
2016-12-23 15:53:16 -05:00
Victor Larchenko
1631045d7a
D5: Refactoring
2016-12-23 15:53:16 -05:00
Victor Larchenko
be3a945fb0
T466: Fixed Nothing to slice bug
2016-12-23 15:53:16 -05:00
Victor Larchenko
d7120e24d0
T466: Automatic switch to LayerView
2016-12-23 15:53:15 -05:00
Victor Larchenko
5d0c598622
T466: Cleaned code
2016-12-23 15:53:15 -05:00
Victor Larchenko
b4a7173a61
T466: Only one gcode file can be loaded at a time, and deleting previous gcode file when loading non-gcode file
...
Merge changes : Only call backgroundItem.hasMesh if/on an imported model (skips if only curaprofiles get loaded)
2016-12-23 15:53:15 -05:00
Victor Larchenko
8987aa2048
T466: Revert the previous commit since it messed up the file rights.
2016-12-23 15:53:15 -05:00
Victor Larchenko
64d7bb0c2a
T466: Added ability to print loaded gcode
2016-12-23 15:53:14 -05:00
Victor Larchenko
2ee5e2cb0b
T466: Added hiding of properties menu
2016-12-23 15:53:13 -05:00
Victor Larchenko
333e501268
T466: Removed cube, Changed label, Added clearing of scene
2016-12-23 15:53:13 -05:00
Jack Ha
61dcaf8811
wip
2016-12-20 11:45:05 +01:00
Simon Edwards
d4619da358
Merge branch 'master' into python_type_hinting
2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509
Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
...
CURA-2917
2016-12-12 16:05:35 +01:00
jack
8fdc0a40ce
Merge pull request #1235 from Ultimaker/project_save_dialog
...
Project save dialog
2016-12-12 10:41:49 +01:00
Jarl Gullberg
19dc1dff82
Changed urllib import to be more restrictive
...
On certain Linux platforms, urllib in py3 no longer accepts a top-level module import. Restricting the imported modules to just "parse" fixes this issue.
2016-12-09 18:02:08 +01:00
Arjen Hiemstra
d641234a74
Remove "debug mode" command line parameter
...
We never used it and it doesn't really work anyway.
2016-12-08 16:15:17 +01:00
Jaime van Kessel
36d743384c
Initial work for adding a save dialog for project saving
...
CURA-1263
2016-12-08 11:56:42 +01:00
Simon Edwards
e1d7a9faec
Properly support the extrauder trains.
...
CURA-2953 Version upgrade 2.3 to 2.4
2016-12-06 17:03:35 +01:00
Ghostkeeper
f6422769b5
Merge branch 'feature_z_seam_location'
2016-11-30 16:34:50 +01:00
Simon Edwards
5ff891496f
Merge pull request #1038 from Ultimaker/feature_config_dir_lock
...
Moved lockfile functions to better place. CURA-2449 CURA-2589
2016-11-29 16:30:34 +01:00
Jack Ha
4d9416aae8
Merge branch 'master' into feature_config_dir_lock
2016-11-29 16:12:56 +01:00
Ghostkeeper
87587ffd40
Fix reloading meshes
...
Not tested with 3MF, but for normal cases this should hotfix it.
2016-11-28 14:11:44 +01:00
Tim Kuipers
2c1028e137
JSON feat: z seam position (CURA-1461)
2016-11-25 16:28:45 +01:00
fieldOfView
21bcb0e434
Create a definition_changes container instead of a second variant
2016-11-23 22:53:03 +01:00
