Commit Graph

106 Commits

Author SHA1 Message Date
yongfang.bian
895d155e1b FIX:clear wxwidgets asset
jira: nojia
Change-Id: I8ba2849afa07bc162a55b326c3d9a45150243ac3
(cherry picked from commit 96ba14c86d3cf180eeb585185d31bcb5d5db7415)
2025-09-30 14:34:08 +08:00
xin.zhang
62b1d05e53 FIX: the encoding of filament check_ams_filament_valid
jira: [STUDIO-12251]
Change-Id: Idc3d23dce67d3e835f15c47984fdd68041371d61
(cherry picked from commit 42b15b4d41a099c5f1aca9dd59ac592aafba0b43)
2025-09-24 11:14:42 +08:00
zhou.xu
2422ad8013 FIX:WxColour (0x00AE42) represents bgr input, incorrect use
jira: STUDIO-12347
Change-Id: If03e23f2ee7cbb5dcb124453fb0a1ea67c3633a0
(cherry picked from commit 8a22fab6d73fe2694b5006712d5e72619ddea51c)
2025-09-24 10:40:45 +08:00
zhimin.zeng
b38145a291 ENH: add filament_printable and delete unprintable and printable list
jira: none

Change-Id: I643ab11831ceac1fe0793510f64b288cbd16415a
(cherry picked from commit 3dd5a601547485bfcc4188727343a52c30bb6a73)
2025-09-21 13:48:08 +08:00
tao wang
19372977d1 NEW:add pre print checker
jira:[none]

Change-Id: Ic1469d30dff30e1eba92d8bfacf58d0f0b789157
(cherry picked from commit 8cfa735c6cac432a2b97dea7703e810f8eef6d04)
2025-09-21 13:48:03 +08:00
zhimin.zeng
ccb6d7df3f FIX: cali crash when using tpu in left extruder
jira: STUDIO-11535
Change-Id: I1f979346748210c9af16931fce107efb8f9e4fd7
(cherry picked from commit b9a040f2edfd3118d84ea565715666b0e6090a68)
2025-09-21 13:47:59 +08:00
xun.zhang
0e921f02d7 ENH: refine check logic for filament mix printing
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I199462cee6284e13e58f829b7972dd3124bfc385
(cherry picked from commit 22834b23586d2230e94e9dffd8b09146e5342246)
2025-09-21 13:47:58 +08:00
zhimin.zeng
9d707c8b54 FIX: fix the error display for ext slot
jira: none
Change-Id: I940554e6b1a5c8c609561670db79948c9efed63d
(cherry picked from commit 72b5ab7ee4f59287dd1888c1c4a1f86466fc1afe)
2025-09-20 15:31:33 +08:00
zhimin.zeng
e1a46aa398 ENH: Updated calibration UI for single-extruder printer
jira: none

Change-Id: I4e2d97f38699b13e2bced8f6a37c952f7903aa27
(cherry picked from commit 2e3a5e8ca71e3e9426412f8bd07b916f6be45aed)
2025-09-20 15:31:26 +08:00
zhimin.zeng
b6c726f39b FIX: modify some text
jira: none
Change-Id: If3f90adda34bc3088f7a43ccf294d82c14180263
(cherry picked from commit 5b056ee0aea62f53688574b06b9424d140e69fa5)
2025-09-18 16:44:34 +08:00
xin.zhang
051f8b1737 FIX: move network hold to MainFrame
jira: [STUDIO-10994]
Change-Id: I2c30ba3b0f17d52079332634a9a2dd138859e083
(cherry picked from commit 506e82cb02a79d97a30effde53fe85c7d278858c)
2025-09-18 16:22:57 +08:00
zhimin.zeng
d0fe52fe8b FIX: The original data of combox is not cleared during initialization
jira: STUDIO-11005
Change-Id: Id5b7259b517a515c2f641ce32998f09e182902ff
(cherry picked from commit ad1f6bdca48fd45ea7cedac15518a5ebe73ba386)
2025-09-18 16:20:26 +08:00
zhimin.zeng
1b04d10002 FIX: the pa profile name cannot be repeated when edit k value
jira: STUDIO-10992
Change-Id: I50d61e9581e188a10a4f804df163b3d50eb7caa0
(cherry picked from commit 431925adf0749faafeaf46ac0b8d60c6d4e5972a)
2025-09-18 16:17:58 +08:00
zhimin.zeng
ac82df15b8 FIX: show message dialog when the machine's nozzle in unknown
jira: none
Change-Id: Ic9b0e668c5e8427df76503731865d1b3de8568c4
(cherry picked from commit d38cbada3e311470594615ee714b51d47a51c54f)
2025-09-18 16:04:52 +08:00
zhimin.zeng
9c0627d2df FIX: add show status for cali when storage is not available
jira: STUDIO-10865
Change-Id: Ibc4d15e0f8d32694d389c68fa300b6ed95030818
(cherry picked from commit 48e2efdc2fdd43ad852d7f1ffc0a11af0714bc14)
2025-09-18 16:04:46 +08:00
zhimin.zeng
f48ac2bafc ENH: add sync status for sync button
jira: STUDIO-10676
Change-Id: Ia3afd0a1f09fa3f27b1f04c84ec9a427f74edf31
(cherry picked from commit d707fd04c3ebdb9fe6787b90cd661b4b121762c3)
2025-09-18 11:07:23 +08:00
zhimin.zeng
c6162067db FIX: Calibration limit left and right must be the same diameter
jira: none
Change-Id: I3ea572184a122abeaee882742eda8b75fb21c30d
(cherry picked from commit 79165e1ad484f18ab376ce5451a58e729c2b3100)
2025-09-18 11:07:18 +08:00
zhimin.zeng
122c35860e FIX: cali should not send job in lan mode
jira: STUDIO-10625
Change-Id: I89227b9f3c06416abe7895fa3edb47358891d573
(cherry picked from commit 6029e4bc5e90094d6dbce08dbb4f47757453dad0)
2025-09-18 10:42:49 +08:00
zhimin.zeng
99ebf305d5 FIX: N3S should only show one slot
and fix crash on calipresetpage
jira: STUDIO-10669

Change-Id: I93aecdcc360d47baa72ef08af711f3d06206d5e2
(cherry picked from commit 926cfb14d28a196082b2437ace182e960c0c66c2)
2025-09-17 23:09:23 +08:00
tao wang
7723fc5c4b ENH:support checking blacklists for specified models
jira:[none]

Change-Id: Icd88c478a04e8743cdaaa8d670f238b534e40283
(cherry picked from commit c3643fdec9c0fcbceeba71f9ef5cd2de0cf7957d)
2025-09-17 17:38:52 +08:00
tao wang
a73153e5ed ENH:fixed incorrect prompt for glow material
jira:[STUDIO-10574]

Change-Id: I4475eb527ffbc8cc6d72405445552971d062b45e
(cherry picked from commit 01918affdfb69879f86ca47fe2f1ab8af5e1311b)
2025-09-17 17:09:21 +08:00
zhimin.zeng
af37dd6524 FIX: add log for cali_sync_button
jira: none
Change-Id: Id6f7030ec8476e8dc209b4e7bb88ec4531f2013a
(cherry picked from commit ebc30a7769b84b507514ff11d270104848e4b450)
2025-09-17 15:49:03 +08:00
tao wang
5f33cc87b8 NEW:added inspection of pla-glow material
jira:[none]

Change-Id: I1a62992e24665b83f54981e59edc1ba1fcda9a8a
(cherry picked from commit fa2fc22f3e648c0f0f485d1a7e701658693da457)
2025-09-17 11:16:10 +08:00
zhimin.zeng
fa18b06b71 FIX: H2D only displays supported heated beds on cali page
jira: STUDIO-10287  STUDIO-10433
Change-Id: Ief38584243a0ee836f9ba4541d2bb9eaa6343c1c
(cherry picked from commit 6a7d281d0df32d4232ba4da7260a696dc4a84594)
2025-09-17 10:03:44 +08:00
zhimin.zeng
050279c707 FIX: fix some size error on dpi changed
jira: TUDIO-10053
Change-Id: Icd93aa0dd9a2c693d7b957f9ede5c6dafc415352
(cherry picked from commit ce65273dc0fc9bc3f23dc54b01e4dcc92d92483c)
2025-09-16 21:21:40 +08:00
zhimin.zeng
7d76f3a6d9 FIX: the extruder_id of cali is incorrect with N3S
jira: STUDIO-9888
Change-Id: I25c4a436e322923a247d1c6d3c3de9f0319bb420
(cherry picked from commit 13355ca669229839e8c8943f80cc50533256d0d7)
2025-09-10 11:01:27 +08:00
zhimin.zeng
5ddd2203a9 FIX: fix some translation and style issues
jira: STUDIO-9777 & STUDIO-9726 & STUDIO-9717 & STUDIO-9720
Change-Id: I05e6df6bb1416988a1862fc589058241d5344a58
(cherry picked from commit d833ab7d48729b527748662872df1ec33567b5ab)
2025-09-10 07:25:19 +08:00
zhimin.zeng
d3953f2284 FIX: fix crash when cannot find preset
jira: STUDIO-9422
Change-Id: If81e1ac9379ccbc4b40cbda5cf8cb876ea230173
(cherry picked from commit 758d37d0807288cf63fa2b7487a65d7097b94e8e)
2025-09-07 00:12:32 +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
zhimin.zeng
3d3ed4deae ENH: add sync button for cali preset page
and modify some UI part
jira: none

Change-Id: I9462a10adb7017a7038e5cd7e30cf393b63ae77b
(cherry picked from commit da68a52247c3a963b9d5df339da8f80ead617839)
2025-09-06 23:38:15 +08:00
tao wang
562b07946a ENH:change SD card to external storage
jira:[none ]

Change-Id: Ia8fb38151f75433344a085196728752d2fe6f159
(cherry picked from commit 6c7b61fcd8aefd9ad9da56da8b55e0c06865a677)
2025-09-05 19:48:50 +08:00
zhimin.zeng
d06fce0579 ENH: add printable check before cali
jira: 8816
Change-Id: I7df5676ecc80c27b516f47efe00ac40d04a4a5c9
(cherry picked from commit 13a4edc97c5ba0fc5f8a0a7263608597ce923548)
2025-08-28 15:22:39 +08:00
lane.wei
1b060b1b24 FIX: cali: fix the 3mf wrong issue when cali for multi-extruder
jira: no-jira
Change-Id: I352e4dd499f4e4dd22cdc21f3f62428a0baa5bfb
(cherry picked from commit f9cd3dd8764ab551c2aa85cdb7383b19bc345f36)
2025-08-26 20:27:08 +08:00
zhimin.zeng
b35c1dd267 FIX: 1. the status of ams item is not correct
2. fix the status cali button of stat page is sometimes incorrect
3. when the nozzle volume type is not the same as printer, prompt user to sync
4. fix the incorrect nozzle volume type of cali preset page
jira: STUDIO-8856 STUDIO-8832

Change-Id: I83569f41533681b3d2f68d7b86be68955bd957f1
(cherry picked from commit 9dffa8d00281e06b24c29d818064e1c55418333d)
2025-08-24 23:18:29 +08:00
zhimin.zeng
8fb986b6ad FIX: modify the name of high flow
jira: none
Change-Id: Icd1a0ac91e957fc38a6f072b1bb3af0c97be398e
(cherry picked from commit ea0691f092755d7e68db3ecf8b46b0e86a8fadb2)
2025-08-24 23:18:28 +08:00
zhimin.zeng
db37d5e30f FIX: modify for cali
1. add repeat pa name check
2. display tray icon in save page
3. incorrect extruder id for left virtual slot
4. fix crash when enter save page
jira:none

Change-Id: Iae00788094d182ae84fff2aa71fedbb35ea938c6
(cherry picked from commit be256c0a6dcdcd29a3fc97edf55435bb65858f1c)
2025-08-24 23:18:27 +08:00
tao wang
180edd3fa4 NEW:support new nozzle and extder data
jira:[new nozzle data]

Change-Id: Ief37b42794ce1469163fcd8227431ec77957508e
(cherry picked from commit db8ae4ccb3069347e1303de104302357bc352754)
2025-08-24 23:18:27 +08:00
Noisyfox
24a694f12a Fix NPE 2025-08-24 23:18:24 +08:00
zhimin.zeng
2f000bacf8 ENH: add tpu check for send print and cali
jira: 8234
Change-Id: I5706071d900079477abc9558461811a8d85fb0ab
(cherry picked from commit f0d2ad3dbe2e29548a8b3621a863cd38b543b6b4)
2025-08-24 23:18:17 +08:00
zhimin.zeng
af59fba6d8 FIX: fix ui display problem
jira: STUDIO-8143 STUDIO-8142
Change-Id: I50abb78f9585378d3ef7278377dfb35d5db6189d
(cherry picked from commit 00a6e17c6c21e741f8427f6841047fe49e6330cf)
2025-08-24 23:18:16 +08:00
zhimin.zeng
a9fe07b35b FIX: fix flow ratio calib bug for single extruder printer
2. modify the filament_flow_ratio to nullable
jira:none

Change-Id: I3f0569ee643cfe9473c6029ca0e04f4b80c8332e
(cherry picked from commit ed61d1d31bdc79f064567deacf35e05bd123880d)
2025-08-24 23:18:13 +08:00
zhimin.zeng
5baa59fe6c ENH: flow_ratio cali support multi_extuder
jira: none
Change-Id: I03399040a772043d3d20116b0588fd04e0725be1
(cherry picked from commit 38b3c32b6ae2ca63e815623144cb4c2a9c194977)
2025-08-24 23:18:13 +08:00
hang.xu
e5a2108dd5 FIX: Parse virtual slot info
jira: STUDIO-7724, STUDIO-7725

Change-Id: Id9181511b7503787fe06403be6ecb782d78cb21e
(cherry picked from commit 286eca79c2c0824522f0917123c9315f8df65dee)
2025-08-24 23:18:13 +08:00
Noisyfox
6b3e8ea34b Fix build 2025-08-24 23:18:12 +08:00
zhimin.zeng
aa3f116c03 FIX: modify for virtual slot when multi_extruder
jira: none
Change-Id: Ic7284018ecb44e24536788b05dba572b96460e66
(cherry picked from commit 52e890fba1584bf9687a24ee46890c00f531e383)
2025-08-24 23:18:11 +08:00
zhimin.zeng
89ee40ab0a ENH: calib support multi_extruder(UI part)
jira: none
Change-Id: I3009c2f8b601dc078cfed787dc3531fc1d4848d6
(cherry picked from commit 11f61abefaca6f0810e76266e50729432a3aa15e)
2025-08-24 23:18:11 +08:00
tao wang
068eb194d1 NEW:support new ext slot mapping
jira:[support new mapping]

Change-Id: Iaf88f7bd57177df772a926ad162bd3b5a141327a
(cherry picked from commit 3b93bd2dd305026457e9f63ca3faeb153b59c9a5)
2025-08-24 23:18:00 +08:00
Alexandre Folle de Menezes
f54c73e2a1 Standard units don't need translation, part 2 (#9974)
* Revert unit change made by mistake, and fix some unit translations

* Fix the declaration of untranslated Unicode strings
2025-07-17 09:48:29 +08:00
Noisyfox
d213e7a2e6 Merge branch 'main' into dev/bbl-network-upd 2025-06-25 08:49:55 +08:00
Alexandre Folle de Menezes
01d52624e7 Standard units don't need translation (#9965) 2025-06-22 15:10:40 +08:00