1234 Commits

Author SHA1 Message Date
Jack Ha
e6e5d7862e Removed testfunctions. CURA-3214 2017-02-16 10:57:31 +01:00
Jack Ha
464bf73f85 Made backend available in qml, calling forceSlice and stopSlicing directly. CURA-3214 2017-02-16 10:56:01 +01:00
Jack Ha
59a8c21c73 Turn slice automatically off now correctly visualizes Prepare button. CURA-3214 2017-02-16 09:55:49 +01:00
Jack Ha
ca84fdd767 Merge branch 'master' into feature_auto_slice 2017-02-15 12:42:09 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
Mark Burton
0237a5a386 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
# Conflicts:
#	cura/CuraApplication.py
2017-02-15 08:20:45 +00:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Jack Ha
e5cdc318f7 Added preference. CURA-3214 2017-02-13 14:29:34 +01:00
Simon Edwards
2020ff5622 Removed the debug which we no longer need.
CURA-3335 Single instance Cura and model reloading
2017-02-13 13:27:10 +01:00
Simon Edwards
234130eb7a Added a static "app version" method.
CURA-3335 Single instance Cura and model reloading
2017-02-13 11:58:14 +01:00
Simon Edwards
88395ebb6a Reliability fix and more debug for testing purposes.
CURA-3335 Single instance Cura and model reloading
2017-02-12 20:37:48 +01:00
Simon Edwards
34793e06fb Removed debug. Toned down a FIXME.
CURA-3335 Single instance Cura and model reloading
2017-02-08 11:41:30 +01:00
Simon Edwards
8a4b6adfb3 Flash the window icon instead of trying (and failing) to make it visible directly.
CURA-3335 Single instance Cura and model reloading
2017-02-07 15:47:45 +01:00
Simon Edwards
412e299f0c Cleaned up and bug fixed the command loop.
CURA-3335 Single instance Cura and model reloading
2017-02-07 13:33:37 +01:00
Jack Ha
1d77864915 Added force layer view compatibility mode. CURA-3273 2017-02-07 09:36:21 +01:00
Simon Edwards
0e306df1bc Initial basic version of this feature.
CURA-3335
2017-02-02 15:59:09 +01:00
Ghostkeeper
307896cb41
Fix converting URL to local path in setDefaultPath
It is a method, not a static function.

Contributes to issue CURA-3297.
2017-02-01 09:48:06 +01:00
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
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +01:00
Mark Burton
31c1684066 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles 2017-01-27 15:55:43 +00:00
Mark Burton
db3cf0c0fb Add the [int] setting type for settings that are a list of integers.
The RegExpValidator (more of a restrictor than a validator) requires the
text to start with a '[' and then have a sequence of integers separated by
commas. A trailing ']' is accepted.
2017-01-27 15:54:19 +00: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
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