Commit graph

24913 commits

Author SHA1 Message Date
Tim Kuipers
ffa16727fe add cross to background of xray error image
prevents that small error regions are totally covered by the background and therefore invisible
2020-02-27 16:41:20 +01:00
Tim Kuipers
426a4b63f6 use less detail in xray error icon 2020-02-27 16:41:20 +01:00
Tim Kuipers
c16f677bf0 make a new xray error image
includes SVG source file
2020-02-27 16:41:20 +01:00
Tim Kuipers
28abf6ff8c fix xray error image scaling 2020-02-27 16:41:20 +01:00
Tim Kuipers
0f184219e6 use tiled image for xray error instead of a uniform color
temporarily use the cura logo as placeholder image
didn't correctly determine window size yet
2020-02-27 16:41:20 +01:00
Tim Kuipers
82b2f23689 make xray solid color depending on what it occludes 2020-02-27 16:41:20 +01:00
Tim Kuipers
1b2cc7f7a7 make xray error noise depend on background color 2020-02-27 16:41:20 +01:00
Tim Kuipers
4a8385e3e8 make xray counting color hardcoded value
Somewhere between the xray.shader and the xray_composite.shader the colors are stored as unsigned int.
Since we want to count the integer number of faces behind a pixel in the red channel, we simply use a color with an r value of 1/255.
2020-02-27 16:41:20 +01:00
Tim Kuipers
b515a0f744 make xray errors exhibit static noise and see-through 2020-02-27 16:41:20 +01:00
Tim Kuipers
fc4c66b62a show xray errors in solid view 2020-02-27 16:41:13 +01:00
Jaime van Kessel
3958d85a9a
Revert "Prevent zip bombs in the g-codegz reader"
This reverts commit 27777c759c.
Resource isn't available on windows, so the solution won't do what needs to be done
2020-02-27 16:30:35 +01:00
Dimitriovski
24e2fc89e5
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7162/replace_robot_with_placeholder 2020-02-27 11:20:38 +01:00
Dimitriovski
77cf63acfa
Removed the new placeholder from WelcomePage.qml as we probably want to see the Robot there instead of the hexagon.
CURA-7162
2020-02-27 11:20:32 +01:00
Dimitriovski
1acfaf9705
added sourceSize property to qml's Image for better rendering
CURA-7162
2020-02-27 11:19:44 +01:00
Ghostkeeper
d7102729f1
Use spaces instead of tabs
And remove floating point rounding errors too.

Contributes to issue CURA-7260.
2020-02-27 10:57:15 +01:00
Ghostkeeper
f6bc220faa
Merge branch 'master' of https://github.com/skriDude/Cura into skriDude-master
Conflicts:
	resources/definitions/skriware_2.def.json -> On master the old setting value was changed to 'value' rather than 'default_value', while on this branch the value was changed to use the resolve function.
2020-02-27 10:54:31 +01:00
Jaime van Kessel
1a44aa6d2e
Ignore comments when checking for temperature prepends
Fixes #7124
2020-02-27 10:47:32 +01:00
konskarm
ba0eb114f6
Merge pull request #7164 from Ultimaker/Hrybmo-master
Update to ColorMix.py script
2020-02-27 09:33:10 +01:00
Ghostkeeper
bbb704ff24
Remove working directory from sys.path
This prevents accidentally loading packages from the working directory that are not in Cura's build.

Contributes to issue CURA-7081.
2020-02-26 17:02:40 +01:00
Tim Kuipers
b3761c454b fix xray error visualization missing red faces 2020-02-26 16:24:27 +01:00
Tim Kuipers
0f4ff1f149 lil: fix naming and spacing to fit code conventions 2020-02-26 15:37:25 +01:00
Tim Kuipers
14d351e185 Merge branch 'master' of https://github.com/Hrybmo/Cura into Hrybmo-master 2020-02-26 15:31:58 +01:00
Ghostkeeper
d84bc5c682
Also check if streams are not closed
SmartAvionics found that this was a safer way to be able to write to these streams.

See comments on commit 2eab2c0f3d.
2020-02-26 13:48:27 +01:00
Hussain Bhavnagarwala
8f70bb934e
Update fabxpro_extruder_0.def.json 2020-02-26 16:56:03 +05:30
Nino van Hooff
7e2177a8cd Rename _loginStateChanged for consistency
CURA-7251
2020-02-25 16:25:03 +01:00
Nino van Hooff
cf689ee3b0 Hide the Cloud Sync message when the user logs out
CURA-7251
2020-02-25 16:21:06 +01:00
Ghostkeeper
b2ab5d98cb
Merge branch '4.5' 2020-02-25 16:17:10 +01:00
Ghostkeeper
15a7d0842d
Fix layout of 4.5 change log
Contributes to issue CURA-7250.
2020-02-25 16:16:45 +01:00
Ghostkeeper
92e6141765
Merge branch '4.5' 2020-02-25 15:29:16 +01:00
Ghostkeeper
43ced914fd
Add change log entries for Cura 4.5
Contributes to issue CURA-7250.
2020-02-25 15:28:48 +01:00
Ghostkeeper
3dbbd17e32
Round coordinates
This would have worked out of the box if this plug-in actually used the theme rather than hard-coding its sizes here. However that is too big of a change for me to make in 5 minutes, so it'll have to wait. Also fixed some missing screen scale factors.

Done as a 5 minute fix to try to amend #7125.
2020-02-25 15:00:41 +01:00
Nino van Hooff
77590ad0e2 Disable SSL checking in debug mode
Allows inspecting web traffic during development

CURA-7150
2020-02-25 14:42:12 +01:00
Ghostkeeper
b4a646c191
Make warning values for support interface depend on Z distance
Rather than a hard-coded 0.2mm. The point of these is to ensure that there is always one layer.
2020-02-25 14:42:11 +01:00
Nino van Hooff
27902fe38f Use JsonDecorator scope in the Toolbox and CloudSync
Improves security by disallowing other content than json for requests

CURA-7150
2020-02-25 14:41:02 +01:00
Ghostkeeper
dba35dc664
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2020-02-25 14:34:36 +01:00
Remco Burema
510d9822dd
Merge pull request #7153 from Ultimaker/CURA-7066_gcode_reader_line_width_fix
Cura 7066 gcode reader line width fix
2020-02-25 13:45:07 +01:00
Ghostkeeper
a1438e91d0
Merge branch '4.5'
Conflicts:
	cura_app.py -> Due to moving some imports around.
2020-02-25 12:07:47 +01:00
Dimitriovski
2b11152c4d
Added a comment(explanation) to an unused code of the Toolbox. 2020-02-25 12:06:11 +01:00
Ghostkeeper
4db66c71ba
Uncomment old translation for 'do not show again'
We re-added this string after the string freeze.

Contributes to issue CURA-7231.
2020-02-25 12:04:26 +01:00
Nino van Hooff
d762ad4acc
Merge pull request #7156 from Ultimaker/CURA-7231_no_layers_to_show_msg
Cura 7231 no layers to show msg
2020-02-25 09:42:23 +01:00
Hussain Bhavnagarwala
055a224c72
Update fabxpro.def.json 2020-02-25 07:34:34 +05:30
Tim Kuipers
70a95e68d6
Merge pull request #7122 from Ultimaker/CURA-7223/remove_crashHandler
CURA-7223/Removed the user input from the CrashHandler as we are not using it f…
2020-02-24 22:22:37 +01:00
Jaime van Kessel
1b65e47bea
Move imports of Arcus & Savitar up
This was needed due to the crashhandler being imported

CURA-7245
2020-02-24 17:08:19 +01:00
Jaime van Kessel
77f0ff588f
Merge branch 'CURA-7245_sentry_prune_more_user_data' of github.com:Ultimaker/Cura into 4.5 2020-02-24 17:01:29 +01:00
Ghostkeeper
43e373af02
Merge branch 'master' of https://github.com/FN5969/Cura into FN5969-master 2020-02-24 17:00:12 +01:00
Jaime van Kessel
9c0e6f9338
Apply suggestions from code review
Codestyle!
2020-02-24 16:57:37 +01:00
Nino van Hooff
94e9753b6c Update cura/CrashHandler.py
Import Any and re-order if-statements for efficiency

CURA-7245
2020-02-24 16:26:32 +01:00
Nino van Hooff
2cd6149ef0
Update cura/CrashHandler.py
Add typing to pruneSensitiveData

Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2020-02-24 16:14:12 +01:00
Nino van Hooff
62dfadecdf Prune all sensitive data before sending it to Sentry
CURA-7245
2020-02-24 15:27:17 +01:00
Tim Kuipers
9bcae15d39 lil: optimize parsing gcode arg letter
CURA-7066
2020-02-24 14:56:06 +01:00