GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 17:49:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,024 Commits 291 Branches 260 Tags
Commit Graph

1964 Commits

Author SHA1 Message Date
Jack Ha
cc950732b6 Added comment. CURA-3273 2017-02-08 11:57:59 +01:00
Jack Ha
47ab49795f Added comments, changed small layout and id thing. CURA-3273 2017-02-08 11:48:00 +01:00
Ghostkeeper
da4574cb32
Use fallback without time-out if preheating bed on old firmware 
It manually sets the temperature just like what happens when you print via USB.

Contributes to issue CURA-3161.
 2017-02-08 11:38:03 +01:00
Ghostkeeper
28e488dad7
Fix setting target bed temperature 
The previous implementation just emitted the signal twice, once in setTargetBedTemperature and once in _setTargetBedTemperature. I've made the private one actually set the temperature.

Contributes to issue CURA-3161.
 2017-02-08 11:37:04 +01:00
Jack Ha
50ba236e66 Removed unused option in LayerPolygon, added comments 2017-02-08 11:24:41 +01:00
Jack Ha
6c19bc1c16 Only show legend in color: line_type 2017-02-08 11:08:59 +01:00
Jack Ha
1d6ef4bc3c Default color if no material color is available. CURA-3273 2017-02-08 10:40:17 +01:00
Arjen Hiemstra
74bef2ff95 Fix OpenGL 2.0 fallback shader for Layer View 2017-02-07 17:34:02 +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
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
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
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
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
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
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
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
Jack Ha
1d77864915 Added force layer view compatibility mode. CURA-3273 2017-02-07 09:36:21 +01:00
Jaime van Kessel
3d01d7bc54 Removed unneeded bytearray to string conversion 2017-02-06 14:26:02 +01:00
Jaime van Kessel
4dc70cc2b1 3MF writer now also uses libSavitar 
CURA-3215
 2017-02-06 14:14:03 +01:00
Jaime van Kessel
b6118a764e Updated documentation 
CURA-3215
 2017-02-06 14:13:20 +01:00
Jack Ha
7c964045db Removed unused line in shader. CURA-3273 2017-02-06 13:16:47 +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
Jack Ha
0889722350 Finishing up opengl 4.1 core profile things, it all works. CURA-3273 2017-02-02 17:08:20 +01:00
Jaime van Kessel
a3326a8313 3mf reader now uses libSavitar for loading 
This greatly decreases (~factor 10) the time required to load 3mf files

CURA-3215
 2017-02-02 15:54:44 +01:00
Ghostkeeper
7b41e844cc
Fix name and address for USB printing devices 
As address it uses the serial port, which would be COM# for Windows and /dev/ttyUSB# for Linux. I don't know what it would display there on OSX, probably a drive directory.

Contributes to issue CURA-3161.
 2017-02-02 15:19:56 +01:00
Ghostkeeper
cda5ee1dca
Separate name from address in properties 
This way we can display them separately.

Contributes to issue CURA-3161.
 2017-02-02 14:27:49 +01:00
Jack Ha
4659d8616e Fixed some opengl 4.1 core vertex and fragment shaders, layerview anchor. CURA-3273 2017-02-01 16:29:21 +01:00
Jack Ha
4bb8e1b025 Converted layers3d.shader to 41core spec. Contributes to CURA-3273 2017-02-01 16:10:52 +01:00
Ghostkeeper
3aec36018f Add entry that we switched Linux to AppImage format 
It was deemed worthy to mention.

Contributes to issue CURA-3048.
 2017-01-31 16:54:54 +01:00
Jack Ha
aa923321f8 Fix compatibility mode layout. CURA-3273 2017-01-31 09:19:18 +01:00
Jack Ha
523211c3e8 Merge branch 'layer_view3_cleanup' into layer_view3_layout 2017-01-30 16:48:31 +01:00
Jack Ha
5a2aa8846b Added extruder count detection to layer view. CURA-3273 2017-01-30 13:29:35 +01:00
Jack Ha
d6f00a0a64 Solved merge conflict. CURA-3321 2017-01-30 11:40:53 +01:00
Jack Ha
5f6ed488d1 Layerview removed Color Only Selected Extruder, cleanup 3d shader. CURA-3273 2017-01-30 11:39:59 +01:00
Jack Ha
645d188698 Merge branch 'layer_view3_cleanup' into layer_view3_layout 2017-01-30 11:26:13 +01:00
Jack Ha
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +01:00
Jack Ha
b1d95f3464 Layout Layer View menu, removed item, changed size. CURA-3321 2017-01-30 11:24:51 +01:00
Mark Burton
31c1684066 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles 2017-01-27 15:55:43 +00:00
Mark Burton
db3cf0c0fb Add the [int] setting type for settings that are a list of integers. 
The RegExpValidator (more of a restrictor than a validator) requires the
text to start with a '[' and then have a sequence of integers separated by
commas. A trailing ']' is accepted.
 2017-01-27 15:54:19 +00:00
Simon Edwards
eb43806d7a Merge branch 'master' into python_type_hinting 2017-01-27 15:37:30 +01:00
Jaime van Kessel
48e5a2237d Merge branch 'master' of github.com:Ultimaker/Cura 2017-01-27 09:33:13 +01:00
Jack Ha
bb1fa3ae04 Started changing layout of layer view. CURA-3321 2017-01-26 17:29:39 +01:00