1855 commits

Author	SHA1	Message	Date
Jack Ha	1df9066340	Fix error after refactor, added comments	2017-04-04 09:52:07 +02:00
Jack Ha	1ebf947ff2	Added tests for ShapeArray. CURA-3239	2017-04-03 17:03:30 +02:00
Jack Ha	d1b9078657	Added first arranger tests, small refactors. CURA-3239	2017-04-03 16:36:48 +02:00
Jack Ha	892140150a	Fix group models bounds check. CURA-3640	2017-04-03 15:06:40 +02:00
Jack Ha	a83b1dd638	Split ShapeArray from Arranger. CURA-3239	2017-04-03 14:48:31 +02:00
Jack Ha	d6cd37626b	Removed logging, improved spot for left-over object. CURA-3239	2017-04-03 11:47:04 +02:00
Jack Ha	e866c03b50	Fixed multiplyObject group. CURA-3239	2017-04-03 11:12:20 +02:00
Jack Ha	bd874a62ac	Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239	2017-04-03 10:44:53 +02:00
Jack Ha	abb5d1e76e	Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239	2017-04-03 10:40:04 +02:00
Jaime van Kessel	786a4565b7	Added a few plugins to required list	2017-03-31 10:30:13 +02:00
Jaime van Kessel	e0c77231e0	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-30 20:04:18 +02:00
Jaime van Kessel	891aebc366	Removed getBackend from Cura (and onto Uranium)	2017-03-30 20:03:21 +02:00
Lipu Fei	c74ff4b204	Catch exceptions when checking if a file is a project	2017-03-30 19:08:19 +02:00
Jaime van Kessel	0c6d0a0abb	Moved recent files into Uranium ... USL-41	2017-03-30 18:35:41 +02:00
Jack Ha	9db816b0fc	Funed arranger for better performance. CURA-3239	2017-03-30 17:26:56 +02:00
Jaime van Kessel	dbfa5873ce	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-30 17:03:01 +02:00
Jack Ha	76c1c31cf4	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-30 16:27:19 +02:00
Jack Ha	1164805a68	WIP Solved stash apply. CURA-3610	2017-03-30 16:26:39 +02:00
Jack Ha	3135dc7d77	Solved MC	2017-03-30 16:20:08 +02:00
Jaime van Kessel	6314d872e1	If we find multiple materials for a new extruder, prefer a read only material ... CURA-3147	2017-03-30 16:07:26 +02:00
Jack Ha	fa7a026efe	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-30 16:05:07 +02:00
Jack Ha	da5288ea78	Fix updating allowed areas. CURA-3610	2017-03-30 16:04:57 +02:00
Jaime van Kessel	cd5e883010	Build volume now uses IsSlicable decorator to check for scene changes ... CURA-3608 Fixes #1598	2017-03-30 11:24:01 +02:00
Tim Kuipers	a4272bf7be	Merge branch 'master' into feature_mold	2017-03-30 11:16:27 +02:00
Jaime van Kessel	13561bdb46	material_amounts is now defined in init ... Somehow this was forgotten, which could cause issues in certain cases. CURA-3617	2017-03-30 10:47:11 +02:00
jack	3a255b341f	Merge pull request #1586 from fieldOfView/fix_radius0 ... Fix crash when editing material diameter	2017-03-29 10:43:41 +02:00
jack	f50c3f430a	Merge pull request #1586 from fieldOfView/fix_radius0 ... Fix crash when editing material diameter	2017-03-29 10:37:13 +02:00
Jack Ha	099752125b	Arrange all now places biggest objects first. CURA-3239	2017-03-29 10:00:21 +02:00
Jack Ha	f357dea086	Tuned arranger a bit, good enough for proof of concept. CURA-3239	2017-03-29 09:32:29 +02:00
fieldOfView	ba06f06cd0	Optimize code	2017-03-28 20:17:51 +02:00
Jack Ha	bf08d30e7d	Added first arrange function and smart placement after loading. CURA-3239	2017-03-28 14:27:22 +02:00
Tim Kuipers	7a67ab4e66	Merge branch '2.5'	2017-03-28 12:55:18 +02:00
Jack Ha	d8c20b9d6c	First version of multiply object seems to work quite well. CURA-3239	2017-03-28 11:33:07 +02:00
Jaime van Kessel	6367755875	Disabled center_on_select for windows, as pyqt has a bug with it	2017-03-28 10:21:52 +02:00
fieldOfView	67d66905ba	Fix crash when editing material diameter ... While editing the diameter value in the materials pane, it can happen that the radius evaluates to 0. This led to a division by zero. Fixes https://github.com/Ultimaker/Cura/issues/1582	2017-03-26 14:08:07 +02:00
Jaime van Kessel	8023341090	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-23 15:15:08 +01:00
Jaime van Kessel	ecbf0e1e28	Only add center to list for merge if there is one	2017-03-23 15:14:34 +01:00
Jack Ha	462f3abead	Merge branch 'master' into feature_arrange	2017-03-23 15:02:04 +01:00
Jaime van Kessel	94c6b23418	Codestyle & removal unused imports	2017-03-22 11:38:55 +01:00
Jack Ha	72db7772f5	Merge branch '2.5'	2017-03-22 09:44:47 +01:00
Jack Ha	3d6e378289	Revert accidently added test-code.	2017-03-22 09:44:21 +01:00
Jack Ha	8275c419c1	Merge branch '2.5'	2017-03-22 09:34:06 +01:00
Jack Ha	40a7d2fecc	Added not supported quality profiles. CURA-3555	2017-03-22 09:33:17 +01:00
Lipu Fei	622ff4e662	Add default for preference "view/invert_zoom"	2017-03-21 13:56:12 +01:00
Lipu Fei	9e5513ade6	Use QUrl to parse fileUrl ... CURA-3495	2017-03-21 13:56:11 +01:00
Lipu Fei	f3167bb84b	Add dialog for opening a project file ... CURA-3495	2017-03-21 13:56:09 +01:00
Jaime van Kessel	70dbeaf256	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-21 13:24:06 +01:00
Jaime van Kessel	90a92dce19	If a container_changes can not be found, handle it more gracefully ... CURA-3560	2017-03-21 13:23:50 +01:00
Jaime van Kessel	00258e570f	If a container_changes can not be found, handle it more gracefully ... CURA-3560	2017-03-21 11:13:10 +01:00
Lipu Fei	555cd58f5e	Save with code names for profile override preference ... CURA-3561	2017-03-21 09:09:17 +01:00