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
3cc11ecae5
Log when pre-heating or cancelling pre-heat
...
To help debugging and because it's a user interaction.
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
e6e5d7862e
Removed testfunctions. CURA-3214
2017-02-16 10:57:31 +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
Simon Edwards
2f89a1cff4
Small fix for a regression in the ThreeMFWriter from the recent type hint merge.
2017-02-16 10:20:44 +01:00
Jack Ha
59a8c21c73
Turn slice automatically off now correctly visualizes Prepare button. CURA-3214
2017-02-16 09:55:49 +01:00
Jack Ha
db984561e9
Almost done with manual and auto slicing. CURA-3214
2017-02-15 16:02:14 +01:00
Jaime van Kessel
b34bb26a1a
Fixed broken getInstance caused by refactor
2017-02-15 13:51:53 +01:00
Jack Ha
94badb1b9f
Fix auto slice after startup. CURA-3214
2017-02-15 13:51:24 +01:00
Jaime van Kessel
b187cf89a5
Fixed broken logging
2017-02-15 13:50:02 +01:00
Jack Ha
ca84fdd767
Merge branch 'master' into feature_auto_slice
2017-02-15 12:42:09 +01:00
Jack Ha
aab17608ff
Fixed shader bugs, lines are now nice and smooth again. CURA-3273
2017-02-15 11:53:20 +01:00
Jack Ha
ce226ebbea
Fix layerview checkboxes. CURA-3273
2017-02-15 11:35:49 +01:00
jack
8fc88f763b
Merge pull request #1288 from Ultimaker/layer_view3_cleanup
...
Layer View 3D, with detection of OpenGL context versions.
2017-02-15 11:11:42 +01:00
Jack Ha
78de5412a2
Merge branch 'master' into layer_view3_cleanup
2017-02-15 10:57:24 +01:00
Jack Ha
9e973732f5
Fixed remember coloring type in Layer View. CURA-3273
2017-02-15 10:50:21 +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
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
Jack Ha
e5cdc318f7
Added preference. CURA-3214
2017-02-13 14:29:34 +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