7023 Commits

Author SHA1 Message Date
Simon Edwards
60d4e6e4fd Make the run_mypy.py script find Uranium via the PYTHONPATH env var. 2017-02-15 08:53:18 +01:00
Ghostkeeper
42982b7a86
Fix link to UM.Version.Version
The Version object is no longer exposed via UM.__init__, so we have to dig inside the UM.Version module to get it.

Contributes to issue CURA-2917.
2017-02-14 17:03:37 +01:00
Ghostkeeper
b488441d81
Fix link to ContainerRegistry
This one was forgotten because it is in a comment.

Contributes to issue CURA-2917.
2017-02-14 17:00:33 +01:00
Ghostkeeper
5055c534c5
Fix links to ContainerRegistry
ContainerRegistry is no longer exposed in UM.Settings.__init__, so we must dig the class up from inside the module.

Contributes to issue CURA-2917.
2017-02-14 16:57:21 +01:00
Simon Edwards
4928c91942 Make run_mypy.py slightly more cross platform. 2017-02-14 13:47:37 +01:00
Simon Edwards
2451921604 Merge branch 'master' into python_type_hinting 2017-02-14 13:36:50 +01:00
Simon Edwards
cb400f0257 Fix for a recent merge problem. 2017-02-14 13:36:03 +01:00
awhiemstra
6d8df73401 Merge pull request #1429 from fieldOfView/fix_missing_label_color
Add missing label color
2017-02-14 11:52:41 +01: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
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Jaime van Kessel
e6c8a11017 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 14:16:59 +01:00
Jaime van Kessel
e8c5f81c79 Merge branch 'feature_preheat_bed' of github.com:Ultimaker/Cura 2017-02-13 14:16:50 +01:00
Jaime van Kessel
cc396d5357 Fixed target temp never updating 2017-02-13 14:16:22 +01:00
Ghostkeeper
a3af887d3f
Add support for WSH USB driver when not filtering USB-only
This support was included when filtering for USB only, but not the case when we are not filtering. I don't like this bit of code much since we should just define a list of paths to check and iterate over it, so that we can re-use the data and prevent syncing mistakes like this.
2017-02-13 13:46:30 +01:00
Jaime van Kessel
f62030dae5 setTargetBed temperature now directly sets target temp
This is instead of sending /bed/temperature a json which contains target & temp as keyvalue.
2017-02-13 13:30:51 +01:00
Jaime van Kessel
6deaf5bd65 Failure logging for network printing is now more explicit (also prints what the operation was) 2017-02-13 13:28:32 +01:00
Simon Edwards
2020ff5622 Removed the debug which we no longer need.
CURA-3335 Single instance Cura and model reloading
2017-02-13 13:27:10 +01:00
Jaime van Kessel
8d7b813318 All good 20x http replies are now accepted 2017-02-13 13:26:36 +01:00
Jack Ha
488b952815 Fix 4.1 shader for line types. CURA-3273 2017-02-13 13:21:30 +01:00
Jack Ha
106cb6ded9 Fixed compatibility mode. CURA-3273 2017-02-13 12:47:04 +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
Simon Edwards
234130eb7a Added a static "app version" method.
CURA-3335 Single instance Cura and model reloading
2017-02-13 11:58:14 +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
Jaime van Kessel
94439eddd4 Merge branch 'switching_performance_fixes' of github.com:Ultimaker/Cura 2017-02-13 11:07:36 +01:00
Jaime van Kessel
ce5f435be9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 11:07:25 +01:00
Jaime van Kessel
c18fb02f82 Removed unneeded (and somewhat expensive) checks
CURA-3311
2017-02-13 11:06:21 +01:00
Jack Ha
7000717f6e Fixed warning non-NOTIFYable properties, added signals for propertiesChanged. CURA-3273 2017-02-13 09:58:33 +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
Simon Edwards
88395ebb6a Reliability fix and more debug for testing purposes.
CURA-3335 Single instance Cura and model reloading
2017-02-12 20:37:48 +01:00
Thomas Karl Pietrowski
2464df053a Merge pull request #1421 from Torsten85/support-wch-driver
FEATURE: Support wsh usb driver (for mac)
2017-02-12 13:32:44 +01:00
Torsten Blindert
2fca555ea6 FEATURE: Support wsh usb driver 2017-02-11 16:34:49 +01:00
Ghostkeeper
ea043beb87 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2.4.0 2017-02-10 18:11:49 +01: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
Jaime van Kessel
185f5fe1c4 Added a clarification to the changelog regarding the inital print temperature 2017-02-10 16:41:49 +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
Jaime van Kessel
5e3782e6c3 Added more authentication logging to network printing 2017-02-10 15:44:45 +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
Jaime van Kessel
5e5cc723d7 Calling the stop of USBPrinterOutput device no longer joins the thread.
This caused quite a bit of delay on the application closing down (up to 5 seconds!)
2017-02-10 15:03:34 +01:00
Jaime van Kessel
6e7c4711e3 When creating XML profiles, directly set the name
The setName function is intended if the user changes the name (as by means of the edit material menu).
For deserializing this simply gives too much overhead
2017-02-10 14:58:22 +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