4252 Commits

Author	SHA1	Message	Date
Diego Prado Gesto	ff6bc9de4e	Fix some more code-style	2018-07-03 13:09:05 +02:00
Diego Prado Gesto	7714515204	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-03 12:06:23 +02:00
Diego Prado Gesto	762a1b1bfd	Fix code-style	2018-07-03 12:06:06 +02:00
Lipu Fei	293b803dd3	Fix preferences upgrade in 3.4 to 4.0	2018-07-03 10:40:57 +02:00
Diego Prado Gesto	e983a9a9e7	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-03 10:40:00 +02:00
Diego Prado Gesto	3c57068cf4	CURA-5034 Fix a typo in the method call.	2018-07-03 10:38:44 +02:00
Aleksei S	47300eabe7	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-03 10:24:17 +02:00
Aleksei S	7b63dc7b10	Changed machine and extruder_train version in VersionUpgrade 34to40	2018-07-03 10:17:42 +02:00
Mark	c0e97b9529	Merge branch '3.4'	2018-07-02 16:37:04 +02:00
Jack Ha	7058ddbb66	Corrected float/int mixups and allow catching temperature before the layers start. CURA-5491	2018-07-02 16:35:49 +02:00
Mark	c6b31b3b0c	Merge pull request #3901 from fieldOfView/fix_toolbox_flicking ... Limit flicking the Toolbox scrollviews to vertical only	2018-07-02 16:35:45 +02:00
alekseisasin	debe142c18	Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all ... CURA-5334 Add extruder definitions for all single-extrusion machines	2018-07-02 15:56:45 +02:00
Jack Ha	a283dd1d94	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-02 15:14:14 +02:00
Jack Ha	17c4b65453	Fix pause at height that uses new latest temperature CURA-5491	2018-07-02 15:13:44 +02:00
Jack Ha	3761123513	Merge branch 'master' into CURA-5334_extruder_def_for_all	2018-07-02 14:11:24 +02:00
Ian Paschal	adc7fc58e9	Fixed method naming conflict	2018-07-02 13:53:35 +02:00
Ian Paschal	b55abee783	Code style did not rename this variable	2018-07-02 13:05:22 +02:00
Ian Paschal	8f7370db6c	Merge remote-tracking branch 'origin/master' into feature_send_material_profiles	2018-07-02 12:37:56 +02:00
Diego Prado Gesto	0692192d58	Merge branch '3.4'	2018-07-02 09:10:57 +02:00
Lipu Fei	dc8d9e0f96	Merge branch 'master' into mypy_fixes	2018-06-29 13:45:55 +02:00
Diego Prado Gesto	56c7c6f2b2	CURA-5518 Check whether the the findDefinitionContainers return any ... element or not.	2018-06-29 10:41:54 +02:00
Jaime van Kessel	b4f59a7822	Removed unneeded application reference in construction of meshreaders	2018-06-29 09:25:38 +02:00
Ghostkeeper	0cb6e506d2	Rewrite code style of _getScaleFromUnit ... It should be much more readable now. Discovered while investigating #3847.	2018-06-28 16:39:53 +02:00
Mark	5fe812b4a4	Add downloadnumber to model and plugin view	2018-06-26 15:29:35 +02:00
Ghostkeeper	d4ca3d144e	Use latest temperature instead of a manual resume temperature ... We don't need the user to fill this in. We can just track the resume temperature ourselves. Contributes to issue CURA-5491.	2018-06-21 16:07:29 +02:00
Ghostkeeper	a401c1d64f	Disambiguate between list of metadatas and metadata ... Because MyPy doesn't allow a variable to change its type later. Contributes to issue CURA-5330.	2018-06-15 17:03:04 +02:00
Ghostkeeper	79c6b2dad8	Use CuraApplication instead of Application ... Because UM.Application doesn't have any getPrintJobInformation function or anything like that. Contributes to issue CURA-5330.	2018-06-15 16:55:30 +02:00
Ghostkeeper	e717abf499	Fix typing related to Network Printing ... Contributes to issue CURA-5330.	2018-06-15 16:53:45 +02:00
Ghostkeeper	b07db74011	Fix more typing errors ... It never ends. Contributes to issue CURA-5330.	2018-06-15 15:44:29 +02:00
Ghostkeeper	cfd0bde6b1	Use CuraApplication instead of Application ... Because UM.Application has no function getMultiBuildPlateModel. Contributes to issue CURA-5330.	2018-06-15 15:32:44 +02:00
Ghostkeeper	797d05947c	Fix type errors ... Contributes to issue CURA-5330.	2018-06-15 15:20:41 +02:00
Ghostkeeper	9821793b46	Don't override boundingbox of SceneNode ... Whatever was intended here, it didn't work. Because when a method is called it is called on the class of the object. Methods are not attributes of instances but attributes of the class. The attribute of the class was never changed, so this had no effect. Contributes to issue CURA-5330.	2018-06-15 15:16:55 +02:00
Ghostkeeper	10f22f9c25	Cast result of getPluginObject to the plug-in type it implements ... We know for sure what the type of that plug-in is, only we can't import that type because it's a plug-in. We can (and did) import the plug-in type object MeshWriter though. Contributes to issue CURA-5330.	2018-06-15 15:09:19 +02:00
Ghostkeeper	e957f7b650	Fix typing errors ... Contributes to issue CURA-5330.	2018-06-15 15:07:08 +02:00
Ghostkeeper	2b33a1f1b6	Fix broken import with DefinitionContainerInterface ... And the ensuing type error that can then be found. Contributes to issue CURA-5330.	2018-06-15 14:31:29 +02:00
Ghostkeeper	0d52b03716	Fix the wrong types in this class ... These mistakes were found by MyPy. Contributes to issue CURA-5330.	2018-06-15 14:25:25 +02:00
Ghostkeeper	4c3d28709b	Add typing for all functions and fields ... Lots of typing so that MyPy can then check whether the functions are safe to call. Contributes to issue CURA-5330.	2018-06-15 14:07:33 +02:00
Ghostkeeper	8256788ed8	Use CuraApplication instead of Application ... Because we need to call getExtruderManager which is only in CuraApplication. Contributes to issue CURA-5330.	2018-06-15 13:40:43 +02:00
Ghostkeeper	75e5a185d9	Don't unnecessarily cast to a set ... The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set. Contributes to issue CURA-5330.	2018-06-15 13:07:55 +02:00
Diego Prado Gesto	b309e93767	CURA-5330 Fix typing in the VersionUpgrade plugin	2018-06-14 16:54:22 +02:00
Diego Prado Gesto	dc4556647a	CURA-5330 Fix code style in XmlMaterialProfile plugin	2018-06-14 16:49:26 +02:00
Diego Prado Gesto	a184fad8ee	CURA-5330 Add typing to the USBPrinting plugin	2018-06-14 15:57:30 +02:00
Diego Prado Gesto	7eba868574	CURA-5330 Fix typing and code style in the UM3NetworkPrinting plugin	2018-06-14 15:41:12 +02:00
Ghostkeeper	e0699a0997	Merge branch '3.4'	2018-06-14 14:57:20 +02:00
Ghostkeeper	7b82421751	Don't disable E steppers when pausing ... There is no such command to disable only the E stepper drivers. This command M84 gets interpreted as disabling ALL stepper drivers, which on some printers would cause the print bed to fall down.	2018-06-14 14:57:03 +02:00
Diego Prado Gesto	dfd20e1362	CURA-5335 Looking for the actual line number in the gcode when using the filament change script.	2018-06-14 14:35:46 +02:00
Diego Prado Gesto	49abf38210	CURA-5334 Ensure the material manager is fetched before call	2018-06-14 13:24:07 +02:00
Mark	49a3444b13	Unhide label for master	2018-06-14 10:59:05 +02:00
Jack Ha	f5dd7f6e92	CURA-5456 fixed typo, fixed multi objects with disabled extruders in message	2018-06-14 10:27:24 +02:00
Diego Prado Gesto	2c7c167fe0	CURA-5335 Looking for the actual line number in the gcode when using the filament change script.	2018-06-13 20:41:56 +02:00