Commit Graph

315 Commits

Author SHA1 Message Date
xin.zhang
8836e8efa5 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
8236294cee 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
7ac2d5bbab 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
372a39f771 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
e5cb3f48bf 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
3c19f58d64 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
f09611ad80 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
73339ca392 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
56a5417713 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
99e1468b57 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
bb2afd5e08 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
968aea0480 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
39f641abb4 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
51c5a3304d 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
03c781c844 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
a6d8b794d6 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
3f2dad133f 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
4d787260ba 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
bc29e9b657 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
723177d25a 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
e0cb3e6065 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
a594846bd0 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
4ec211fc0b 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
a6862c2eaf 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
ba5f6ed4b3 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
a869802836 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
360d150cc8 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
1226a6a489 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
b2db417d55 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
3e7d39f441 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
b385b5136a 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
9401dede98 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
e0f4646d78 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
745f27dd5b 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
47561ece6f 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
xin.zhang
e41bfcb6d7 FIX: the temper icon is not visible
jira: [STUDIO-9574]
Change-Id: Ia42aa20eb085807c753495acb7f046056081df9d
(cherry picked from commit 0ba1166e79f8c7e3d5a31b1d6c7a10659ae28145)
2025-09-09 10:48:58 +08:00
xin.zhang
222921caec FIX: update HMS to support multi-type machines
jira: [STUDIO-9582]
Change-Id: I5ad4083d666db4237d355ac8bd8160afb8e8a35f
(cherry picked from commit 954a27016953bcf4f07b2a3e14ac1f5faf68c644)
2025-09-09 10:46:37 +08:00
tao wang
742ca93dd5 FIX:fixed SD card printing mapping issue
jira:[none]

Change-Id: I809a306701d60b9d9a069be70b11ae707e3c3544
(cherry picked from commit 29acfabeab379d13b4d4fe6afc8600bc35dc6e64)
2025-09-07 23:26:48 +08:00
tao wang
b813ecf445 ENH:optimize device page lag
jira:[none]

Change-Id: I0f6f1b257922d0e25152df9d42814551fa4a89ae
(cherry picked from commit 570751668e120b92953593c38bf2469474e98d8f)
2025-09-07 22:50:48 +08:00
tao wang
5f077d1629 ENH:allow RFID for all AMS
Change-Id: Idb0b2eb71307748f3448f9746696cac946345df7
(cherry picked from commit ae5df57d385d7170e9c7230d9deca32e9d24dfb6)
2025-09-07 18:58:57 +08:00
xin.zhang
2c10d2ae88 FIX: support set temp to 65 for some devices
jira: [STUDIO-9412]
Change-Id: Ia19a05477d4b52b65afdbbab7b6f841caa15089c
(cherry picked from commit 067966e7046b642ff98512d16d49329c1f277a58)
2025-09-07 00:17:12 +08:00
zhimin.zeng
08b3f7a4be FIX: Calibration adaptation encryption
jira: none
Change-Id: Ie42da224ca02261b0c32262be895c215878b7921
(cherry picked from commit 06df4c86ce7670b1d3b03ddf08b6a6ae3f32f73b)
2025-09-07 00:17:04 +08:00
xin.zhang
33c49c4d64 FIX: support set temp to 65 for some devices
jira: [STUDIO-9412]
Change-Id: I530a8c18ae4b4133526b3e9d91153a7b26512f38
(cherry picked from commit c23f1233db2be6475a434de575fe93c9c08fae75)
2025-09-07 00:16:47 +08:00
zhimin.zeng
5e11c465cb FIX: modify cali text and picture
jira: STUDIO-8778 STUDIO-8824
Change-Id: Iecb0a52a100c3f0765e5eda07e0ed50226490e42
(cherry picked from commit 16791c72d62eabef96011ddc117b329385c5aa68)
2025-09-07 00:12:26 +08:00
tao wang
aeabe97bd9 FIX:fixed the error in the total number of steps when loading
jira:[STUDIO-9169]

Change-Id: I62e61f9ca01b4d04b0ef204df1694d8d0fbc06b2
(cherry picked from commit 2b1f8887ef3ec4e7d1b9dbbd10baeebd6cda7638)
2025-09-06 23:57:25 +08:00
xin.zhang
ce51ccb8db FIX: there are no tempature for R extruder
jira: [STUDIO-9340]
Change-Id: I42b63c05d1c37531e8611648d31613b6ef2556a8
(cherry picked from commit e50901b616bdddcb016226e5ae071d951df571ba)
2025-09-06 23:16:41 +08:00
tao wang
d5cc9763ec ENH:set the max nozzle temper using config file
jira:[STUDIO-9307]

Change-Id: I5e45fa584a6949c77abf60894ea87b4de4ab7fce
(cherry picked from commit 1b53d6d8ccb57b560394e79b8cc4de3fe79fd165)
2025-09-06 23:16:34 +08:00
xin.zhang
4aefef157b FIX:the extruder status display fault while has filament
jira: [STUDIO-9154]
Change-Id: Iadaa5479eb9770c795f2ebc45c8e5305c2c5640b
(cherry picked from commit 27c99677edee337bdda8b947508ff0d586eb1493)
2025-09-06 21:37:06 +08:00
xin.zhang
7b11a60b88 FIX:GUI error about nozzle temperature in device status page
jira:[STUDIO-9147]

Change-Id: I5148097418376e4cd0f0e1fbaaa5f25205f35e6e
(cherry picked from commit 99722056d72ece6338e7e3a076b73a47c874d71a)
2025-09-06 21:35:51 +08:00
tao wang
2b30b1b13b FIX:fixed the display issue of multiple AMS
jira:[for ams]

Change-Id: Icb8ce708b0e65870d627dfbe8932e012fc36c6f9
(cherry picked from commit 2cdfc21b93e37b92deabb3ab8e7b39de2578f0b2)
(cherry picked from commit afbf3cf1976623c9a443f3471ec7ddcfb737d031)
2025-09-06 21:35:18 +08:00