Commit Graph

6090 Commits

Author SHA1 Message Date
Noisyfox a21779dd30 NEW: Port of Cura's multi-material interlocking (#5775)
* Init port of Cura's MM interlocking

* Refactor a bit

* Fix crash when bottom surface is multi-color

* Fix crash when boundary avoidance is 0

* Add config

---------

Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
jira: none
Change-Id: I81cacddf46ad5921a7a2a23fff07cc17addceb6f
2025-03-22 20:58:36 +08:00
tao wang 8dfa6839e5 FIX:fix the issue of macOS crashing easily
jira:[udesk 7578206]

Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b
2025-03-22 20:58:14 +08:00
zhimin.zeng f4379b3e19 FIX: Add a matching rule with the same name for PA value
jira: 8339
Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4
2025-03-22 20:58:14 +08:00
Mack 3cb36b5111 ENH:colour arrangement ui text width limit
jira: nojira
Change-Id: I6a8f4341e671aa88704346bfeb1d8be3725619a1
2025-03-22 20:58:14 +08:00
zhou.xu 12912f6772 FIX: get nozzle_diameter error
jira: none
Change-Id: Ic33854a0d7322fe9154910480d2ea3ceae524f79
2025-03-22 20:58:14 +08:00
zhou.xu c26521470f FIX:reset is_load_extruder_only_area_textures flag
when change machine
jira:none

Change-Id: I97c97fae3d4ded0e25d518c0ae4a5cef9c640b45
2025-03-22 20:58:14 +08:00
tao wang 54a3e4786e FIX:Fix the issue of text wrapping
Change-Id: I360c08e37d58359b30df460df07ed8266ac5dd6a
2025-03-22 20:58:14 +08:00
xun.zhang e3f4496adf ENH: modify filament group strategy
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iac837beeb7a5c4684aea38c3e3925a67cd916fe8
2025-03-22 20:58:14 +08:00
tao wang 9f3c98dcfb FIX:fixed the crash when sent print when no printer available
Change-Id: I2974ff7c3f7e753239718f9bfd8b4977672dc651
2025-03-22 20:58:14 +08:00
zhimin.zeng 2a75d397c4 FIX: Inconsistent filament map box width at other resolutions
jira: none
Change-Id: Ib8d8478848252264ba43ad9a9091403f92d8314e
2025-03-22 20:58:14 +08:00
chunmao.guo 6a282118f8 FIX: not set extruder index of option to -1
Change-Id: I67b053db9936e71eed54cafe8f8f7a63a7f85822
Jira: none
2025-03-22 20:58:14 +08:00
chunmao.guo 0e0599c722 FIX: AMSCountPopupWindow wxPU_CONTAINS_CONTROLS
Change-Id: Iff7c79640e1fddc1bb4c5f73b4bbbe81122515d9
Jira: none
2025-03-22 20:58:14 +08:00
tao wang 370be63709 ENH:Hide multi disk switching
jira:[for demo]

Change-Id: I4cbfde15ec2b6f7e8aa68e8654ebea0e9cb09b9c
2025-03-22 20:58:13 +08:00
zhimin.zeng 5dce0ebc06 FIX: add set to Optimal button
2. modify the manual mode of filament_dialog
jira: none
Change-Id: I2ce6834eb65de2da70e7649346fc88b90f280b29

Change-Id: I18448e800fe3338f045d35f7a1fa6c3e3c8eef79
2025-03-22 20:58:13 +08:00
xun.zhang 21379e1336 ENH: do not consider empty filament
1. Do not consider empty filament when selecting group for ams
2. Function "collect_filaments_in_groups" is frequently called,
optimize memory allocation to speed up.

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iad8c9a257bc2dd832c77e650f8c052fb9d8379a0
2025-03-22 20:58:13 +08:00
tao wang 65e8b4ee7e FIX:fix some new ui issues
jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
2025-03-22 20:58:13 +08:00
Mack c4cdc2e8f3 FIX:loss is_auto
jira: nojira
Change-Id: I3511b0abdbdb94b9517a1b21c95ce224d0f7422d
2025-03-22 20:58:13 +08:00
liz.li 3e633455de ENH: add filament arrangement drag image and other UI details
jira: new

Change-Id: I2ebbfd2a20c2d2f6059c2508467cd69dd272f943
2025-03-22 20:58:13 +08:00
xun.zhang 13df1ee7ba FIX: invalid pop up when changing machine profile
1. Machine with multi extruder should set length of extruder offset
to extruder num
2. Register retract_restart_extra

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic3eb324cb91dc70b091c8922936d2709c361cc38
2025-03-22 20:58:13 +08:00
Mack 785b8c7b2f ENH:change Color Arrangement ui
jira: nojira
Change-Id: I77f84675da0b4fe7069c76c14668026fc3d8932a
2025-03-22 20:58:13 +08:00
zhimin.zeng 6b5a0c2d17 FIX: modify the limit of max_volumetric_speed to 200
jira: none
Change-Id: Id84707471d4b34ebda9ff56766e3b058ee6a5021
2025-03-22 20:58:13 +08:00
zhimin.zeng 927170c630 FIX: fix incorrect flush_volume_matrix size when switch printer
jira: none
Change-Id: Idaaaaa65b2ea7fdefd41d1c589e5404f8296ae4a
2025-03-22 20:58:13 +08:00
xun.zhang 48023e4c15 FIX: empty filament map
1.Caused by uninitialized filament map in mapping for AMS

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I71ce6001fc6f2e72eb9303fcaba0bac16ad70dc9
2025-03-22 20:58:13 +08:00
xun.zhang 1379b83846 ENH: Select group that best fit filaments in AMS
1.Only consider groups with a distance within the threshold

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I91526a796a0f7f1ed3e77c41076c1f85620dd944
2025-03-22 20:58:13 +08:00
zhimin.zeng b17c5e7e01 FIX: flush_volume_matrix and flush_multiplier is incorrect
jira: none
Change-Id: Ie2d73b90b9ac7f5a6945b2bac859b76d2132f55a
2025-03-22 20:58:13 +08:00
hang.xu e6b14bdefb FIX: Aix and temp control
jira: none

Change-Id: I7a9db8178a77727c85ad2b727771179fc5e8050a
2025-03-22 20:58:12 +08:00
xun.zhang 3cfb49a1b9 ENH: refine filament group algorithm
1.Use max flow network to handle limit
2.Support setting master extruder id
3.Fix the issue in the KMedoids algorithm where data is overwritten
after each retry.

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Idd2bedf39f61e7a65eb4199852f60b8fbebe0a7d
2025-03-22 20:58:12 +08:00
zhimin.zeng 2ee87600cb ENH: modify the error information of gcode check
jira: none
Change-Id: Icccd17e110408f2fdb9890307139de0f9821f008
2025-03-22 20:58:12 +08:00
zhimin.zeng f53e00ec6d FIX: crash when sending print with empty ams_id
jira: none
Change-Id: I89dc87af28b45c69eac86810444de2519dfccd08
2025-03-22 20:58:12 +08:00
zhimin.zeng a0b563dc8f FIX: modify color to empty string when reset filament
jira: none
Change-Id: I3a32dc8307ec5d65c8c5b7b05a5bc1e2d7d2b5b7
2025-03-22 20:58:12 +08:00
liz.li 12932832ae ENH: filament preset edit menu should not change to self
jira: new

Change-Id: Ia8eb3db05f83932d2eb0b8ef2ba8014e99c8e057
2025-03-22 20:58:12 +08:00
zhimin.zeng 9097efd869 FIX: FIX cali protocol
add extruder_id for start_cali and add protection for setting_id
jira:none

Change-Id: Idd8eeaa38c618c0ef8db10064d3e4d9793487aa6
2025-03-22 20:58:12 +08:00
zhimin.zeng a35d9b3138 FIX: change small filament to large filament is incorrect
jira: none
Change-Id: I0f7b10fb557ac5cb147bfebf0445de9ea862d602
2025-03-22 20:58:12 +08:00
liz.li 73c05eee3b ENH: refine dual extruder related UI details
jira: new

Change-Id: I63dd6278f3e7d22336482dba0f178150ebe55f1d
2025-03-22 20:58:12 +08:00
zhimin.zeng 8b8b6bdec8 ENH: enhance cali history dialog for mutli_extruder
jira: none
Change-Id: Id23ae2c12b93b9f49d3031fbb9a49930d072b02c
2025-03-22 20:58:12 +08:00
zhimin.zeng d479d1186a FIX: Modify calibration protocol
jira: none
Change-Id: Ib0fdf4fd1ab514c2db4d1731ad0d37d3dc38fce5
2025-03-22 20:55:55 +08:00
zhimin.zeng 65c00e00fe FIX: Prompt user when mix ams and vtslot in an extruder
jira: none
Change-Id: I9a1d4936056fc872c75bf0454e4ca89665ece2f8
2025-03-22 20:54:17 +08:00
zhimin.zeng d715353fa6 FIX: fix the crash bug when slicing
jira: none
Change-Id: Ieaec4fda4c653e6595322356bd16226640d2e932
2025-03-22 20:54:17 +08:00
zhimin.zeng c7486e1c5e FIX: modify UI of FilamentMapDialog
1. Modify dragging behavior
2. The swap button is grayed out in automatic mode
jira:none

Change-Id: Idff795bf092c4959c67d0711b0be316fba997684
2025-03-22 20:54:17 +08:00
zhimin.zeng 20837717d4 FIX: When the printer is inconsistent with the current preset
when the ams is 0/0, should not consider the print connect status
jira:none

Change-Id: I2288ff15894d5c734a98b830df6678cab2bd12fc
2025-03-22 20:54:17 +08:00
xun.zhang d9ea1a4b24 FIX: performance issue caused by copy LayerResult
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5f1bda598ef096999a0eda2fa68d2a24c97c22ca
2025-03-22 20:54:17 +08:00
zhimin.zeng 8360bd2473 FIX: Should not sync when machine types are inconsistent
jira: none
Change-Id: If769fe0d19fb06c4a70e616416bf28f194ebcd45
2025-03-22 20:54:17 +08:00
zhimin.zeng 14ceceb3d7 FIX: auto filament map does not consider vt slot
when it has ams
jira:none

Change-Id: Id101a17375059a3aabc8e35d08352cd394a894e6
2025-03-22 20:54:17 +08:00
Mack 65e3829f92 ENH: color arrangement ui
jira: STUDIO-8124
Change-Id: Ibcde0e002ffd652b350bd05a9453ce7aaefd7bca
2025-03-22 20:54:17 +08:00
chunmao.guo c1e4be1652 FIX: Button text render pos on macOS
Change-Id: Icaa8cb95d81b3f906507dc74a3fcffc77a535fdb
Jira: STUDIO-8026
2025-03-22 20:54:16 +08:00
zhimin.zeng f30c7d3355 ENH: Enhance ams synchronization prompts
jira: none
Change-Id: Ide3141f980dc8de0284f3301414eca5c58a24204
2025-03-22 20:54:16 +08:00
xun.zhang b34395358b ENH: support virtual G1
1.We need virtual G1 command for statistics

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0db0f7f0f0c2d61e43582154e0bd76bd0097c8da
2025-03-22 20:54:16 +08:00
xun.zhang b4d8566332 FIX: crash when ams filament list is empty
1.Set the default size of ams filament to 2

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie985ecfa44cb9fcaf21406303e32bb56e731f351
2025-03-22 20:54:16 +08:00
xun.zhang 2f11ca8a03 ENH: remove a useless assert
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ief29b7cc8adc16218f1b3608a35448bd95e54c80
2025-03-22 20:54:16 +08:00
xun.zhang 0b95bdd9d9 ENH: do another map for ams filaments
1.If the group result differs little in flush,we will choose the one
that best fits the ams filaments

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Icd147b406e3494c841ef13564ad1b1231ad798fd
2025-03-22 20:54:16 +08:00