Commit Graph

623 Commits

Author SHA1 Message Date
Stone Li 32ac28738e ENH: do ams mapping in printing and upgrading
Change-Id: I592d37ce581077c317642cbdf250a369bc992d09
2022-09-29 11:16:43 +08:00
chunmao.guo ad471bf3db FIX: missing border in static box on Linux
Change-Id: I2105608cf74c5bc40caf383d3086ff852beaa07d
2022-09-29 11:16:43 +08:00
chunmao.guo 70de37d1ae ENH: help video play failure
Change-Id: I5f847547877a82d626bffb78488e5f3d20cc56d0
2022-09-29 11:16:43 +08:00
chunmao.guo 6dc68c4c9e FIX: optimize style of media file panel
Change-Id: I2e5319538adae84b9b0348874d7b468b0dbc2db1
2022-09-29 11:16:43 +08:00
chunmao.guo b21b4aec95 FIX: device video/tunnel functions, add local video tunnel
Change-Id: I9da97406544c233d5ba6903857db6ad6f7f851e1
2022-09-29 11:16:43 +08:00
salt.wei 80575cd269 ENH: some change for external bridge
1 move thick bridge from support to quality page

2 Fix the issue that some times the external bridge angle
is not the best, and the bridge line is not the shortest one.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie26570fb289898f6b62960f9333e79aa92c08ae4
2022-09-29 11:16:43 +08:00
chunmao.guo d41e0db18f ENH: icon for param group
Change-Id: I435830615747aa850ed82621349f5fedfc29d860
2022-09-29 11:16:43 +08:00
chunmao.guo c5024af7e2 FIX: move preset dirty suffix to prefix
Change-Id: I52d4d6e3dea28d071eb7bf2f3b5e77b5e1b8c8bb
2022-09-29 11:16:43 +08:00
Stone Li 99fcecf193 ENH: fixed gcode of ams switch
Change-Id: Iad3845e5797a699dacc1a505db8f12e3fbb1b64e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-29 11:16:43 +08:00
Stone Li ca3ba7604a ENH: do uniform scale if uniform_scale is true
Change-Id: Iac208416110492fccb7b8a326c807641311dabd8
2022-09-29 11:16:43 +08:00
Stone Li 2996affc55 ENH: save uniform scale to an app_config item
Change-Id: Ib4a42597308382ea195d73776790e9cd4a122b76
2022-09-29 11:16:43 +08:00
miaoxin c6d6784070 FIX: large unarrangable objects may overlap with bed boundary
large unarrangable objects may overlap with bed boundary in auto-arranging

Change-Id: Ie98aa96fb26cc819d1bb38ad0fc316f99423393c
(cherry picked from commit 3caf447a62e4dec5f56807c9f86a351db8fff5a7)
2022-09-29 11:16:43 +08:00
Arthur abddb1edc3 NEW: add support_critical_regions_only for tree support
When this option enabled, only generate supports for sharp tail, cantilever,
thin pillar (not well supported). So holes are safe from unnessary supports.

Currently only works for tree supports, will need to copied to normal
supports if it works fine.

Change-Id: I5eb86484a5b503149e3bfdee8ce73f76a0a849e4
2022-09-29 11:16:43 +08:00
salt.wei 5152a90545 ENH: add some pattern back for user case
For github issue #328

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iafbb141173f4ebe8352c5247f5de00ee671077e5
2022-09-29 11:16:43 +08:00
zhimin.zeng 0072e5ec37 FIX: prompt when opening 3mf
Change-Id: Ife452f5b16bdcf3f8eb105aeb58ffccdccb9177f
(cherry picked from commit c1e984d0feadef778fd09e61063ac1dacbbf9a64)
2022-09-29 11:16:43 +08:00
zhimin.zeng 0d25141a90 FIX: prompt when cancel loading 3mf
Change-Id: Id4a472a4d4ece3202fd8374e2154533c44e41635
(cherry picked from commit 3953223bb46dac8a39a54859b5e7579e8c6c318e)
2022-09-29 11:16:43 +08:00
Stone Li 66a2f49008 FIX: fix HMS display blank string
Change-Id: I36fe5879a5db76fba65095ce409b3f0060689de6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-29 11:16:43 +08:00
Arthur fae9036f01 FIX: tree support floating branches
Change-Id: Id28324e7676b28a315b03055d941b9876b2b3b5b
(cherry picked from commit 8b5d3fae4a476b91caf854cc75d5de36ff984790)
2022-09-29 11:16:43 +08:00
zhimin.zeng 2ee113b9da FIX: Remember the bed typ of the previous project
Change-Id: Id3b0e4ec7f8b4fcb2396f6f9f22789736e48eb8a
(cherry picked from commit 2ea818594b6da0ee323b5e255c36b45ff4247324)
2022-09-29 11:16:43 +08:00
zhimin.zeng 1ed06855a9 FIX: When rescaling an object, "Uniform scale" is checked again
Change-Id: I850c63abe77e45380f49cbd96cfd6e500252d89c
(cherry picked from commit a2bbbd7051427d54aefd28a9bd6fcf3269eb304c)
2022-09-29 11:16:43 +08:00
liz.li 07dd4c3672 FIX:mousewheel bug in preview slider
Change-Id: I9366a9c36250519259c132380e0a69697b6ee18c
2022-09-29 11:16:43 +08:00
tao wang ecc76d0f33 FIX:Use url links to display Releasenote
Change-Id: Ib57931d71702d1356b10bd4c665017b3331189aa
2022-09-29 11:16:43 +08:00
chunmao.guo 42e08b5414 FIX: less param line option vertical gap
Change-Id: I5b63a078c54a6bd744321a5a57f2452b01c0dd0a
2022-09-29 11:16:43 +08:00
lane.wei 516a960f71 refine the plate's sliced_result logic
1. when the plate is locked, the sliced result is kept after auto-arrange;
2. when only arrange a plate, other plates' results are not affected

Change-Id: I7566e11e9eec0c2b196a2e78d9dc306ea325e9ff
2022-09-29 11:16:43 +08:00
tao.jin 8386b48554 ENH: add confirm dialog for cancel-print button
Change-Id: I0a97c7a3122b1b5dd0b306212292e8c51b9acd9b
2022-09-29 11:16:43 +08:00
tao wang 1b4486cc5d FIX:Change the menu options from Reduce Triangles to Simplify Model
Change-Id: I68d44b8c055456ae237925896573316c2a24b264
2022-09-29 11:16:43 +08:00
Arthur 92f1236128 FIX: height not synced when inputing cut movement
Change-Id: I0640f9a21e1d700806ade79e4e1637338aef963a
(cherry picked from commit 8bacb887da19a9bed6451d2aaa1ebc149c20359d)
2022-09-29 11:16:43 +08:00
tao wang c47f892ec8 FIX:release note support for richtext and markdown
Change-Id: Ie00dc94d88005c123acd20f05f43c5473b6dfa46
2022-09-29 11:16:43 +08:00
chunmao.guo 673b6418c1 ENH: sync with ams filament
Change-Id: Ifa8b9487c934a18ad1003f380bbb53fa9288e387
2022-09-29 11:16:43 +08:00
tao.jin 83a9c259f7 ENH: add hint dialogs for firmware upgrade
Change-Id: Iff34e4543d50074db05280fec8178029c4531e00
(cherry picked from commit 6f98eda25c722ecb6e0b6f4926972031c00bc366)
2022-09-29 11:16:43 +08:00
zhimin.zeng 37d6efdbef FIX: thumbnails not showing after simplifying model
Change-Id: Ie599b3067cf3f3dbf48a38f5f434678a7d56dbda
2022-09-29 11:16:43 +08:00
salt.wei 6a8d42359a ENH: don't load empty mesh when loading step
This is fix for crash issue for some specific step
file, which generate empty mesh.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I910e3d2da670b623570665265a12361492bd706b
2022-09-29 11:16:43 +08:00
zhimin.zeng 87718e6725 FIX: prompt when opening 3mf
Change-Id: I645bb675ea060ca3827a597b13a86cd56425735f
(cherry picked from commit 743d0bf1757a886784a41cc35c4f13381d27699d)
2022-09-29 11:16:43 +08:00
zhimin.zeng 46a0e67be7 FIX: sort extruders for minimal flush volume
Change-Id: Idf96e10ae5a8809a689c80e38611a14dbb108f0a
(cherry picked from commit cbfa3f17807313b7120e19e5f30836fb49d36b55)
2022-09-29 11:16:43 +08:00
zhimin.zeng 9f74ea5763 FIX: wipe tower does not extruder fill in smooth mode timelapse
Change-Id: Ia6957cfe41ed3624baa4c12b6df90462fc436475
(cherry picked from commit 39ecccc94bea2a43a74ac852f121c5dbc739dc67)
2022-09-29 11:16:43 +08:00
chunmao.guo 530c2287c8 FIX: restore config value of Bools type
Change-Id: I6ea8b44d71176fe75238e0207addceb8ddd1e73f
2022-09-29 11:16:43 +08:00
lane.wei d2eb526ea3 Fix the slice button status incorrect issue after auto-arrange
when a plate is locked, the slice result is also affected by auto-arrange

Change-Id: I83b3400d07fd55c42422b358d4b9ed7a179bd3a7
2022-09-29 11:16:43 +08:00
liz.li 613b433bfa ENH:refine GUI of speed/flow text display
Change-Id: Ia077a56a14af059d94d9581518ac39a45fa56527
2022-09-29 11:16:43 +08:00
Arthur 3d55647895 ENH: increase auto-arranging spacing to 5mm
Change-Id: Iebf4d31f2f869f11ddb6d9e903dfd446082802d1
2022-09-29 11:16:43 +08:00
lane.wei cb3c9503d0 Fix the Bed texture gone missing issue on AMD systems
patch picked from PrusaSlicer, thanks to Prusa3D

Windows specific: Use mipmaps generated through OpenGL for AMD graphics cards with drivers newer than 22.6.1.

Since AMD driver version 22.7.1,
there is probably some bug in the driver that causes the issue with the missing texture of the bed.
It seems that this issue only triggers when mipmaps are generated manually (combined with a texture compression)
and when mipmaps are generated through OpenGL glGenerateMipmap is working.

This workaround detects the AMD driver version and generates mipmaps through OpenGL for driver versions newer than 22.6.1.

Change-Id: I679dd61efec8f4baf97e5bf4868cb93db5184dcf
2022-09-29 11:16:43 +08:00
tao wang bf927f5adc FIX:add the sd card removal function
Change-Id: I98592a5d3d4abcfd3a67b8c12fa4cf07e79b0e4b
2022-09-29 11:16:43 +08:00
tao wang b9b3f7b4c1 FIX:only show the material used in the actual printing
Change-Id: I44edd5ffb54376da91077e2e3d990851af050949
2022-09-29 11:16:43 +08:00
liz.li 07d234825e NEW:show flush of every filament on gcodeviewer
1.show flush of every filament
2.modify first-layer text display
3.show time in seconds when time cost < 1h
4.forbid add-filament when print by-object

Change-Id: Ib8a94b9f620797e367bfc9e8a33abd5d7ab648ec
2022-09-29 11:16:43 +08:00
salt.wei ec347aba3a ENH: po change to add some translation
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I25acd3ff199ac04f5f86f21859dec441c90e6925
2022-09-29 11:16:43 +08:00
salt.wei fac58ccefa ENH: reduce infill margin for small nozzle
Small nozzle has higher print accuracy. Reduce
infill margin to improve bridge overlap quality.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5321c2fe1fe5c3d6422c5f11e8c9f0b82b9ba5bd
2022-09-29 11:16:43 +08:00
salt.wei 6d8887e858 ENH: handle github issue 254 and 286
1 add back Aligned Rectilinear infill pattern

2 allow wall loop to be 0

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id2873b9107b7b269466a8db1768dfead9ebdad0d
2022-09-29 11:16:43 +08:00
salt.wei db9ade2257 ENH: enable arachne for concentric pattern
Enable arachne for concentric pattern by
referring to PrusaSlicer

Also remove useless pattern we added.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie2574f7fc4751ebdf1caab4de52013f3101e104f
2022-09-29 11:16:43 +08:00
liz.li df321f8cd9 NEW:show speed and flow in gcodeviewer
Change-Id: I107f8be06820bc7859aee5654f264397331726b6
2022-09-29 11:16:43 +08:00
tao.jin 31ba41ec3e NEW: move selected model to the center of selected plate
Change-Id: I7af49e98e83f5eef690f7d30d10a2cc240046466
2022-09-29 11:16:43 +08:00
chunmao.guo 62da568e0b FIX: check int value invalid in Choise Field
Change-Id: I75cbe55b36dd75480903b6991f234c02ad8de5cc
2022-09-29 11:16:43 +08:00
Stone Li 09e1c0a1af FIX: do not display use_ams checkbox when no ams
Change-Id: I5be4843b22e019111264922f1721787e2dd5111b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-29 11:16:43 +08:00
salt.wei 3e0f26c296 ENH: remove old typo
Delete some useless and wrong code

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If103e5ced2c930340e6291a63e2226ecf577f19e
2022-09-29 11:16:43 +08:00
Arthur 9edc90704a ENH: unify multi-object copy with single copy
Also adapt empty cell stride with object size plus 1mm.

Change-Id: I47ac98bede196d636ebb3da549c16e393756de0a
2022-09-29 11:16:43 +08:00
DeftDawg f5a4862da5 Add Linux related build scripts
including following changes:
- Linux build scripts from SuperSlicer project;
- Update BuildLinux dev dependencies, remove unused bits;
- Update BuildLinuxImage to use nproc for cpus;
- CMake: render BuildLinuxImage and build_appimage templates;
- Fix "DSO missing" linking problems;
- Add Podman Containerfile for building;
- Update BuildLinux.sh to work better in container build;
- fixes to create AppImage inside container;
- add env to build environment;
- Update build instructions in Containerfile;

Change-Id: I73e30ab488cda8c1b0886cd34858e125596f282b
(cherry picked from commit 83fc26670ca592c91c7af1d4033a04b587cfd4cd)
2022-09-15 16:03:53 +08:00
salt.wei 014152f078 ENH: wrong == in brim code
Typo, Should be fixed.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I576b15df9bc738ef2c4440356afc06c9132bd9eb
2022-09-15 16:03:53 +08:00
salt.wei d4854c0df7 ENH: fix empty infill layers
This is fix for github issue #216 that
sometimes the infill layer is empty.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie3be08b75506e48f5ae9dd6aae2ae729ba666e01
2022-09-15 16:03:53 +08:00
lane.wei d9d88b8022 change the main thread name to bambustu_main
the max length of linux's thread name could only be 16 bytes
bambustudio_main can not be set by pthread_setname_np

Change-Id: Idab83896c81787b32f6a4dde869b101da1d69e5c
2022-09-14 17:39:11 +08:00
zhimin.zeng e05f28d0fb FIX: modify the translation
Change-Id: I8f894012660ec9877fb3af9f87be370d78859c76
2022-09-14 17:39:11 +08:00
zhimin.zeng 084ea583fb FIX: support to import color in standard 3mf
Change-Id: I631e3f62c4d996924efafdfe9352d1585ad4d130
(cherry picked from commit ec08a5194b45a98973eb53ab0022a0799238134c)
2022-09-14 17:39:11 +08:00
zhimin.zeng 56fddf988a ENH: add reload from disk and replace with stl
Change-Id: I23088c023141c2f8b76ee6d2de663fb4b311f1f5
(cherry picked from commit d4e4b5eb6ef01ea3a3d097809b229c438ee18169)
2022-09-14 17:39:11 +08:00
zhimin.zeng 2e9174500d FIX: add tips for timelapse
add tips when both print by object and smooth mode are selected

Change-Id: I13f4cc14f2ff7c33c23dcd1708fdb784aef5afa3
(cherry picked from commit a0bfe48df21d4eecf105d41387838f14b22fff3c)
2022-09-14 17:39:11 +08:00
qing.zhang 4ad4151a07 ENH: modify the warning msg of virification temperature
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I77157ed65aedc9c114c40c2e1e72d323cf4a46b8
2022-09-14 17:39:11 +08:00
Stone Li 9adf67f095 FIX: add more utf8 chars to support language hu
Change-Id: I65c9ed7cac13f28e077f42f2ae214a5d56d28bd0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-13 19:42:32 +08:00
chunmao.guo 4d6ec7cd34 FIX: only auto play live video on had started playing
Change-Id: Ic54bcb00ea312f08b4ec43123a031a0cffde5850
2022-09-13 19:42:32 +08:00
lane.wei 4138a989af refine the version update logic
1. always copy the system profiles if found version mismatch
2. use AA.BB as the version check rule of presets

Change-Id: I4895f1d765dadcbb906ac6bc2be6b32e48b4f9f2
2022-09-13 19:42:32 +08:00
yifan.wu dd1511084e FIX: fix an adapative layer height not work issue
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
2022-09-13 19:42:32 +08:00
lane.wei 7f1d87f20a fix the multiple stl no hint issue
Change-Id: I368060285890ccd3e440cdb04e7672d038e2a1d7
2022-09-13 19:42:32 +08:00
yifan.wu 1f38d12862 FIX: fix a prime tower issue in timelapse smooth mode
Fix the issue that the first 2 layers of prime tower are not generated
when timelapse is set to smooth mode. This issue only happens in single
filament printing.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
2022-09-13 19:42:32 +08:00
Arthur Tang cd315d0888 FIX: empty reference image of first layer
This is caused by the new layer 0 of custom extrusions.

Change-Id: Ie1fe5aac65f908b90a7505db6ae3deb279247007
2022-09-13 19:42:32 +08:00
gerrit 6a319bcb56 ci: update network module based on commit dde61e3
Change-Id: I126ec79f3a79de4af46c647eac13c0187eac7109
(cherry picked from commit b8a22b969098f0a6e0512decb6e69ce290791bd4)
2022-09-09 19:59:27 +08:00
chunmao.guo 4448409722 FIX: timelapse wiki url
Change-Id: I7d82c7ef1585cc5bd907f36bc7592449131efe6f
2022-09-09 19:59:27 +08:00
Stone Li d20656b869 FIX: do not clear access code when connection lost
Change-Id: I540f26def8946b85c7cf9d2bff78c57287c911d8
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-09 19:59:27 +08:00
zhimin.zeng 96e827ca7f FIX: the tree support use interface materials
Change-Id: I6c61c427095bf8157a2e29a8bb81a1754b6fd980
(cherry picked from commit 4b6d5c25599ca8c97184fd977a3bac2f278f8896)
2022-09-09 19:59:27 +08:00
zhimin.zeng 4c063a8a32 FIX: modify the text
Change-Id: If9d6d629288f9016b5d8abfaff5ee44c99d90e30
2022-09-09 19:59:27 +08:00
lane.wei 5b7cf54cf5 fix some building issues under linux
Change-Id: I787024a74e15ef3904dcffe233e4387bdfc139b3
2022-09-08 21:49:36 +08:00
chunmao.guo 5f1138f022 FIX: media play error url
Change-Id: I7ade71a951fda4e5b2d6c632248d0868846f4e7f
2022-09-08 21:49:36 +08:00
salt.wei a0d4185909 ENH: remove ignore of slice_closing_radius
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I96aa0a07e5e278f0e22f5c2acc5303050ff0cd2c
2022-09-08 21:49:36 +08:00
zhimin.zeng 05625a5e43 ENH: add traditional timelapse without wipe tower
Change-Id: I77792fb1a7af2ee95242c6f2501371dc0745287f
(cherry picked from commit f6d434cc8b6c8d11d16bbabf9600c2f2b63868db)
2022-09-08 21:49:36 +08:00
Stone Li 4987f19147 FIX: clean ams mapping result when reading info is timeout
Change-Id: I2dbe6dd4edd26f0464c94aa3237ac371ec4a562c
2022-09-08 21:49:36 +08:00
tao wang c278291808 FIX:fixed sort character display error
Change-Id: I5f4a9318f26f11f8294dcb1d4e17862546ef9825
2022-09-08 21:49:36 +08:00
salt.wei 9e2f227aef ENH: fix wrong extruder offset when loading from gcode
All extruder offset should be extruder_offset[0] when
it is single extruder multi material.

Add handling when load config from gcode.

This is fix for github issue #213

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia881b2bfbbdffa98e3c3db7b35201dc86b520b29
2022-09-08 21:49:36 +08:00
Arthur e7c977f86b ENH: move first layer inspection before 2nd layer
So an object with a single layer won't do first layer inspection.

Change-Id: I43d8d41b64215b13573c517e6350f7feff5f2e33
2022-09-08 21:49:36 +08:00
chunmao.guo b2b2bc2a9c FIX: not keep restarting video on local error
Change-Id: I2f79208326f92931bec108a4609088788ceca998
2022-09-08 21:49:36 +08:00
liz.li 288913cc4b NEW:add shortcut introduction
Change-Id: I6d85b5bcc20f2e5d5cfc78c4cfe8520565f25ff2
2022-09-08 21:49:36 +08:00
chunmao.guo 605253f61b FIX: open new BambuStudio at fixed path
Change-Id: I4ebadf9d27c38243a3cb462c6723e61864169d9c
2022-09-08 21:49:36 +08:00
liz.li 04d3917993 FIX: imgui font texture failed
Change-Id: I5ba0ad1c568024ab15e3c1559015e192709376a2
2022-09-08 21:49:36 +08:00
zhimin.zeng a3071f9e48 FIX: grabber moving distance is too small
When dragging in 3D scene, the grabber's moving distance is less than the mouse's moving distance

Change-Id: I7b766a73b7e862fb6304531c75502b09702eb128
(cherry picked from commit 82ebcd38e50c63bcfe5863dd4ff87b93df5a771e)
2022-09-08 21:49:36 +08:00
tao.jin fbd6af069d ENH: support to skip current version in upgrading dialog
Change-Id: Iedcf595b146017fa26827900b446fd8782938341
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-08 21:49:36 +08:00
salt.wei 4e1caa428d ENH: wipe_distance should not to be 0 or negative value
As title, fix github issue #220

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If63c839da1341ac2e16bbfa287c4e32564284d59
2022-09-08 21:49:36 +08:00
liz.li e6f0c5abec FIX:speed ctrl in device
1.the speed ctrl shouldn't open popup when the printer is in idle status.
2.add tooltip

Change-Id: I3b0b4c58ef1c1961835ee2e06b2e7f3cccb53428
2022-09-08 21:49:36 +08:00
salt.wei 72221d2760 ENH: add slice_closing_radius back
For github issue #182

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I38c69bed03b6d70cb21d58b5f724b4dc3a8992a4
2022-09-08 21:49:36 +08:00
Stone Li 1a3a01a39f ENH: update translation and sync with localazy
Change-Id: Icbf0a5642e16ad18eb8a9552810e39de5ec3b471
2022-09-08 21:49:36 +08:00
Stone Li e2653289f4 ENH: refine translations, sync with localazy
Change-Id: I33d462b6e407f1cce91e1e0901a91249a8866ee7
(cherry picked from commit c1a392b62ebcb36d52bbd1d05c8f073f8e751de8)
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-08 21:49:36 +08:00
Stone Li 55e12ef8b7 ENH: refine ams user settings display
Change-Id: Ie205824cf6f60f6acd8b07a2b89c1220eebdfb83
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-08 21:49:36 +08:00
liz.li 664672b742 FIX:Gcodeviewer:arc type render bug on first layer
Change-Id: Id047e9c6ef39fa95af800bc1b218c14bc6efb7ab
2022-09-08 21:49:36 +08:00
zhimin.zeng a4e89ab1f5 FIX: model moves when adding negative volume
Change-Id: I49fdfa8324751874203bde42a692c3babc901623
(cherry picked from commit 550286d7314cc20da5ea590e3dd19772daceda16)
2022-09-08 21:49:36 +08:00
zhimin.zeng e5c3127517 FIX: keep only one repeated opt_key
keep only one repeated opt_key when old software open new 3mf file

Change-Id: I4f35d2f15e0cb9e5fa4a7523cfcba7b601afd795
(cherry picked from commit a25c42f31437b4562b8fe71a836a421c014c6cf9)
2022-09-08 21:49:36 +08:00
tao wang 264aad9b4b FIX:add new effect of disabling print operations
Change-Id: I19cd39205785fc2d4321016746a2dc19cff98c5b
2022-09-08 21:49:36 +08:00
chunmao.guo a64fc3918a FIX: scroll direction of DropDown
Change-Id: Id5abf74e099586810ac9a5ec2b43e6050381a3c3
2022-09-08 21:49:36 +08:00
chunmao.guo 63448d9126 FIX: modify ui styles in media file panel
Change-Id: I064858975fc39618339cf4fe0e577fa3d2e5085f
2022-09-08 21:49:36 +08:00
chunmao.guo dd0ccfb6e9 FIX: StaticBox background color
Change-Id: Ifbb0bc4ac3e0a69675f16dc3234b4190fff698fb
2022-09-08 21:49:36 +08:00
chunmao.guo b03a16054b FIX: add authors to param links
Change-Id: Ibcbd1d58e6201e1a668f350891eb1beda9fe4d12
2022-09-08 21:49:36 +08:00
chunmao.guo 0471c7d427 ENH: open new process on MacOS
Change-Id: I0bc4069f9ff14ac86d9edf800134f04a26a650f2
2022-09-08 21:49:36 +08:00
tao wang 77e4599c4a FIX:add few extra function for objecttable
1.supports filament sort
2.printable supports batch selection

Change-Id: I231b8add4f43550f4854796cfd804f86251604e7
2022-09-08 21:49:36 +08:00
Arthur b8846f675f ENH: do not change relative pos for multi object copy
Change-Id: Id54e119ebb72ca90989c13b221b9be72e4ac2f86
2022-09-08 21:49:36 +08:00
Tao Wang 0ed1d2ed34 FIX:fixed crashed when starting Studio on secondary display
Change-Id: I0392607479a25b5e2b2704f5569d6b8b94ba7e3d
2022-09-08 21:49:36 +08:00
liz.li 3fb942077c FIX:AMSMaterialSetting dialog
1.Set dialog readonly when printing
2.replace comboBox with text when set readonly

Change-Id: Ic9d9570f3984088550b70628f4acb33c83108dde
2022-09-08 21:49:36 +08:00
Stone Li 0a1f3df697 FIX: fix display error in UpgradePanel
set to default value when monitor status is DISCONNECTED or NO_PRINTER

Change-Id: I48b9f44e9744794cfaaed32c316b7f3866cf76fd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-08 21:49:36 +08:00
Stone Li 93b26be024 ENH: update ams mapping result after changing use_ams checkbox
popup axis tips after axis action

Change-Id: Iadae7e645d4718dc80264f5d1f98b16edcfb9cbb
2022-09-08 21:49:36 +08:00
salt.wei ee16e75a9c ENH: move overhang fan speed to advanced group
Show these two settings in advanced mode

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ic7ef16ef3a9940d81839cce15de05bf6e32d9315
2022-09-08 21:49:36 +08:00
liz.li 65cbccb219 NEW:add custom-gcode before first layer
Change-Id: I168e3038cb7d6850a5d6c568f348fed8000a915a
2022-09-08 21:49:36 +08:00
qing.zhang 53be2ee554 FIX: fix the topmost iron issue
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I79a034f188aaa1ef4528b944c725008f926b7b1f
2022-09-08 21:49:36 +08:00
tao wang fbb9dfc41a FIX:amsmappingpop dialog adjustments on macos
Change-Id: Ideeb1b8536efeaf0fedefa0acf91c386a2c76b96
2022-09-08 21:49:36 +08:00
tao wang 43e69fee35 FIX:refine objecttable layout and interaction
Change-Id: If7639decffc994bfbbef3461fd02de0c06758b89
2022-09-08 21:49:36 +08:00
tao wang 83b427b7e2 FIX:synchronize the add and import actions
Change-Id: I3fbd52d5d554001af4bea27bbf6bb6feee6e230d
2022-09-08 21:49:36 +08:00
liz.li 0d432bf89f FIX:adjust text of home dialog
Change-Id: I4e6412ae2828d2918f44d6442a7fd2efc21970cf
2022-09-08 21:49:36 +08:00
yifan.wu a744f7d60c ENH: support to show object labels in 3D scene
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: If2267b13ab15d2c18175dc54cfda605f8f062cf8
2022-09-08 21:49:36 +08:00
zhimin.zeng 612204b443 FIX: STUDIO-787 & STUDIO-786 lion face model problem
1. memory explosion when enable timelapse.
2. Models with only one color become multicolor after slicing.

Change-Id: Iab3ace70c08d03ab612158d52ff67eef8d5bc718
2022-09-08 21:49:36 +08:00
zhimin.zeng db83a1c193 FIX: STUDIO-795 crash in painting mode with Ctrl+A
Change-Id: I10e49eb704b4b2bf6b4059242b2cb6374ec91ded
(cherry picked from commit 44089d5a783121d1c8c0c98b53f5d78d868567af)
2022-09-08 21:49:36 +08:00
zhimin.zeng a66aa0a259 FIX: add text link to bed type
Change-Id: Ic051bc37f87ec355865c3ce5fb857ad0a38c1d32
(cherry picked from commit 5573fdca645ba3721df25ae538c76b2f0abb2149)
2022-09-08 21:49:36 +08:00
zhimin.zeng ac0b383858 FIX: add 16 colors
Change-Id: I5e24e8ea95f85a9ffdef4c3871ea4b30e9711d23
2022-09-08 21:49:36 +08:00
Stone Li 8f28474ed2 FIX: hide checkbox/label/tips of use_ams
Change-Id: Ifce452f0776bbe02bf2446e952b1ac0b474a6d72
2022-09-08 21:49:36 +08:00
Stone Li 6792b42992 ENH: hide media file and upgrade panel
Change-Id: If953e2261fbc031382f42cc47e5c8beecb626f85
2022-09-08 21:49:36 +08:00
Stone Li 2dc2d8252d NEW: support software limit of axis control
Change-Id: I0d241aeddeed112b21ed576ce793c3e9f061c923
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-08 21:49:36 +08:00
liz.li 8e1fd89430 FIX:add multi-color goes wrong in multi-plate case
1.new: forbidden add multicolor from preview slider if a plate uses multiple filaments in prepare
2.fix: cannot change color from preview slider if a plate uses different color with another plate.

Change-Id: I28dee0e158fab121dc888590c4cc7554900504be
2022-09-02 13:16:54 +08:00
chunmao.guo 0a7f696101 FIX: crash on MediaFilePanel when download in empty list
Change-Id: I13f33005a8730498aea28b32da2818ceca055aac
2022-09-02 13:16:54 +08:00
Stone Li 7184960dce FIX: fix crash when select a printer in lan mode
Change-Id: I93f604c900a56e938b16bd377031c331ecc20f43
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
Stone Li 89c83fb8a6 FIX: fix crash when to press cancel button
it would crash when avatar of user is loading.
cancel web request before closing dialog.

Change-Id: Ib41c5d8e7b5663d15c7d7f544335b48f47c25fea
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
Stone Li 3aa3df00fc FIX: fix slice info display error
Change-Id: Ifccc8027fbd9f7a659523e170d33d01b10ecd9d9
2022-09-02 13:16:54 +08:00
Stone Li a688265bfd ENH: refine ams logic
update ams settings
add rfid reading bits

Change-Id: If46d2a3bf896e1279514aba94e5facdaee12014d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
Stone Li 0ed5b956ae NEW: add ams option when sending a printing job
Change-Id: If75b9da926c1d9a9e59f3e16b3d491a6e0bdb2e6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
gerrit 09e0e4fcca ci: update network module based on commit 3cf3634
Change-Id: I7028f6fccd7fd8811394b4e23f1dab034a9285d6
(cherry picked from commit 285a74eb4511423e2028e2b6813abd264bd10bc4)
2022-09-02 13:16:54 +08:00
Stone Li b7974185fa FIX: join bind_job when close BindDialog
Change-Id: Ide24f4d116d65063ebc414230abe12ef94d9dd23
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
chunmao.guo 30a97cc6dc ENH: params web link to wifi pages
Change-Id: Id79c65a973840cdc23cdf1b1c353d29da2216750
2022-09-02 13:16:54 +08:00
tao.jin fd8caee3db NEW:Add search printer for debug
Change-Id: I3d8db835331e1ce4699f02a3571b3978544b8e77
2022-09-02 13:16:54 +08:00
chunmao.guo 4601022aaa FIX: stop video when not visible
Change-Id: Ibc5204084efec5381a7ede9face0519276592aa8
2022-09-02 13:16:54 +08:00
Stone Li d42c8f58df FIX: fix display error when only ams2 exists
Change-Id: I6993b6681b403094d8ed242fbd3869ad19f834b9
2022-09-02 13:16:54 +08:00
tao wang 5cedfe2216 Fix: Only call wxEndBusyCursor when is busy
Change-Id: I8a6085aca652df4892bf5182e34d01c423a17bd6
2022-09-02 13:16:54 +08:00
chunmao.guo 6b580d285c FIX: some bugs with media files
Change-Id: Ia5e0710a2979ae338902042e520ba9210e3a557d
2022-09-02 13:16:54 +08:00
tao wang 8eb9d6a863 FIX:disable rename except picture type
Change-Id: I69ec39d2e3066102f7116bb17af8e26120af237d
2022-09-02 13:16:54 +08:00
tao wang 1c7b183035 FIX:add protection when slice information is not available
Change-Id: Iaf654c8a14252f6647a64ded97d4ded3e79d7057
2022-09-02 13:16:54 +08:00
Stone Li bb1be58815 FIX: check bind status in update timer
Change-Id: I2079e1ef96cdffa0a9776b72942fd45ec88be10b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
lane.wei 79944bd0fc fix a typo issue submitted previously
Change-Id: Ia31522fb3133f90468e6ba034daa8feca6d9c69d
2022-09-02 13:16:54 +08:00
wintergua 73f4c848de FIX: some brim might be ignored by mistake
In current studio, a brim area will be ignored if it does not be connected to any object island.
After patching, a brim area will be ignored if it does not connected to any object island and other brim areas.

Change-Id: I1aef5cd1af12cf76746f7614807aa03956d625ad
2022-09-02 13:16:54 +08:00
Stone Li 801b15966a ENH: modify to new upgrade protocol
Change-Id: I8d431ec3c5e9c81e7a7438c6b1db9febf01d4706
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
Stone Li d54461413f ENH: add calibration and unload filament
define new command for calibration and unload filament

Change-Id: I834680740b4052d5719193a40945ca2704a3d858
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit c742fb5feb26938152858c44056d809fe18ce742)
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
lane.wei b5a21e6520 add logic to remove the plugins folder when the version changed
Change-Id: Idb0ac34376c4eed81bf37da7afe670d9d9a42457
2022-09-02 13:16:54 +08:00
lane.wei 562b52c6b9 fix the assert issue under debug mode
Change-Id: I02b5e4e3229f695d89ac6f04aadeb831810dd3ff
2022-09-02 13:16:54 +08:00
lane.wei 73b84a5e77 update the networking version
Change-Id: I51d599324a8c354b4d7b465c78bbac1af835da06
2022-09-02 13:16:54 +08:00
yifan.wu 0b323649d3 ENH: order support toolpaths to reduce extra travels
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ifae5807ff094eede1eaf7494430fdd174572a021
(cherry picked from commit dfb3fc991a6f4a6e7dcdcce902f26ffa789f57fb)
2022-09-02 13:16:54 +08:00
xiangdong.yang 83010a0d85 ENH: Optimize the overall Gizmo layout
Change-Id: Ic773fa45d163d598f4510d981c11d4f9f5858495
2022-09-02 13:16:54 +08:00
lane.wei 3b9801f147 NEW: add config file to store functional compatibility
Change-Id: I9831cef9d57642fe7709eef87e74a64e21857e18
2022-09-02 13:16:54 +08:00
tao wang b510e94e06 FIX:add code protection when updating print basic info
Change-Id: If64c24e394276c3c127bb12039353ae478481192
2022-09-02 13:16:54 +08:00
tao wang e11c354999 FIX:fixed machine list crash when after logout account
Change-Id: Ic71fe459032de97943c28f92319a56a47f6430ac
2022-09-02 13:16:54 +08:00
Stone Li 63bd77caf9 ENH: save hms file to hms folder
Change-Id: I20ff7317c689eefc684c44e6509a45f5911de7fe
2022-09-02 13:16:54 +08:00
tao wang ba286fedbd FIX:fixed camera button cant not adaptation
Change-Id: I208d7ca31e77e6cb7a0674e9794fd4eefecca840
2022-09-02 13:16:54 +08:00
zhimin.zeng 11c24053dd FIX: remove user preset folder when logout
Change-Id: I64f0e46de7a91264c3c50188bbad2ac1409bcc0d
2022-09-02 13:16:54 +08:00
Stone Li 346480005a NEW: add comments for print job
Change-Id: Ie7a65a76d535dc210268842704fdaf4a7475135a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 13:16:54 +08:00
chunmao.guo de712b08f1 FIX: crash on MacOS when system logout, not really Close mainframe
Change-Id: I0e7cc73c1b4bbc663105034e82dcd7a51998e244
2022-09-02 13:16:54 +08:00
zhimin.zeng 8319ef604c FIX: report an error when slice in painting
Change-Id: I55ba3687e3988ae96d33833c03efd66ea3f607d8
2022-09-02 13:16:54 +08:00
zhimin.zeng 06af15f60c FIX: disable the dual graphics card option
Change-Id: I76967e5e87abc1c55920bcf31b196c3ab588bd58
2022-09-02 13:16:54 +08:00
tao wang a8d91531b3 FIX:Turn on the Release switch of HMS
Change-Id: I67fe615aec0e18cc8fd0a1e6992b6dc38a03fc88
2022-09-02 13:16:54 +08:00
tao wang db435bc704 FIX:fixed wxwidget assert(amsmappingpop)
Change-Id: Ie97e6c0bdea9af713eb7088311dfc3df97d74239
2022-09-02 13:16:54 +08:00
arthur 35d6e048ff FIX: auto-arrange fails in several cases
Jira: STUDIO-644, STUDIO-661

Change-Id: I3cd1fcd4e1fabf9a401c9fd536e8f55592775fbd
2022-09-02 12:52:18 +08:00
arthur 1e0301dbde FIX: fix slicing error of more than 1 empty first layers
Jira: STUDIO-656
Change-Id: I582e432ac14b823656780147ec585ae7a7499517
2022-09-02 12:52:18 +08:00
arthur 7e01006db7 FIX: cocentric interface in tree support may be floating
1. fix floating cocentric interface
2. fix missing 1st roof layer with 0.12 & 0.08 layer height

Change-Id: I6cdbe99dabb711c650900d35aead7f7aa0fdb8f7
2022-09-02 12:52:18 +08:00
chunmao.guo 56a61bfcf5 FIX: record dialog stack and EndModal on system session end
Change-Id: Ie0a7de7cf467f5b9e88881d3894dbb7a0790d500
2022-09-02 12:52:18 +08:00
Stone Li 0f8ad6d5e6 ENH: add log in request_user_unbind for debuging
Change-Id: I9540080713ac848302b788797005b28a5938f547
2022-09-02 12:52:18 +08:00
tao wang 4c619aeaa0 FIX:print slice infon will be obtained from the cloud
Change-Id: I7e05787baf1bb1cbca5ff956e371e67bc3f8c7d7
2022-09-02 12:52:18 +08:00
tao wang a5774c1902 FIX:fixed send printjob page can not show full page size
Change-Id: I1d9120c4eabf69e9510f9f64d378eab3adf6b7a9
2022-09-02 12:52:18 +08:00
chunmao.guo 0fa82b5e18 ENH: expor core spec 3mf
Change-Id: I97ccd87f29668833881b9327b251c2ca110ecd31
2022-09-02 12:52:18 +08:00
lane.wei 29267b58d3 Fix the export_3mf failed issue caused by filename
Change-Id: I54709b9f92af34c9459f2befb68759ee6d03d85b
2022-09-02 12:52:18 +08:00
Stone Li c7b698f4f1 ENH: modify default view to current plate view
Change-Id: I32cecfe20e01011089928e24058c4ff89aca074a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 12:52:18 +08:00
chunmao.guo 71d81ad78b FIX: save backup mesh with temp file safely
Change-Id: I39ed281e271add443c41cb177d203f0b0decf2b6
2022-09-02 12:52:18 +08:00
chunmao.guo 2ecdf43ca1 FIX: media play state conflict when switch device
Change-Id: I95680159a50b2085cb6de5b7cd612d6b444a6446
2022-09-02 12:52:18 +08:00
Stone Li 3c8d9be77e FIX: fix crash when exiting studio
Change-Id: I91f6cde208e044aae20b40e4b79159f6cd46356c
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-02 12:52:18 +08:00
salt.wei d9ad79e922 ENH: add back random seam
As title. Random is useless in some cases.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I169edb005574c43fae5aafbdbe4b6e901b8d0c74
2022-09-02 12:52:18 +08:00
chunmao.guo e016f522fd FIX: clear ams filament list on user logout
Change-Id: I27417caa3dbcf7bb46bcb1b0182033ffb3b8825f
2022-09-02 12:52:18 +08:00
xiangdong.yang 1337498efa FIX:fix the device interface button adaptation problem
Change-Id: Ide49dce78dd83cdb87e13dc93fb128e554d36871
2022-09-02 12:52:18 +08:00
chunmao.guo ed1870b3a5 FIX: wxTE_PROCESS_ENTER flag for wxTextCtrl
Change-Id: I23b43997f080ed173676c2582148b8db6e83b701
2022-09-02 12:52:18 +08:00
xiangdong.yang 966242b8dd FIX:Coloring interface optimization
Change-Id: I43f7f6e119374a5b2ec6a23ae7e0a6b11942b08f
2022-09-02 12:52:18 +08:00
chunmao.guo 115995e46d ENH: export current preset configs
Change-Id: I75642f9786ed14e4e6e2048f4a70e7bb49bff03f
(cherry picked from commit 31886319c0a3f1adea301e01a9f49834c1c92670)
2022-09-02 12:52:18 +08:00
zorro.zhang f44a0b88d9 NEW: homepage and UserManual
Change-Id: Iecdb4d0151a0cf76614548aee69e525ad7e1fe68
(cherry picked from commit 4c7403683b334e42d8676a933012e2133cd1ce7f)
2022-09-02 12:52:18 +08:00
tao wang 3b021d4443 FIX:replace new camera icons
Change-Id: Ibd8b178260733a4b95198687d90d111b542462e1
2022-09-02 12:52:18 +08:00
liz.li b51b562be8 FIX:refine objecttable
1.fix multi-line text are cut off
2.romove resize of object_table
3.fix object_table_setting without scrollbar
4.improve UI of filament column

Change-Id: I5eb989e86545c411013e31f31580a1e0a71472e2
2022-09-02 12:52:18 +08:00
tao wang a3fbcf2963 FIX:add multilingual translation
Change-Id: I2227bd55a48c7ce136f97893bd797a161459007e
2022-09-02 12:52:18 +08:00
liz.li 121dccc59c ENH:close dialog by pressing esc key
Change-Id: Ib883e7119699e06f63c61dd083ad761ba58bc19c
2022-09-02 12:52:18 +08:00
xiangdong.yang 03f62ed9ae FIX:fix GizmoText failed to change font
Change-Id: I2b6ea7effead4d4667b4a797392396784be9180d
2022-09-02 12:52:18 +08:00
xiangdong.yang 05dddcfd3c ENH:Optimized the overall Gizmo layout and Print Error font style
Change-Id: Icc26fdcec667dfd7018132d39af0bb450e4caff5
2022-09-02 12:52:18 +08:00
liz.li 5cd7873a3c FIX: Auxiliary conflict
Change-Id: I3026445e215b689aed325133caa386cb2f48bfdc
2022-09-02 12:52:18 +08:00
lane.wei fef0a4944c FIX: fix the position not correct issue after copy
Change-Id: Id7505230f8a46785310b8c49d19705b2de5164af
2022-09-02 12:52:18 +08:00
zhimin.zeng a85dc1ef67 FIX: Crash when undo multiple times
Change-Id: Ie2e06d294e7e31ce050e8f63308e45c076130af6
(cherry picked from commit ca4b9db007f7e839da768424484c098988cbc3f0)
2022-09-02 12:52:18 +08:00
liz.li 36ca76c2a4 ENH: Auxiliary GUI
Change-Id: Iaefd8bb6a2a560f4f2ec8235b21231763d8562fe
2022-09-02 12:52:18 +08:00
tao.jin 2ba2c2fec4 NEW:Change flush icon
Change-Id: I46240870a04c1cbb4a4e7f1cd842eb3aa19f567b
2022-09-02 12:52:18 +08:00
xiangdong.yang 7bb227df2c FIX:fix Gizmo Text displays the location layout
Change-Id: I0696725660d3640486750259f7643d1809989db0
2022-09-02 12:52:18 +08:00
zhimin.zeng 5aaa785655 FIX: Slicing process crashes when enable timelapse
Change-Id: Idc3068b73809ee28fe685266fcd2355555e9f02a
2022-09-02 12:52:18 +08:00
yifan.wu df6fb3eeb4 ENH: remove current filament logic in context menu
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie7933eeccb8ee4f3390c8e5999b32bb45319c89f
(cherry picked from commit 1426178dd40e95d8d7313335a0ecf264bfeeb7b9)
2022-09-02 12:52:18 +08:00
lane.wei 0898817053 ENH: rotate: refine the behavior of assemble rotation
use the logic of rotate_local_with_target

Change-Id: I181372b6784c5d025bc3748377f6130f15a80d85
2022-09-02 12:52:18 +08:00
tao wang ffb1f706d8 NEW:update the new print progress layout
Change-Id: I4390c9ef5de3d050178bebe5d1dc60213a400280
2022-09-02 12:52:18 +08:00
zhimin.zeng 007659aeec FIX: hide the "Don't show again" checkbox of ProjectDropDialog
Change-Id: I83ed917cab71e10eda6a14a4f78ebc56ee894600
(cherry picked from commit 64179562b116f5b16fc223d5d307e5c2f795e6c1)
2022-09-02 12:52:18 +08:00