14353 Commits

Author SHA1 Message Date
Ghostkeeper
c7793238f7
Disallow pre-heat temperature of 0 explicitly
Because that signals to the printer that it should cancel pre-heating.

Contributes to issue CURA-3161.
2017-02-16 14:20:35 +01:00
Ghostkeeper
253b4bce03
Don't disable pre-heat text if temperature is invalid
Otherwise you can't change the temperature to make it valid again...

Contributes to issue CURA-3161.
2017-02-16 14:17:13 +01:00
Ghostkeeper
84f695821d
Disable text field when pre-heat button is disabled
More consistent user experience.

Contributes to issue CURA-3161.
2017-02-16 14:01:42 +01:00
Ghostkeeper
9a480ac041
Change description of temperature settings to prevent confusion
The term 'pre-heat' is now reserved for the actual pre-heating functionality.

Contributes to issue CURA-3161.
2017-02-16 13:55:09 +01:00
Ghostkeeper
2498ee9726
Also disable pre-heat if printer is paused or pausing
The UM3 also doesn't allow pre-heating during this period. Other printers tend to keep the bed hot during pausing.

Contributes to issue CURA-3161.
2017-02-16 13:37:44 +01:00
Ghostkeeper
abf092512a
Don't show temperature if print core is removed in UM3
The empty string as hotend ID is interpreted as there being no hotend, since this is what the UM3 returns in that case.

Contributes to issue CURA-3161.
2017-02-16 13:23:20 +01:00
Ghostkeeper
140d5204c3
Fix error message when not connected in preheatUpdateTimer
Can't get preheatBedRemainingTime from null.

Contributes to issue CURA-3161.
2017-02-16 12:58:40 +01:00
Ghostkeeper
b002e367e3
Only update bed temperature on switching to tab
The problem was that the bed temperature for pre-heat was being updated when focus was lost. It now only updates on component being completed. Since print monitor is a component that is switched out with a Loader, it is completed every time the monitor tab is clicked, thus causing this update. It is not pretty to be dependent on this, but it's quite practical considering the alternatives.

This causes the pre-heat temperature to not update when you switch machines. Whether this is desirable or not is up for debate. In any case the bed temperature is now always equal for all machines so it doesn't matter anyway.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
d2fa6dbae2
Notify to update remaining time when it drastically changes
When the time passes normally it doesn't trigger this signal but just go on counting, but when the pre-heat starts or cancels it updates via this signal. This is handy for the future, when we want to update the remaining time from the printer information. However for now it is also nice because we can make the pre-heat timer dependent on this signal so we know when to have it running. This fixes the problem that the pre-heat seems to have been cancelled in the GUI when you switch away the tab, because the timer running is now dependent on the property rather than always false.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
9a5b355f2b
Make countdown visibility dependent on its own text
No need to 'update' that in the update timer. We can just link it and it updates on its own.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
d363736fdd
Rename preheatCountdownTimer to preheatUpdateTimer
It is a timer that triggers every 100ms to update the state of the pre-heating process, after all.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
75a50b73c2
Move pre-heat timer into PrinterOutputDevice
If it's held inside the device that has two advantages: It's being held per-device, so switching connection doesn't stop the timer. And also, the logic is no longer in the GUI.

Contributes to issue CURA-3161.
2017-02-16 12:58:32 +01:00
Jack Ha
464bf73f85 Made backend available in qml, calling forceSlice and stopSlicing directly. CURA-3214 2017-02-16 10:56:01 +01:00
Jack Ha
59a8c21c73 Turn slice automatically off now correctly visualizes Prepare button. CURA-3214 2017-02-16 09:55:49 +01:00
MaukCC
2b99b22036 Update cartesio_0.25.inst.cfg 2017-02-15 14:02:39 +01:00
MaukCC
1833dd5a5d Update cartesio_0.25.inst.cfg 2017-02-15 12:59:00 +01:00
Jack Ha
ca84fdd767 Merge branch 'master' into feature_auto_slice 2017-02-15 12:42:09 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
MaukCC
603fc6d95d Update cartesio_0.4.inst.cfg 2017-02-15 10:05:15 +01:00
MaukCC
64a5a55c87 Update cartesio_extruder_0.def.json 2017-02-15 10:02:22 +01:00
MaukCC
14e6e4073f Update cartesio_extruder_0.def.json 2017-02-15 10:01:37 +01:00
MaukCC
6ab579db72 Update cartesio_extruder_0.def.json 2017-02-15 10:01:09 +01:00
MaukCC
e9dec8daf6 Update cartesio_extruder_1.def.json 2017-02-15 10:00:44 +01:00
MaukCC
f4fed560fc Update cartesio_extruder_3.def.json 2017-02-15 10:00:04 +01:00
MaukCC
0d28b28539 Update cartesio_extruder_2.def.json 2017-02-15 09:59:55 +01:00
MaukCC
c0b8678a89 Update cartesio_extruder_1.def.json 2017-02-15 09:59:45 +01:00
MaukCC
87802a1cf8 Update cartesio_extruder_0.def.json 2017-02-15 09:59:32 +01:00
MaukCC
dfff2e193f Update cartesio_extruder_0.def.json 2017-02-15 09:58:58 +01:00
MaukCC
3f502d3d6d Update cartesio_extruder_1.def.json 2017-02-15 09:58:48 +01:00
MaukCC
c2ee3efc72 Update cartesio_extruder_1.def.json 2017-02-15 09:58:31 +01:00
MaukCC
a69c331b26 Update cartesio_extruder_0.def.json 2017-02-15 09:58:12 +01:00
MaukCC
a0059f372d Update cartesio_extruder_1.def.json 2017-02-15 09:57:26 +01:00
MaukCC
f1a9e18642 Update cartesio_extruder_1.def.json 2017-02-15 09:56:57 +01:00
MaukCC
8f3ced5791 Update cartesio.def.json 2017-02-15 09:55:35 +01:00
MaukCC
758a810e9b Update cartesio_0.8.inst.cfg 2017-02-15 09:44:55 +01:00
MaukCC
88e9be1ade Update cartesio_0.4.inst.cfg 2017-02-15 09:44:39 +01:00
MaukCC
9c71735d1a Update cartesio_0.25.inst.cfg 2017-02-15 09:44:23 +01:00
MaukCC
48331a2579 Update cartesio.def.json 2017-02-15 09:40:55 +01:00
Mark Burton
0237a5a386 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
# Conflicts:
#	cura/CuraApplication.py
2017-02-15 08:20:45 +00:00
fieldOfView
25fb3fed16 Add missing label color
One of the labels in the newly redesigned printmonitor is lacking a color, thus making the hotend temperature unstylable.
2017-02-14 10:38:33 +01:00
Jaime van Kessel
a8853a992f Removed unused ID 2017-02-14 09:29:14 +01:00
Jaime van Kessel
b7176f0c62 Added basic profile for folgertech
As per info provided by Paul Bussiere
2017-02-13 19:51:21 +01:00
Tim Kuipers
935ee141d4 feat: spaghetti_flow setting (CURA-3238) 2017-02-13 15:44:29 +01:00
Tim Kuipers
647ff3403e feat: spaghetti_inset setting (CURA-3238) 2017-02-13 15:44:29 +01:00
Tim Kuipers
84b019393e JSON feat: Spaghetti infill settings (CURA-3238) 2017-02-13 15:44:29 +01:00
Jack Ha
e5cdc318f7 Added preference. CURA-3214 2017-02-13 14:29:34 +01:00
Jaime van Kessel
e8c5f81c79 Merge branch 'feature_preheat_bed' of github.com:Ultimaker/Cura 2017-02-13 14:16:50 +01:00
Ghostkeeper
2724af7508
Add lining between bottom of extruders and build plate boxes
Using margins for this is not applicable since it was the background of the rectangle around the flow that has the correct lining colour. So this is manually adding a line.

Contributes to issue CURA-3161.
2017-02-13 12:01:27 +01:00
Ghostkeeper
34dccfd6a6
Fix updating extruder names on machine switch
The extruder name is asked from the extruder manager, so that the signal from extruder manager properly updates it once the new name is available.

Contributes to issue CURA-3161.
2017-02-13 11:57:01 +01:00