Commit Graph

16946 Commits

Author SHA1 Message Date
hemai
6408cf04e1 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
43c7aa195e 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
c369c200f1 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
d6d720143e 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
4936503227 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
c117ec1a25 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
72948e1151 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
88d6299700 Update PrintOptionsDialog.cpp
(cherry picked from commit 3e0807716e61769265a434a15a07f70de57773b9)
2025-09-30 11:17:09 +08:00
Erwin Ried
63fecf07a1 Update StatusPanel.cpp
(cherry picked from commit bf8fa891587c80bd2bbc6562d683392a04a2d106)
2025-09-30 11:17:04 +08:00
weizhen.xie
4387601fed 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
95323f2692 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
848ce2f2f1 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
weiting.ji
f3f9693864 FIX: Client crash when opening 3mf file of older version
Jira: STUDIO-13381
Change-Id: I9065c215758d035cd6de3cc11519285663046bfb
(cherry picked from commit d73756c59729e5525b013d989c154678cf344fee)
2025-09-30 10:47:54 +08:00
weiting.ji
29a4450d8d FIX: Background process stuck after closing client
Jira: STUDIO-11596
Change-Id: I32fd92c504c16e04d5361d428d4cf5da2960548c
(cherry picked from commit fa435310a1082660dd1c9f7fbf815a396eca79a0)
2025-09-30 10:42:34 +08:00
songwei.li
004e4c0f91 FIX:The estimated flushing amount of consumables for multi-color printing is inaccurate.
change: Multiply the flush_volumes_matrix in the exported gcode by the coefficient and output the final value.
Also fixed the issue where the flush matrix page was limited to 900, but the Gcode output value could be greater than 900 (the product of the matrix and the multiplier was limited to 900 before storing the value)

jira: STUDIO-13332

Change-Id: I893f27bec206c3b9da3273241d1cd5f1883e55a9
(cherry picked from commit 8aa91cd86c8c75b3736c616bcfbed4872db9734c)
(cherry picked from commit 038fc1c18220cef8c269d272059afea503fb5d5b)
2025-09-30 10:40:09 +08:00
milk
9be0e099d9 ENH:Syncing print action text
jira:[STUDIO-11406]

Change-Id: I8ef48345ee57cc66868a05f9e468f857a66d4feb
(cherry picked from commit 0e9e4a2f32c0b3ce38eb7e9bf9a0d0bcd3e39e66)
2025-09-30 10:09:03 +08:00
hemai
55e478030d FIX: support external filament with multi-printer
Jira: [STUDIO-13091]
Change-Id: I1f4cb255520f7216c67fc94466e9aa95d88240bd
(cherry picked from commit 79ce3efc76f29df088f8cb4645aefc82fbf53036)
2025-09-30 09:42:30 +08:00
xin.zhang
6e0851a774 FIX: The value maybe string or int
JIRA: [STUDIO-13018]
Change-Id: I4af161431fb51e1e0234bc37de8346b45f3ca4b7
(cherry picked from commit 4e2934685033c352ea2c3baded585381c285a90d)
2025-09-30 09:41:45 +08:00
zhimin.zeng
93b806de5d FIX: The device page keeps sending cali commands
jira: none
Change-Id: I55a116e471e4d40c8033aaefd3b7e22e9ccaab06
(cherry picked from commit 21cbafd52a393960e5b7b84d6e5259c829aa50c5)
2025-09-30 09:34:34 +08:00
xin.zhang
a21ddfe635 FIX: correct the mac os version check
jira: [STUDIO-13291]
Change-Id: I70e1015f3bfd436ca021a1e98ec66a2f37d21ff1
(cherry picked from commit e4a3d23368659a5bface6cc7215ebacbbfe99dfc)
2025-09-30 09:34:26 +08:00
hemai
39313dc3b1 FIX: enbale multi-color external change assist when has AMS
Jira: [STUDIO-13367]

Change-Id: Ib77b7b75fbb139ceaa7076c6bbf616d011cf142b
(cherry picked from commit 688d8b15f816ab3612f3f230b6ea6a1dcc71f45a)
2025-09-30 09:34:02 +08:00
maosheng.wei
87756bddad ENH: Record the preset compatibile_printer field for cloning
Jira: STUDIO-12167

Change-Id: Iaf66bf48f892d32c77103ee7c8dbf3ccaabc2e09
(cherry picked from commit f4abad029e01c597b91bc14c60e6bb9a30f2d477)
2025-09-30 09:33:38 +08:00
xin.zhang
20661701a2 ENH: remove the unnecessary line
jira: [STUDIO-13300]
Change-Id: Icdcca33b350a07268dd8e7a8a1791599a7a4fad5
(cherry picked from commit 9a4e88e366c78eee3ea31339599f01f7552172cf)
2025-09-30 09:27:49 +08:00
xin.zhang
bfc342f6b3 FIX: correct the tool tip
jira: [STUDIO-13302]
Change-Id: I745e6d05f78fa4f025237f70c7af424cc9c204a0
(cherry picked from commit e2fa14270c8767e53e2c023ccfec203504f38822)
2025-09-30 09:26:34 +08:00
hemai
7914d75bff FIX: disable multi-color with ext when ams enable
Jira: [STUDIO-13290]
Change-Id: I36f83a90959ba759e0616afe7b515dbd716b1020
(cherry picked from commit 5a4ec1f3a4175a927c37cea1577e6b276daa0f3c)
2025-09-30 09:26:03 +08:00
weiting.ji
c8fc832f73 FIX: Sync button text modification
Jira: STUDIO-13031
Change-Id: I9007557f4f6f2909250460fc9d6f5d4c4756adc6
(cherry picked from commit c588c5aad60d6eb7bc2b59fd93cbbfbd5ed2849b)
2025-09-30 09:24:26 +08:00
milk
89f585ca5f FIX:Reset calibration picture when sdcard print
jira:[STUDIO-12656]

Change-Id: I3c96d88b50bb4638a0c094e5766fb3c6877f597e
(cherry picked from commit 5958ba55842557560e70772bcf1321000c5fbf2f)
2025-09-30 09:22:32 +08:00
milk
f9f2b58f67 FIX:Fix dev_name miss question
jira:[STUDIO-12655]

Change-Id: If74ca19675a11705b26f3042e5d01711ffed4e62
(cherry picked from commit 8e35dc81aec41e11ad0fbeac96caa54233bdb633)
2025-09-30 09:22:24 +08:00
haolin.tian
90b5d315cc ENH: delete useless function, delay start_device_subscribe after mqtt_connect called
jira: [STUDIO-13135]

Change-Id: Ibce80b043d08f6c1c7baa6611c3cfa2f0c85f2f5
(cherry picked from commit c2ff073525937fb571ea8d3bfae55231adaa691d)
2025-09-30 09:11:39 +08:00
chunmao.guo
3ca0030ed2 FIX: ScalableButton size
Change-Id: I944dc4fb96a58641aa8502233ffe87dedc128657
Jira: STUDIO-13262
(cherry picked from commit c78a697f0ee4a40009373cb560def12e4553fd40)
2025-09-29 23:57:56 +08:00
zhimin.zeng
89d7ad7dd4 FIX: Upgraded P1P to P1S shows up again as a P1P
jira: STUDIO-12944
Change-Id: If234cbd96cffa547e9cae47a71875efd1b097a25
(cherry picked from commit 2fa053dadef5750d1888743866ebca2867c85f7a)
2025-09-29 23:46:13 +08:00
zhimin.zeng
fcf4fac503 FIX: error wipe tower gcode
jira: STUDIO-13101
Change-Id: Ic1e2aa294c290e208074a6a65d6f80c705ab7dc6
(cherry picked from commit d4deb67dda0a6a92622f0126706110518b90a8bd)
2025-09-29 23:44:50 +08:00
zhimin.zeng
71c9d8d843 FIX: the layer time of PA line display nan
jira: STUDIO-12996
Change-Id: Ib03dc506bfdc8f7f2c0a8cff89ba6e2d4b784988
(cherry picked from commit b8e1be7b3cb9d2948fd2fe45c280b1ec3bcea525)
2025-09-29 23:40:40 +08:00
chunmao.guo
5487e65ddc FIX: DropDown render y position
Change-Id: Ic8962de615f36477c8a7ac62cee4261cd9c259e5
Jira: STUDIO-12904
(cherry picked from commit 725fc1dec273ac848c166896558104b9b8c2bde3)
2025-09-29 23:40:00 +08:00
milk
5b74af02f7 ENH:Add translation for on/off/auto
jira:[STUDIO-13113]

Change-Id: I6b7ec64c13c664b0a2ea01ccf29dd147a2f75f32
(cherry picked from commit c90e991f1f67a3047585532159c3ae0e74f986b5)
2025-09-29 23:39:55 +08:00
milk
043d3c9387 FIX:Change the note when ams empty
jira:[STUDIO-12764]

Change-Id: I3dc400184840edb099a62b5dbc0cddf6bc67cd08
(cherry picked from commit ab983c261b5438e611ae3978a93690fce61b3179)
2025-09-29 23:39:50 +08:00
milk
8a96da53c4 FIX:Adjuct the AI detection UI
jira:[STUDIO-13060][STUDIO-13059][STUDIO-13028]

Change-Id: Ibfb37b9e7f82956e1b6e8d5cf561e45dd078efde
(cherry picked from commit 8cf3c7a8600dfcfb022a8d8595a43ea63ac9ef9b)
2025-09-29 23:39:44 +08:00
xin.zhang
2cb059eb8b FIX: only enable this on windows, since there are freeze problems on mac platform
JIRA: [STUDIO-12929]
Change-Id: If793d72db63ba00f4a65f09c024d07fd5e7776c3
(cherry picked from commit 7054f18e2b26b562d336401980a0f54df2050f01)
2025-09-29 23:38:35 +08:00
Noisyfox
6a50b3d68b Ignore the index when accessing a scalar variable 2025-09-29 23:34:26 +08:00
Noisyfox
e3fde9c8dc Fix compile error 2025-09-29 23:19:53 +08:00
Noisyfox
ddb0910fad Change the worker to store the job using shared_ptr, so caller can still hold a reference to the job for other purpose 2025-09-29 23:15:15 +08:00
jiaxi.chen
06b51af690 FIX: dont change when choosing NO
jira: STUDIO-12279
Change-Id: I5b0a6da4938665d84dbb82e502d1d59df46c61ff
(cherry picked from commit 959d0dff91b14409e543f273191d904665c21c94)
2025-09-29 20:43:42 +08:00
xun.zhang
320b7e2fe7 FIX: potential cli crash caused by missing params
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1b61e44414118e40e421592649928664fdecf092
(cherry picked from commit 6deb3db25b7a7e4bc7a71d75f661b3f4b996d73f)
2025-09-29 20:43:20 +08:00
jiaxi.chen
abbce57e05 FIX: supports use filaments that aren't designated for this layer
jira: STUDIO-13216
Change-Id: I17272f45475eb281dfb0aa731b55363e0dde7427
(cherry picked from commit 209878dbc9d257675c8c638d141cebfc9858ed71)
2025-09-29 20:43:07 +08:00
hemai
4402615fc7 FIX: if has ams then disable multi-color external assist
Jira: [STUDIO-13222]
Change-Id: Ife9bf7ad0fa0d4688a4052dd0f90734dab95a623
(cherry picked from commit c030cc2ca31eb19e063597dbabf9fc320e153eec)
2025-09-29 20:42:24 +08:00
zhou.xu
1bb5e97d3d FIX:Optimize display of ImageDPIFrame
jira: STUDIO-12783
Change-Id: I65bb9f6d1f70f921717acdf1dd24ab1d6e936e80
(cherry picked from commit 83594b82e0a9917d9be3f8cc54c2aa14d0f6bc57)
2025-09-29 20:41:21 +08:00
chunmao.guo
639ae50afb FIX: filament list group problem
Change-Id: I0ab9590e88336a8f95285df5f346f45eebe8d32a
Jira: STUDIO-12522, STUDIO-12209
(cherry picked from commit efeb19a292a38e2f8a4d117b5bfceddd644e4ce0)
2025-09-29 20:41:15 +08:00
xun.zhang
270ebc2688 FIX: crash and wrong flush data in cli mode
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibaad369e4dc6d0307f709c1c6e543a7a985b0345
(cherry picked from commit 83a2c405e282a1fe39b1dbd637e480765b6b6551)
2025-09-29 20:41:07 +08:00
hemai
ab4506247c FIX: set multi-color with external label hiden in normal
Jira: [STUDIO-12520]

Change-Id: Ic7329c00bdc65820b26bc87f508b3adc91799c6c
(cherry picked from commit 2f7bfa883729f8c94a4d2f619de79bcf907ea487)
2025-09-29 20:40:03 +08:00
xun.zhang
7000f04666 FIX: display the minimum flush data
1. Use the minimum flush between nozzle volume and flush in datalist
2. Add a new param to decide the datalist to use

github:7445

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id87c98ca5069e7b328974d641d7a81dfbf9c50a0
(cherry picked from commit 2be29b784727330732170b5c2ff0ba9d5e79d82f)
2025-09-29 20:38:38 +08:00