Commit graph

2810 commits

Author SHA1 Message Date
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
57ec987cd9
Disable pre-heat if temperature is invalid
Contributes to issue CURA-3161.
2017-02-07 17:13:36 +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
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
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
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
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
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
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
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
Ghostkeeper
ee2076b407
Merge branch '2.4' 2017-01-28 02:35:28 +01:00
Ghostkeeper
d24f42444e
Fix formatting so translation files actually compile
My guess is that the translation bureau didn't properly check its file format correctness.

Contributes to issue CURA-3028.
2017-01-28 02:30:33 +01:00
Ghostkeeper
24cb768339
Remove all fuzzy markers from professional translations
They don't want them there. They apparently don't think they have to check for fuzziness either.

Contributes to issue CURA-3028.
2017-01-28 01:44:17 +01:00
Ghostkeeper
3d0c57262c
Fix fuzzy translations
They are still marked as fuzzy. Going to resolve that next.

Contributes to issue CURA-3028.
2017-01-28 01:29:40 +01:00
Ghostkeeper
efb866c64f
Update translations for 2.4
This initial round, the translators didn't check the fuzzy string matches. These are therefore incorrect. We have new translations for the fuzzies. I'm going to add them now.

Contributes to issue CURA-3028.
2017-01-28 01:05:43 +01:00
Cláudio (Patola) Sampaio
f83a2c1066
Fixed two typos, removed quotes from jerk, changed 'anti-suporte' to 'anti-pendências' so that it does not conflict with future changes. 2017-01-27 09:51:38 +01:00
Ghostkeeper
4f2ec59298 Merge branch 'misc' of https://github.com/ubitux/Cura into ubitux-misc 2017-01-26 17:24:24 +01:00
Ghostkeeper
73516fce89
Merge branch 'fieldOfView-fix_unthemed_rects' 2017-01-26 17:21:21 +01:00
Ghostkeeper
0a2520599d Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects 2017-01-26 17:19:05 +01:00
Ghostkeeper
d3029c6c4f
Add Brazillian Portuguese language
The translation is almost complete at the moment. In the beta of the next release we'll decide if we want to keep this language.
2017-01-26 17:06:06 +01:00
Ghostkeeper
635535e33a
Fix plural forms of Brazillian Portuguese files 2017-01-26 17:06:06 +01:00
Jack Ha
6defbc8649 Merge branch '2.4' 2017-01-26 15:30:50 +01:00