Commit graph

330 commits

Author SHA1 Message Date
xin.zhang
b6cd98dfa1 FIX: update the AMS refresh check flag about N3S
jira: [STUDIO-11016]
Change-Id: Icbfc8d29e6b3fe5b61183796ce9976a655765264
(cherry picked from commit 1c62771c4c6c296aee536373c3c0dcc4b9c3422b)
2025-09-18 16:42:18 +08:00
xin.zhang
e268e5923d FIX: crash if the catched object becomes wild pointer
jira: [none]
Change-Id: I5082ab58f4a6c7177758efcd7ff66a9f73bd0efa
(cherry picked from commit b2256c828b45b1734dd9793752a54e22a98b073c)
2025-09-18 16:14:46 +08:00
xin.zhang
489543313c FIX: use wxMessageDialog as warning in MAC
jira: [STUDIO-10386]
Change-Id: Ic8cc6d09f2eba41ec8cfebf239eb6bd78dd3844a
(cherry picked from commit 1537f575927f8d0f0e2658f900296344deb6682c)
(cherry picked from commit a856c7cc62636a4897b0e473034579e223808a7b)
2025-09-18 15:22:56 +08:00
xin.zhang
2c365fba63 FIX: rebuild the TempInput logic
jira: [STUDIO-10386]
Change-Id: If7160dacafaa19d7056125961a59111ff63ea25b
(cherry picked from commit f078f6bfdc4bf2610f8c861132241ebdd933bb74)
(cherry picked from commit 1820ca6fc00f6b6d1250e3464ee05bd33cd244f5)
2025-09-18 15:22:55 +08:00
xin.zhang
a2ab9e41d8 FIX: the AMS refreshing problem
jira: [STUDIO-10643]
Change-Id: I6bd94f2e608b833e880033fdace236d465b9db38
(cherry picked from commit 99045ae070bb03641d1086993cc4ffaf51408730)
2025-09-18 14:01:55 +08:00
xin.zhang
9db67520c0 FIX: add hms action buttons
jira: [STUDIO-10823]
Change-Id: I751f0951df439a5265cc53f5679fa69b8d1c728a
(cherry picked from commit 0ed457207e2ec31cca276667af9c4ffa392f9843)
2025-09-18 11:06:57 +08:00
xin.zhang
8dfc0a4929 FIX: build failed
jira: [none]
Change-Id: I359f99fd02f7ccd33e333f9fe7f85e400bdfcd37
(cherry picked from commit e3fb2a4c65f96fafb9478902b28f286a400e5e39)
2025-09-18 10:19:06 +08:00
xin.zhang
8886fd5b64 FIX: add context translation
jira: [none]
Change-Id: Ie144a3a7894dae86a0721731a0357cb6f1b2631a
(cherry picked from commit 964458c65a9c6867600ebfadfc04fe2dd728ca78)
2025-09-18 10:18:54 +08:00
xin.zhang
ba5641b311 FIX: optimize the switching cancel
jira: [none]
Change-Id: I60f4e5bcbbe67e6c86793a651e8837a551a762a3
(cherry picked from commit 27c6d46dc20003111bda97c516bf9bf04730d7e6)
2025-09-18 10:18:42 +08:00
xin.zhang
5550d23354 FIX: update the info ready check
jira: [STUDIO-10771] [Studio-10608]
Change-Id: I6af3409ebdc7c173b2cfcd6745854e928753dff1
(cherry picked from commit 04e45e4a6e4e4fbc2b3664d29a17b508b7b58f24)
2025-09-17 23:30:39 +08:00
xin.zhang
198c78cac9 FIX: the DPI issue
jira: [STUDIO-9238]
Change-Id: I8ab364402358b8b21e6768ecdd0da9cfe6541777
(cherry picked from commit 6dda5f3e523e79485cd0f10c333849fbaa3e0851)
2025-09-17 23:07:08 +08:00
xin.zhang
03ea48c6b4 FIX: update the extruder image in status panel
jira: [STUDIO-10732]
Change-Id: I5437c4ef1538f0022f97c7ef7fb40ec2242328ed
(cherry picked from commit f5c49c89a80e508a442440218b068446d1e9e797)
2025-09-17 23:06:54 +08:00
xin.zhang
740f7eabb1 FIX: use dialog instead of popup window
jira: [STUDIO-10692]
Change-Id: I85e8da120946fc6ff845c9b88d4f1594e313652b
(cherry picked from commit 7115c1ca177e98c2931517d748ce4d63d3a067da)
2025-09-17 21:53:27 +08:00
xun.zhang
9cb261cbf2 ENH: add some change for translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I58ded926c8525e261bb1c7518562c9276afc1409
(cherry picked from commit 1a240e5d14e173cce2b9cb99a56e4103729cc9d7)
2025-09-17 17:52:51 +08:00
xin.zhang
b1168c2b6e FIX: support open door check
jira: [STUDIO-9095]
Change-Id: I2e033641724beb15f649b04950c5de51be8722df
(cherry picked from commit d504010ee0137c4ecf55b99b730f76692ef76390)
2025-09-17 15:49:30 +08:00
xin.zhang
76b54ffffc FIX: The HMS is internal
jira: [STUDIO-10547]
Change-Id: If40e9f3f9a0c9fa22d1e9b25ceef4284a8c61b10
(cherry picked from commit e399f136342cb26333da2afb3fa4aa58f99921e5)
2025-09-17 15:49:03 +08:00
xin.zhang
73810199d6 FIX: add switching status panel
jira: [STUDIO-10272]
Change-Id: I0bf0c45a3176d132d246908255f1984b50fe75f9
(cherry picked from commit 3085175fc6606b559b2719b53f2fc195aa0f6260)
2025-09-17 15:04:40 +08:00
zhimin.zeng
44624274f5 FIX: Cali thumbnails distinguish left and right nozzle
jira: STUDIO-9747
Change-Id: Ie28901288c166cdcd7403311cb467b72453c2ca4
(cherry picked from commit 0b3cd958d5b573276488c477540b122f116099ab)
2025-09-17 14:17:13 +08:00
xin.zhang
ae7438f249 FIX: update the fan panel
jira: [STUDIO-10499]
Change-Id: I5b760946229ea1cb24802ddddce250cc276986d6
(cherry picked from commit 418370ca5cde3a174ed7a9404413f61a62e214e9)
2025-09-17 11:34:54 +08:00
xin.zhang
b50df3588a FIX: add translation flag
jira: [STUDIO-9148]
Change-Id: Idd50664e0f9c55fe5e8d7e0a840948fd82dafc15
(cherry picked from commit b79f6243474e5d96cf51719001564d38abf0f5a7)
2025-09-17 11:01:19 +08:00
xin.zhang
360eb8e190 FIX: fix the APPLE macro
jira: [none]
Change-Id: Ibcdccbf987776f691bdae8a1ae14e817ccbd90dd
(cherry picked from commit a8b7870fe2088138c3c28e2336f58c03e09e54ad)
2025-09-17 09:56:58 +08:00
xin.zhang
1fdc6e5dac FIX: prevent the dialog in macOS
jira: [STUDIO-10386]
Change-Id: I19c5df3c2c110979d57190c9219f76f6f6911f85
(cherry picked from commit d4d4b76ce54b030de255d7382a831674b8c79817)
2025-09-17 09:48:33 +08:00
xin.zhang
b368483aaa FIX: champer_switch_head_dlg->ShowModal() may wake up another wxCUSTOMEVT_SET_TEMP_FINISH, break the chain
jira: [STUDIO-10386]
Change-Id: I2debe9eebf455e4adbe9161945ce84508f594f9d
(cherry picked from commit 26881072a44d755335931a3f800bc7548744acc5)
2025-09-17 09:29:40 +08:00
xin.zhang
696485fe2b FIX: the print task image is not refreshed
jira: [STUDIO-10329]
Change-Id: I44a55c1259ba35805569622f4f45aa4f2b64f16d
(cherry picked from commit 4621bcbe548069cb3c4bcf45d52484faa03d0d18)
2025-09-16 23:00:30 +08:00
xin.zhang
7b4ec54afa FIX: modify the nozzle temp control location
jira: [STUDIO-10303]
Change-Id: I8147d3331b3073e7e30881c4eab95609303eb01b
(cherry picked from commit 83b98fbfe7b4565d1433bad2e147c852708389b3)
2025-09-16 22:58:01 +08:00
xin.zhang
6d04854a98 FIX: add images for filament load steps
jira: [STUDIO-9850]
Change-Id: Ie3f3dfbda3d7bc2e1e8c8bab4c9a5f2168536e53
(cherry picked from commit 89efa6cb272e11a0ee79f9713b537ff68009e44f)
2025-09-16 21:48:30 +08:00
xin.zhang
0e1a930e10 FIX: the current temp has been set twice
jira: [none]
Change-Id: I46f313e8f3bee49be708feb4dc6475a60ab1cea6
(cherry picked from commit 091430018192e530dbfe52677383b90ece167dc6)
2025-09-16 21:48:10 +08:00
xin.zhang
319e93ba4d FIX: try to reduce page fault while idling
jira: [none]
Change-Id: I563cbf4a8ba8a4ae1e5b1b1f735753d3aef23e16
(cherry picked from commit ed1e9678c351dc037f2e3cc7ea0e19d46731699c)
2025-09-16 21:21:40 +08:00
xin.zhang
170deadbda FIX: the dpi changed display of bed control
jira: [STUDIO-10067]
Change-Id: I84a2763686b004cfb27ddb567b0f6a44577924b0
(cherry picked from commit 36deba9d131b9433998e3fd1c2f96f785d6a6e0a)
2025-09-16 15:38:42 +08:00
xin.zhang
6c4479d0ea FIX: update some scale while DPI changed
jira: [STUDIO-10067]
Change-Id: Icb8480d01bdf20a17c699746677d54fc8c8680a6
(cherry picked from commit 677ec9e364a47b944b3ebee5519aea4c35439af1)
2025-09-16 14:49:15 +08:00
xin.zhang
c1fe23d824 FIX: update the extruder panel when object changed
jira: [STUDIO-10050]
Change-Id: I4eb12f3cdecf2a099a9b0773c73a48a8aa3713b6
(cherry picked from commit ca85009945010d51adf28c1722bf62385cc5917e)
2025-09-16 14:49:06 +08:00
Noisyfox
2375ab860a Merge remote-tracking branch 'upstream/main' into dev/h2d
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
2025-09-16 14:46:40 +08:00
xin.zhang
229c87df16 FIX: disable the switch nozzle if not connected
jira: [STUDIO-10072]
Change-Id: I2f705af4cd6f50770c9c0019287855ef90518d18
(cherry picked from commit eae81e9d95059d6fef7dc0ee9e7c38f57e57e902)
2025-09-12 17:25:48 +08:00
xin.zhang
4887de8cbe FIX: move the state record to higher coding level
jira: [STUDIO-10050]
Change-Id: I1e0721c80492688c66e700979461ac0bdd396ef4
(cherry picked from commit 371ef9c554dff57e0685519b1c0931c8999c5841)
2025-09-10 16:36:40 +08:00
xin.zhang
21571e6eba FIX: enlarge the scroll rate
jira: [STUDIO-9924]
Change-Id: Ic6cabccf3febc484bdd05b10cb6dfa1b0b78d710
(cherry picked from commit a07b45ba854813a1b776bd5e66130093d605a82b)
2025-09-10 15:28:32 +08:00
xin.zhang
ae267aeca5 FIX: update the check logic
jira: [STUDIO-9715]
Change-Id: I38fcc7fb45c34b2ff675807b7dcbcd1aaa20449c
(cherry picked from commit 52cfb30119ff324b202ab768ff01cf883a24eaed)
2025-09-10 14:43:35 +08:00
tao wang
8e78915cd2 ENH:O1D hot bed temperature no longer checks voltage
jira:[STUDIO-9088]

Change-Id: Ia11154705770919694c58b908b3886fe3feb432a
(cherry picked from commit 7e16329d24c9e31ff5fc99eb74ab4b4b9a5e2b13)
2025-09-10 12:37:36 +08:00
xin.zhang
2878eb50f1 FIX: add a warning dialog
jira: [STUDIO-9715]
Change-Id: I376235de8a8569e63530eca914dc977a670a769c
(cherry picked from commit 4f1ad8016e11d5440127b45c48854c1ed2cf75aa)
2025-09-10 09:22:19 +08:00
xin.zhang
c2a91c613d FIX: Can do switch while printing pause
jira: [STUDIO-9789]
Change-Id: I8d5d2195adcd2cd048d95303f0562f24b696e34e
(cherry picked from commit f3777db02d1ae61ff2ad996bf1dbb6c3aba8a1c3)
2025-09-10 09:21:38 +08:00
tao wang
919606110c ENH:optimize some layouts at different resolutions
jira:[STUDIO-9807]

Change-Id: I3d432734a6b3f494ed79d816b754d6d1cbcd3a0f
(cherry picked from commit d134b66446e5a9561152b6545fe79d19a70dddfe)
2025-09-10 09:02:43 +08:00
xin.zhang
0803186472 FIX: update dark mode text color
jira: [STUDIO-9781]
Change-Id: Ief8c0d820beb698ae19057fba4ad21ef3278f6a9
(cherry picked from commit 20d62fe504e772d2e41d7a86989dc22faba10c15)
2025-09-10 07:29:16 +08:00
xin.zhang
34e06c2b4f FIX: the load filament steps shown fault
jira: [STUDIO-9684]
Change-Id: Ic238993302156788200482ed34e3092b9ab94dfd
(cherry picked from commit f8b4949353fbb4cead3249d5e8f6beb06859164c)
2025-09-10 07:27:48 +08:00
xin.zhang
f97c9e3e7d FIX: update the display of switch extruder
jira: [STUDIO-9746] [STUDIO-9359]
Change-Id: I12ce46c935883e5dba709576b944275af547d3dd
(cherry picked from commit 80b5e4f4d637d1daaebdc784ef2d8eb5a8e25193)
2025-09-09 17:06:38 +08:00
Kunlong Ma
9e16287b21 FIX: hide fan when device not in fdm
JIRA: none

Change-Id: I14a6e01b4e0950ca1bc3c805fe00313cfd7caf06
(cherry picked from commit c12b4f13911a7f6057eced54dba9e41cf75985ea)
2025-09-09 16:52:44 +08:00
tao wang
8d5ee46a3c ENH:reset the filament loading status after change printer
jira:[none]

Change-Id: Idc25491752ab979cf96962345f0c28b7b81ad4cc
(cherry picked from commit ef09f8ee91f9ea05e97e496e90047865927782d1)
2025-09-09 16:52:22 +08:00
xin.zhang
ed3175f7a0 FIX: disable the extruder switch while printing
jira: [STUDIO-9648]
Change-Id: I027bf7f72b77c35422b2d904f3b0839dcbe3669e
(cherry picked from commit 27d5ca4ac6a8eb8aa938d4537bb2902c21a9cd82)
2025-09-09 15:33:57 +08:00
xin.zhang
28439b3650 FIX: the dialog continues popup
jira: [STUDIO-9680]
Change-Id: I9c12db6b9b1223fc611f980529814a71249b4080
(cherry picked from commit 29bbc0aa413872c11af50ecd8c8b3dbe20db215a)
2025-09-09 14:41:23 +08:00
xin.zhang
f8cd89fdee FIX: support internal HMS
jira: [STUDIO-9617]
Change-Id: I5c073966244171a85f43e4bb014b02c00886fef3
(cherry picked from commit d5a8675badce0400dde4e3a2e9956c65d8878cf2)
2025-09-09 11:24:16 +08:00
tao wang
35bc6da4bb ENH:folding filament loading area
jira:[STUDIO-9598]

Change-Id: If5c1bd12aa3307f0bda640361352f079a1851b91
(cherry picked from commit ff4fc92c6cdde91b2d078109be0f2b3ace2cce89)
2025-09-09 11:07:22 +08:00
tao wang
522a8b63d1 ENH:disable switching extruders when printing
jira:[STUDIO-9624]

Change-Id: I75322fae98d8e42b9ee9a9d85d60be19a1a7686c
(cherry picked from commit 3060a8606a39a09fd7d9f785788d5424c19f8d08)
2025-09-09 11:03:18 +08:00