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
Ghostkeeper
77f07bbc1d
Use Flow for extruder boxes instead of GridLayout
...
Flow makes things a lot more simple with the double-width item at the bottom.
Contributes to issue CURA-3161.
2017-02-13 11:54:12 +01:00
Ghostkeeper
adbcd874a8
Add SettingPropertyProvider for machineExtruderCount here too
...
It's not necessary, but this keeps it more localised.
Contributes to issue CURA-3161.
2017-02-13 11:52:46 +01:00
Ghostkeeper
40f32449c6
Remove unnecessary watched properties from machineExtruderCount
...
Since we don't change the colour of the input box right now, we won't need the warning values.
Contributes to issue CURA-3161.
2017-02-13 09:38:02 +01:00
Ghostkeeper
c2c61c4331
Improve condition for extruder name fallback
...
In effect this has no change. But semantically it is better: If there are no extruders or the extruders have no name, use 'hotend'. Otherwise use the available name. It has nothing to do with the amount of extruders.
Contributes to issue CURA-3161.
2017-02-13 09:35:09 +01:00
Ghostkeeper
2722ac5a8f
Re-use repeater count instead of listening to machineExtruderCount everywhere
...
Might be slightly more efficient and/or update stuff in the correct order.
Contributes to issue CURA-3161.
2017-02-13 09:32:16 +01:00
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
784b223fc7
Merge branch '2.4'
2017-02-13 09:13:25 +01:00
Mark Burton
c1a770877f
Add "Skin " prefix to "Expand Distance" and "Shrink Distance" labels.
...
It's useful to know what is being expanded/shrunk when those labels are
cited (for example if you are switching profiles without saving changes).
2017-02-12 17:48:11 +00:00
Ghostkeeper
050f76e11d
Update quality profiles from material research
...
This locks initial layer speed at 20, without scaling from the normal print speed. It also adjusts some jerk and speed of support infill.
2017-02-10 18:09:34 +01:00
Jaime van Kessel
7838888d5c
Merge branch '2.4' of github.com:Ultimaker/Cura
2017-02-10 16:43:08 +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
f5ac357824
Merge branch 'probonopd-patch-1'
2017-02-10 10:19:41 +01:00
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
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
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
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
MaukCC
dc2dfec0c8
Update cartesio.def.json
2017-02-08 13:14:53 +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