viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 4 Packages Projects Releases 4 Wiki Activity
27,314 Commits 6 Branches 4 Tags
89d7ad7dd4cd21244d2fc807f850e65402e704af
Commit Graph

803 Commits

Author SHA1 Message Date
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
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
chunmao.guo
69224a1b45 FIX: filament variant index & override nil value 
Change-Id: I828fff09df39a60d59af516c969466d9b09e503f
Jira: none
(cherry picked from commit 1745657e222b8e9d7c96fcca16581b2deac526c6)
 2025-09-28 16:46:34 +08:00
fei2.fang
ad0fadcef4 FIX: Show RGB for custom color and allow staying in official picker dialog 
- Display RGB values when a custom color is selected
- Prevent official color picker dialog from closing when custom color dialog is canceled
- Ensure multi-color materials are correctly displayed when importing new 3MF files

jira: STUDIO-12938, STUDIO-12937, STUDIO-12933, STUDIO-13110

Change-Id: Iab410585bf8cc5e9e81c6f0da23fe4ddba561785
(cherry picked from commit 2c20d591b998b02b0b66ac81b048a28fa26bd409)
 2025-09-28 15:01:11 +08:00
fei2.fang
7d08d4fe1d FIX: Correct virtual tray loading and multi-color material display 
- Fixed incorrect is_array() check on vtray["cols"], causing virtual tray init failure.
- Rewrote AMS grouping logic using iterators and set<int> for cleaner and safer traversal.

jira: STUDIO-12955

Change-Id: I09a68e259b56864260abb6c59ff9b1bf7ec2823c
(cherry picked from commit 60c47473047a3fba20d59cd974179537c116524d)
 2025-09-28 14:19:10 +08:00
fei2.fang
26a0a15b43 NEW: Official filament color selection approved 
- Add a filament picker dialog for official color selection
- Enable displaying multiple filament colors in the picker dialog and preview sidebar
- Introduce two new config options:
  - `filament_multi_colors`
  - `filament_color_types`
  to both the application config and the 3MF config

jira: STUDIO-12346

Change-Id: I66f8c1ec9147df4f5948c8a329c1737551280e63
(cherry picked from commit 522dc0bbca49033a1ba9725ca7f6c3ea729691a6)
 2025-09-28 14:17:52 +08:00
zhou.xu
98e6ed6c0c ENH: 3mf: fix save fullpath issue 
jira: STUDIO-12970
Change-Id: I71bbd9fd3e1bae669fcc29822f75a3ab9025af56
(cherry picked from commit da0f893433049899227a71e5ddc79833431ce39a)
 2025-09-28 13:12:11 +08:00
Noisyfox
d070490619 Hide nozzle flow selection 2025-09-25 21:33:03 +08:00
Noisyfox
9c2b44823e Fix printer info sync 2025-09-25 21:14:51 +08:00
fei2.fang
eb1c47585c FIX: Align printer preset controls in sidebar 
jira: STUDIO-12397
Change-Id: I728d84b8862de0a72ef467388cbf4c63b24fdcc8
(cherry picked from commit 7ceff77207916b059aa1add0f9869d0e55a59023)
 2025-09-25 20:48:14 +08:00
zhou.xu
9b063e3b1e FIX:add bottom texture 
jira: STUDIO-11342
Change-Id: I69fd573b4d7b05135d5f280cf42d367421664cff
(cherry picked from commit 645f93fac732b8794aa1e99301bfe179a74915a7)
(cherry picked from commit 803a1dffde0f66c3076ae4fc80d4b821f34b03fc)
 2025-09-25 14:42:57 +08:00
zhou.xu
b6058afcf5 FIX:deal null pointer 
jira: github 7109
Change-Id: I1db1dd1b306a33c80b256a7b6f9460ad3d35d1db
(cherry picked from commit c79311e3ee2d13dcfd733e413812c5b52f6aac9c)
 2025-09-25 09:03:28 +08:00
xun.zhang
862f862a53 FIX: unable to send file to sd card if plate > 1 
1. Should set plate index before send file

jira:STUDIO-12431

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id7828069a81f5671b0a6b90d7b0c9b703b10a9cc
(cherry picked from commit fd1e17f818c5c8e38d207e1e829dc5c5749e6f65)
 2025-09-24 11:41:56 +08:00
zhou.xu
f81db4f324 FIX:Switching printer requires that cleared status of synchronization button 
jira: STUDIO-12413
Change-Id: I86ad8125cd2b0b4c870cedd3b9b54c20c91dd9af
(cherry picked from commit b8d2657515ca616e4e8577ed26e6ccfc4d849587)
 2025-09-24 11:40:38 +08:00
zhou.xu
fb393c6c37 FIX:Fix the issue of importing GCode array out of bounds 
jira: STUDIO-12389
Change-Id: Id7995558bf0e297e2360b338ffbf63d93efa38f0
(cherry picked from commit 6d15a9005769a7dbfb96bb28ce6b57e55bf1c435)
 2025-09-24 11:18:23 +08:00
chunmao.guo
1932829fa3 FIX: update layout after remove filament 
Change-Id: I147e32f423d8d3debf1bea537dd0dfc2e1b24c19
Jira: STUDIO-12072
(cherry picked from commit 63783419e530abbb9f443de7d6a2d03d9d2c6031)
 2025-09-24 11:00:50 +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
6b56d1c5ad FIX: the nozzle type sync status is incorrect for P/A printers 
jira: STUDIO-12310
Change-Id: I7a01bcfdfda45de4c2eb65b30e11e107779d3ecb
(cherry picked from commit 4a15a6da6c10383cc6a9c5ac47ce61c4acbc60ae)
 2025-09-24 10:40:45 +08:00
zhou.xu
c90c8ecc67 FIX:update text and window width when change different machine 
jira: STUDIO-12303
Change-Id: Ic994e71a265511cf4e93009707815d34c2d79054
(cherry picked from commit 312c12f10735bcf180c2f2338cc4fdeb75e3b6a3)
 2025-09-24 09:44:05 +08:00
Noisyfox
ae66936d9c Merge remote-tracking branch 'upstream/main' into dev/h2d-2 
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
 2025-09-24 09:15:33 +08:00
zhimin.zeng
3dd9462399 FIX: should not sync nozzle flow type for P/A printers 
jira: STUDIO-12183
Change-Id: I6351c18b7e01c50aa2c741047934a96ca7572c12
(cherry picked from commit 93095852fb41d7a2b0f252d11125a614fd4a1ef0)
 2025-09-23 21:45:54 +08:00
zhou.xu
5829dc3606 FIX:update_all_preset_comboboxes shoulld not return 
jira: STUDIO-12045
Change-Id: Ie507a87f9be6b95350603231a4ef7ee5596f5fdf
(cherry picked from commit 1541e256f9c858d3e33d5d31d4881e6ebf38e5b7)
 2025-09-23 17:25:38 +08:00
chunmao.guo
80d244963e FIX: bbl printer combox layout 
Change-Id: I7b82e0d989e0e197bb7644bbdc74927b308e9d89
Jira: STUDIO-12214
(cherry picked from commit e09410acce9ab64a62e4158b68f84570cda5c873)
 2025-09-23 17:22:20 +08:00
chunmao.guo
16f4f90527 FIX: fixed print bed icon large size 
Change-Id: I580109e3edb4f546d52a5eb33bbf5b9de0ac000c
Jira: STUDIO-12164
(cherry picked from commit 33cad32d644805145cb56c0992c27151c79e22d2)
 2025-09-23 17:13:28 +08:00
zhou.xu
2e9541a829 FIX:The plate type in dialog of the plate settings does not match the machine 
jira: STUDIO-12181
Change-Id: I1d055e3530f19946073c30647c12fbab2be97d50
(cherry picked from commit 54b6cc3c41319ddfc0e3d78f41b903508f0f4c15)
 2025-09-23 16:50:33 +08:00
zhou.xu
7283213996 FIX:miss "Printer not connected" case 
jira: STUDIO-12166
Change-Id: I962a93f1127064816fd481dc3ad7be034e3de0f3
(cherry picked from commit 9eba9b8a2d91517f13cfa306fb41b06232910a13)
 2025-09-23 16:38:51 +08:00
zhou.xu
ecdc54cebd FIX:update_badge_according_flag should check compatible machine 
jira: STUDIO-12166
Change-Id: Id19d398fd2159ee916d0ac63691530ba6d746cdd
(cherry picked from commit fa642e8d6673aba65ac363a92b40312242813509)
 2025-09-23 16:38:51 +08:00
chunmao.guo
f67ae8a16a FIX: clapse filament list min height & adjust filament groups 
Change-Id: Ie4c41b2977addcac4359f161daa46f34dd35054e
Jira: STUDIO-12082, STUDIO-12084, STUDIO-12077
(cherry picked from commit 973399104f9877afd8d5796d7cfa241a05957706)
 2025-09-23 16:38:50 +08:00
milk
03cd5c57ef ENH:After re-importing the multi-plate Gcode.3mf file, sending all plates to the printer results in information loss 
jira: [STUDIO-11531]

Change-Id: Icfbf56ac1f6610f70c3ed192f765e3381ad8ddb6
(cherry picked from commit fcb4ca7a412dfc7c0897b96a3b4c528e6936c297)
 2025-09-23 09:22:53 +08:00
zhou.xu
5da190ff0f ENH:update text 
jira: STUDIO-12117
Change-Id: Idb8af2fd8826c6e0098dbb9ece1da6b8b9109c96
(cherry picked from commit 38364e36c19ba3d35bf08656d5cc62bb5849f21f)
 2025-09-23 09:05:19 +08:00
Noisyfox
00adfb45dd Sync diameter 2025-09-21 17:05:55 +08:00
zhimin.zeng
e594e1d3de ENH: add sync button for single extruder printer 
jira: STUDIO-11628
Change-Id: If77b6e3094d27666bfc7adfb8e4a0fd989703db7
(cherry picked from commit 69dd3571968318e52631151c5de8fa230a4522ef)
 2025-09-21 16:58:12 +08:00
zhimin.zeng
fa56fe001c FIX: fix error variable name 
jira: none
Change-Id: I98098caf80bcdc7b0f506bc158b8f5f6d2cbff57
(cherry picked from commit fb432cdb9dec018bf7d1081efa99979afe513334)
 2025-09-21 16:58:01 +08:00
zhimin.zeng
96395d686b FIX: error sync behavior for customize printer preset 
jira: STUDIO-10331
Change-Id: I4d42ed089e515c2d74dfade1589f20f1c80ca4ca
(cherry picked from commit ce963cede53a72a123f55666a1f718726eb18ab6)
 2025-09-21 16:56:49 +08:00
chunmao.guo
82a5dd56e4 FIX: switch_diameter in sync 
Change-Id: Iff7c654ef932f36b9c3cb4267e4ea90b8074c9c2
Jira: STUDIO-9744
(cherry picked from commit 0c01d7b3e0224f745b249e8d8dbe1990f3b407bc)
 2025-09-21 16:54:02 +08:00
chunmao.guo
83a11b2c0f ENH: sync ams info to extruder group 
Change-Id: Id0aace998a759c6e91aabb2685306e54e06d152e
Jira: STUDIO-9828
(cherry picked from commit 2bae63e3819bc2dc04dc64c1d53b10d2f04edeff)
 2025-09-21 16:48:19 +08:00
chunmao.guo
b72bed1480 FIX: printer diameter select & param extruder sync 
Change-Id: I4f2cff974cea24d599b7870d6a82d44d718e8a2e
Jira: STUDIO-9110
(cherry picked from commit 4558e3d3e7f3dc4d9063d06bad27dbab76203a64)
 2025-09-21 16:47:05 +08:00
zhimin.zeng
5bb8fa9158 EMH: add nozzle diameter synchronization 
jira: STUDIO-9140
Change-Id: I62e4035e473c8bfa2ccf7719bc6c1072c0a30b61
(cherry picked from commit 3c303e6e2c6f8fcb7d2e804c2dd13b0fb8d13e7c)
 2025-09-21 16:39:09 +08:00
jiaxi.chen
c2ecae7f17 ENH: popup more informative message with support materials 
1. Remove popup message with PVA
2. Add popup message with PETG
3. Encourage users to print both support base and interface with Supp.PLA

jira: STUDIO-11984
Change-Id: I7be5d033e47939b9b80ddb99635b2abbb8c848d5
(cherry picked from commit c7d05861270f925411256d8ce20093ec1701230a)
 2025-09-21 16:27:29 +08:00
SoftFever
d206c9a6ad Fix a crash issue when importing a 3MF file saved from version 2.3.1-alpha as geometry only 2025-09-21 16:13:45 +08:00
chunmao.guo
4fc4e07962 ENH: printer nozzle diameter select 
Change-Id: Ibf8b74e1f93a7c387db3f0fb5e6e733165322322
Jira: STUDIO-9140
(cherry picked from commit c990314567383d3bfff72ac11df6471e0a10f315)
 2025-09-21 14:37:37 +08:00
chunmao.guo
18ca398509 ENH: scroll filament list 
Change-Id: I2958ff68e90a6707eb823b0314d62555012b3173
Jira: STUDIO-11070
(cherry picked from commit 39688286a75b78635dc670e387ac5ab75d0b1d54)
 2025-09-21 13:53:00 +08:00
zhou.xu
3e84bc66f8 FIX:revert offset when exit ObjColorDialog 
jira: github 6344
Change-Id: Ia574876aa24fde7c7b958b02d928d1aef6f0633f
(cherry picked from commit b852a7113f8926043cd7c49691b5b96768de1b32)
 2025-09-21 13:48:01 +08:00
zhou.xu
9ced9b9dbc ENH:ban gcode to send print 
jira: STUDIO-10518
Change-Id: I5958fe1bfea9a133d3adde6b0e64289f7ceb0f52
(cherry picked from commit 4b96f09a75ec07a756da55ace2ac7f6447c2681f)
 2025-09-21 13:48:01 +08:00
zhou.xu
ced4ecb4ed ENh:dynamic_filament_list should update after sync_ams_list 
jira: STUDIO-11690
Change-Id: I43cacbd7a5bf74ce410a56afb440ba88d01d08d0
(cherry picked from commit 7d95de151ca5468f3d72e0aea7e35f897505e728)
(cherry picked from commit 47c48b64df903ec137922dba390fce572ee48b2d)
 2025-09-21 13:48:00 +08:00
xin.zhang
52f7feda33 FIX: update send print state after load gcode 
jira: [STUDIO-11512]
Change-Id: I6853a30055e3e3e6e5445d201e959b8c8487d7b6
(cherry picked from commit b01702cadb4cbcb49accf549dea01b52920eb326)
 2025-09-21 13:48:00 +08:00
xin.zhang
481b221794 ENH: disable the nozzle settings in Studio 
jira: [STUDIO-11489]
Change-Id: Id26f06d312ea04ba3aaea9ec4539860f72533078
(cherry picked from commit 8fb88001af3cea8c94adb1f1ace00795cb4be299)
 2025-09-21 13:47:57 +08:00
zhou.xu
26335a17d0 ENH:fix the issue where images can still be displayed when drawn from the top left corner in Mac 
jira: STUDIO-11487
Change-Id: I9878bd9fe47f4c9067ca224377677eb2a0f93ffc
(cherry picked from commit e2191a9e1506cefaaca5fd214ccc5f85a26128f6)
 2025-09-21 13:47:57 +08:00
zhimin.zeng
2d46243403 FIX: use old wipe tower params for old version 3mf file 
jira: STUDIO-11309
Change-Id: I598236646b4de5094d1e9d10ace59c14f1643b44
(cherry picked from commit ed7658ae9f37f6253fbc0efebca73cd8b6e6d6a8)
 2025-09-21 13:47:57 +08:00
zhou.xu
dde78e23d3 ENH:delete no use code 
jira: none
Change-Id: Ib63d812a797b7bbf06f1af434c705f5e3884d57d
(cherry picked from commit 8f007662874b3fd6ea5d63e820ef92a5ae8c384a)
 2025-09-21 13:47:56 +08:00