GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-12 11:21:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,181 Commits 295 Branches 268 Tags
Commit Graph

24181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
0ccf457314
Split up an overly long call into shorter readable bits 2020-02-28 14:25:50 +01:00
Nino van Hooff
86fb0383de Refactor refresh backups call to use HttpRequestManager 2020-02-28 14:03:41 +01:00
Jaime van Kessel
68d70734ee
Skip nodes in modelchecker without active extruder 
Fixes CURA-5S
 2020-02-28 13:56:16 +01:00
Jaime van Kessel
e4930d3c3b
Add missing typing 2020-02-28 13:53:43 +01:00
fieldOfView
d07649fc59 Fix values in print monitor preheat fields 
Contributes to #7172
 2020-02-28 12:27:57 +01:00
Remco Burema
5036a7acc0
Add public key. 
Part of CURA-7016
 2020-02-28 11:30:12 +01:00
Ghostkeeper
5e49a5fa24
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2020-02-28 09:47:40 +01:00
Ghostkeeper
832298e586
Merge branch 'patch-7' of https://github.com/thopiekar/Cura into thopiekar-patch-7 2020-02-28 09:37:58 +01:00
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
Nino van Hooff
0d5a3e1941 Add requirements.txt file 
The wiki page for bulding from source mentions some pip
dependencies but misses others. I suggest to pup them here
and add a `pip3 install -r requirements.txt` to the wiki
 2020-02-27 16:50:02 +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
4b1a426873 add xray error warning preference 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
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 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
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 2eab2c0f3dbe3153cc704ca9e396cd78b0ebbf9d.
 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.
4.5.0 		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