9150 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	479176bc6f	Remove superfluous mocking and fixtures ... There, that's better. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	09ab895feb	Only test whether setProperty calls setProperty on proper container ... It sets up a mock container and records whether setProperty is called on that container. Whether that actually sets the property correctly is up to the instance container. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	2161cf9f52	Remove superfluous output_value parameter ... It's not used any more since we don't test the actual instance container any more. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	7f1930d452	Rewrite test_setPropertyUser ... It now only checks if setProperty is being called on the user changes instance, not what the result of that should be. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	52d6c074f5	Align parameters of test_setPropertyUser ... For readability. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	2c9e115488	Add test for hasUserValue returning false ... When a value is not in user changes or in quality changes, it is no longer a user value so it shouldn't get marked as one. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	bbddc2308e	Don't use MockContainer in hasUserChanges tests ... This makes the testing code much simpler. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	e0c8a52eec	Fix test_setVariantByIdExists ... It now also uses the return_value construct. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	f08053283e	Fix test_setQualityChangesByIdExists ... It now also uses the return_value construct. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	73bd47a0a1	Actually assert that the ID is correct ... Oops. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	c5cce10786	Fix test_setQualityByIdExists ... It now also uses the return_value construct. Contributes to issue CURA-3497.	2017-04-12 10:00:44 +02:00
Ghostkeeper	d652e4564e	Fix test_setMaterialByIdExists ... It now also uses the return_value construct. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	546cacec37	Verify that we set the correct container after set...ByID ... Makes sense. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	6ba79881df	Use new container registry functionality for test_setDefinitionByIdExists ... We can just set the return value of the registry to whatever we like and we'll verify that we got that from the registry and it was put on the stack. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	4f83ae3fa7	Remove unused import ... It was removed when we removed some of the mocking code earlier. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	c3ad7d114a	Set return value of registry.findContainers in the test ... This way we need to mock way less. It's the min-cut. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	8dc073f5c8	Add container types to fallthrough tests ... This checks exactly the same code as the global stack. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	b97ef58436	Remove redundant deserialize tests ... They test Uranium code, not this module. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Ghostkeeper	4bb217592f	Refactor deserialise tests ... These are now essentially testing the same code as the similar tests for the global stack. This is ugly but without looking at the implementation this is correct. Contributes to issue CURA-3497.	2017-04-12 10:00:43 +02:00
Lipu Fei	5945212e4b	Remove pixel ratio for childrenRect in OpenFilesIncludingProjectsDialog ... CURA-3642	2017-04-12 08:55:17 +02:00
Lipu Fei	f4e1212005	Use screen pixel ratio for OpenFilesIncludingProjectsDialog ... CURA-3642	2017-04-12 08:43:48 +02:00
CRojasV	84a5717d04	Add files via upload ... Adding makeR printers profile configuration files	2017-04-11 15:39:12 -05:00
CRojasV	a8d2e53bcb	Add files via upload ... Adding Platforms for makeR 3D printers	2017-04-11 15:24:02 -05:00
CRojasV	bd41655772	Delete makeR_prusa_tairona_i3_platform.stl ... Delete file in wrong path	2017-04-11 15:22:52 -05:00
CRojasV	e70409a897	Delete makeR_pegasus_platform.stl ... Delete file in wrong path	2017-04-11 15:22:09 -05:00
CRojasV	620b9a2516	Add files via upload ... Adding Platforms for our 3d printers	2017-04-11 15:18:29 -05:00
Arjen Hiemstra	b9dc94e1f6	Override getProperty in ExtruderStack with some additional checks	2017-04-11 17:45:23 +02:00
Jaime van Kessel	f56dc3d09e	Fixed copying for Linux ... CURA-3529	2017-04-11 17:01:16 +02:00
Arjen Hiemstra	93e42164a8	Make value unit tests also provide a "state" property ... Since we now use state to determine whether we should perform resolve or not.	2017-04-11 13:56:40 +02:00
Arjen Hiemstra	323107ef5c	Fix GlobalStack::getProperty ... It used to only consider user values in the "user" containers, now it also accounts for values in the other instance containers.	2017-04-11 13:51:01 +02:00
fieldOfView	f15345a0cb	Restore material on global stack when switching back to single extrusion ... MachineManager._onGlobalContainerChanged removes the global material of multiextruder machines	2017-04-11 12:18:33 +02:00
Ghostkeeper	70dc9fd95b	Document why we skip this test for now ... Contributes to issue CURA-3497.	2017-04-11 10:42:17 +02:00
Ghostkeeper	1c2ce5b8b1	Remove old getPropertyWithResolve test ... It has been replaced by several separate tests right above it. Contributes to issue CURA-3497.	2017-04-11 10:42:17 +02:00
Ghostkeeper	86b288cc6e	Add test for when instances have value and definition has resolve ... The value of the instances should always get evaluated first. Contributes to issue CURA-3497.	2017-04-11 10:42:17 +02:00
Ghostkeeper	759da2ab05	Add test for value winning over resolve in instances ... In instance containers, if there's both a resolve and a value, it should take the value. Contributes to issue CURA-3497.	2017-04-11 10:42:17 +02:00
Ghostkeeper	0a7bcc4277	Add test for when there's no resolve in definitions ... It must not attempt to execute a resolve function then. Contributes to issue CURA-3497.	2017-04-11 10:42:17 +02:00
Ghostkeeper	12d1db8f19	Add test for whether resolve wins in definition ... I'm splitting the test below up into pieces. It'll be removed eventually, when I've made all of these separate tests. Contributes to issue CURA-3497.	2017-04-11 10:42:17 +02:00
Jack Ha	2b8e6eb5c8	Merge branch 'feature_peopoly_moai'	2017-04-11 10:35:48 +02:00
Jack Ha	4c1199d75c	Revert permissions on file. CURA-3665	2017-04-11 10:35:25 +02:00
Jack Ha	24211624e6	Added inherits fdmprinter for Peopoly Moai. CURA-3665	2017-04-11 10:34:52 +02:00
Lipu Fei	20f28b3fa2	Set dir names in config to allow UM detect old cura dir ... CURA-3529	2017-04-11 09:18:19 +02:00
Elijah Snyder	b4f6ae8c5f	First refactor for section to increase verbosity and move all translated M105s.	2017-04-10 19:01:59 -05:00
fieldOfView	31ecb30c03	Allow setting the nozzle size through the extruder definition	2017-04-10 22:30:43 +02:00
fieldOfView	6dd642469a	Set value before activating another extruder ... Because all extruder tabs share the same SettingPropertyProvider, we want the property provider value to update before its container stack is changed, or the value carries over to the other containerstack, leaving the value for the initial containerstack unchanged	2017-04-10 20:37:41 +02:00
fieldOfView	df7f039826	Store extruder settings in definition_changes containers	2017-04-10 18:26:10 +02:00
Arjen Hiemstra	73e1af49ee	Track which settings we are trying to "resolve" ... This prevents infinite recursions when a resolve function tries to get its own value.	2017-04-10 18:06:24 +02:00
Arjen Hiemstra	09e5765f22	Do not try to validate against machine_extruder_count when there is no machine_extruder_count	2017-04-10 18:06:24 +02:00
Arjen Hiemstra	73779eef25	Properly set the ContainerRegistry for the missing container test	2017-04-10 18:06:24 +02:00
fieldOfView	499971d55c	Fix loading values on 1st extruder tab	2017-04-10 17:24:02 +02:00
Ghostkeeper	dfd8cfb2b8	Skip test_deserializeMoveDefinitionContainer ... This test is currently failing because of a weird hack we're doing to get around a Uranium bug: We're searching only through definitions that have a category, any category. This is done because Uranium requires a search to have some metadata entry to search on. We'll have to refactor that eventually but for now that is out of scope. Contributes to issue CURA-3497.	2017-04-10 17:17:13 +02:00