354 Commits

Author SHA1 Message Date
Ghostkeeper
a349606fef
Make my name more anonymous
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
2021-10-16 11:45:48 +02:00
Jaime van Kessel
f3e2e7f6ac Merge branch 'filament-change-marlin-unload-fix' of git://github.com/barnybug/Cura 2021-09-27 14:43:07 +02:00
Barnaby Gray
59c8858559 FilamentChange: Fix unload on marlin based printers
See related #10038. This fixes the issue by referencing the gcode flavor set for the machine.
2021-09-16 07:14:52 +01:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Konstantinos Karmas
e5374ada3b Merge branch '4.11' 2021-08-17 15:59:53 +02:00
Jelle Spijker
d87c7a70cb
Switch return order for Repetier pauseAtHeight
While testing I noticed that the movement after the pause will
first move the head down and then move to the position before
the pause. This could result in noticeable artifacts or
accidentally push thin towers from the bed.) See the code below.

```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F300 Z5
G1 F9000 X30.759 Y30.759
G1 F1800 ; restore extrusion feedrate
```
I have switched the lines in the script such that it will first move to the correct X, Y and then move down
```python
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
```
As shown in the code below
```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F9000 X30.759 Y30.759
G1 F300 Z5
G1 F1800 ; restore extrusion feedrate
```
2021-08-17 13:38:50 +02:00
fieldOfView
91b2a9b325 Fix typo 2021-08-16 21:07:55 +02:00
fieldOfView
e4a04c186f Merge branch 'master' into feature_pause_at_height_optional_parking
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
2021-08-16 12:19:49 +02:00
fieldOfView
6c585deb1e Make parking optional
Not adding parking gcode makes the repetier @pause method suitable for use with OctoPrint.

Contributes to #7842
2021-08-16 12:15:38 +02:00
Jaime van Kessel
a124342127 Fix Pause at height issue
Fixes #8575

Thanks to @EGOiST1991 for suggesting the fix!
2021-08-16 11:15:30 +02:00
Ghostkeeper
9046506f2a
Convert icons to UTF-8
As per our architecture design, all of these files should be UTF-8. Luckily it maps well.

Contributes to issue CURA-8342.
2021-06-28 18:28:50 +02:00
Ghostkeeper
1d0620908e
Remove useless and unused SVG elements
- Remove unused imports of xlink.
- Remove comments about which application originally wrote the text file. It's untrue because PyCharm edited it, etc.
- Remove unused IDs.
- Remove unused colours for icons rendered with RecolorImage.
- Remove useless x and y positions on 0, which is the default.
- Remove useless style setting the background to transparent.
- Remove useless whitespace in the path d attribute, and remove the then-useless XML space preserving attribute.
- Remove unused groups.
- Remove unused CSS classes.

Contributes to issue CURA-8342.
2021-06-28 18:22:52 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Ghostkeeper
9a470f639d
Only add G92 for Griffin if redoing layer
Also, don't add it twice for the Repetier flavour.
This way the code is separated better into if-else cases to make it easier to read, even though it has this line in there 3 times.

Fixes issue CURA-8331.
2021-06-22 16:29:28 +02:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Remco Burema
04002056ae
Update SDK/API from 7.5.0 to 7.6.0 for 4.10
CURA-8320
2021-06-15 16:08:07 +02:00
Ewald Kleefstra
94871a32e3
Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
Get extrusion mode from global container stack instead of first extruder

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-06-14 15:26:57 +02:00
Ewald Kleefstra
76da7768e8
Added relative extrusion mode support for PauseAtHeight.py script 2021-06-14 15:26:41 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Humsie
21baf90ec8
Add Z Position parameter to FilamentChange (#9658)
* Add Z Position

* PR Comment: Add minimum value for z_position

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-05-21 17:02:53 +02:00
Remco Burema
4d4427ce79
Extrusion should be retraction.
Should fix #9752 aka internal ticket CURA-8246 -- This makes the repetier case completely analogous to the other 'not-griffin' flavours (at least what concerns retraction amounts), and also neatly dove-tails with the first point things start to go wrong in the bug-report.
2021-05-18 13:21:34 +02:00
Jelle Spijker
2813ae62b2
Merge pull request #9781 from Ultimaker/CURA-8146_Fix_getting_PyCapsule_error_on_import
CURA-8146: Fix getting PyCapsule error on import
2021-05-10 11:21:55 +02:00
Ghostkeeper
84fc35abc2
Default to using customised configuration rather than firmware
Not all printers support a firmware configuration here. Wouldn't want to ruin some people's old prints by adding unsupported commands in there, nor change the tried-and-true old parameters people already tested with.

Contributes to issue CURA-8219.
2021-05-05 14:52:21 +02:00
Ghostkeeper
bed255ecb9
Simplify if/else statement
This deduplicates some code and makes it generally easier to read.

Contributes to issue CURA-8219.
2021-05-05 14:50:43 +02:00
Ghostkeeper
e1e25d629e
Use more neutral setting and variable names
It may be just Marlin that implements this right now, but that is bound to change.

Contributes to issue CURA-8219.
2021-05-05 14:49:41 +02:00
Ghostkeeper
29e4cf06b3
Merge branch 'master' of https://github.com/Sekisback/Cura into Sekisback-master 2021-05-05 14:44:51 +02:00
Kostas Karmas
354d96d87a Fix getting PyCapsule error on import
Previously, Arcus, Savitar, and pynest2d were being build with a missing sip flag. This led to Cura
getting `ValueError: PyCapsule_GetPointer called with incorrect name`, if those libraries were not
imported (even if they were unused).

This flag was added in the following commits:

* 83393f989c
* e9e530d963
* bd440b50ad

Since the issue seems to be gone now, the unused imports should be removed from Cura.

All credits go to Rex Dieter for figuring that this missing flag was the issue.
https://src.fedoraproject.org/rpms/libarcus/pull-request/1#request_diff

CURA-8146
2021-05-05 12:20:13 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Kostas Karmas
b2b258d357 Fix add script button list not working in MacOS
Fixed by using the qt quick controls 2

CURA-8127
2021-04-06 14:53:20 +02:00
Ghostkeeper
08be77adad
Increment SDK version to 7.5.0
The Cura 4.9 release will have expanded functionality. If you have a plug-in that uses this functionality, marking it as using SDK 7.5.0 will notify older Cura releases that they can't use that plug-in.
2021-04-06 13:28:08 +02:00
Ghostkeeper
0787594a3d
Accept Griffin-style time estimation header
Otherwise it doesn't work for those printers.

Contributes to issue CURA-7787.
2021-03-31 15:08:33 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
pnt103
2ed40fe2c6
Get last position from previous layer instead.
Old code was next-next layer, which is actually the layer _after_ the one that is meant.

Fixes #9430
CURA-8116
2021-03-25 09:19:45 +01:00
Ghostkeeper
91fe9e8ebf
Merge branch 'patch-1' of https://github.com/EGOiST1991/Cura into EGOiST1991-patch-1 2021-03-23 13:57:00 +01:00
Jaime van Kessel
d24bbc4071
Merge branch 'fix_postprocessing_script_roots' of https://github.com/fieldOfView/Cura 2021-02-12 16:29:28 +01:00
Ghostkeeper
5138466fea
Merge branch 'feature/thumbnail' of https://github.com/Gravedigger7789/Cura into Gravedigger7789-feature/thumbnail 2021-02-04 15:19:07 +01:00
fieldOfView
d790de8706 Fix loading scripts from all registered resource paths 2021-01-19 13:55:02 +01:00
Jaime van Kessel
bc15ca2269
Merge branch 'fix_pause_at_height_default_value' of https://github.com/fieldOfView/Cura 2021-01-15 17:10:23 +01:00
fieldOfView
47723e9823 Fix definition of machine_gcode_flavor setting in PauseAtHeight 2021-01-03 13:22:51 +01:00
Ghostkeeper
ba9e10cfd8
Round temperatures when displaying them
These are long lines for some screens. It'll save a bit of space. No PID controller can really control down to fractional degrees.
Fan speed and flow rates are already integer settings. For speeds and retraction lenghts the fractions can be important.

Done for #8967.
2020-12-24 16:08:12 +01:00
Sekisback
b458005e7e add Marlin Advanced Pause Feature! 2020-12-24 09:46:19 +01:00
Chris Racioppo
4f8c4be34e Added break from loop 2020-12-06 14:08:46 -05:00
Chris Racioppo
cfed67076e Removing unused import 2020-12-06 13:46:37 -05:00
Chris Racioppo
efb79ae650 Create CreateThumbnail.py 2020-12-06 13:40:56 -05:00
Lucas Teske
c4d9edca69
Update plugins/PostProcessingPlugin/scripts/TimeLapse.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-11-25 19:33:37 -03:00
Lucas Teske
62e4baa746
Update plugins/PostProcessingPlugin/scripts/TimeLapse.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-11-25 19:33:30 -03:00
Lucas Teske
0a21cff234
Update plugins/PostProcessingPlugin/scripts/TimeLapse.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-11-25 19:33:24 -03:00
Lucas Teske
394fa8f2f2
Add Z-Hop and filament retraction to Timelapse
So less string occurs
2020-11-17 17:05:15 -03:00
Ghostkeeper
3353817e1c
Fix displaying time estimation with Griffin header
Otherwise it can't find the time and then doesn't output any time remaining commands.

Contributes to issue CURA-7787.
2020-10-22 16:26:15 +02:00