9400 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	b5a88d5964	Merge branch 'patch-1' of https://github.com/probonopd/Cura into probonopd-patch-1	2017-02-10 10:19:27 +01:00
Ghostkeeper	928d13b1e5	Fix string-type settings by making them specify default_value ... None of these settings get a 'value' property defined in fdmprinter, so they can safely use 'default_value' to specify their setting value.	2017-02-10 09:59:36 +01:00
Ghostkeeper	e1351e788f	Merge branch 'patch-1' of https://github.com/probonopd/Cura into probonopd-patch-1	2017-02-10 09:44:07 +01:00
Ghostkeeper	45c045131b	Fix rendering pre-heat button text twice ... It was rendered by the button and again by the style for the button. I'm just using the style since it has the proper styling. Thanks, fieldOfView. Contributes to issue CURA-3161.	2017-02-10 09:38:38 +01:00
probonopd	f85e0f57ad	Change gcode to default_value and remove single quotes	2017-02-09 19:21:52 +01:00
Ghostkeeper	0c9b9a3033	Add fallback name property in PrinterOutputDevice ... It'll call this property, which gives an empty string, if the device doesn't implement giving a name. Contributes to issue CURA-3161.	2017-02-09 17:34:51 +01:00
Jack Ha	655b3aa9cf	Removed .gitignore from PauseBackendPlugin. CURA-3361	2017-02-09 17:20:49 +01:00
Jack Ha	3d1e5a84fc	Added PauseBackendPlugin, added to changelog. CURA-3361	2017-02-09 17:19:59 +01:00
Jack Ha	c2bf88751e	Enable functions pauseSlicing and continueSlicing in combination with BlockSlicingDecorator. CURA-3361	2017-02-09 16:06:36 +01:00
Jack Ha	30af908e29	Fixed GCodeReader. CURA-3273	2017-02-09 15:27:53 +01:00
Mark Burton	3e8789ae48	Renamed anchor_skin settings to equivalent expand_skins settings. ... Expand skins describes the operation better, the fact that the skins end up getting anchored in the infill is just one benefit of the expansion.	2017-02-09 11:35:54 +00:00
Ghostkeeper	27c30006da	Give no address instead of a wrong address if unknown ... Contributes to issue CURA-3161.	2017-02-09 10:33:14 +01:00
Ghostkeeper	e37d8b949e	Add fallback in PrinterOutputDevice for getting address ... The fallback gives a warning that it's not implemented. Contributes to issue CURA-3161.	2017-02-09 10:31:35 +01:00
Ghostkeeper	c5655d4d8c	Document preheatBedTimeout ... Must've slipped through the cracks. Contributes to issue CURA-3161.	2017-02-09 09:32:14 +01:00
MaukCC	60d93a57d4	Update cartesio.def.json	2017-02-08 14:52:04 +01:00
Ghostkeeper	4013b50063	Only allow pre-heating if authenticated ... Contributes to issue CURA-3161.	2017-02-08 14:01:07 +01:00
Ghostkeeper	bcab0d7be9	Add unit to maximum temperature indication ... Contributes to issue CURA-3161.	2017-02-08 14:00:45 +01:00
Jack Ha	81e575da31	Added comment. CURA-3273	2017-02-08 13:39:19 +01:00
Jack Ha	811f40d294	Renamed lightDir to light_dir. CURA-3273	2017-02-08 13:34:54 +01:00
Jack Ha	0d444298bc	Added myEmitVertex function in layers3d.shader. CURA-3273	2017-02-08 13:29:24 +01:00
MaukCC	dc2dfec0c8	Update cartesio.def.json	2017-02-08 13:14:53 +01:00
Jack Ha	8e80593232	Added comment. CURA-3273	2017-02-08 13:03:48 +01:00
Ghostkeeper	1395735ece	No longer mention printer name in status ... The printer name is displayed right above it, so mentioning the name again is double. Contributes to issue CURA-3161.	2017-02-08 12:53:54 +01:00
Ghostkeeper	d7b0336c24	Fix colour of unknown material ... The other colour was just used for debugging. Contributes to issue CURA-3161.	2017-02-08 12:42:40 +01:00
Ghostkeeper	2a114f1e53	Display last item with double width if there's room on the right side ... If it's on the left side and it's the last item, it gets the entire width. Contributes to issue CURA-3161.	2017-02-08 11:59:19 +01:00
Jack Ha	cc950732b6	Added comment. CURA-3273	2017-02-08 11:57:59 +01:00
Jack Ha	47ab49795f	Added comments, changed small layout and id thing. CURA-3273	2017-02-08 11:48:00 +01:00
Simon Edwards	34793e06fb	Removed debug. Toned down a FIXME. ... CURA-3335 Single instance Cura and model reloading	2017-02-08 11:41:30 +01:00
Ghostkeeper	9f66ad1132	Remove superfluous empty item ... Don't know where that came from. Contributes to issue CURA-3161.	2017-02-08 11:40:40 +01:00
Ghostkeeper	da4574cb32	Use fallback without time-out if preheating bed on old firmware ... It manually sets the temperature just like what happens when you print via USB. Contributes to issue CURA-3161.	2017-02-08 11:38:03 +01:00
Ghostkeeper	28e488dad7	Fix setting target bed temperature ... The previous implementation just emitted the signal twice, once in setTargetBedTemperature and once in _setTargetBedTemperature. I've made the private one actually set the temperature. Contributes to issue CURA-3161.	2017-02-08 11:37:04 +01:00
Jack Ha	50ba236e66	Removed unused option in LayerPolygon, added comments	2017-02-08 11:24:41 +01:00
Jack Ha	6c19bc1c16	Only show legend in color: line_type	2017-02-08 11:08:59 +01:00
Jack Ha	1d6ef4bc3c	Default color if no material color is available. CURA-3273	2017-02-08 10:40:17 +01:00
Ghostkeeper	98e3e2a25a	Allow pre-heating bed while pausing ... It is allowed during the pause. So it should also be allowed when transitioning towards the pause. Contributes to issue CURA-3161.	2017-02-08 10:19:20 +01:00
Ghostkeeper	34f929c9df	Disable preheat button if printer is busy ... It is allowed to preheat the bed if the printer is waiting for the bed to clean up or for stuff to cool down after a print. Contributes to issue CURA-3161.	2017-02-08 10:18:21 +01:00
Ghostkeeper	2cdf06413b	Remove margin on the left of print monitor ... For the other side bar objects this margin was applied doubly, so that makes it very easy to remove. Contributes to issue CURA-3161.	2017-02-08 09:41:42 +01:00
jack	f571c5ea8e	Merge pull request #1405 from Ultimaker/opengl41core ... Opengl41core - on top of layer_view3_cleanup	2017-02-08 08:44:25 +01:00
Ghostkeeper	be9823e94f	Hide maximum bed temperature if there is no maximum ... Instead of the ugly 'None' it would display. Contributes to issue CURA-3161.	2017-02-07 17:39:45 +01:00
Arjen Hiemstra	74bef2ff95	Fix OpenGL 2.0 fallback shader for Layer View	2017-02-07 17:34:02 +01:00
Ghostkeeper	0b10df01b0	Don't check for min/max temperature if we have no min/max ... If we have no minimum/maximum bed temperature, the property returns 'None'. Contributes to issue CURA-3161.	2017-02-07 17:33:59 +01:00
Ghostkeeper	e9b30daad6	Write out pre-heat button enabled condition ... It should be equivalent. This needs to be done because the line is getting long and I need to add additional checks for if the properties are even set. Contributes to issue CURA-3161.	2017-02-07 17:30:15 +01:00
Ghostkeeper	7cf81412ae	Implement bed pre-heating via USB ... It just calls the bed heating command without implementing the time-out. Implementing the time-out is impossible via just g-code. Contributes to issue CURA-3161.	2017-02-07 17:26:44 +01:00
Ghostkeeper	b05697b0d5	Also cancel pre-heating bed from Cura after time-out ... Printers that don't automatically turn off their heated bed will get the task to do so by Cura then. Contributes to issue CURA-3161.	2017-02-07 17:21:14 +01:00
Ghostkeeper	9354a80504	Document no longer that pre-heating defaults to 15m ... Because that was removed. Contributes to issue CURA-3161.	2017-02-07 17:17:45 +01:00
Ghostkeeper	d30430381f	Add default implementations for preheatBed and cancelPreheatBed ... It is a no-op implementation that gives a warning. I'd rather give an exception and have that handled by whatever calls it, but this is how the other methods here do it. Contributes to issue CURA-3161.	2017-02-07 17:16:19 +01:00
Ghostkeeper	57ec987cd9	Disable pre-heat if temperature is invalid ... Contributes to issue CURA-3161.	2017-02-07 17:13:36 +01:00
Arjen Hiemstra	a63b4646e9	Postpone containersChanged signals of all active stacks ... This avoids things taking longer because the not-active extruder stack was still emitting containersChanged.	2017-02-07 17:01:52 +01:00
Ghostkeeper	4ccadc6208	Round pre-heat temperature and duration to integer but allow floats ... We want to allow floats in the interface since the interface needs to be agnostic of what device it is connected to. But the UM3 API only allows integers, so we still need to round it to the nearest integer. Contributes to issue CURA-3161.	2017-02-07 16:57:20 +01:00
Ghostkeeper	785f10966e	Don't send a time-out for preheat if timeout is 0 ... The printer doesn't accept 0. Contributes to issue CURA-3161.	2017-02-07 16:48:27 +01:00