Commit Graph

14517 Commits

Author SHA1 Message Date
zhimin.zeng
58226a65e0 FIX: enhance filament_map auto manual behavior
1. auto mode dragdrop is not allowed
2. not display filament_map when there is no result in auto mode

jira:none

Change-Id: I0800e0d832e27fe459a17bb1aa829b5e72d0ee8f
(cherry picked from commit 9ee85bef34aaabe7a4cef251f07e77f9af693a2f)
2025-08-24 23:18:11 +08:00
hang.xu
14a0de5d2f FIX: Mapping UI display
jira: STUDIO-7473, 7817

Change-Id: Ibd014985b3b4997bd86700537e1d8a7d0d18176f
(cherry picked from commit 66701cc4c9f6c975ebd30b35e519ca8189dc9b7d)
2025-08-24 23:18:11 +08:00
hang.xu
785371bfc7 NEW:Use new ams mappiong item ui/ux
jira:[STUDIO-7347]

Change-Id: Iba306c4a1b5ae59e406a6862428b425a48002870
(cherry picked from commit 260a7202fc07af028db74159c34106c058fd07ff)
2025-08-24 23:18:11 +08:00
Noisyfox
ee48759ac7 Fix compile 2025-08-24 23:18:11 +08:00
xun.zhang
c01d34c756 ENH: add tool order function
1.Use min cost max flow to solve the tool order

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I909845039b67c7fe3ddd42580ad3f1d71d52262d
(cherry picked from commit 0716b8518ef62e0eac7c45de8bafb1458d8f9a8e)
2025-08-24 23:18:10 +08:00
xun.zhang
1f20ffdb55 ENH: optmize code structure of tool order
1.Put reorder functions in ToolOrderUtils

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I49c7b447ba1f41f3747ba3127d842c4e3957b5ff
(cherry picked from commit 0f70c81a7d5686d8e80396f8f865f25b72618907)
2025-08-24 23:18:10 +08:00
Mack
aea9d3a972 FIX: load_from_svg_file_change_color() supports 8bit colour values
JIRA: nojira
Change-Id: I72e68bd9cb547064736d130205074da0e7eabd60
(cherry picked from commit 8bdac292a0bd34786189f4ca320f646340157d2c)
2025-08-24 23:18:10 +08:00
zhimin.zeng
8f6397a4b1 FIX: only single extruder printer display the icon
of FilamentSettingDialog
jira: 7714

Change-Id: I5d6eca802b9be1fcdeaa28d9e4fbc4862d8c8378
(cherry picked from commit b7176bfdd14c88362058d374c8573d1bb22d6a03)
2025-08-24 23:18:10 +08:00
hang.xu
01d0105364 FIX: the order of cans in AMSLite
jira: STUDIO-7765, STUDIO-7766, STUDIO-7767, STUDIO-7721, STUDIO-7713

Change-Id: If95e0667fc1d615c0494b007f7f7408f68e5b21c
(cherry picked from commit 9b510c0aeb4e9b8f26c285e1f6d5402852be1895)
2025-08-24 23:18:10 +08:00
zhimin.zeng
644b5ef529 ENH: wipe tower support nozzle change
jira: none
Change-Id: I398a508cbc8d02644b60e504405392254329ef10
(cherry picked from commit 8b2a94ed5f8b757ccc4919b9182f3d8edaf767fd)
2025-08-24 23:18:10 +08:00
chunmao.guo
d6738f7988 ENH: drop variant modify values if inconsistant
Change-Id: I6c3e487e4b222df63f91aceccff13c3afd002ab8
Jira: none
(cherry picked from commit 9801a10f7f660c25eb5f8269350f126d5facbd6a)
2025-08-24 23:18:10 +08:00
xun.zhang
15637de5b7 ENH: save multi extruder state in gcode processor
1.Save multi extruder state in gcode processor
2.Add machine exturder change time
3.Fix some naming issues

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9785331290515eeb908ff0ff01aad5aac44212d9
(cherry picked from commit b49d4ca1539cd9f473e0ee0c79a4287c0d5fe03b)
2025-08-24 23:18:10 +08:00
xun.zhang
fe0ba4bc2a FIX: wrong prepare time with chamber temp
1.Caused by missing break of switch case

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie667eda4069f3e2487ed87081580e2540ae4da7b
(cherry picked from commit 9267bd65aa7a39c3a775890b59611fba7b3883ac)
2025-08-24 23:18:10 +08:00
lane.wei
9bf8067f5d FIX: fix a typo in GCodeProcessor
Change-Id: I56b9eaedc3cb062d17facf7352eb469524db5b60
(cherry picked from commit 1bb3b64cfc1aabad9ece3e5d5c0f55a9cb3367c5)
(cherry picked from commit ced9e43be6)
2025-08-24 23:18:10 +08:00
chunmao.guo
fc251cfaad ENH: config apply_only vector at index
Change-Id: I7bf5a44b2d3db2e21207696b6ef7e41a499da078
Jira: STUDIO-7747
(cherry picked from commit 5f30ee389e804f3a71021cdec231a0c92d21d83c)
2025-08-24 23:18:09 +08:00
hang.xu
88e353db8a FIX: Ams control display
jira: NONE

Change-Id: I221eb4167dad894c9e7f32141d33c5c96934df96
(cherry picked from commit 065c8d029eb9df4deb85ce22fe41896fa7c2a883)
2025-08-24 23:18:09 +08:00
xun.zhang
98db4dbbd4 FIX: wrong placeholder data when filament change
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If6f6db1a2086c17541c7984c2db33d7bbcf21801
(cherry picked from commit ab81baee928c48d2b5dfcaf478f87b826f629425)
2025-08-24 23:18:08 +08:00
xun.zhang
5829f09121 ENH: add manual grouping mode stats
1.In auto mode,display the statistics of auto mode and single
extruder
2.In manual mode,display the statistics of manual mode and auto mode
3.Support by object mode

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If54c4db79f33d5278c0f18d01ab0518e8660f9c7
(cherry picked from commit 2dbc5c939666e294c805ee4bf33ec09976688be3)
2025-08-24 23:18:08 +08:00
xun.zhang
134fd5daf4 FIX: wrong filament map in layer filament
1.Should calculate cost if filament used in that layer is 1,because
we should consider the last filament used in previous layer

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5838af77f1d73bfa07c65bd6ee12ae352dc3b571
(cherry picked from commit 0756b51eb2b457a1ddfddc0ab8e445c779737597)
2025-08-24 23:18:08 +08:00
zhimin.zeng
cc19f0cb82 FIX: only display used filament on filament dialog
jira: none
Change-Id: Id643d1efad26eb2719f873543c2e451fe59dc5bb
(cherry picked from commit 1d4ce2bad5c4878f75208486d5862009154fc7ff)
2025-08-24 23:18:08 +08:00
xun.zhang
68dff03667 ENH: modify forcast limit number
1.Use forcast when filament num in current layer and next layer both
smaller than limit number

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia21bb22ce353f0c74eeaf748c6d9f9c4b315ec18
(cherry picked from commit c49c0c8f723e82e4e87cd931b7d5070142fb0781)
2025-08-24 23:18:08 +08:00
zhimin.zeng
24d4b85e04 FIX: only multi-nozzle display multi-extruder combobox
jira: 7686
Change-Id: Ic95d0789582e0a9dbb0edc2421ee076fdadb3572
(cherry picked from commit a174000ec18dae27d37976bdef6810914ba5f0ee)
2025-08-24 23:18:08 +08:00
lane.wei
59965bf4cf FIX: plater: fix the slicing state not correct issue
after change the filament maps, we should invalidate state
jira:none

Change-Id: If2923d959f5120bd80c5bdf3933609cf8b282523
(cherry picked from commit 5f0bb395ad6464039bdacec58c924044a27587a0)
2025-08-24 23:18:08 +08:00
xun.zhang
76957d79ef ENH: add filament saved by multi extruder
1.Add filament flush,filament change count reduced by multi
extruder

NTOE: cases when printing by object haven't been handled

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iaaea5f8ffae2345df5a6f1dc605342d835974d48
(cherry picked from commit ad65cdb909b29210117f690a119ef76b70373da4)
2025-08-24 23:18:08 +08:00
Noisyfox
5f3d91a1cd Don't bother with extruder variants
Fix compile error
2025-08-24 23:18:08 +08:00
xun.zhang
626591a550 ENH: add greedy algorithm for filament reorder
1.When n becomes large,the original algorithm to get best filament
sequence will cost too much time and memory.Use a greedy algorithm
instead.Always select the next filament with fewest flush

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iabc924e1bdb0a07af0a6ef0bbdd62e54ce54f052
(cherry picked from commit 3167e34e609d0eecb481fd550e6550024b72bb67)
2025-08-24 23:18:08 +08:00
lane.wei
c09f0ca7b8 ENH: config: refine some small logic
1. always resize filament count when not matched in full_fff_print
2. remove no-use codes in Preset::normalize

jira: no-jira
Change-Id: Ie15a5977d28f28e0f63ba84f27f98f77d16665c0
(cherry picked from commit f122c4f4ef6f476c4e8190a0872e566d690d6c25)
2025-08-24 23:18:08 +08:00
xun.zhang
d635219ef7 FIX: mistake in profiles
1.Spelling mistake in long retraction
2.Some params length change to 4

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8952df7a1bbf060471e24a19eaeddde017d17d82
(cherry picked from commit 7ce2bb70df1b4f45f27e8e91293e1dbf4456956c)
2025-08-24 23:18:08 +08:00
tao wang
bbb745d406 FIX:Fix some multi nozzle issues
jira:[for multi nozzle]

Change-Id: Ibb9dafc3e664adb3a9058766f47f2d28938d6a0b
(cherry picked from commit e746035f31f20a30f12abcbd4c8da64b70d5d7fa)
2025-08-24 23:18:07 +08:00
zhimin.zeng
0642202c14 FIX: edit filament dialog crash after ams sync
jira: none
Change-Id: Ia551fa75400cef217e6d630aee76d00a06449b1a
(cherry picked from commit fe9e88f1c861aec2703dc19940897f28caf8c5f8)
2025-08-24 23:18:07 +08:00
xun.zhang
3167ef4ca2 FIX: unable to custom first layer filament order
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0107ebf6a85ea0deba93ff558835138981365670
(cherry picked from commit e95179427fe31cf3365afdccbaadce84c31407f8)
2025-08-24 23:18:07 +08:00
hang.xu
debc7266fc FIX: Ext auto fill when mapping item is empty
jira: [Ext auto fill]

Change-Id: I4a8844555e33fcf9f7054fc2e0e254621dec0a1d
(cherry picked from commit 8b4182d0c1de3e7f70fd1f17c032681f12af0045)
2025-08-24 23:18:07 +08:00
xun.zhang
4b070c57b5 ENH: add grab length
1.During the filament change, the extruder will extrude an extra length
of grap_length for the corresponding detection, so the purge volume can
reduce this length.

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I14f55a3200c1dd48b1603e50280d0c29e1319ebe
(cherry picked from commit 16cadec565f987e6baae97428d5392c1f8e7ad39)
2025-08-24 23:18:07 +08:00
xun.zhang
c02c5646c8 ENH: enable long retraction for multi_extruder
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I41daa7a5f1eabf0a805a86d72d00544c8f4edb4a
(cherry picked from commit 887ca8f45f9b66ea24ca82dc7b84f411f6fe7b59)
2025-08-24 23:18:07 +08:00
zhimin.zeng
613c795b7a ENH: add extruder_ams_count behavior
1. save to appconfig and project setting
2. use it to group
jira: none

Change-Id: Id4048fc1b47f6904b2e9c0154aaa3a2b03590437
(cherry picked from commit da32b878b3d7ca95ae5c4786102848c1e8a5ab2d)
2025-08-24 23:18:07 +08:00
zhimin.zeng
18c64b9e82 NEW: Add FilamentMapDialog
support drag drop to modify the filament map
jira: none

Change-Id: I0ed3180a0fa8e95e7c871bb039eb844faccd1344
(cherry picked from commit 67f67d76889668fdd80ae5e496b6cbca5f771a43)
2025-08-24 23:18:07 +08:00
xun.zhang
bf3f93e57b ENH: optimize filament group algorithm
1.When filament <10, do the reorder with next layer.This can reduce
10% flush in some cases
2.Support custom filament seq
3.Use caches to speed the algorithm

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie1af9841f7165802d350eae962efe8febafbb357
(cherry picked from commit cffb4a8564844b1892eb42cfe8e883a52e70fb6a)
2025-08-24 23:18:07 +08:00
hang.xu
ce3ae59ee0 FIX:Ams cannot mapping
jira: [ams mapping]

Change-Id: I17b88b169c30e7c567e5e505bd7f7c56357466eb
(cherry picked from commit 9166c1d0c482c38044b90df06b089f5b0ac8f042)
2025-08-24 23:18:07 +08:00
Mack
155f9cc9cb FIX: inconsistent colour arrange display at different resolutions
JIRA: no
Change-Id: Id838bf68c8a58d9075994052af10fa31bacc2ed3
(cherry picked from commit 91ea29eb56a148606cc645dfbca17fe470cb6131)
2025-08-24 23:18:06 +08:00
xun.zhang
3cb6b7ff38 ENH: add filament group strategy
1.When capacity is greater than the num of filaments, always choose the
map result that can be accommodated
2.In BestFit strategy,always try to fill up the existing capacity
3.In BestCost strategy, just try the group with fewest flush

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd6d64b77774039e57ffff26cf2243a4d3f89054
(cherry picked from commit cddf8cae27f4320f830b463e92703d3a6cf344e7)
2025-08-24 23:18:06 +08:00
zhimin.zeng
d0a5b280f8 FIX: fix bug when delete filament
update filament of HeightRange
jira: none

Change-Id: I62cb21a65ecdfc36e8bc7d0915a85ecba578e49f
(cherry picked from commit 8232a716e64fcfbd12fc7ebdaeeef4bfde261f66)
2025-08-24 23:18:06 +08:00
zhimin.zeng
8ab31f01ad FIX: update filament map of plate when switching preset
that has different nozzle nums
jira:none

Change-Id: If78571ddf4fa7ac17e7dcf47013075821b8567a6
(cherry picked from commit a6ad5c8be86313085922e3063eec2aba029a5a99)
2025-08-24 23:18:06 +08:00
zhimin.zeng
559e6c4437 FIX: save filament_maps to slice_info
and fix bug when switching printer preset between single-nozzle and double-nozzle, prompt the modification of extruder_count
jira:none

Change-Id: I1d5f0b2f002493378d2f482d08cfd5a72b35b99f
(cherry picked from commit ed9816397374116db37c2a76d11e0216df5aca1d)
2025-08-24 23:18:06 +08:00
xun.zhang
d6f1ec6698 FIX: compatible with one extruder reorder
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e350ba8728ac4b3dd34093ff4e9647d0a2ba671
(cherry picked from commit cc81e57ac947375a525281e7cbf52437c740a746)
2025-08-24 23:18:06 +08:00
xun.zhang
510c1d6243 FIX: logic error in filament change
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e2b1333d4b82e4495375fcf4daec3aea08be445
(cherry picked from commit 7128e2925a7b75c6e1bee76b739cef8c4fd46c89)
2025-08-24 23:18:06 +08:00
lane.wei
e942de4b61 ENH: config: remove unused custome_defined logic
also improve project_embedded
1. remove unused is_custom_defined
2. improve project_embedded to support multi-extruder diff

jira: no-jira

Change-Id: I1db28c3cfd59ccc31c6855af30305396c71c4e9a
(cherry picked from commit 0434853bf32b063f7850fd4e0c9c3a6045375225)
2025-08-24 23:18:06 +08:00
zhimin.zeng
9aae7d2968 FIX: Clean up the code
1. Refactor recommended code for print by object
2. Calibration adaptation sends print command

jira: none

Change-Id: I24fd92d6aca07a7067e09bb200854e5bec72a324
(cherry picked from commit ad03fae1eba75a866d806a4319ef7edde2fb3562)
2025-08-24 23:18:06 +08:00
xun.zhang
678affed94 ENH: alternate multi-head printing sequence
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I739438e8c411b638571d5291f3e5ad3d54650a73
(cherry picked from commit 1ab2964ee3b0357233a0a3747edefc12db51d46c)
2025-08-24 23:18:06 +08:00
Noisyfox
b3d9258c39 Show SEMM related items for BBL printers 2025-08-24 23:18:06 +08:00
xun.zhang
59ab414c8d FIX: wrong flush logic
1.Fix flush calc logic
2.Rename m_extruder in GCodeWriter

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I38f023fbad983305632ca62cbfb3909759013c25
(cherry picked from commit f1b0805ed13eb94d6eb61e12330db3d628c0241b)
2025-08-24 23:18:05 +08:00