Commit graph

6779 commits

Author SHA1 Message Date
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
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
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
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
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
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
Ghostkeeper
5c2f1a935a
Move monitorLabel into PrintMonitor.qml
It's a label that belongs to the print monitor after all. Let the print monitor file decide how it's going to look.

Contributes to issue CURA-3161.
2017-02-01 17:31:36 +01:00
Ghostkeeper
425dbf1ad8
Only check for validationState changes if it's not already a value change
No need to check the second if-statement in most cases.

Contributes to issue CURA-3291.
2017-02-01 16:29:59 +01:00
Ghostkeeper
3ac9036b4a
Only listen for other container stack errors if multi-extrusion
It's not even necessary to check otherwise. Requesting an extruder stack would give None anyway, which would give errors.

Contributes to issue CURA-3291.
2017-02-01 16:28:45 +01:00
Ghostkeeper
a0ba1188a1
Always listen to changes on all extruder stacks of the current machine
We need to listen for changes on all extruder stacks because the values might change and therefore the validation states might change. The value of a different extruder stack could change if you change a global value that has impact on a per-extruder value via inheritance, or in this case if a limit-to-extruder property specifies that the setting should be changed on a different stack. It could change on the stack that is not active in either case.
This might have some performance impact, but it is very small. Other than layer_height there aren't many global settings that have impact on multiple extruders via inheritance. And via limit-to-extruder there will typically only be one changed value which you want to update for. Changing layer height will be a bit slower though.

Contributes to issue CURA-3291.
2017-02-01 16:17:12 +01:00
Ghostkeeper
362c5835ee
Don't use limit_to_extruder if it evaluates to -1
The default value for the limit_to_extruder property is -1. So no need to check if the property exists. Just check if it is positive.

Contributes to issue CURA-3291.
2017-02-01 14:42:06 +01:00
Ghostkeeper
ed2b09c975
Fix getting limit to extruder property
Apparently it didn't even reach this code up until now. Well, now it does.

Contributes to issue CURA-3291.
2017-02-01 14:26:37 +01:00
Ghostkeeper
039015e3df
Don't unnecessarily copy extruder stacks to list
You're just looping over it. No need to actually make a list out of it.

Contributes to issue CURA-3291.
2017-02-01 14:24:03 +01:00
Ghostkeeper
7d536e2f8b
Clarify global container stack checking code in _checkStacksHaveErrors
The order of operations was a bit weird. This made the code unclear and also required an extra check in an if-statement. This is simpler and theoretically even a bit faster.

Contributes sorta to issue CURA-3291.
2017-02-01 14:17:23 +01:00
Ghostkeeper
31e88aa5af
Also check for errors via limit_to_extruder settings
The error should then not be checked in the active stack but in the stack which has the correct setting value.

Contributes to issue CURA-3291.
2017-02-01 14:14:50 +01:00
Ghostkeeper
9cf0fdc4a3
Add quality profiles for ABAX printers
These are delivered to me by Pedro J. of ABAX 3D Tech. I modified the file names to be in line with our code standards, and I modified the link to the machine definition to coincide with the file names that were changed there to be in line with our code standards.
2017-02-01 13:17:02 +01:00
Ghostkeeper
f2695a40e0
Remove Prusa platforms from ABAX printers
The Prusa platform meshes say 'PRUSA' in huge letters. They are not the ABAX printers, though the structure is mostly the same. To prevent confusion I'm removing the platform mesh.
2017-02-01 13:17:02 +01:00
Ghostkeeper
2c893e2ea1
Conform ABAX printers to our code style
Fixed indenting, that's mostly all.
2017-02-01 13:17:02 +01:00
Ghostkeeper
d45f292324
Add ABAX printer definitions
These are exactly how they were delivered to me by Pedro J. from ABAX 3D Tech.
2017-02-01 13:17:02 +01:00
Tim Kuipers
6e84805c93 fix: angle limitations for machine_nozzle_expansion_angle (CURA-2572) 2017-02-01 13:10:39 +01:00
Tim Kuipers
6b7876d60e fix: fill line distance of 0 is possible, but generates no fill (CURA-2572) 2017-02-01 13:06:02 +01:00
Tim Kuipers
2db15602a4 fix: minmum line width is 1 micron (CURA-2572) 2017-02-01 13:05:17 +01:00
Ghostkeeper
307896cb41
Fix converting URL to local path in setDefaultPath
It is a method, not a static function.

Contributes to issue CURA-3297.
2017-02-01 09:48:06 +01:00
Ghostkeeper
1a4d71c3f8
Save last-opened file path as local-file format
It's stored in the format of '/home/user/Models/Basic' rather than 'file:///home/user/Models/Basic'. The QML FileDialog class expects the latter format though.

Contributes to issue CURA-3297.
2017-01-31 17:42:32 +01:00
Ghostkeeper
d4af2ce797
Merge branch 'maukcc-master' 2017-01-31 13:14:42 +01:00
Ghostkeeper
7115db6f2e Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-01-31 10:46:36 +01:00
MaukCC
e2b208eebd Update cartesio_0.4.inst.cfg 2017-01-31 09:02:31 +01:00
MaukCC
26854eedcf Update cartesio_extruder_0.def.json 2017-01-31 09:01:46 +01:00
MaukCC
f65ea57e80 Update cartesio.def.json 2017-01-31 09:01:14 +01:00