112 Commits

Author SHA1 Message Date
Ghostkeeper
a3170041f8
Fix typo of theme
This was giving a warning that we couldn't get a font from undefined.

Contributes to issue CURA-3161.
2017-02-13 09:15:58 +01:00
Ghostkeeper
d3147a6e97
Add font for extruder name label
This allows it to get stylised.

Contributes to issue CURA-3161.
2017-02-10 16:07:16 +01:00
Ghostkeeper
440508f002
Don't display material if an unknown material is given
This makes it more clear for the cases other than UM3.

Contributes to issue CURA-3161.
2017-02-10 16:05:18 +01:00
Ghostkeeper
6629c8d0cf
Anchor last-row extruder box to left and right to stretch it
Layout.fillwidth seems to only stretch the box to full width on the first row, but without it the entire thing doesn't stretch. Leaving the width out will make the entire left column stretch so that the right column is no longer visible. It's all a bit weird, this QML stuff.

Contributes to issue CURA-3161.
2017-02-10 15:29:58 +01:00
Ghostkeeper
b69ec56f66
Make extruder name recover if it returns null
If it returns null, you'd get an error that it can't assign [undefined] to a text field.

Contributes to issue CURA-3161.
2017-02-10 14:55:06 +01:00
Ghostkeeper
2f8fc05181
Fix button enabled state depending on printer connection
I think I made a mistake when I removed one of the global variables here.

Contributes to issue CURA-3161.
2017-02-10 14:43:31 +01:00
Ghostkeeper
b3bd488c07
Use stylised tooltip for pre-heat button
Took some figuring out, this one... But it works.

Contributes to issue CURA-3161.
2017-02-10 14:40:31 +01:00
Ghostkeeper
be5b656ef7
Hide extruder information when hotend/material is not provided
This happens when there is no extruder in the machine or the machine simply doesn't provide enough information.

Contributes to issue CURA-3161.
2017-02-10 13:28:59 +01:00
Ghostkeeper
f6fe4f9fd3
Use Label for all text, not just labels
The fonts use better fallbacks if they fail to load for labels.

Contributes to issue CURA-3161.
2017-02-10 11:56:37 +01:00
Ghostkeeper
6ed0e81492
Remove unnecessary alignment
It is single-line text and already aligned to the right side via the anchors.

Contributes to issue CURA-3161.
2017-02-10 11:30:05 +01:00
Ghostkeeper
60812139b7
Use global margins instead of specific per cardinal direction
Makes it a bit shorter. But also makes it use the width of the margins for vertical margin, which is unintuitive.

Contributes to issue CURA-3161.
2017-02-10 11:27:45 +01:00
Ghostkeeper
17a03d777c
No longer use printerAcceptsCommands
It's an external variable we don't need. Just ask the currently connected printer.

Contributes to issue CURA-3161.
2017-02-10 11:14:28 +01:00
Ghostkeeper
4ce755021a
Don't use printerConnected from Sidebar.qml
We don't need it if we just check for connectedPrinter to not be null each time.

Contributes to issue CURA-3161.
2017-02-10 11:11:39 +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
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
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
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
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
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
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
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
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
57ec987cd9
Disable pre-heat if temperature is invalid
Contributes to issue CURA-3161.
2017-02-07 17:13:36 +01:00
Ghostkeeper
8d09c53896
Make pre-heat button cancel if currently heating
This is based on the timer, which is locally. Eventually we'd want to make the timer update every now and then or so.

Contributes to issue CURA-3161.
2017-02-07 16:46:22 +01:00
Ghostkeeper
9b235aebf2
Add clock icon to pre-heat countdown
It's aligned left of the pre-heat countdown and only visible if the countdown is visible.

Contributes to issue CURA-3161.
2017-02-07 16:38:28 +01:00
Ghostkeeper
8e25a1c73f
Also use central pre-heat time when sending time to printer
Oops.

Contributes to issue CURA-3161.
2017-02-07 16:32:36 +01:00
Ghostkeeper
1a902b21bb
Store default pre-heat time in central location
Its default is 900s or 15 minutes. QML now requests the time-out time and sends it on to the printer.

Contributes to issue CURA-3161.
2017-02-07 16:29:41 +01:00
Ghostkeeper
d705fb1d76
Document why we set endTime to the current date initially
Contributes to issue CURA-3161.
2017-02-07 16:24:28 +01:00
Ghostkeeper
d3d36d47eb
Add countdown timer for pre-heat time
Not happy with how there is '900' in multiple places in the code. I might do something about that later.

Contributes to issue CURA-3161.
2017-02-07 16:22:47 +01:00
Ghostkeeper
559b40867e
Call pre-heat if pre-heat button is pressed
Contributes to issue CURA-3161.
2017-02-07 13:29:57 +01:00
Ghostkeeper
f24d778cc5
Disable pre-heat button when not connected
This covers the case when there is no printer added as well as the case where a printer is added but not connected.

Contributes to issue CURA-3161.
2017-02-07 12:51:02 +01:00
Ghostkeeper
b1448887ba
Add button to pre-heat build plate
This is the one. The actual commit that implements the issue. It doesn't do anything yet, this button, but it's how it should look.

Contributes to issue CURA-3161.
2017-02-06 16:45:52 +01:00
Ghostkeeper
b1a8b28e87
Bind default pre-heat temperature to current build plate temperature
Currently the setting 'resets' when you go out of the print monitor mode. That wasn't the original intention but it works kind of nicely. We'll bring it up in a meeting whether this needs to be changed.

Contributes to issue CURA-3161.
2017-02-06 15:44:40 +01:00
Ghostkeeper
78fed0531d
Fix hovering the setting box
The 'hovered' property was taken from the example of the setting item, but that doesn't exist apparently. I looked up how it is normally done in QML.

Contributes to issue CURA-3161.
2017-02-06 15:17:59 +01:00
Ghostkeeper
27ff55d75b
Add binding to current maximum bed temperature
Instead of the MAXTEMP placeholder.

Contributes to issue CURA-3161.
2017-02-06 15:09:18 +01:00
Ghostkeeper
3fb625109e
Add text field for target pre-heat temperature
I'm sure it's quite buggy on all sides though.

Contributes to issue CURA-3161.
2017-02-03 17:04:31 +01:00
Ghostkeeper
abb9b8d7f0
Add box for build plate monitoring
This one's a bit bigger. It is supposed to contain the pre-heat button.

Contributes to issue CURA-3161.
2017-02-03 15:52:14 +01:00
Ghostkeeper
03e16b5398
Fix material colour when no printer is selected
It's invisible anyway, but the hex colour gives no errors at least.

Contributes to issue CURA-3161.
2017-02-03 15:49:18 +01:00
Ghostkeeper
1305dd88d7
Remove old extruder monitoring code
It has been replaced by these fancy new boxes.

Contributes to issue CURA-3161.
2017-02-03 15:20:24 +01:00
Ghostkeeper
a6c244f969
Use setting separator margin between material colour and name
It's a bit smaller. Looks like it belongs together now.

Contributes to issue CURA-3161.
2017-02-03 15:06:21 +01:00
Ghostkeeper
41c94fd247
Add variant names to extruder boxes
In the bottom-right corner.

Contributes to issue CURA-3161.
2017-02-03 15:03:24 +01:00
Ghostkeeper
ee3e0ba6ab
Add material indication to extruder boxes
Only if a material is known of course. But the case where it is unknown is not tested.

Contributes to issue CURA-3161.
2017-02-03 14:52:09 +01:00
Ghostkeeper
687cdcc30e
Add grey border between extruder boxes
This is done by fitting tightly a rectangle around the grid of boxes. The boxes themselves have a white background but there is spacing between the boxes, which results in the little border.

Contributes to issue CURA-3161.
2017-02-03 13:54:37 +01:00
Ghostkeeper
9546c85967
Add boxes containing information on extruders
These are meant to eventually replace the bullet-list of information we currently have.

Contributes to issue CURA-3161.
2017-02-03 13:50:17 +01:00
Ghostkeeper
7b8d41cb8f
Remove old connected printer header
It has been replaced by a nicer header.

Contributes to issue CURA-3161.
2017-02-02 14:48:06 +01:00
Ghostkeeper
c7a91f07d2
Add label for printer connection text to header
Also fixed the indenting of the previous two labels to use spaces instead of tabs. I knew I was going to forget putting it back to spaces after working on a different project that uses tabs.

The information is duplicated now. I'll remove the old one promptly.

Contributes to issue CURA-3161.
2017-02-02 14:45:44 +01:00