8609 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	e76c3f72e7	Lower QtQuick requirement further to 2.2 ... 2.2 is required for the modifications we make to the Button objects.	2017-03-24 10:49:46 +01:00
Ghostkeeper	0f0b8cd5dd	Lower QtQuick requirement further to 2.2 ... 2.2 is required for the modifications we make to the Button objects.	2017-03-24 10:47:47 +01:00
Lipu Fei	578f72c91e	Use "False" instead "false" in cfg files ... CURA-3555	2017-03-24 10:44:44 +01:00
Jaime van Kessel	ba21a52827	Merge pull request #1570 from fieldOfView/fix_spool_cost_limit ... Up the limit of the maximum cost of a spool of filament	2017-03-24 09:53:42 +01:00
Lipu Fei	7ad5a64b91	Add msg dialog for ignoring gcode in multiple file selection ... CURA-3495	2017-03-24 09:53:12 +01:00
fieldOfView	6474f3eb25	Ups the limit of the maximum cost of a spool of filament ... This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country. Fixes https://github.com/Ultimaker/Cura/issues/1567	2017-03-24 09:12:48 +01:00
Jaime van Kessel	e30e2a8018	Instead of not sending the line at all, just send a get temp command	2017-03-23 20:13:13 +01:00
Jaime van Kessel	645e3e8dfe	Don't try to send empty g-code lines	2017-03-23 19:42:52 +01:00
Jaime van Kessel	6ff130c361	Added logging	2017-03-23 17:57:52 +01:00
Arjen Hiemstra	de1dbfbc07	Override replaceContainer and add some type checking ... type in this case being container type Contributes to CURA-3497	2017-03-23 17:55:21 +01:00
Arjen Hiemstra	dc0c666a54	Disable add/insert/remove container ... Since we want to have a fixed list of containers in the stack. Contributes to CURA-3497	2017-03-23 17:55:21 +01:00
Arjen Hiemstra	5ad0651fd1	Add an "extruders" property and an addExtruder method ... Contributes to CURA-3497	2017-03-23 17:55:21 +01:00
Arjen Hiemstra	462d5fac8d	Add setters for properties ... Contributes to CURA-3497	2017-03-23 17:55:21 +01:00
Arjen Hiemstra	f97a6ebd74	Move exceptions to their own file ... Since that keeps the GlobalStack cleaner Contributes to CURA-3497	2017-03-23 17:55:21 +01:00
Ghostkeeper	a95404f72f	Add test for missing containers in container stack ... This seems to give a different exception than intended at the moment. Contributes to issue CURA-3497.	2017-03-23 17:31:21 +01:00
Ghostkeeper	f579b5f304	Clean up temporary files after test ... If the test fails to remove the temporary file, this cleans up after it. Contributes to issue CURA-3497.	2017-03-23 17:22:10 +01:00
Ghostkeeper	9ce621a02d	Restore the original container registry after each test ... A bit of code duplication, but I don't see how to reduce this at the moment. Contributes to issue CURA-3497.	2017-03-23 17:17:43 +01:00
Ghostkeeper	b18c72bbbf	Remove unused import ... This was replaced with mocks, if I recall correctly. Contributes to issue CURA-3497.	2017-03-23 16:48:38 +01:00
Ghostkeeper	053974bc96	Add test to see if legacy files are renamed ... The test seems to fail at the moment. No new file is created. Contributes to issue CURA-3497.	2017-03-23 16:47:37 +01:00
Ghostkeeper	e521f6b38d	Remove unnecessary findContainer replacement ... By default the patch context returns mock objects anyway, so no need to actually make a function that does that. Contributes to issue CURA-3497.	2017-03-23 16:35:11 +01:00
Ghostkeeper	96c7a4ed77	Remove unused variable ... This was changed earlier that it doesn't return the same mock every time but creates a new mock in findContainer. So the single mock that used to be returned every time is no longer needed. Contributes to issue CURA-3497.	2017-03-23 16:16:32 +01:00
Ghostkeeper	91192b702e	Use a global stack from a fixture ... Removes a bit of duplicate code. Contributes to issue CURA-3497.	2017-03-23 16:12:28 +01:00
Ghostkeeper	bf2050479b	Add tests for hasUserValue ... These fail at the moment because they also depend on being able to change the stack, which isn't implemented yet. Contributes to issue CURA-3497.	2017-03-23 16:09:03 +01:00
Ghostkeeper	8a3ab6d289	Fix testing ID of mock-definitions ... This isn't the best solution because all definitions now have to get the ID 'some_definition', but it's the best that I could come up with so far. Contributes to issue CURA-3497.	2017-03-23 15:46:11 +01:00
Ghostkeeper	610d2ae1e6	Fix assertion for test_deserializeDefinitionChanges ... Copy-paste error there. Sorry. Contributes to issue CURA-3497.	2017-03-23 15:41:25 +01:00
Ghostkeeper	521e85b2a7	Add test for deserializing stacks with definitions in them ... This tests whether the definition is properly found. Contributes to issue CURA-3497.	2017-03-23 15:40:44 +01:00
Ghostkeeper	91f51d11cd	Fix ID and name of only-variant stack ... This makes it consistent with the file name and such. Contributes to issue CURA-3497.	2017-03-23 15:32:27 +01:00
Ghostkeeper	15de1f235a	Add test for seeing whether definition changes are properly found ... Whether the deserialize function finds the definition changes properly. Contributes to issue CURA-3497.	2017-03-23 15:30:54 +01:00
Ghostkeeper	79f6e49280	Add test for seeing whether variants are properly found ... Whether the deserialize function finds the variants properly. Contributes to issue CURA-3497.	2017-03-23 15:21:57 +01: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
Lipu Fei	a0f841e8eb	Prevent MachineSettings dialog go beyond the top of screen	2017-03-23 13:46:01 +01:00
Lipu Fei	96e9780273	Fix typo in changelog 2.5.0	2017-03-23 08:53:57 +01:00
Lipu Fei	08f6ee319e	Use default font for open file dialog text ... CURA-3495	2017-03-23 08:46:48 +01:00
Lipu Fei	ef0a502dcf	Add { } around statements in "if" ... Make nitpicking people happy :P	2017-03-22 21:05:45 +01:00
Ghostkeeper	95a377d54e	Add test for deserialising materials in stacks ... Similar to the other tests, but this one is a bit special since the original test stacks had a material defined. Therefore it also defines a separate stack that only has a definition so that we can see if it's fine with the material being empty. Contributes to issue CURA-3497.	2017-03-22 17:32:37 +01:00
Ghostkeeper	80329ad6e8	Fix test name ... Oops. Copy-paste mistake. Contributes to issue CURA-3497.	2017-03-22 17:26:37 +01:00
Ghostkeeper	66b5fe6702	Align test parameters for readability ... Contributes to issue CURA-3497.	2017-03-22 17:25:22 +01:00
Ghostkeeper	eae6ad0e05	Add test to see whether quality profiles deserialise well ... Works just the same as the quality-changes stuff. Contributes to issue CURA-3497.	2017-03-22 17:24:21 +01:00
Ghostkeeper	ba43b835f4	Move reading the stack file to a separate function ... That whole os.path stuff is a bit opaque. Now it's separated from the actual test. Contributes to issue CURA-3497.	2017-03-22 17:10:04 +01:00
Ghostkeeper	09a3b90dcc	Add test for detecting quality changes ... I should try to re-use a bit of code here because there's going to be a lot of these. Contributes to issue CURA-3497.	2017-03-22 16:58:06 +01:00
Ghostkeeper	2eed596280	Align parameters better for overview ... Contributes to issue CURA-3497.	2017-03-22 16:49:59 +01:00
Ghostkeeper	9d9832f8e2	Move findSomeContainers out to global function ... This way we can re-use it for other tests. Contributes to issue CURA-3497.	2017-03-22 16:48:58 +01:00
Ghostkeeper	c14b3e4f2b	Add test with complete stack ... In this stack, all profiles are filled in properly with an instance container. This required some magic to make the container registry always return the desired profiles. Contributes to issue CURA-3497.	2017-03-22 16:45:38 +01:00
Lipu Fei	fa7dc3a708	Use onActivated for profile override combobox	2017-03-22 16:01:50 +01:00
Ghostkeeper	a2fe051c09	Allow all profiles as some_* to be instances ... This allows us to differentiate between one container in the stack and the other. Contributes to issue CURA-3497.	2017-03-22 15:58:28 +01:00
Ghostkeeper	ebd08ac994	Add test case where there is only a user changes profile ... Specifically what this test requires. Contributes to issue CURA-3497.	2017-03-22 15:54:32 +01:00
Ghostkeeper	60b6b72912	Rename some_material to some_instance ... This way we can semantically use it in place of other instances on the stack as well without changing our test. Contributes to issue CURA-3497.	2017-03-22 15:51:45 +01:00
Ghostkeeper	007f764471	Don't let a test remove files from hard disk ... This test does not test the removing of these files. In general, to make a test run fast, it should not perform any disk operations. Contributes to issue CURA-3497.	2017-03-22 15:47:15 +01:00