zhou.xu
78229089bf
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
6c79e8262a
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
5a9439ab4f
Fix NPE
2025-08-24 23:18:24 +08:00
zhou.xu
1f7dc5a641
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
1b55440b15
Fix compile
2025-08-24 23:18:23 +08:00
zhimin.zeng
64a2199733
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
ea4357df3e
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
b71d14b526
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
179eab1355
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
a2ae7e1ddd
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
56af264273
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
eec174ccf0
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
3141dbd57c
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
d841b2d178
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
f888fafc07
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
4e4e9f7d15
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
5b9510981d
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
9b9e339d15
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
041ca29ab7
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
1b11416cb8
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
679a4a7fa3
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
f73273519f
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
8ace17eaef
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
5d17c51aa9
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
950da4ecfd
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
99f0e35069
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
b6197c460b
FIX:loss is_auto
...
jira: nojira
Change-Id: I3511b0abdbdb94b9517a1b21c95ce224d0f7422d
(cherry picked from commit c4cdc2e8f3960a9128ab7a8a7a62717351bcdbbc)
2025-08-24 23:18:22 +08:00
liz.li
0b71026bed
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
a6dc8c27a8
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
e26e2ca793
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
4ac3edf780
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
c362a99a11
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
2c75d2f1b9
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
b553cf68da
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
hang.xu
291225ae35
FIX: Aix and temp control
...
jira: none
Change-Id: I7a9db8178a77727c85ad2b727771179fc5e8050a
(cherry picked from commit e6b14bdefb949d3a61479e54b7b27450b344de18)
2025-08-24 23:18:19 +08:00
Noisyfox
00ece36f38
Fix del filament button spacing
2025-08-24 23:18:19 +08:00
xun.zhang
e1ebe832dd
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
(cherry picked from commit 3cfb49a1b9dc2c76066ec441f1028f99a4bf99c4)
2025-08-24 23:18:19 +08:00
zhimin.zeng
3e9e9a1fa0
ENH: modify the error information of gcode check
...
jira: none
Change-Id: Icccd17e110408f2fdb9890307139de0f9821f008
(cherry picked from commit 2ee87600cb6d1d09808447bb6ec996224d633905)
2025-08-24 23:18:19 +08:00
zhimin.zeng
1737829922
FIX: crash when sending print with empty ams_id
...
jira: none
Change-Id: I89dc87af28b45c69eac86810444de2519dfccd08
(cherry picked from commit f53e00ec6d9350046df4b9dc70cec75039b6d5d1)
2025-08-24 23:18:19 +08:00
liz.li
cbfbe80ed8
ENH: filament preset edit menu should not change to self
...
jira: new
Change-Id: Ia8eb3db05f83932d2eb0b8ef2ba8014e99c8e057
(cherry picked from commit 12932832ae793b142f66e2a9c6d9a5fd819e4125)
2025-08-24 23:18:19 +08:00
zhimin.zeng
a99d8736a7
FIX: change small filament to large filament is incorrect
...
jira: none
Change-Id: I0f7b10fb557ac5cb147bfebf0445de9ea862d602
(cherry picked from commit a35d9b3138853efa16c733a228f244b547da27c4)
2025-08-24 23:18:19 +08:00
liz.li
7370dead32
ENH: refine dual extruder related UI details
...
jira: new
Change-Id: I63dd6278f3e7d22336482dba0f178150ebe55f1d
(cherry picked from commit 73c05eee3bbcbed6fc5909db638fa4bac9a75bfc)
2025-08-24 23:18:19 +08:00
zhimin.zeng
626affffd8
ENH: enhance cali history dialog for mutli_extruder
...
jira: none
Change-Id: Id23ae2c12b93b9f49d3031fbb9a49930d072b02c
(cherry picked from commit 8b8b6bdec8d81e56fc78e27d1cdeec077c56e9f5)
2025-08-24 23:18:18 +08:00
zhimin.zeng
859e5373a5
FIX: Modify calibration protocol
...
jira: none
Change-Id: Ib0fdf4fd1ab514c2db4d1731ad0d37d3dc38fce5
(cherry picked from commit d479d1186a63e9432f3b063cc70c9f691cd6214b)
2025-08-24 23:18:18 +08:00
zhimin.zeng
ca6a3fe17b
FIX: Prompt user when mix ams and vtslot in an extruder
...
jira: none
Change-Id: I9a1d4936056fc872c75bf0454e4ca89665ece2f8
(cherry picked from commit 65c00e00fe8709255c40e94679fa4ced6d3ae688)
2025-08-24 23:18:18 +08:00
zhimin.zeng
9e05f88a36
FIX: fix the crash bug when slicing
...
jira: none
Change-Id: Ieaec4fda4c653e6595322356bd16226640d2e932
(cherry picked from commit d715353fa634660cb420920d96466cb23bc6576e)
2025-08-24 23:18:18 +08:00
zhimin.zeng
1bcc4614b8
FIX: modify UI of FilamentMapDialog
...
1. Modify dragging behavior
2. The swap button is grayed out in automatic mode
jira:none
Change-Id: Idff795bf092c4959c67d0711b0be316fba997684
(cherry picked from commit c7486e1c5e56667cab61ee9a97898f03b65b64b8)
2025-08-24 23:18:18 +08:00
zhimin.zeng
1658c6c54d
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
(cherry picked from commit 20837717d411016251c4831586b0fa61350a08b2)
2025-08-24 23:18:18 +08:00
zhimin.zeng
b0329ac88d
FIX: Should not sync when machine types are inconsistent
...
jira: none
Change-Id: If769fe0d19fb06c4a70e616416bf28f194ebcd45
(cherry picked from commit 8360bd24735073f5882ab014cd80a30d93238ebc)
2025-08-24 23:18:18 +08:00
zhimin.zeng
454002d65c
FIX: auto filament map does not consider vt slot
...
when it has ams
jira:none
Change-Id: Id101a17375059a3aabc8e35d08352cd394a894e6
(cherry picked from commit 14ceceb3d73c0a5e02c7b9cd748978f847fdf03e)
2025-08-24 23:18:18 +08:00