GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,353 Commits 293 Branches 266 Tags
Commit Graph

5752 Commits

Author SHA1 Message Date
Simon Edwards
60547b4265
Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states 
CL-1247 Improve cloud disabled states
 2019-02-20 13:17:11 +01:00
Remco Burema
f81ad58836 Merge branch 'ppa_contribute_compatible_format' into 4.0 2019-02-20 11:29:24 +01:00
Remco Burema
7fca9dae04 Merge branch '4.0' into ppa_contribute_compatible_format 2019-02-20 11:26:13 +01:00
Jaime van Kessel
9a1d8ea5f9 Don't serialize "definition" for material profile 
CURA-5787
 2019-02-20 10:46:49 +01:00
Ian Paschal
164e721c42
Merge pull request #5331 from Ultimaker/monitor_tab_images 
Fix the path to the pop up images in the monitor tab.
 2019-02-20 10:17:54 +01:00
Simon Edwards
43b1c86920 Use QUrl.fromLocalFile() to create the file:// URLs for the images 2019-02-20 09:31:51 +01:00
Jaime van Kessel
3f18b0b974 Increase agressiveness of short circuit logic; Just check if the node is slicable 
That should also filter out platform, buildVolume and convexHulLNodes
 2019-02-19 18:00:20 +01:00
Jaime van Kessel
aef89e2bd3 Add few more cases where Camera changes caused un-needed updates 2019-02-19 17:40:44 +01:00
Simon Edwards
3ad916b565 Fix the path to the pop up images in the monitor tab. 2019-02-19 17:07:09 +01:00
Jaime van Kessel
22b70e1a34 Ignore sceneChange signals if the camera triggered them in some places 
These places weren't interested in all changes. They can probably be more
strict, but the camera is a really safe bet (and already greatly decreases
the number of updates, especially when just moving the camera)
 2019-02-19 17:06:48 +01:00
Jaime van Kessel
3c9f630ddd Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-19 15:43:40 +01:00
Jaime van Kessel
d53bac6eb8 Simplify the expensive call to the validation state 
Since the support angle needs to be between 0 and 90, we don't have to rely on the (expensive)
validator. We can just check that ourselves.
 2019-02-19 15:42:51 +01:00
Ian Paschal
7b3420653e Actually, just hide manage queue on cloud 
Contributes to CL-1247
 2019-02-19 12:27:41 +01:00
Ian Paschal
0ef014a542 Don't show "Review Connection" unless you're on the LAN 
Contributes to CL-1247
 2019-02-19 12:24:04 +01:00
Ian Paschal
b6b7f8cfce Disable queue link when connected to cloud 
Contributes to CL-1247
 2019-02-19 12:23:48 +01:00
Ian Paschal
e23dd2dd6b Grey-out buttons when using cloud connection 
Contributes to CL-1247
(includes some boyscoutin')
 2019-02-19 12:23:33 +01:00
Ian Paschal
05b5dfa05f Improve "don't ask me again" checkbox 
Contributes to CL-1222
 2019-02-19 10:13:05 +01:00
Ian Paschal
0cfc258b8d
Merge pull request #5316 from Ultimaker/fix-cloud-printer-properties 
CL-1255 Manually create printer properties for cloud output device
 2019-02-18 13:33:44 +01:00
Jaime van Kessel
222f8e6cdb Prevent crash for backup plugin if there is no internet connection 2019-02-18 10:38:39 +01:00
ChrisTerBeke
f25fefdbcb Add expected mesh back to test 2019-02-15 17:24:03 +01:00
ChrisTerBeke
11cf409d71 Fix codestyle 2019-02-15 17:07:45 +01:00
ChrisTerBeke
3f11cb911d Add filesize back to expected result 2019-02-15 17:06:32 +01:00
ChrisTerBeke
897c932e80 Fix test for cloud output device ufp uploading 2019-02-15 17:03:38 +01:00
ChrisTerBeke
119c868650 Add a test for the device properties 2019-02-15 16:52:11 +01:00
ChrisTerBeke
e80eccaea3 Manually create printer properties for cloud output device 2019-02-15 16:46:47 +01:00
Lipu Fei
3e819f56fc Remove debug code 
CURA-6225
 2019-02-15 15:14:12 +01:00
Lipu Fei
f521fae152 Fix call_on_qt_thread decorator 
CURA-6225

Do thread check in the wrapper function, not outside.
 2019-02-15 15:11:11 +01:00
Ian Paschal
0a945b8ba5 Code style 
Contributes to CL-1250
 2019-02-15 10:18:47 +01:00
Ian Paschal
f7d86667ed Simplify code a bit 
Contributes to CL-1250
 2019-02-15 10:14:14 +01:00
Ian Paschal
4feb53fdf4 Revert "Expect to always have a build plate" 
This reverts commit 0be6c9e6d37dad83b7c447bffd439a6a2b2bb1e4.
 2019-02-15 10:12:19 +01:00
Ian Paschal
0be6c9e6d3 Expect to always have a build plate 
Contributes to CL-1250
 2019-02-15 10:10:39 +01:00
Ian Paschal
5d294a7ff5 Handle self.build_plate = None 
Contributes to CL-1250
 2019-02-15 10:04:39 +01:00
Ian Paschal
72ce40deba Update buildplate with other props 
Contributes to CL-1250
 2019-02-15 09:36:38 +01:00
Ghostkeeper
cc94441b54
Fix serialising materials with Ultimaker S5 in it 
Contributes to issue CURA-5787.
 2019-02-14 17:45:25 +01:00
Ghostkeeper
d6f116b156
Don't crash on editing metadata entries of non-registered materials 
Sometimes we need to create a temporary material profile just to save it to file.

Contributes to issue CURA-5787.
 2019-02-14 14:03:38 +01:00
Ian Paschal
af565aff55 Clarify if using key or human-readable name 
This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name.

Contributes to CL-1250
 2019-02-14 11:49:43 +01:00
Ian Paschal
0275de7f77 Make sure to set the build plate so it's not empty 
Contributes to CL-1250
 2019-02-14 11:46:41 +01:00
Ian Paschal
e39e09a692 Fix incorrect method name 
Contributes to CL-1165
 2019-02-13 15:21:09 +01:00
Simon Edwards
8f37421c11
Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Ensure pop-up is not shown if cloud connection is already configured
 2019-02-13 14:30:40 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
25cfd4f496 Avoid double negatives in cloud flow metadata 
Contributes to CL-1222
 2019-02-13 14:21:23 +01:00
Simon Edwards
d08b8d813d Generate the correct path for the svg on Windows. 
CL-1222
 2019-02-13 12:24:59 +01:00
Ian Paschal
cf4bcf81e7 Make pop up permanent 
Contributes to CL-1222
 2019-02-13 11:49:53 +01:00
Ian Paschal
d74f4f36bd Improve cloud flow checks 
Contributes to CL-1222
 2019-02-13 11:30:31 +01:00
Ian Paschal
8fecf7fb39 Don't crash when clicking don't show again 
Contributes to CL-1222
 2019-02-13 11:04:51 +01:00
Ian Paschal
c15e49876a Revert "Use parseBool instead of "is True" and "is False"" 
This reverts commit aa454ea357b8a64405601b37e1a0ec5f230a34c5.
 2019-02-13 11:00:11 +01:00
Ian Paschal
aa2acac244 Fix typo 
Contributes to CL-1222
 2019-02-13 10:52:37 +01:00
Ian Paschal
70fc363048 Fix cloud pop up paths 
Contributes to CL-1222
 2019-02-13 10:49:53 +01:00
Ian Paschal
aa454ea357 Use parseBool instead of "is True" and "is False" 
Contributes to CL-1222
 2019-02-12 12:18:29 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00