Commit graph

508 commits

Author SHA1 Message Date
Bastien Nocera
b8b83a6f15 FIX: Fix missing std:: declarations in ToolOrderUtils
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.hpp:14:26: error: ‘numeric_limits’ is not a member of ‘std’
   14 |     const int INF = std::numeric_limits<int>::max();
      |                          ^~~~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/GCode/ToolOrderUtils.cpp:545:66: error: ‘unordered_set’ in namespace ‘std’ does not name a template type
  545 |     static std::vector<T> collect_filaments_in_groups(const std::unordered_set<unsigned int>& group, const std::vector<unsigned int>& filament_list) {
      |                                                                  ^~~~~~~~~~~~~

(cherry picked from commit 059e18aa38ccc715a6c1f2dc1ceb9af1940c7a17)
2025-09-18 23:01:00 +08:00
Bastien Nocera
81ae29d82f FIX: Fix missing offset() helper declaration
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.cpp:3327:26: error: ‘offset’ was not declared in this scope; did you mean ‘off_t’?
 3327 |             outer_wall = offset(outer_wall, scaled(spacing)).front();
      |                          ^~~~~~
      |                          off_t

(cherry picked from commit c77afa7096c48c2b3e2559b39252bafca3f87b28)
2025-09-18 21:53:18 +08:00
jiangkai.zhao
bca7f73f7f Fix: error the contact layers of different categories
jira: none
Change-Id: Ife5508427e0c09527489f1ff973d27463650d60a
(cherry picked from commit 6a927ebb5539cf866e04c309c723fca91f573ee8)
2025-09-18 17:04:59 +08:00
xun.zhang
cd16bd83a3 FIX: translation problem
1. add regroup link

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia90c80f5ff86e785e00fb0c38360eb33424a5ddd
(cherry picked from commit 01be3a51e646a9ca4277c490396417c95d983648)
2025-09-18 16:38:26 +08:00
zhimin.zeng
bf0f98b0eb FIX: apply unprintable filament type to limit filament map
jira: none
Change-Id: I81e22dc28bc416a1b26c242fab4e054f597b064e
(cherry picked from commit 9b81b9e2d4c6b39329e94efe3e433564c66f6ffe)
2025-09-18 16:14:01 +08:00
xun.zhang
f4445d0c04 ENH: optimize group logic for unprintable filaments
1.Also fix a tip mistake

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia52f95988d467a7018579a774376578b83e7ca05
(cherry picked from commit 804fe8d124e916f5957244913a50d24aceb621bd)
2025-09-18 16:13:25 +08:00
zhimin.zeng
c8aa1de66f FIX: crash when tool_change is empty
jira: none
Change-Id: Ia2d6fda6847e41054700e37a25179ae2a8d5cd46
(cherry picked from commit c38eb761c6ec5bf8013ba9f4b02ccb09985b4181)
2025-09-18 15:22:55 +08:00
zhimin.zeng
b077e0d39c ENH: Reduce unnecessary solid fills
jira: none
Change-Id: I9f0f3eeacb6a553ef06c9afbb1299ff6139e77b9
(cherry picked from commit 2a00a0d88984ad8aeb664308465be995c834a101)
2025-09-18 15:22:55 +08:00
xun.zhang
7e98754e9b FIX: negtive value in grouping stats
jira:STUDIO-10772

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90b88c7d96f6aeb31df36233efab5b9059ad2622
(cherry picked from commit f6a46d9b95aca66e49c89485424637b5eeae35ec)
2025-09-18 11:29:42 +08:00
zhimin.zeng
c5580b4cba FIX: Old version of gcode cannot be opened normally
jira: STUDIO-10825
Change-Id: Ibf512cd4abc5315bb090d39974fb436e328214c7
(cherry picked from commit de449496b5c4c3f37bdcd115c6ea308ecb92d2a2)
2025-09-18 11:07:13 +08:00
Bastien Nocera
6e425e9601 FIX: Fix missing polygon primitives declaration
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.hpp:31:12: error: ‘TriangleMesh’ does not name a type
   31 |     static TriangleMesh                 its_make_rib_tower(float width, float depth, float height, float rib_length, float rib_width, bool fillet_wall);
      |            ^~~~~~~~~~~~
<snip>
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.hpp:33:12: error: ‘Polygon’ does not name a type
   33 |     static Polygon                      rib_section(float width, float depth, float rib_length, float rib_width, bool fillet_wall);
      |            ^~~~~~~
<snip>
/run/build/BambuStudio/src/libslic3r/GCode/WipeTower.hpp:200:21: error: ‘Polylines’ was not declared in this scope
  200 |     std::map<float, Polylines> get_outer_wall() const
      |                     ^~~~~~~~~
<snip>

(cherry picked from commit ea2c021427dddcddb8a4e9e41c0f649dd727fdf9)
2025-09-18 09:33:17 +08:00
jiangkai.zhao
5573293582 ENH: Use the real prime tower model after slicing.
1. set wipe tower real height
2. fix wipe tower small arc error
3. add rib_width constraint to ensure that the rib wall of the wipetower are attached to the infill.
jira: STUDIO-10540

Change-Id: Idfdc809f0236121d98587ac2a09a2ebbf5caf945
(cherry picked from commit 3a7dcfd23249571224a4d538c55907a0a5c6154d)
2025-09-18 09:33:02 +08:00
zhimin.zeng
0235329bff FIX: modify the insert depth value of wipe tower
jira: none
Change-Id: I60b453e688b5bd592b6e276621fc9e8ca68c8789
(cherry picked from commit 7345b0034fa0044afe9d5375c5dc4953eafa5322)
2025-09-17 23:09:17 +08:00
zhimin.zeng
b791a31aff FIX: crash when the wipe tower block is invalid
jira: STUDIO-10696
Change-Id: I6e9ff87cfb8cfd2383480248d56b8515d383b11c
(cherry picked from commit 609a4c0e52b4ad2c7b145d21b9c648c96d2ba13d)
2025-09-17 22:58:45 +08:00
zhimin.zeng
8974ab6e46 FIX: fix slice core dumped problem
enable timelapse and the first layer has no toolchange
jira: STUDIO-10698

Change-Id: Ia503efe4a143fe98f67cd3913b7745d74b113170
(cherry picked from commit a4388010bd289f15d57044b208a2aa2116f76332)
2025-09-17 21:56:14 +08:00
xun.zhang
9cb261cbf2 ENH: add some change for translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I58ded926c8525e261bb1c7518562c9276afc1409
(cherry picked from commit 1a240e5d14e173cce2b9cb99a56e4103729cc9d7)
2025-09-17 17:52:51 +08:00
jiangkai.zhao
042f109cc9 Fix: modify tpu travel speed to 2 times
because of 2x nozzlechange width
jira: none

Change-Id: I3a9af777551c54b8bac273bf1f6e06c9f36673bb
(cherry picked from commit 99af2382c4a6d8d942611b4d1145b4d8872a99a8)
2025-09-17 17:48:31 +08:00
jiangkai.zhao
fb47a27bc1 ENH: adjust wipe_tower depth interpolation
because [0,0] will cause the wipetower to disappear in low-layer-height models with enable smooth timelapse type.
jira: none

Change-Id: I6fe3d4128e9b284ae7660f7e0f9f8b62f74cf427
(cherry picked from commit d5b570d8dccd2b96620e0448c3657c1d21cc8844)
2025-09-17 17:48:25 +08:00
jiangkai.zhao
4a12032cd3 Fix: crashes when slicing small objects with wipe_tower.
jira: STUDIO-10572
Change-Id: I37312673a87e542120ee7282c22f80e16c894cd9
(cherry picked from commit 8d32d29016a96ae3e9fcaec3fc9d261bff39dd22)
2025-09-17 16:11:00 +08:00
jiangkai.zhao
16dc0381a2 FIX: add gcode reserved tag
and fix block.finish_depth error

jira: none
Change-Id: If272b181430aa79a88ff0cb79670cf2c62a06020
(cherry picked from commit 0f4516f78186fb2a13b245eb38d13dfc2fce8bfc)
(cherry picked from commit 7e0078b24e65711266fe70d8d50f0d3faa4096b3)
2025-09-17 15:49:03 +08:00
jiangkai.zhao
3682cbe45f Fix: modify the rules of get_wall_filament_for_all_layer
jira: none
Change-Id: I6e8655105470dc3eef291d4b6ac1c4447092b21a
(cherry picked from commit 81ad7bdde0db5c7bc22951843c2c226496d7b2c0)
2025-09-17 15:06:43 +08:00
jiangkai.zhao
b8384f0b7e ENH: Remove the solid layer below the fast extrusion
jira: none
Change-Id: Ied59c6f18bc2832be80c105d95f77d5cff119cc3
(cherry picked from commit b9d07f402ea929b90c26bf6f55919677cf77a75b)
2025-09-17 15:06:38 +08:00
jiangkai.zhao
3f7f8260cb ENH: modify quick extrude to 2 perimeter width
and use bridge flow for nozzlechange
jira: none

Change-Id: I9bda1b689d7139819607bace09354ef43d27a970
(cherry picked from commit 147e7bdb50765143074dd8111c24f8c1b61872dc)
2025-09-17 15:06:33 +08:00
jiangkai.zhao
39276e0c35 Fix:the missing extrusion issue in the wipe tower
and resolve the infinite loop during multiple material changes when printing TPU.

jira: none
Change-Id: I9d0fb142ced6ba894803fd4c9b9b665e2fa93d92
(cherry picked from commit aad1ab2090781e072053dfe16764a3e05bb57178)
2025-09-17 14:04:31 +08:00
jiangkai.zhao
820f12a16b ENH: reopen confilctchecker with adpative height.
and fix conflict checking when the wipe tower's brim fully encloses the model

jira: STUDIO-10237, STUDIO-10296
Change-Id: I6e2a6640c06ddb6b3af700c9048fa26434411631
(cherry picked from commit b36c41e5146168325d8b7ec966eb97f1062442a7)
2025-09-17 14:03:59 +08:00
jiangkai.zhao
d1d04d395e Fix: the generation of the skirt does not take the wipe_tower into account.
jira: STUDIO-10381
Change-Id: I523d366d6d569696de48f872be827d73710cb526
(cherry picked from commit 939b405c35809dbceb65e5efdc65622407065b65)
2025-09-17 14:02:10 +08:00
jiaxi.chen
0d62d88387 FIX: useless change of extruder
jira: none
Change-Id: I4331e129d5a1ed79b539946d84ccd3113df93ef0
(cherry picked from commit fe20ab11b970a066fdeb42486c4bb53a8a5172ba)
2025-09-17 11:07:30 +08:00
zhimin.zeng
af44f4736d FIX: remove not necessary assert
jira: none
Change-Id: I9878671ff2adf898c7ebfea1f3838205c8ad458b
(cherry picked from commit 43d15d97010ffc96b08d1cfdbbbe0d78d643eef0)
2025-09-17 10:28:18 +08:00
xun.zhang
137fffa857 ENH: update translations
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0a7f24dd1538f4baf1b2b56f35233de5937a6d30
(cherry picked from commit 4747cbc53a5e5e8457f03914755d192421ea1d57)
2025-09-17 10:21:15 +08:00
xun.zhang
acbea85829 FIX: add some missing translate keys
1. Add missing translation keys
2. Fix filament map dialog can't display in auto mode

JIRA:STUDIO-10216

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0c3927877dd91befc2463a300324bc6823615673
(cherry picked from commit 3733f33953fa89b490be0d2f36e225fa62dcbc00)
2025-09-17 10:21:15 +08:00
zhimin.zeng
37013aa25b FIX: modify quick extrude to 1 perimeter width
jira: none
Change-Id: Ibda111742af2d664088a51e9dd3740f81b4649c7
(cherry picked from commit 9fccb9bcde5332bafcb50f5fbb77212caac19131)
2025-09-17 10:07:49 +08:00
jiangkai.zhao
e236b6aafe FIX:Change the sorting method of the wall filament
and fix wipe_tower's interface bug
jira: none

Change-Id: I3887142bac2d43a4d2b6db65b5a3976bb271cf71
(cherry picked from commit 58891ce3102649e090499cff09d0c6443d6a6658)
2025-09-17 10:07:44 +08:00
zhimin.zeng
a0b5cdfbb2 ENH: generate framework for all layers
jira: none
Change-Id: I95f35ba45fe9f544c53bdf0c5a52a70bd45ee7a9
(cherry picked from commit 3e0b6eb2289eab383c6e616d37559b0c6619eca1)
2025-09-17 10:07:27 +08:00
zhimin.zeng
5b589b47f1 FIX: fix error length for nozzle change
jira: none
Change-Id: I1c9052cadef717888c5f8ff50e0d6e1efce6d73e
(cherry picked from commit d0d5ed2f5ef69b9f5155ec64c7c0a73cfa90483e)
2025-09-17 10:04:30 +08:00
jiangkai.zhao
283dbe48b2 ENH: Set the skeleton of contact surface to solid
and fix the nozzlechange's error cleanbox.
and fix some error in interface's nozzlechangle and toolchange.

jira: none
Change-Id: I2fd5c68d90506fcb8f01f09a8246dfb5838baef4
(cherry picked from commit 6c5b63db246a1f42e34225c5561fb8b0975da53b)
2025-09-17 09:48:52 +08:00
jiangkai.zhao
38ec6429a3 ENH: change solid layer count
and reduce the toolchange speed if it occurs at the contact surface
jira: none

Change-Id: Ic238671366145bc7bff76d18d20c104a201a1f17
(cherry picked from commit fb9f9f41e618c5064032b85351363029307e209c)
2025-09-17 09:48:46 +08:00
xun.zhang
229ef8884f ENH: enhance filament group alogrithm
1. Try to merge filaments before grouping
2. Set max match num for machine filamnet in match mode

jira:STUDIO-10392

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2451d838e07ee02f493fda4dc702f3d13b2ad37b
(cherry picked from commit d15fc37ff2fa048e38a0b132bb3ae525ff666fab)
2025-09-17 09:46:04 +08:00
jiangkai.zhao
9ad372f3f5 ENH: add solid infill before nozzlechange
and set the contact surfaces of different material types as solid,
and reduce the nozzlechange speed if it occurs at the contact surface,
and recuce the toolchange speed if it occurs at the contact surface.
jira: none

Change-Id: I884d60f4114544dfa959bd654ecc985f5fb9aac4
(cherry picked from commit ed7bfd3ff6732efe6c7e9eb96901be1db00bb3d0)
2025-09-17 09:30:48 +08:00
jiangkai.zhao
ffdce0671c Fix: error wipe when no finish_block_tcr
jira: none

Change-Id: I0890089661a719f728c5fbc5254cf53f047d7248
(cherry picked from commit 7d48561817647e7ee111ce5c40063159c4baee03)
2025-09-17 09:30:43 +08:00
zhimin.zeng
4b7514fc97 FIX: error travel when start print TPU
jira: none
Change-Id: I0ccabf460afca03662249c97d6f2e01e05120509
(cherry picked from commit fde94de17b80333167463b542a81f71de5226613)
2025-09-17 09:30:38 +08:00
zhimin.zeng
9bb3532743 FIX: fix some wipe tower issue
1. the nozzle change gcode use double perimeter width
2. fix the error layer height for adaptive layer height
3. limit the nozzle change speed to 50 when a bridge is detected
4. fix the error extrusion flow for filament change gcode when a bridge is detected
jira: STUDIO-10269

Change-Id: I580c618555fe19d000a56e2510a42004722c1b8b
(cherry picked from commit 5c56b43166ab32b09da31b7046efbbcbe3cbc9c8)
2025-09-16 23:40:53 +08:00
xun.zhang
58c877976d FIX: some filament group issues
1. Add filament_is_support field. Format the filament type
2. Optimize machine filament info logic

jira:STUDIO-10326

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia8bfc37095339e73c98209b4e3f1e0804e511e88
(cherry picked from commit 001144400b841629439a890d46fa40a7296689ba)
2025-09-16 23:27:32 +08:00
jiangkai.zhao
d463858fda ENH: Change the collision calculation
of the wipe tower's outer wall to use the actual outer wall path.

jira: none
Change-Id: Ib45ecbc328c88c1abe6d9e8567f715331a3ddd37
(cherry picked from commit 0a20f1fe6d6d63cdcb13bc19fd9ae553f45b6f59)
2025-09-16 22:20:14 +08:00
qing.zhang
01c2a31ac9 ENH: change param name
Jira: none

change filament category to filament adhesiveness category

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I267d71b2f968becf4e8f434daafdf1a70c36a823
(cherry picked from commit faec4160d560d965978447eaa8675a5fbee4090c)
2025-09-16 21:56:37 +08:00
jiangkai.zhao
9e29f2db0b ENH: add wipe_tower infll gap
and fix wipe error when enable timelapse and in single color
and set rib wall as default
jira: none

Change-Id: Ic365bb7ee0ee6715c9d4f4f00b4bca9fd472c61a
(cherry picked from commit 89b59f1c41e0f360457622438a09237bfa1eaa18)
2025-09-16 21:34:10 +08:00
jiangkai.zhao
595d67761e ENH: add lift after printing the wipe_tower
and reduce the travel speed inside the wipe_tower
jira: none

Change-Id: I3b07ee62623e0cdc2f1824f0011f95776020bee1
(cherry picked from commit 1aad582e08229fad1f935e257c1335dcfdbe406c)
2025-09-16 17:39:16 +08:00
jiangkai.zhao
69d85d0045 ENH: add flat ironing before toolchange
jira: none
Change-Id: Iabe121f9523b662fc90c18365aa642583635a126
(cherry picked from commit 1b467b13c4bbac7d6afd361fee75ccc52eddef9a)
2025-09-16 17:39:10 +08:00
jiangkai.zhao
715a8a8518 FIX: FIX: fix width error of rib wall
when enable timelapse_print without toolchange;

jira: none
Change-Id: I4c89acc70ee122c0ad504d97c003ebb4016567d1
(cherry picked from commit 6350ebf9b651a933ab8a9030da9cdf9b1608cff0)
2025-09-16 17:23:36 +08:00
xun.zhang
26bedce268 ENH: refine code for gcode line process
1.Add a Trietree to match command instead of the switch sentence.
2.Support VM104 and VM109

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5f6b3d1bf87baebc0a20c2589a5138538469dfec
(cherry picked from commit 85cb4a41c2a7e42552d7b8c04864e5199ae942e9)
2025-09-16 15:04:02 +08:00
zhimin.zeng
ae9493d885 FIX: only check TPU for multi-extruder printer
jira: none
Change-Id: I1fb882c05d43ffbcd42950ca6618d5789f148cd9
(cherry picked from commit 1b41b9a76369f28b51bc172b5c289968c6e8550c)
2025-09-16 15:01:17 +08:00