GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 11:58:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,644 Commits 290 Branches 260 Tags
Commit Graph

7988 Commits

Author SHA1 Message Date
Tim Kuipers
3919b1292e fix cooldown for xray warning 2020-02-27 20:39:19 +01:00
Tim Kuipers
42a1b02d4c use transparency in xray view and merge shader duplication 2020-02-27 20:29:58 +01:00
Tim Kuipers
890b6dc0b4 prevent false negative xray error for high overlap count 2020-02-27 20:03:35 +01:00
Tim Kuipers
5d90fd31d9 fix xray for high intersection count models 
I don't understand why, but any deviation from this produces worse results
 2020-02-27 18:42:27 +01:00
Tim Kuipers
b51b699715 fix old xray view 
I don't understand why it only seems to work if I define u_color via [default]
andd why it doesn't work when I set it inside the shader itself.
 2020-02-27 18:17:07 +01:00
Tim Kuipers
0e633a0dfa allow immediate change of preference for showing xray errors in solid view 2020-02-27 16:41:20 +01:00
Tim Kuipers
643b27e160 add xray error warning message 2020-02-27 16:41:20 +01:00
Tim Kuipers
b4c3703dc4 Check xray overlay for badness in model every 1.0 second 2020-02-27 16:41:20 +01:00
Tim Kuipers
01643f5fee remove outdated unused shader functions 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 27777c759c91965c800080ff4435110900320a96.
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
Jaime van Kessel
1a44aa6d2e
Ignore comments when checking for temperature prepends 
Fixes #7124
 2020-02-27 10:47:32 +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
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
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
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
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
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
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
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
Tim Kuipers
efafc37e49 fix E-values after G92 when parsing gcode 
CURA-7066
 2020-02-24 14:55:58 +01:00
Tim Kuipers
5653c8c9ae Avoid showing infinitely wide lines in gcode 
lines less than zero wide are displayed as very wide; prevent negative extrusion lines from being generated in the first place

CURA-7066
 2020-02-24 14:55:42 +01:00
Ghostkeeper
f918f39fc2
Don't use a newline at the beginning of the sync message 
Again, this breaks stuff. See the previous commit.

Contributes to issue CURA-7201.
 2020-02-24 14:33:10 +01:00
Ghostkeeper
633bdac21a
Don't start message with a newline 
That breaks a couple of things:
* It messes up the layout of the message.
* The translations need to have this newline in as well, or they won't be accepted by gettext.
* The x-test translation puts 'xxxx' before the translation, so this one won't compile any more.

Contributes to issue CURA-7201.
 2020-02-24 14:21:39 +01:00
Jaime van Kessel
610dc7f115
Merge branch '4.5' of github.com:Ultimaker/Cura into 4.5 2020-02-24 13:55:00 +01:00
Jaime van Kessel
239a8ea3db
Revert speedup 2020-02-24 13:07:59 +01:00
Jaime van Kessel
b86658996b
Revert "Chop up the render function to make it a bit more readable" 
This reverts commit 61a605d02be0d0f34893fa5d544111a3b0d49132.
 2020-02-24 12:45:13 +01:00
konskarm
069384e588
Merge pull request #7152 from Ultimaker/CURA-7231_no_layers_to_show_msg 
Cura 7231 no layers to show msg
 2020-02-24 12:02:06 +01:00
Dimitriovski
3a0da99256
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7162/replace_robot_with_placeholder 2020-02-24 11:13:29 +01:00
Dimitriovski
35b7ce90d3
Added the placeholder.svg file 
CURA-7162
 2020-02-24 11:13:13 +01:00
Dimitriovski
3e13507156
Merge branch '4.5' of github.com:Ultimaker/Cura 2020-02-24 11:03:21 +01:00
Dimitriovski
9282423db1
Added lifetime=0 to the sync_message to make it stay there 2020-02-24 10:59:41 +01:00
John Hryb
9aa6887b02 Update ColorMix.py 
Updates based on review.
 2020-02-22 11:58:19 -05:00
Dimitriovski
510acfab62
Replaced the logobot.svg image with a new placeholder.svg image 
CURA-7162
 2020-02-21 17:05:27 +01:00