Commit Graph

479 Commits

Author SHA1 Message Date
jiaxi.chen
68d7bd9e17 FIX: Interface_not_for_body is ignored for detached support layers
jira: STUDIO-12826
Change-Id: I3ab585aa899dee5cf006effb3cea15b5e64332eb
(cherry picked from commit 56e239e38103a0f1631f0174c9153e239ab5c802)
2025-09-25 17:12:35 +08:00
xun.zhang
b351fa3b50 FIX: only meature m29 once in machine start GCode
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3661159dd09f6d179eae3a0b1f2bbc14277be312
(cherry picked from commit 60492b7b0b57dc243cc8ac17f2cad638724aaca2)
(cherry picked from commit 8555af21cacaa10e74715e771aa0866052a31bd6)
2025-09-25 16:49:01 +08:00
jiangkai.zhao
fd17dd6382 FIX:Crash caused by wipe_tower depth = 0
and remove useless assert

jira: STUDIO-12514,STUDIO-12474,github#7064
Change-Id: I8faf498251c8f7ca2c1eead463f38e8a3d836299
(cherry picked from commit 723e2d7ced6b466f2166085b8ca007762aaf17aa)
2025-09-25 14:45:44 +08:00
xun.zhang
e42556f835 FIX: collision caused by pick safe pos in object mode
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic9a45e314ffa1115854736516cc06dfd976c28f9
(cherry picked from commit 04d90ac16d3abc481860a46b2d8bc8cd2f599aed)
2025-09-24 13:12:55 +08:00
zhou.xu
adeb3ab3f7 FIX:Fix the issue of importing GCode array out of bounds
jira: STUDIO-12389
Change-Id: Id7995558bf0e297e2360b338ffbf63d93efa38f0
(cherry picked from commit 6d15a9005769a7dbfb96bb28ce6b57e55bf1c435)
2025-09-24 11:18:23 +08:00
zhimin.zeng
fa8280f065 FIX: The print_z of some layers is incorrect after slicing
jira: STUDIO-11989
Change-Id: Ia0488d8270a7880d3f019d757cde7ce2f591713d
(cherry picked from commit 9bd47ef3e59b5518cd049182890c1d557c69b710)
2025-09-24 10:40:45 +08:00
Noisyfox
580414265d Merge remote-tracking branch 'upstream/main' into dev/h2d-2
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
2025-09-24 09:15:33 +08:00
xun.zhang
1e9d825dbb ENH: remove the limit for number of tpu filaments
jira:STUDIO-11995

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd3ff7bf870570f9691b7008d8ca6ee8245c046d
(cherry picked from commit cd3219e6654d126363c04d0135bece62dcf94e39)
2025-09-23 21:32:18 +08:00
xun.zhang
44e62213e9 FIX: potential collsion in by object seq
1. update the expand length
2. enhance rod collision detect

jira:STUDIO-12199

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1350ef5612b833405928e22c542a7a6f0c671105
(cherry picked from commit 7a197af3e0aa6d6c1493768d757ecdc938e49c1d)
2025-09-23 17:22:10 +08:00
xun.zhang
ce81f03b6d FIX: avoid collsion in by object mode
jira:STUDIO-11625

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If5957a919af606934a34aa942f54dc4e7650a7f9
(cherry picked from commit 476c17819fe2e4fb7891b4b46865dde1a0057f33)
2025-09-23 08:55:31 +08:00
SoftFever
b483dff617 Enhance GCode handling for Z-axis movements (#10803)
* Enhance GCode handling for Z-axis movements

- Updated `travel_to_z` method to include a `force` parameter, allowing forced Z movements.
- Modified GCode generation logic to ensure Z position is restored after unknown last positions.
- Enforce z restoreation after tool changer

* Improve filament_multitool_ramming logic

* fix indent
2025-09-21 22:03:54 +08:00
xun.zhang
3e8ca38990 ENH: refine filament sorting when flush volume is 0
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia012cbd7a45a2fead94d2c579106115ea8edb5e8
(cherry picked from commit 6c1be5bddca79bc9a3bf536277d46cfc7fe20ebe)
2025-09-21 18:01:16 +08:00
zhimin.zeng
119f16c565 ENH: add filament_printable and delete unprintable and printable list
jira: none

Change-Id: I643ab11831ceac1fe0793510f64b288cbd16415a
(cherry picked from commit 3dd5a601547485bfcc4188727343a52c30bb6a73)
2025-09-21 13:48:08 +08:00
noisyfox
eb75a325ca Fix build error when PCH is not used 2025-09-21 13:48:07 +08:00
xun.zhang
425cb8b52b ENH: speed up timelapse pos pick
1. Cache the bbox of object

jira: STUDIO-11625

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4682cd5fe2aef1dc5cd5fd6be33425c7095263eb
(cherry picked from commit 07516d1fecfff7719a60f2c5730bfcbe1958299e)
2025-09-21 13:48:04 +08:00
jiangkai.zhao
8e616ce892 ENH:add flat_irong as print preset
jira: none
Change-Id: Ic29634780e1ece2d0cffddd0c2cf7cafb1318fa2
(cherry picked from commit 2acd313f72d5e9531cf1394c218dc3bc6b8d9521)
2025-09-21 13:48:03 +08:00
xun.zhang
b5756d1702 ENH: add timelapse pos picker
1. refine code structure
2. prevent moving tool head between camera and object
3. consider raft layer

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic0004791bfd4036d4323045a041709d861e5c8d0
(cherry picked from commit 7dc269f99473421162ad89c555bfac7ace0e9a6b)
2025-09-21 13:48:03 +08:00
zhimin.zeng
e993a4cab8 FIX:Incorrect filament used for extruder with support filament
jira: STUDIO-11670
Change-Id: I7c5da8280cdc31c5910cd42333654db7673265c7
(cherry picked from commit 5b0b04815e6cff0d119328e780e4183a6ed479c5)
(cherry picked from commit 4364a4ecca47c96ebb39a4a7eacefb50ef6dd932)
2025-09-21 13:48:00 +08:00
jiangkai.zhao
f3c11288f6 Fix:skip_point error when gap overlap
jira: STUDIO-10852
Change-Id: Idbfdfe2513115b0fef540e0d681997be0a3719a4
(cherry picked from commit baae89db17b7a59858d7760d6bfc394fbdd8c252)
2025-09-21 13:47:51 +08:00
jiangkai.zhao
e7f95ae1af Fix:False positive in collision detection
jira: none
Change-Id: I4f2c88ac95273086e2f77e60f5856415aba83741
(cherry picked from commit 93e8f29e5d683e2949310b3037b1d90f3eeeab0b)
2025-09-21 13:47:51 +08:00
xun.zhang
782c7f1d0c FIX: filament savings not consider flush multiplier
github:6214

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9cb9f8d172bfa501732bb50f437e261793e18972
(cherry picked from commit 274a05367313daac913e58b98dd8944e934ebabe)
2025-09-20 15:36:49 +08:00
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