GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 14:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,023 Commits 290 Branches 260 Tags
Commit Graph

7023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7cf81412ae
Implement bed pre-heating via USB 
It just calls the bed heating command without implementing the time-out. Implementing the time-out is impossible via just g-code.

Contributes to issue CURA-3161.
 2017-02-07 17:26:44 +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
9354a80504
Document no longer that pre-heating defaults to 15m 
Because that was removed.

Contributes to issue CURA-3161.
 2017-02-07 17:17:45 +01:00
Ghostkeeper
d30430381f
Add default implementations for preheatBed and cancelPreheatBed 
It is a no-op implementation that gives a warning. I'd rather give an exception and have that handled by whatever calls it, but this is how the other methods here do it.

Contributes to issue CURA-3161.
 2017-02-07 17:16:19 +01:00
Ghostkeeper
57ec987cd9
Disable pre-heat if temperature is invalid 
Contributes to issue CURA-3161.
 2017-02-07 17:13:36 +01:00
Arjen Hiemstra
a63b4646e9 Postpone containersChanged signals of all active stacks 
This avoids things taking longer because the not-active extruder stack
was still emitting containersChanged.
 2017-02-07 17:01:52 +01:00
Ghostkeeper
4ccadc6208
Round pre-heat temperature and duration to integer but allow floats 
We want to allow floats in the interface since the interface needs to be agnostic of what device it is connected to. But the UM3 API only allows integers, so we still need to round it to the nearest integer.

Contributes to issue CURA-3161.
 2017-02-07 16:57:20 +01:00
Ghostkeeper
785f10966e
Don't send a time-out for preheat if timeout is 0 
The printer doesn't accept 0.

Contributes to issue CURA-3161.
 2017-02-07 16:48:27 +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
Arjen Hiemstra
0292756ad7 Do not limit containersChanged methods to a single container type 
This may trigger a few extra updates, but allows us to use signal
compression in the postponesignals context manager, which greatly
improves performance.
 2017-02-07 16:28:08 +01:00
Arjen Hiemstra
927055806c Postpone containersChanged signals when doign setActive* calls 
This makes sure we do not trigger everything three times when switching
variants.
 2017-02-07 16:26:44 +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
Simon Edwards
8a4b6adfb3 Flash the window icon instead of trying (and failing) to make it visible directly. 
CURA-3335 Single instance Cura and model reloading
 2017-02-07 15:47:45 +01:00
Ghostkeeper
d751285713
Provide pre-heat command with integer parameters 
The firmware only accepts integers, apparently.

Contributes to issue CURA-3161.
 2017-02-07 14:44:28 +01:00
Jack Ha
4057996e23 Made layers.shader compatibility shader compatible. CURA-3273 2017-02-07 14:28:22 +01:00
Ghostkeeper
b27a9e6535
Implement tracking target bed temperature 
I had already assumed it was tracking this but apparently it wasn't. This works though.

Contributes to issue CURA-3161.
 2017-02-07 13:52:44 +01:00
Simon Edwards
71d2990ca9 Merge branch 'single_instance' 2017-02-07 13:45:11 +01:00
Ghostkeeper
3618ae0d4f
Properly float-format input of preheatBed 
It rounds to 3 digits. The specification of the feature in the API doesn't mention how detailed the temperature and duration can go, but thousands seems more than enough. This also eliminates pesky problems with the JSON brackets in the format function.

Contributes to issue CURA-3161.
 2017-02-07 13:35:09 +01:00
Simon Edwards
412e299f0c Cleaned up and bug fixed the command loop. 
CURA-3335 Single instance Cura and model reloading
 2017-02-07 13:33:37 +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
0df4afff33
Convert parameters to string before including them 
This way you can provide normal floating point values instead of providing strings with numbers in them.

Contributes to issue CURA-3161.
 2017-02-07 13:26:10 +01:00
Ghostkeeper
d7bf23ca21
Add function to cancel pre-heating the bed 
You could also do this by calling preheatBed with a temperature of 0. In fact, that's what this function does.

Contributes to issue CURA-3161.
 2017-02-07 13:23:56 +01:00
Ghostkeeper
9d8034d14f
Add default for duration parameter of preheatBed 
It defaults to 15 minutes.

Contributes to issue CURA-3161.
 2017-02-07 13:22:21 +01:00
Jack Ha
ed1fea2d3e Fix colors of compatibility mode. CURA-3273 2017-02-07 13:20:26 +01:00
Ghostkeeper
cfbcf56739
Add function to pre-head bed 
This makes a PUT-request to the printer with the new API function call.

Contributes to issue CURA-3161.
 2017-02-07 13:18:41 +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
Jack Ha
4b02a425d8 Let Layer View compatibility mode depend on OpenGL version we asked for (may be different than actual). CURA-3273 2017-02-07 11:55:51 +01:00
Ghostkeeper
31b9318865 Merge branch 'patch-1' of https://github.com/probonopd/Cura into probonopd-patch-1 2017-02-07 11:45:01 +01:00
Jaime van Kessel
aeb8fbd82e Merge pull request #1407 from DelphinPETER/master 
French translation - Little correction
 2017-02-07 11:21:16 +01:00
Jack Ha
1d77864915 Added force layer view compatibility mode. CURA-3273 2017-02-07 09:36:21 +01:00
PETER Delphin
b56cf165ec French translation correction 2017-02-06 23:38:55 +01:00
probonopd
62fdaf52f2 Add extra quotes as per https://github.com/Ultimaker/Cura/pull/1350#discussion_r99554294 2017-02-06 19:32:01 +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
c19544a293
Remove duplicate minimum/maximum of prime tower Y position 
This seems to have gone wrong in merging a pull request.
 2017-02-06 14:26:26 +01:00
Jack Ha
7c964045db Removed unused line in shader. CURA-3273 2017-02-06 13:16:47 +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