23916 Commits

Author SHA1 Message Date
Aldo Hoeben
7ea3891da0
Merge branch 'master' into feature_unify_pause_at_height 2020-03-30 17:58:25 +02:00
Jaime van Kessel
329c5c5c11
Rename pause duration to disarm timeout and set default to give same behavior as before
The name wasn't really covering what it was doing. It wasn't setting the duration of the
pause, it was setting the timeout for the stepper disarm.
Also, ive set the defaults so that the behavior remains the same, unlesss a user
explicitly enables this

CURA-7331
2020-03-30 17:20:59 +02:00
Jaime van Kessel
4682b9c4ae
Merge branch 'pp-plugin_pause-a-h_disarm' of https://github.com/ilyko96/Cura 2020-03-30 17:12:54 +02:00
konskarm
95cefbe895
Merge pull request #7368 from maukcc/master
HMS434 update
2020-03-30 15:53:09 +02:00
konskarm
bba6a5cc39
Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder
CURA-7162/Replace the default logobot.svg with a new placeholder
2020-03-30 15:05:37 +02:00
Ghostkeeper
2ee3e5b386
Don't remove machines that don't exist
Fixes Sentry issue CURA-EM.
2020-03-30 14:10:59 +02:00
Ghostkeeper
f34edd6bec
Show error when we don't have permission to write workspace
Fixes several Sentry issues, among which Cura-EG.
2020-03-30 14:00:36 +02:00
Ghostkeeper
6063307a31
Remove overrides of unused machine setting
Contributes to issue CURA-7328.
2020-03-30 12:10:35 +02:00
Ghostkeeper
40fc064e98
Don't remove Nozzle Length
Turns out this one was used: As default for the wire printing height.

Contributes to issue CURA-7328.
2020-03-30 12:10:01 +02:00
Ghostkeeper
b5dfcdd482
Remove Nozzle Length and Filament Park Distance from the settings list
Implements CURA-7328.
2020-03-30 12:00:59 +02:00
Ghostkeeper
8422172000
Increment setting version to 12
This is necessary for the version upgrade to run.

Contributes to issue CURA-7328.
2020-03-30 11:54:18 +02:00
Ghostkeeper
bdb3c4bcad
Add version upgrade plug-in to remove settings
Contributes to issue CURA-7328.
2020-03-30 11:48:38 +02:00
Ghostkeeper
be85e6d75e
Merge branch 'fieldOfView-feature_object_name' 2020-03-30 09:32:27 +02:00
maukcc
b92d0a83ac HMS434 update 2020-03-29 14:21:57 +02:00
Tim Kuipers
687f598d81
Fix xray composite shader for opengl 2.1
A commit from @fieldOfView
2020-03-28 10:20:03 +01:00
fieldOfView
0794766644 Fix xray composite shader for opengl 2.1
textureSize() is not available in opengl 2.1, so we calculate the xray error image scale outside the shader (which is also a theoretical performance improvement because now the scale does not get computed over and over for each pixel)
2020-03-27 23:24:20 +01:00
Jaime van Kessel
c1de3d49bb
Merge branch 'CURA-7325_fix_config_error_on_restore_backup' of github.com:Ultimaker/Cura 2020-03-27 14:44:03 +01:00
konskarm
cc365c23e1
Merge pull request #6994 from Ultimaker/ppscript_pre_secure
Prepare PostProcessingPlugin for security.
2020-03-27 13:31:08 +01:00
Remco Burema
380e377cf3
Scout some documentation to docstring.
part of CURA-7325
2020-03-26 18:26:14 +01:00
Remco Burema
3c50b78e68
Fix: Definitions could be partly saved between backup restore and quit.
part of CURA-7325
2020-03-26 18:19:47 +01:00
Ghostkeeper
afea4a76e7
Merge branch 'feature_object_name' of https://github.com/fieldOfView/Cura into fieldOfView-feature_object_name 2020-03-26 17:39:25 +01:00
Nino van Hooff
0841124389
Merge pull request #7344 from Ultimaker/CURA-7310_Template_export_inkection_call_custom_openUrl
Cura 7310 template export injection call custom open url
2020-03-26 15:40:39 +01:00
Ghostkeeper
92691f68b6
Reduce retraction at the end of all Anet g-code
Multiple people have found this to work better.

Fixes #7275.
2020-03-26 14:47:41 +01:00
Ghostkeeper
fd8c29ebbf
Merge branch 'master' of github.com:Ultimaker/Cura 2020-03-26 14:15:51 +01:00
Ghostkeeper
ae9f2b4ba9
Catch TopologicalError when calculating convex hull intersection
Apparently this can happen. I don't know what shapes this happens with though. I'm guessing it's got something to do with degenerate shapes.

Fixes Sentry issue CURA-DZ.
2020-03-26 14:15:38 +01:00
Remco Burema
e664eccb8d
Merge pull request #7299 from Ultimaker/CURA-7173_validate_uploads
CURA-7173_validate_uploads
2020-03-26 12:05:19 +01:00
Deltacomb
f61051e4e7 New Machines Fixes (3) 2020-03-26 10:28:05 +01:00
Deltacomb
f81889a3bc New Machines Fixes (2) 2020-03-26 10:04:33 +01:00
Nino van Hooff
ddd7d15287 Attempt to appease mypy 2020-03-26 09:45:26 +01:00
Deltacomb
9012dd7c52 Fixed IDs in extruders 2020-03-26 00:53:09 +01:00
Deltacomb
16bd9f4f1d New Deltacomb Models and updates 2020-03-26 00:28:31 +01:00
Gabriele Rossetti
d196e77f72
Merge pull request #2 from Ultimaker/master
Merge to master
2020-03-26 00:18:48 +01:00
Ghostkeeper
986284052d
Show warning on any invalid pixel, not just 10
Now that we have no noise any more we can do this.
Possibly cuts the processing time in half, too.

Contributes to issue CURA-7262.
2020-03-25 18:57:30 +01:00
Ghostkeeper
c2651d1141
Unobfuscate and document this SVG
These numbers end up beautifully on round numbers if you were to just scale them to their original size and apply these mysterious translation operations.
Also do away with all of the Inkscape and Sodipodi metadata. They don't make it any easier to read.

Contributes to issue CURA-7262.
2020-03-25 18:51:09 +01:00
Ghostkeeper
4c770587e2
Fix getting additional bytes from QImage
QImage's bytes are aligned to memory words per column of pixels. That means that one of these columns contains 99% valid image data, but with several bytes of unassigned noise at the end. How many of these padding bytes there are would depend on the image size, i.e. Cura's window size. In the end, the total number of bytes in the image ends up slightly more than w*h*3. As a result, Cura would crash because it couldn't reshape the image. Reshaping was completely unnecessary anyway, but this random noise was giving false positives also.
But how do you then get only the actual pixels from each column of data? We can't just go iterating over this array, as that would be an iteration of thousands of columns which is prohibitively slow in Python. No, we're going to do some Numpy magic. We're going to create a class that pretends to be a Numpy array. Give this class some data and say that this data has a certain pixel size but also a certain STRIDE LENGTH. This stride length can be the length of the actual pixel data. As a result when Numpy sees this object it will read out the data using these strides, all done efficiently within the C code of Numpy.

Framerate is fantastic on my computer. No problems at all. Pretty powerful computer though. But also a big 5k screen. Still no problem for Numpy. Seems to be decently efficient.

Took me quite a while to figure all of this out.

Contributes to issue CURA-7262.
2020-03-25 18:00:14 +01:00
Nino van Hooff
3bb3b69082 Attempt to appease mypy 2020-03-25 17:32:41 +01:00
Nino van Hooff
92f278acc8 Change trusted scripts path from resources to plugin/scripts
CURA-7319
2020-03-25 16:54:43 +01:00
Nino van Hooff
6bf00d7ea1 Merge branch 'master' into ppscript_pre_secure 2020-03-25 16:25:44 +01:00
Ghostkeeper
433c9a9f60
Add SVGToolpathReader to gitignore
I like to have no untracked files in my list. This is not going to get into our source repository anyway!
2020-03-25 16:08:26 +01:00
Ghostkeeper
a4fbf3c613
Move X-ray set-up code into _checkSetup
That's what that function is meant for. It's executing essentially the same, since before it was executed right after the call to _checkSetup() and now it's at the end inside that function.

Contributes to issue CURA-7262.
2020-03-25 15:13:33 +01:00
Jaime van Kessel
dec68002bc
Use patch.object to temporarily replace mock a function call
CURA-7319
2020-03-25 12:35:15 +01:00
Jaime van Kessel
d5b58cf3b4
Add missing typing 2020-03-25 11:47:38 +01:00
Ghostkeeper
2b003c30dc
Catch PermissionError when writing workspaces
We'll want to give a proper error message then. We have no mechanism right now to show a message on the screen particular to this error. Instead we'll let it fail (the user sees a message that writing fails) and put a message in the log why it failed.

Fixes Sentry error CURA-DK.
2020-03-25 09:12:14 +01:00
Ghostkeeper
0150f37937
Merge branch 'master' into xray_in_solid_view 2020-03-24 21:45:48 +01:00
konskarm
7ab005e423
Merge pull request #7312 from maukcc/master
HMS434 update
2020-03-24 17:33:32 +01:00
Kostas Karmas
136fc90f48 Merge branch 'master' into CURA-7310_Template_export_inkection_call_custom_openUrl 2020-03-24 16:59:27 +01:00
Nino van Hooff
fefdef6781
Merge pull request #7136 from hussainsail2002/master
Adding Fabx Pro Machine
2020-03-24 16:54:14 +01:00
Kostas Karmas
eaef9f0f45 Open plugin author page with custom openUrl
CURA-7310
2020-03-24 16:42:46 +01:00
Kostas Karmas
4f0f7dec5e Open material author page with custom openUrl
CURA-7310
2020-03-24 16:42:22 +01:00
Kostas Karmas
92cef02ee5 Open "buy material spool" with custom openUrl
CURA-7310
2020-03-24 16:38:25 +01:00