GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-11 04:21:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,337 Commits 295 Branches 268 Tags
Commit Graph

7337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mark Burton
7681261b03 Added anchor_skin_shrink_distance. 
Also, renamed anchor_skin_distance to anchor_skin_expand_distance.

The idea behind the shrink distance is that when the slope of the model surface
is steep, very slim skin areas are created close to the wall and if they
are expanded we end up with skin inside the infill that isn't required. So
by shrinking the skin polygons slightly first, the very slim areas are removed
before the skin is expanded. The amount to shrink defaults to half the wall
width which appears to work OK but may as well make it a setting so that it
can be tweaked if required.
 2017-02-07 09:55:15 +00: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
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
Mark Burton
495a73e976 Tweaked descriptions of anchor_skin_in_infill and anchor_skin_distance. 2017-02-06 08:44:25 +00:00
Mark Burton
b83537f27d Hide children of anchor_skins_in_infill when it isn't enabled. 2017-02-05 15:58:42 +00: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
Ghostkeeper
ee3e0ba6ab
Add material indication to extruder boxes 
Only if a material is known of course. But the case where it is unknown is not tested.

Contributes to issue CURA-3161.
 2017-02-03 14:52:09 +01:00
Ghostkeeper
687cdcc30e
Add grey border between extruder boxes 
This is done by fitting tightly a rectangle around the grid of boxes. The boxes themselves have a white background but there is spacing between the boxes, which results in the little border.

Contributes to issue CURA-3161.
 2017-02-03 13:54:37 +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
Ghostkeeper
39cbed61e5
Make machine_nozzle_expansion_angle min/max properly into functions 
They are inheritance functions so they must be written as a string in the JSON.

Contributes to issue CURA-2572.
 2017-02-03 11:30:54 +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
Simon Edwards
0e306df1bc Initial basic version of this feature. 
CURA-3335
 2017-02-02 15:59:09 +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
7b8d41cb8f
Remove old connected printer header 
It has been replaced by a nicer header.

Contributes to issue CURA-3161.
 2017-02-02 14:48:06 +01:00
Ghostkeeper
c7a91f07d2
Add label for printer connection text to header 
Also fixed the indenting of the previous two labels to use spaces instead of tabs. I knew I was going to forget putting it back to spaces after working on a different project that uses tabs.

The information is duplicated now. I'll remove the old one promptly.

Contributes to issue CURA-3161.
 2017-02-02 14:45:44 +01:00
Ghostkeeper
1f0bcc1abd
Add header bar for print monitor 
It lists the name of the printer it is connected to, and the address on the right side. This won't work for USB printing (it'll give errors there). I'll solve that later.

Contributes to issue CURA-3161.
 2017-02-02 14:34:40 +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