Commit Graph

16946 Commits

Author SHA1 Message Date
zhimin.zeng
20c31e201e FIX: slice crash with incorrect filament_map of single printer
jira: none
Change-Id: I49bdcf03fc8abb24e41e0545e2d9cd3c55941df4
(cherry picked from commit 83681128e0c14c8f50952011122d6eceacce496a)
2025-08-24 23:18:26 +08:00
Noisyfox
4f1e1a0c38 Update code structure to match BBS 2025-08-24 23:18:25 +08:00
Noisyfox
1300e608d6 Fix compile error 2025-08-24 23:18:25 +08:00
zhimin.zeng
b28aa7edba ENH: add a prompt dialog box to prompt
for synchronization of machine information when opening a file
jira:none

Change-Id: I7b3419bb3489a5b6a37a99b5021c7e69ac35a009
(cherry picked from commit 6437437fe0c83f7c14f7ee5b339475d6db559a56)
2025-08-24 23:18:25 +08:00
zhimin.zeng
402baf25f8 ENH:add layer_filament_list.json record used filaments for each layer
jira: none
Change-Id: Ib293ff9fdd284fef9e6de93260e2ba7cc3d66daa
(cherry picked from commit 28046fbc23e174868f41535764076888a680d116)
2025-08-24 23:18:25 +08:00
zhimin.zeng
651e9dfb45 FIX: modify the filament id for painting color
jira: none
Change-Id: I25dcab95f1499783afd892c790f1e18232ea4f72
(cherry picked from commit f7a0e66e0dd16531d2318843ec86630232880867)
2025-08-24 23:18:25 +08:00
zhimin.zeng
40a9490f01 FIX: show k value when select default pa profile
jira: STUDIO-8540
Change-Id: I1c92628fa888f935762d31968237e28d65594e51
(cherry picked from commit 3f791574cd5ae384ee295e595f35d45c78ac719f)
2025-08-24 23:18:25 +08:00
zhimin.zeng
5e3cb89729 ENH: add tpu check before slicing
jira: none
Change-Id: I7d4f053e67f4a4aa22ef990d597d28cb894c4195
(cherry picked from commit 60cdf3b6551a8c18c10db0a746e1b15b764eda66)
2025-08-24 23:18:25 +08:00
lane.wei
bba44b1f2b ENH: CLI: support multi-extruder slicing
1. add slicing errors for gcode in unprintable area, also for filament mapping
2. use common area for auto arrange
3. support filament_map/filament_map_mode related params
4. add logic to check the filament maps before slicing
5. uptodate support multi-extruder
6. switch new machine/filament support multi-extruder
7. process config params support transfer between mult-extruder and
   single-extruder
8. improve machine-limit logic support multi-extruder
9. flush-volume support multi-extruder
10. add default params to support auto mapping slicing

jira: no-jira
Change-Id: Ice39a365841322ddb586d39c56ff923626822528
(cherry picked from commit f518d6804a9de69deef81c20cd22005a4bbd0cd4)
2025-08-24 23:18:25 +08:00
zhimin.zeng
b58b236b77 FIX: add ams status check before print
jira: none
Change-Id: I5fd03ec596ddddd1b568325c509914cd9aec0f61
(cherry picked from commit 8fca76aac9742934c27c66f824d6190bb6e9279e)
2025-08-24 23:18:24 +08:00
xun.zhang
5c4345db6b FIX: wrong flush statistics in sequence mode
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iec3557900fce7b3c70e05705f9ea0e987fdff3cd
(cherry picked from commit 563e4ca8cf1756b514a893699c29410bfe68afb5)
2025-08-24 23:18:24 +08:00
xun.zhang
2e52c3e441 ENH: save filament sequences in gcode result
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I79c2eb4002c72568d487df417c914ab0b8a14a67
(cherry picked from commit a289370b19e78693698db388d4057e25ba285d6b)
2025-08-24 23:18:24 +08:00
zhimin.zeng
e32e3018f9 FIX: UI display problem of filament map dialog
jira: 8467
Change-Id: I4bf3aa8d0b743a910362def4fc565e9001d79c53
(cherry picked from commit ea5137d6187e151586cc78f424a3873870fe0a33)
2025-08-24 23:18:24 +08:00
zhimin.zeng
0d5001c4e6 FIX: Mixed mappings are not allowed
jira: none
Change-Id: Ia29aa3ea5b953983e6b4e71b11fdb53a518bd0cf
(cherry picked from commit 159ad9fe0d82c9e4b157b4eb83ea509d7ba104d1)
2025-08-24 23:18:24 +08:00
zhou.xu
d338ddfc40 ENH:add calc_extruder_only_area api
jira: none
Change-Id: Ic49348915bce53e9cd63effb5053a93a40840e04
(cherry picked from commit 647467e25b83588bfde25429e64320cb42c1ac99)
2025-08-24 23:18:24 +08:00
zhimin.zeng
c94347656c NEW:add "slice error" for double extruder
jira: none
Change-Id: I58e86c33bc91456d42efcc1a0cad003432bb13df
(cherry picked from commit 166a46caa8157e246adfeec591dc13383a47b252)
2025-08-24 23:18:24 +08:00
zhou.xu
595a6fda2c FIX:fix warning for icon_size define
jira: none
Change-Id: I0393677c5c29354aeca41917daecc87721d9d9ce
(cherry picked from commit 97584e0a1e73a0ce2152ce88c1ffd58abfc96c73)
2025-08-24 23:18:24 +08:00
lane.wei
32b3274584 ENH: Scene: check object position error in 3DScene for multi-extruder
for some obvious error, we identified it and show to user

JIRA: no-jira
Change-Id: Id0365e89c4121ccccb9b5627a98428704432ab58
(cherry picked from commit 270ae086fbca576b75901313959c92cbfb913db6)
2025-08-24 23:18:24 +08:00
Noisyfox
24a694f12a Fix NPE 2025-08-24 23:18:24 +08:00
zhou.xu
7991120315 FIX:create new project should delete notification
in last project
jira:none

Change-Id: I936e9a737f8b5e43905936d8796aeedd70248268
(cherry picked from commit e3330c6fba7db7932e485a1d0543ce23ce43cdfe)
2025-08-24 23:18:24 +08:00
Noisyfox
e60ab20bcc Fix compile 2025-08-24 23:18:23 +08:00
zhimin.zeng
384f5a6bff FIX: Add a matching rule with the same name for PA value
jira: 8339
Change-Id: I134139fd8cff9cb47b29523e90d5dd4f2667c387
(cherry picked from commit 489285c9b89bdd21812c5e7429263fb28fd30f20)
2025-08-24 23:18:23 +08:00
Bastien Nocera
e30b42f70e libslic3r: Fix declaration in FlushVolPredictor.hpp
In file included from src/libslic3r/FlushVolPredictor.cpp:1:
src/libslic3r/FlushVolPredictor.hpp:44:34: error: ‘string’ in namespace ‘std’ does not name a type
   44 |     FlushVolPredictor(const std::string& data_file);
      |                                  ^~~~~~

src/libslic3r/FlushVolPredictor.hpp:49:5: error: ‘uint64_t’ does not name a type
   49 |     uint64_t generate_hash_key(const RGB& from, const RGB& to);
      |     ^~~~~~~~

In file included from src/libslic3r/FlushVolPredictor.cpp:1:
src/libslic3r/FlushVolPredictor.hpp:44:34: error: ‘string’ in namespace ‘std’ does not name a type
   44 |     FlushVolPredictor(const std::string& data_file);
      |                                  ^~~~~~

(cherry picked from commit 126dfea02729e16f9e64d6634a762da8b665d6e2)
2025-08-24 23:18:23 +08:00
xun.zhang
9e2383a918 ENH: consider colors with de < 5 as the same
1. Use cie de2000 as color distance
2.Consider colors with de < 5 as the same color  when calculating
flush

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4b451910a21c9db3471c63c270f1f120e3c5d160
(cherry picked from commit 72bc6f44cfab9145aecdb843ac4a03a9338a8cc6)
2025-08-24 23:18:23 +08:00
xun.zhang
1f45f8abd6 ENH: add module flush vol predictor
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie1b0d4c443df4a26ff1b010e73d589162a0fbff7
(cherry picked from commit 475e9b34ff85cf6058ac639fde4b73264e350195)
2025-08-24 23:18:23 +08:00
xun.zhang
d31826f326 FIX: disable unprintable logic for single ext
1.Disable unprintable logic for single extruder printers

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iecb4cc80455288925d3acb5688b81aa9ef1c3a8a
(cherry picked from commit c6ddd329e3397cc4cafac4665b9fdf2dabb657f6)
2025-08-24 23:18:23 +08:00
zhimin.zeng
666e283c0f FIX: add object id for gcode check
and display plater limit error individually
jira: none

Change-Id: Ie6105642667530901be494b344ce853e728ae5fa
(cherry picked from commit acd6016fc834c749307205448e05bffee954c71e)
2025-08-24 23:18:23 +08:00
zhimin.zeng
097eaedc4a FIX: remove auto sync for extruder
jira: none
Change-Id: I924c5d8c8d15139dfcb1532322ad7cf813aece3b
(cherry picked from commit e956106c158d67d265c641b959ad1ed397ece09a)
2025-08-24 23:18:23 +08:00
tao wang
c3ad94b091 FIX:fix the issue of macOS crashing easily
jira:[udesk 7578206]

Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b
(cherry picked from commit 8dfa6839e5e3a9bebb03616ff6d0c0c1699ad22f)
2025-08-24 23:18:23 +08:00
zhimin.zeng
4fcee9245d FIX: Add a matching rule with the same name for PA value
jira: 8339
Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4
(cherry picked from commit f4379b3e193ac6d30b8ee91b5c3ff5518aec1f31)
2025-08-24 23:18:23 +08:00
Mack
80226a8d20 ENH:colour arrangement ui text width limit
jira: nojira
Change-Id: I6a8f4341e671aa88704346bfeb1d8be3725619a1
(cherry picked from commit 3cb36b51119ef4468febeab9246e103226c42a07)
2025-08-24 23:18:23 +08:00
zhou.xu
437f17d30d FIX: get nozzle_diameter error
jira: none
Change-Id: Ic33854a0d7322fe9154910480d2ea3ceae524f79
(cherry picked from commit 12912f6772b3c11d5df658be1fc8c17ccb5565cc)
2025-08-24 23:18:23 +08:00
zhou.xu
e6b4361146 FIX:reset is_load_extruder_only_area_textures flag
when change machine
jira:none

Change-Id: I97c97fae3d4ded0e25d518c0ae4a5cef9c640b45
(cherry picked from commit c26521470fb7a35b09a67559d8ec3facf2b3988a)
2025-08-24 23:18:22 +08:00
tao wang
f657260d0c FIX:Fix the issue of text wrapping
Change-Id: I360c08e37d58359b30df460df07ed8266ac5dd6a
(cherry picked from commit 54a3e4786e11b47111b33a80788a376f0d238daa)
2025-08-24 23:18:22 +08:00
xun.zhang
e47a26b718 ENH: modify filament group strategy
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iac837beeb7a5c4684aea38c3e3925a67cd916fe8
(cherry picked from commit e3f4496adf87ce68691c2e511b065925784c54e1)
2025-08-24 23:18:22 +08:00
tao wang
0b0b874cbb FIX:fixed the crash when sent print when no printer available
Change-Id: I2974ff7c3f7e753239718f9bfd8b4977672dc651
(cherry picked from commit 9f3c98dcfb8801fe70e9dd02f0f931be6c5556be)
2025-08-24 23:18:22 +08:00
zhimin.zeng
b1d4ba278e FIX: Inconsistent filament map box width at other resolutions
jira: none
Change-Id: Ib8d8478848252264ba43ad9a9091403f92d8314e
(cherry picked from commit 2a75d397c4ca523c61b51e0853bad8f9e0f7d7c4)
2025-08-24 23:18:22 +08:00
chunmao.guo
24b0e580d6 FIX: not set extruder index of option to -1
Change-Id: I67b053db9936e71eed54cafe8f8f7a63a7f85822
Jira: none
(cherry picked from commit 6a282118f8c4ea2f42df46c8cf6967e8485097e3)
2025-08-24 23:18:22 +08:00
chunmao.guo
c7001e91c5 FIX: AMSCountPopupWindow wxPU_CONTAINS_CONTROLS
Change-Id: Iff7c79640e1fddc1bb4c5f73b4bbbe81122515d9
Jira: none
(cherry picked from commit 0e0599c7226897e22010eea06554d0466fdb1419)
2025-08-24 23:18:22 +08:00
zhimin.zeng
fcc7e76a30 FIX: add set to Optimal button
2. modify the manual mode of filament_dialog
jira: none
Change-Id: I2ce6834eb65de2da70e7649346fc88b90f280b29

Change-Id: I18448e800fe3338f045d35f7a1fa6c3e3c8eef79
(cherry picked from commit 5dce0ebc06f6aace50374fa37bd91cabb5213385)
2025-08-24 23:18:22 +08:00
xun.zhang
bc2a10621a 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
(cherry picked from commit 21379e13366fd70f0042e85dcf8ee220185c782d)
2025-08-24 23:18:22 +08:00
tao wang
f3a15e7ea9 FIX:fix some new ui issues
jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
(cherry picked from commit 65e8b4ee7e816cc313e8d7a33f06c6f1638dceef)
2025-08-24 23:18:22 +08:00
Mack
d9041eaa36 FIX:loss is_auto
jira: nojira
Change-Id: I3511b0abdbdb94b9517a1b21c95ce224d0f7422d
(cherry picked from commit c4cdc2e8f3960a9128ab7a8a7a62717351bcdbbc)
2025-08-24 23:18:22 +08:00
liz.li
fed0b21da6 ENH: add filament arrangement drag image and other UI details
jira: new

Change-Id: I2ebbfd2a20c2d2f6059c2508467cd69dd272f943
(cherry picked from commit 3e633455def0a40f9f041320c7cd3cc4ae65be02)
2025-08-24 23:18:22 +08:00
xun.zhang
541b856383 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
(cherry picked from commit 13df1ee7bab2bf13c9f5ffca6ad1228ff48e885e)
2025-08-24 23:18:20 +08:00
Mack
63614299d5 ENH:change Color Arrangement ui
jira: nojira
Change-Id: I77f84675da0b4fe7069c76c14668026fc3d8932a
(cherry picked from commit 785b8c7b2f5ee014fedea57a88693888d2b8ca26)
2025-08-24 23:18:20 +08:00
zhimin.zeng
20ca58d42e FIX: fix incorrect flush_volume_matrix size when switch printer
jira: none
Change-Id: Idaaaaa65b2ea7fdefd41d1c589e5404f8296ae4a
(cherry picked from commit 927170c6304795b0ad75560688348b4febb96a42)
2025-08-24 23:18:20 +08:00
xun.zhang
6e018e3655 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
(cherry picked from commit 48023e4c154c118c9396b6065b7e2476970fd441)
2025-08-24 23:18:20 +08:00
xun.zhang
df8bd2b0bf 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
(cherry picked from commit 1379b838466f9b0a188fc916c31916626b933dc4)
2025-08-24 23:18:19 +08:00
zhimin.zeng
e3e1ec70f8 FIX: flush_volume_matrix and flush_multiplier is incorrect
jira: none
Change-Id: Ie2d73b90b9ac7f5a6945b2bac859b76d2132f55a
(cherry picked from commit b17c5e7e017a3019224bf105758ef23658308254)
2025-08-24 23:18:19 +08:00