Commit Graph

16417 Commits

Author SHA1 Message Date
songwei.li
873fb30bc5 FIX: 3mf files containing small thumbnails cause crash
Fix the issue that 3mf files containing small thumbnails cause the print page to crash. Due to m_cur_input_thumbnail_data has small size which caused array out of bounds and crash.

jira: STUDIO-13731
Change-Id: Ie3c30287265f635e6afb2b1157c97c5b6863d54e
(cherry picked from commit adffd16e1fbbcba0f1bc33ebd6112e57c88f30e7)
2025-10-02 09:39:01 +08:00
zhou.xu
83feaeadec ENH:modify the color of external materials that are disabled for sync ams dialog
jira: STUDIO-13364
Change-Id: I54105533437493d05c8f6208e7b83f56585da2bc
(cherry picked from commit 53953141a13fd6c49824655da6a39efd1b8b65d8)
(cherry picked from commit 34ad10df2bb946bd2b97dd6f6e4f5e7ee6c0e4dc)
2025-10-02 09:38:22 +08:00
xin.zhang
4a787f6ff8 ENH: clean codes about device
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
2025-10-02 09:30:48 +08:00
haolin.tian
e17c8bfb80 FIX: remove legacy MQTT optimizations; disconnect previous printer on switch
jira: STUDIO-13455

Change-Id: I88f48801f443b3830fbd2bccbc53577f615e6d96
(cherry picked from commit 562ac1a3e7e75e1cab5e42ab09cec719bf698184)
(cherry picked from commit 5143086c5efb4d974e27ba4f55bd82752ded0a93)
2025-10-01 23:32:08 +08:00
Noisyfox
d05420615b Fix crash when dismissing print error dialog 2025-10-01 23:32:08 +08:00
zhimin.zeng
41da6a1ae7 FIX: support calibration for multi-nozzles with different diameters
github: 7543
Change-Id: Ifa20d786836f1991af35b3b95e25f91431d752e0
(cherry picked from commit 0c1053e962c928b253c268fc6658b8ec98f692ff)
2025-10-01 22:01:50 +08:00
xun.zhang
b8bbb04527 FIX: wrong flush volume when select filament or sync filament
1.Correct the wrong logic for support filament check

jira:STUDIO-13719

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia0d5dfa210a4335ea2a6a5f5a97ba69fd136c720
(cherry picked from commit 75c75f83679937b1fcd2ef120ac83cc9a67f125b)
2025-10-01 22:00:57 +08:00
zhimin.zeng
40f8583440 FIX: fix some show bug
jira: none
Change-Id: Ie0efd9a4d0c3c437ca803d1f7708510b28af31cd
(cherry picked from commit c7863685f4d4555d51db902857c90dd10a94345f)
2025-10-01 22:00:07 +08:00
zhimin.zeng
6bb19e10b2 FIX: modify the clumping detection text
jira: none
Change-Id: I646e2fdcb3802bb9255dd77b158ce6d516c7afaf
(cherry picked from commit 370ca3c217ef28a1d1aac08af720578c48aac405)
2025-10-01 21:58:46 +08:00
fei2.fang
f2e759e885 FIX: Correct auto-calc of flush value and default color picker selection
jira: STUDIO-13718, STUDIO-13666

Change-Id: I5dd08d3ed46423ba6b3c6cb4c022cfc36f46c620
(cherry picked from commit 173a6ee070d6b5e1ac445f0ebdc4c2fdd145e253)
2025-10-01 21:58:02 +08:00
Noisyfox
a660e1ae6d Fix extruder_only_area render position when switching plate 2025-10-01 21:54:49 +08:00
Noisyfox
755845598f Render wrap detection area for selected plate only 2025-10-01 21:49:30 +08:00
zhimin.zeng
b3689ec700 FIX: modify the text of Clumping detection
jira: STUDIO-13659
Change-Id: Ib033689f89d90f14f1eab0a488fa76cbb705afb8
(cherry picked from commit d1606d12b53fa21aab38d882b8bac3215af03e71)
2025-10-01 21:21:42 +08:00
zhou.xu
269b4d9fc2 ENH:reset m_wrapping_detection_triangles when change printer
jira: STUDIO-13664
Change-Id: I65f2f496eb12596b44d753509774e6218e2401a2
(cherry picked from commit 1fa2f1c1367e5d5dae2f5ad293d9e0a682332dca)
(cherry picked from commit c486d82d1e79757d0bf13f85b143b7b3a8fe8220)
(cherry picked from commit 98fbeb0fc5a699d8b23f143474083b47d6b7c690)
2025-10-01 21:20:05 +08:00
zhou.xu
637a86b738 NEW:render wrapping_detection_triangles
jira: none
Change-Id: Ifdbd1ae8c3906abd235177f68fe0444bbcecb8ba
(cherry picked from commit d7df1b8a9c172731cdfb42371153f8781c268aad)
(cherry picked from commit 1277955c5f8e81f01c07408debc1338acac667cb)
(cherry picked from commit c09de4cff5dcae942e91feae3fafb097e33563b7)
2025-10-01 21:14:25 +08:00
chunmao.guo
30bce5df45 FIX: Button text render pos on macOS
Change-Id: Icaa8cb95d81b3f906507dc74a3fcffc77a535fdb
Jira: STUDIO-8026
(cherry picked from commit c1e4be1652e682a53b13a403e6ae6b2d00fddda6)
2025-10-01 16:50:17 +08:00
fei2.fang
51151a89c5 FIX: Prevent crash when rendering color button on linux
jira: none

Change-Id: I8758c3a352bd206ff81ce72ed0ad902f8a79c30e
(cherry picked from commit 45818c4e762b540feb0a67d117b595eb589e8058)
2025-10-01 16:09:17 +08:00
Bastien Nocera
cd0eb95c25 FIX: Fix missing wxStaticBitmap declaration
In file included from /run/build/BambuStudio/src/slic3r/GUI/DeviceErrorDialog.cpp:1:
/run/build/BambuStudio/src/slic3r/GUI/DeviceErrorDialog.hpp:78:5: error: ‘wxStaticBitmap’ does not name a type
   78 |     wxStaticBitmap* m_error_picture;
      |     ^~~~~~~~~~~~~~

(cherry picked from commit 834d2bc8026e38d7ed1d0bafa3e125baf412a322)
2025-10-01 15:55:55 +08:00
Bastien Nocera
902b215eb1 FIX: Fix missing std::set declaration
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp: At global scope:
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp:81:10: error: ‘set’ in namespace ‘std’ does not name a template type
   81 |     std::set<wxColour, wxColorSorter> m_colors;
      |          ^~~
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp:13:1: note: ‘std::set’ is defined in header ‘<set>’; this is probably fixable by adding ‘#include <set>’
   12 | #include <chrono>
  +++ |+#include <set>
   13 |

(cherry picked from commit 9d86c8c15e69158d386596bd860b99b61b2c2e61)
2025-10-01 15:47:44 +08:00
Bastien Nocera
46abd03bde FIX: Fix missing fmod declaration
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp: In function ‘Slic3r::ColourHSV Slic3r::wxColourToHSV(const wxColour&)’:
/run/build/BambuStudio/src/slic3r/GUI/EncodedFilament.hpp:41:25: error: ‘fmod’ was not declared in this scope
   41 |             h = 60.0 * (fmod(((g - b) / delta), 6.0));
      |                         ^~~~

(cherry picked from commit 625b661f292fdac9b337365b6792c959f6df59ff)
2025-10-01 15:47:37 +08:00
Noisyfox
fa68dde4b3 Fix AMS sync 2025-10-01 12:50:12 +08:00
Noisyfox
6757906ad3 Fix chamber_temperature crash 2025-10-01 12:29:30 +08:00
zhimin.zeng
8a6a7a0d7d FIX: add wrapping area API for plate
jira: none
Change-Id: I574a42a6c17ded0934ae7456eb5ecfc83a5c2a01
(cherry picked from commit 0ed3f527f08808d9ec04f09b5eb114334805be29)
(cherry picked from commit c81b2e8cb39400255b2cf1321d2fdb346300fdad)
(cherry picked from commit 49f2ed61664c663c189db6a2c94efd6a36d53b9b)
2025-09-30 15:32:44 +08:00
zhimin.zeng
f391070cb7 FIX: only detect wrapping area when enable wrapping
jira: none
Change-Id: I1353e888624f26679e04a98cc9ac8950b991e77e
(cherry picked from commit 53ca132fcdcbec9761b1328f3dc94ab4194e3f07)
(cherry picked from commit e8c8a10c97c7eb681f80978106a28716ea5737f8)
(cherry picked from commit a28eeef7f4f016689a900d4880e2e8927cea363b)
2025-09-30 15:32:44 +08:00
zhimin.zeng
1ccdf7b43b ENH: add wrapping detection
jira: STUDIO-13192
Change-Id: I0fb5692b18cdb3b7af624a831dcfb0f635b165f0
(cherry picked from commit 89a8b6ea5e34340cba3750416ce3100dcc39f5c2)
(cherry picked from commit 50bc8c10a7b4ddc0b2dfe9cbab438b9d307b7fc0)
2025-09-30 15:32:44 +08:00
hemai
070a8e62a1 FIX: long filament name display with ellipsis
Jira: [STUDIO-6754]
Change-Id: I7de774bba953c85b21d39113a5decddd2439fafd
(cherry picked from commit a157d0e26209b12a2bf0544b066866c3df8e50e0)
2025-09-30 15:32:44 +08:00
hemai
c297c4232f ENH: advance hms file get strategy
Jira: [STUDIO-13356]
Change-Id: I2192defc17730ddedd2f667a62b0654ca6f13721
(cherry picked from commit aef88d650495740cac6a45a411e7f9a076c6cab9)
2025-09-30 15:32:44 +08:00
fei2.fang
f7758b1831 FIX: Allow white color selection in default color picker
jira: STUDIO-13666

Change-Id: Ia2f5d8a1830a14d519c9277a88148a723f3d1be0
(cherry picked from commit fccfee6208c5ddc0552004d0642771f99f10dd67)
2025-09-30 15:32:44 +08:00
zhou.xu
c21c715f37 FIX:Only pursue filaments up to the maximum index
jira: github 7682
Change-Id: I77fd7d47965eb6f7f405b43d6009f9c206b8c46f
(cherry picked from commit a79922c773255e0f6dd3b4605fe07ef8aa6a8580)
2025-09-30 15:32:44 +08:00
fei2.fang
91d4b14ba7 FIX: Mac semi-translucent colors & suppress dialog flicker during system picker
• Official filament picker now renders semi-transparent colors correctly on macOS.
• Disables the flicker prompt while the default system color picker is open.

jira: STUDIO-13452

Change-Id: I6a83d3cf488114f92813e378b507f293d7c4254e
(cherry picked from commit 4cd2c47f99f956681f41a1af0343efc9ad377684)
2025-09-30 15:32:44 +08:00
fei2.fang
723ce9d431 ENH: Flash filament dialog on outside click to prompt focus
Brief flicker reminds users to act on the dialog before proceeding elsewhere.

jira: STUDIO-13492

Change-Id: I3daaa567f4aa738094fc01effcd9b9245aea9d2c
(cherry picked from commit 3decd7a5e4f5a13b7fd1dbb0fc39e0b3849ed6d1)
2025-09-30 15:32:44 +08:00
xin.zhang
44c13f3967 FIX: correct the setter
JIRA: [STUDIO-13571]
Change-Id: I6b5c0ac8c817a8d3b8807e17bce12a44d1101442
(cherry picked from commit 10cf6c6ce478d807c36672c8dace0df5d3cdb629)
2025-09-30 14:43:56 +08:00
weiting.ji
c1fa2acd85 FIX: client crash when select other setting in the comparator's right combobox
Jira: STUDIO-13491
Change-Id: I2ca85b2e176de0748317ccd97576d1f052bbbc39
(cherry picked from commit ae8df0f31c1f26278635cf0b270572d8a00319a7)
2025-09-30 14:34:28 +08:00
yongfang.bian
2f18d25a2d FIX:clear wxwidgets asset
jira: nojia
Change-Id: I8ba2849afa07bc162a55b326c3d9a45150243ac3
(cherry picked from commit 96ba14c86d3cf180eeb585185d31bcb5d5db7415)
2025-09-30 14:34:08 +08:00
fei2.fang
6c242c5101 FIX: Honor transparency and add contrasting borders for both themes
jira: STUDIO-13394

Change-Id: I47f3108318ba72895cf5a906a2566d46f3ed3ff9
(cherry picked from commit bac1c5ecceb3dfdf11844beca9d9ec71c6453340)
2025-09-30 14:31:54 +08:00
xin.zhang
b6a44b5eb1 FIX: no resource for the bitmap
JRIA: [STUDIO-13537]
Change-Id: Ib7a128e85d64fa1b4a0c67b3be5f5a3ccb3dd927
(cherry picked from commit aff46bd1378a18cb3d181dbf947bed870c0fa2d0)
2025-09-30 14:31:47 +08:00
xin.zhang
4b06a552b6 FIX: update codes with master
JIRA: [STUDIO-13536]
Change-Id: Ibf1bbc74787b4894cceebf703406848d99f9b8eb
(cherry picked from commit 20a644da6a80664a54d68835f49867813db8af83)
2025-09-30 14:30:23 +08:00
maosheng.wei
26dcf805e6 FIX: Reset Filament only when the preset is deleted from the current Studio
Jira: none

Change-Id: I2a8e17b17a97644d69013e38f50bb7b060b17e57
(cherry picked from commit 0c7e6b6676a1fc595e9b99e22d6c9cd00608c314)
2025-09-30 14:11:46 +08:00
hemai
5f1ff2f9a9 FIX: change AMS n3s ams_id & tray_id from 512 to 128
Jira: [STUDIO-13477]
Change-Id: I3844cb59df18220a22d8ff7524216b9fff2b6632
(cherry picked from commit 8c7b66d24b1e795c3070883f3f439cf160b38037)
2025-09-30 14:08:47 +08:00
hemai
d2fc250e5f FIX: change AMS n3s ams_id & tray_id from 512 to 128
Jira: [STUDIO-13477]
Change-Id: I3844cb59df18220a22d8ff7524216b9fff2b6632
(cherry picked from commit 8c7b66d24b1e795c3070883f3f439cf160b38037)
2025-09-30 14:07:07 +08:00
xin.zhang
a5c6450cc5 ENH: support command error dialog; support clean print error; support stop ams drying
JIRA: [STUDIO-12441] [STUDIO-13123] [STUDIO-12372]
Change-Id: I87170f1f51c1e24f6eee61deb07d06ff6b53a884
(cherry picked from commit 1ec5382f14ebf06d8f3ed128e377243665434ca6)
2025-09-30 11:27:16 +08:00
xin.zhang
0721078177 ENH: update humidity display for AMS-1
JIRA: [STUDIO-13195]
Change-Id: I7abcdf821b7ead2cf4a8605ecd95011e74f5dc6b
(cherry picked from commit 1c1d34ff7e3fea4492ba07e238ca171e28eb0a3b)
2025-09-30 11:19:59 +08:00
xin.zhang
2d215d75d2 ENH: use response to support the message; update the panel if SD state changed
jira: [STUDIO-12552]
Change-Id: I68048c6fa358253664adbf8fe637c6c0c95e1eb9
(cherry picked from commit 65bb25d80435c28bdaa1fe4445f7fc790f5de22f)
2025-09-30 11:19:52 +08:00
weiting.ji
91e27e8e95 FIX: Client crash when opening certain model or select certain item in the comparator dropdown menu
Jira: STUDIO-13491
Change-Id: I40e9cb406fa1b26da9a6527ff5b0bc68d9b10a52
(cherry picked from commit 11f520e44b0ee74abef3433d2b8fefcdd326cb26)
2025-09-30 11:19:23 +08:00
gunlock
a448cff1df Fixes #7211 where the CreateFilamentPresetDialog fails to show the printer list due to the dialog not resizing properly. This workaround sets the wxRESIZE_BORDER flag so the dialog can be resized to reveal the printer list.
(cherry picked from commit 3f066404903e5f13892c1f37c179a68479669e88)
2025-09-30 11:17:31 +08:00
Erwin Ried
c5956d6dff Update PrintOptionsDialog.cpp
(cherry picked from commit 3e0807716e61769265a434a15a07f70de57773b9)
2025-09-30 11:17:09 +08:00
Erwin Ried
0d26211688 Update StatusPanel.cpp
(cherry picked from commit bf8fa891587c80bd2bbc6562d683392a04a2d106)
2025-09-30 11:17:04 +08:00
weizhen.xie
04f0b96029 FIX:Fix the crash that occurred when importing G-code file
Jira:STUDIO-13408

(cherry picked from commit 3810f4edfe086b9500860e59baf35e5568b56977)
2025-09-30 11:02:32 +08:00
xin.zhang
55e3bd1a4d FIX: update the data on init
jira: [STUDIO-13453]
Change-Id: I5a3fed24b0eb0a6e7da7ceff3450da95f29fdaae
(cherry picked from commit 8057ee846c8dbb6d19006ccaaf56c9fabcb66d3f)
2025-09-30 10:51:03 +08:00
tao wang
28f5c3e952 ENH:support printer connection in farm mode
jira:[none]

Change-Id: I05a67e5ff508d21ed9aa1659147c510bd1700b10
(cherry picked from commit 0cf5ca920851735f946b5dd733472009f4dc17de)
2025-09-30 10:50:53 +08:00