159 Commits

Author	SHA1	Message	Date
Jack Ha	a56b7cd98d	Merge branch '2.5'	2017-03-20 13:42:11 +01:00
Jack Ha	b21a87b25b	Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559	2017-03-20 13:41:47 +01:00
Lipu Fei	e00c68344a	CURA-3495 open project/models in one dialog	2017-03-16 13:37:06 +01:00
Jaime van Kessel	d93b137c95	No longer add nodes that don't have children or MeshData ... CURA-3493	2017-03-10 15:48:29 +01:00
Ghostkeeper	d1fada78e6	Merge branch '3mf_speedup'	2017-03-06 17:03:42 +01:00
Jaime van Kessel	bae7af1ea0	Dots in the ID no longer confuse workspace reader ... CURA-3450	2017-03-02 17:06:10 +01:00
fieldOfView	9229027001	Refactor properties that start with 'get' to avoid confusion between slots & properties ... Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.	2017-02-17 13:35:01 +01:00
Jaime van Kessel	b6118a764e	Updated documentation ... CURA-3215	2017-02-06 14:13:20 +01:00
Jaime van Kessel	a3326a8313	3mf reader now uses libSavitar for loading ... This greatly decreases (~factor 10) the time required to load 3mf files CURA-3215	2017-02-02 15:54:44 +01:00
Simon Edwards	eb43806d7a	Merge branch 'master' into python_type_hinting	2017-01-27 15:37:30 +01:00
Jaime van Kessel	d9541a08b8	3mf reader now uses fast normal calculation ... CURA-3215	2017-01-26 17:27:41 +01:00
Jaime van Kessel	b284e8508a	Added extra checks to prevent unneeded signal emits	2017-01-24 13:29:33 +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
Simon Edwards	fb70eb6813	Merge branch 'master' into python_type_hinting	2017-01-17 08:42:55 +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
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	620a3891da	D6: Moved decorator to cura	2016-12-23 15:53:16 -05:00
Victor Larchenko	4aa59950ca	D5: Added decorator	2016-12-23 15:53:16 -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
Jaime van Kessel	c25c4c1d77	Moved conflict boxes to be aligned with "headers" ... CURA-1263	2016-12-19 13:04:55 +01:00
Ghostkeeper	76c2e87749	Fix more plural forms ... Forgot these ones. Contributes to issue CURA-1263.	2016-12-16 17:17:10 +01:00
Jaime van Kessel	c4e061be60	Changed margins on save & load workspace dialog ... CURA-1263	2016-12-16 14:38:31 +01:00
Jaime van Kessel	fa3f473b61	Changed order of buttons	2016-12-16 11:35:08 +01:00
Jaime van Kessel	a7135a0f5f	Added machine type to load menu ... CURA-1263	2016-12-16 10:38:30 +01:00
Jaime van Kessel	2be773c9a3	Added num user settings to workspace loading ... CURA-1263	2016-12-16 10:26:30 +01:00
Jaime van Kessel	8676f3db40	Added workaround for curaproject.3mf extensions not being handled on osx ... CURA-3130	2016-12-16 09:36:40 +01:00
Jack Ha	a9a9390aa6	Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263	2016-12-14 16:52:49 +01:00
Jaime van Kessel	998f127499	Material resolve box is reset properly ... CURA-1263	2016-12-14 10:18: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
Jaime van Kessel	0d9355daab	All added containers are now set as dirty, so they are saved ... CURA-1263	2016-12-12 11:07:29 +01:00
jack	8fdc0a40ce	Merge pull request #1235 from Ultimaker/project_save_dialog ... Project save dialog	2016-12-12 10:41:49 +01:00
Jack Ha	ab16722047	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-08 12:45:50 +01:00
Jack Ha	701eba3a0e	Made 3mf mesh centering more robust.	2016-12-08 12:45:38 +01:00
Jaime van Kessel	0f910ae7a2	Merge branch 'master' of github.com:Ultimaker/Cura into project_save_dialog	2016-12-08 12:37:40 +01:00
Jaime van Kessel	1752c56272	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-08 12:37:20 +01:00
Jaime van Kessel	7ed5a7768a	Use logException instead of just log for project loading ... CURA-1263	2016-12-08 11:59:37 +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
Arjen Hiemstra	3449108d59	Update 3MFWorkspaceReader to handle the new format of ContainerStack ... Contributes to CURA-3098	2016-12-08 11:53:15 +01:00
Jaime van Kessel	bc8a9c30cf	Use right type for logging ... CURA-1263	2016-12-08 10:58:17 +01:00
Jaime van Kessel	8f023524d2	Small textual changes for project handling ... CURA-1263	2016-12-05 11:44:42 +01:00
Jaime van Kessel	535250e714	Loading a project no longer destroys authentication ... CURA-1263	2016-12-05 11:43:27 +01:00
Jaime van Kessel	ceb6017cf4	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-05 11:28:20 +01:00
Jack Ha	7a35e4170b	Moved translation functionality needed for 3mf into ThreeMFReader. Fix CURA-3089, impacts CURA-382	2016-12-05 11:28:06 +01:00
Jaime van Kessel	1860b8667b	Changed extension of 3mf projects to curaproject.3mf ... CURA-1263	2016-12-05 11:27:36 +01:00
Jaime van Kessel	56daf80f2f	removed pixelRatioSize, as this made the screen look weird on osx ... CURA-1263	2016-12-05 09:23:37 +01:00
Jaime van Kessel	db18635049	Instead of emitting signals for all containers, only emit them for top ... This significantly speeds up project loading. CURA-1263	2016-12-02 16:27:58 +01:00
Jaime van Kessel	a1acfe167c	Fixed UI spacing if there is no material conflict in project load ... CURA-1263	2016-12-02 15:31:55 +01:00