Commit graph

27352 commits

Author SHA1 Message Date
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
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
shsst
4c450df0df ENH:[Process/Filament] Modify filament_max_volumetric_speed of abs asa pc Profile Edited by shsst
Change-Id: Ifabfa40ddd19dc4759436a7408873d044161e27f
(cherry picked from commit 18f76c18b67aea8e99b1d29be9b57b2562810a65)
2025-09-30 11:15:14 +08:00
shsst
968be632a7 ENH:[Process/Filament] Modify the volumetric flow rate and retraction parameters of H2D models PLA Basic, PLA Matte, PETG, HF 0.8 nozzle, ABS, ASA, and PC Profile Edited by wenwei.huang
Change-Id: I164d29c79cbe469d8b0fc55c45d7f9d2322528ed
(cherry picked from commit 59b77168ff91a83b8412fc7aafebc1ecb2f6470c)
2025-09-30 11:14:32 +08:00
shsst
c11fd2592e ENH:[Process/Filament] Modify the volumetric flow rate of H2D model ABS ASA PC Profile Edited by wenwei.huang
Change-Id: I8dc3fd0e0c1fa4cce70effef254e210a484d965c
(cherry picked from commit eb08a743ff1b2f1e53526997e3fb8fc04adecfcb)
2025-09-30 11:14:23 +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
weiting.ji
8fc53b4312 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
3c17c26573 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
8d1f11495d 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
73220b4df6 ENH:Syncing print action text
jira:[STUDIO-11406]

Change-Id: I8ef48345ee57cc66868a05f9e468f857a66d4feb
(cherry picked from commit 0e9e4a2f32c0b3ce38eb7e9bf9a0d0bcd3e39e66)
2025-09-30 10:09:03 +08:00
shsst
3d21cea5ee ENH:[Process/Filament] MOD: restore z_trim from -0.01 to -0.02 Profile Edited by xuanquan.liang
Change-Id: Ib61933876c2e98ddfba7b0cc8820d977108c80d3
(cherry picked from commit d1b843c891c57242ee53c1e85cd4f68d66a6c44b)
2025-09-30 10:07:59 +08:00
hemai
1d4b9a9f82 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
zhimin.zeng
9ac93d7a25 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
aad1d7b7ae 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
608ac2354d 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
8d8630241a 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
shsst
6a37e8f295 ENH:[Process/Filament] remove pla glow 0.2 nozzle and pva 0.2 nozzle of h2d Profile Edited by qian.wang
Change-Id: I69ccb1d7f11f431df04c764ae42a2eb2d493a284
jira:STUDIO-13133
(cherry picked from commit 9c47e04d747166243888e49b9a2694aa7841ce28)
2025-09-30 09:31:18 +08:00
shsst
11a800de7d ENH:[Process/Filament] Corrected the default materials and processes of some models Profile Edited by qian.wang
Change-Id: I367f9afd1052419acfd692d305630672b5e2dd68
(cherry picked from commit 7767c6dd0bf873e8c88d71dd050a8dc751d7c954)
2025-09-30 09:28:39 +08:00
xin.zhang
9d0885f382 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
3a49e2f516 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
cd5566aee5 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
1472b5ce21 FIX: Sync button text modification
Jira: STUDIO-13031
Change-Id: I9007557f4f6f2909250460fc9d6f5d4c4756adc6
(cherry picked from commit c588c5aad60d6eb7bc2b59fd93cbbfbd5ed2849b)
2025-09-30 09:24:26 +08:00
qian.wang
041673dc85 ENH:[Process/Filament] Modify wall_loops of H2D Profile Edited by wenwei.huang
Change-Id: Ie20f4301dc574cb24b5a0c9b85386b12906be89f
(cherry picked from commit e056259fcc0d0584a70fab1dff0de700007b5905)
2025-09-30 09:24:14 +08:00
milk
491bcd294f 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
8af893ad75 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
shsst
de718ce420 ENH:[Process/Filament]Modify H2D machine_start_gcode Profile Edited by xuanquan.liang
Change-Id: Ibc69a2f3c417e2028856821544685bf1e1aecc7d
(cherry picked from commit 14be448b8d0928be50b1be65cc3b6ee3f4ec13f1)
2025-09-30 09:16:29 +08:00
haolin.tian
d6e87fc0b7 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
92a8b0b43e FIX: ScalableButton size
Change-Id: I944dc4fb96a58641aa8502233ffe87dedc128657
Jira: STUDIO-13262
(cherry picked from commit c78a697f0ee4a40009373cb560def12e4553fd40)
2025-09-29 23:57:56 +08:00
zhimin.zeng
7f71c59490 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
4a3fa5141c 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
0cb19a2bac 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
7aca9f9535 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
09c5768484 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
3697abe3a9 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
9b91070ca9 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
d0cc4b35ee 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
tao wang
4e99a042bb FIX:use a complete certificate
jira:[STUDIO-13224]

Change-Id: I40fab9a529efb0c7a158f0c74fa33b044e2d7c19
(cherry picked from commit f75448910c279287556ff8347606c87138c22347)
2025-09-29 23:38:22 +08:00
SHSST
c7f50ec485 ENH:[color_code_json]Update filaments_color_codes
Change-Id: Ic4ae9cd3293b58d0f28cdd5007db89f26ee4439f
(cherry picked from commit a182c4b13b3d825d23c5351e8393bb1fe784c375)
2025-09-29 23:38:12 +08:00
Noisyfox
ef0748e96b Ignore the index when accessing a scalar variable 2025-09-29 23:34:26 +08:00
Noisyfox
d4273b4f70 Fix compile error 2025-09-29 23:19:53 +08:00