Commit Graph

305 Commits

Author SHA1 Message Date
jiangkai.zhao
bdb64d447e 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
lane.wei
ce534972e2 ENH: wipe_tower: use uniform wipe tower logic for cli and gui
jira: no-jira
Change-Id: I179212585871071cd17bd37c2756444a2d7aba1f
(cherry picked from commit 1f3dde94980d3685bb4d1266e8a5448b8f231b9f)
2025-09-17 23:29:14 +08:00
lane.wei
06f300e38a FIX: gui: fix some .gcode.3mf can not load issue
jira: no-jira
Change-Id: I8a80936f7a3e1a70116e474cd4429fb23b1d218b
(cherry picked from commit 9ad06ba3f49c32d0bf6cb40cc838f3be12ee7d35)
2025-09-17 23:17:21 +08:00
jun.zhang
e7d9c5901f FIX: position of LayersEditing dialog
jira: STUDIO-10706

Change-Id: Ibadeef751ad500f61b9ab20cb7f030c461869399
(cherry picked from commit 38da475197b5059225f732d11963f10f1d58ad6b)
2025-09-17 22:32:36 +08:00
zhou.xu
b74f020657 FIX:set "picking" true in pick render
jira: none
Change-Id: I110f8fe4811280fbc59282752e06330f7f9dc665
(cherry picked from commit b9c3cb89ec0a880c125679fe6edce7a95ddc10e0)
2025-09-17 17:58:34 +08:00
zhimin.zeng
d518b93ffc FIX: the nums of filament_type in plater config is incorrect
2. Improve the judgment and display of the extruder printing area
jira: none

Change-Id: Ie9e1991904bfbc5bffceedb7810b1d1fa598933b
(cherry picked from commit ca5ec101f9a679d8ea4360d96a2db606923b8429)
2025-09-17 15:49:03 +08:00
zhimin.zeng
c0581780e9 FIX: fix the error slice status
when filament printable check is not valid
jira: none

Change-Id: I6d98e3aa27b063d2e7431f7aa5637348978331f2
(cherry picked from commit b0a8dd1014d3184be8ef9f2a4e9bd304cf4bdea3)
2025-09-17 10:21:15 +08:00
xun.zhang
c40d9e374c ENH: update translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I85317044598c4a014c095cca30d1e9abc1fa9145
(cherry picked from commit d64977c9abe5b1cdc81876dc9124e9b1dbeba899)
2025-09-16 15:42:15 +08:00
qing.zhang
d8e176a545 ENH: translate
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2ed88be363eb5f1bd8a35269d669f3947d46e7f4
(cherry picked from commit 0e21d762be12a352be7c3e0411a71dcebcbf270c)
2025-09-16 15:39:14 +08:00
zhimin.zeng
63ec35ea16 FIX: modify the printable range error prompt
jira: STUDIO-10116
Change-Id: I489ff742f51ab8883306883ee59c98a31523fd34
(cherry picked from commit 9eee96ead7ded02c5ef1fa321b98d7a893074ef4)
2025-09-16 14:49:20 +08:00
xun.zhang
d7155b243f ENH: jump to filament map dialog in error tip
1. Remove error tip for unprintable areas if no longer needed
2. Add link for filament map dialog in error tip

jira:STUDIO-10073

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic3235038de73a85964c6dbcb9b4f435e7aa47d34
(cherry picked from commit 1793060e96cec973d9606bd4fbe36686671e0fee)
2025-09-16 14:48:16 +08:00
liz.li
1d55f8256c ENH: refresh FilamentUnPrintableOnFirstLayer error state
jira: none

Change-Id: Ifec994cdba2c9590d4c1f8b59e6052593fd05bc2
(cherry picked from commit 04eeb40e1eba976e0921686bf6d66599a90e81cc)
2025-09-16 14:47:26 +08:00
Noisyfox
3f2dad133f Merge remote-tracking branch 'upstream/main' into dev/h2d
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
2025-09-16 14:46:40 +08:00
qing.zhang
8c7475eded ENH:instead of prime_volume by filament_prime_volume
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I96e7d0604da8f90678feed81833e3a634752ffff
(cherry picked from commit be02e769bb49680d6be678fc5fa73a141ca8da1c)
2025-09-16 10:39:19 +08:00
jiangkai.zhao
03998203fb ENH: enhance some functions of the wipe_tower
1.Add automatic calculation of the wipe_tower's brim width by height;
2.modify the min_depth_per_height and the default ridwidth

jira: none
Change-Id: Idd96bc90e8e631aa8481b559e1e9fec24c6b822f
(cherry picked from commit 4dd4e9e12c02d945a0ac3fd2020f75313c5b2cc9)
2025-09-13 18:49:41 +08:00
Noisyfox
70ec08a86f Fix compile error 2025-09-12 16:56:45 +08:00
zhimin.zeng
749c098421 EMH: enhance for rib wall wiper tower
1. fix the slice error status
2. add rendering for wiper tower
3. modify the wipe tower start pos for rib wall wipe tower
jira: none

Change-Id: If554ca0fb30f6c7ce9641014c0ed4a7f23afd6f4
(cherry picked from commit 3ae08b458dea1d04cad33b2787d98407111b038c)
(cherry picked from commit 55772c59126bc4dd5c2ad022e7a959785c29cb4e)
2025-09-12 15:37:46 +08:00
xun.zhang
6ee5190fbb ENH: modify sentences for translate
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic97b6d9dce8de77308f0893b55d621d5c250531e
(cherry picked from commit e82fd6b4752e0f72c33afb6d65d9c02b666585e4)
2025-09-10 16:22:30 +08:00
lane.wei
86aff60ac3 ENH: GUI: remove object limited warning
jira: no-jira
Change-Id: I89bc082721bdc05ed2f41febc12a4f4252308ac0
(cherry picked from commit ff02619730f6af3910b535c419fc798b4a9a9d62)
2025-09-10 16:19:14 +08:00
lane.wei
58fd95dda1 FIX: GUI: refine the error message when switch plate
also refine the text
jira: STUDIO-9809

Change-Id: Ifce527d3d19ead80b314611de8f3f861dc598188
(cherry picked from commit 014996d4258cef42ce943157d6485fad9cc98ee2)
2025-09-10 16:19:03 +08:00
xun.zhang
02b7c816ce FIX: always empty popup in unprintable case
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90fcb90ef01e8cc398683bf00eb8d87eefe95069
(cherry picked from commit f79ba9e315689202f592cac3dcc3027c4eae9164)
2025-09-10 15:28:25 +08:00
xun.zhang
94c0b125e0 ENH: update translation
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9b260cb3e21b9052c9a2d65378bd0e795f6db6f3
(cherry picked from commit 2507eba37d5f09cca51b3e9f9f281b2208e57eb1)
2025-09-10 15:02:23 +08:00
xun.zhang
a877b1ced8 ENH: update some sentences and refine ui
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibba2d6c880fcb810f861cf06eb7a30a512cbbacf
(cherry picked from commit 5195e824814a1ee38d789f331ec86e73807d412a)
2025-09-10 15:00:25 +08:00
xun.zhang
9180121762 ENH: update extruder unprintable tip before slice
jira:none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3a47e1505c3410e1ba41e4d12903ccf4db486240
(cherry picked from commit 086e977d897c2a9022321e2611c82f39147462be)
2025-09-10 14:42:30 +08:00
zhimin.zeng
99ebe90ce3 ENH: Add prompt information when mixture of PLA and PETG
jira: STUDIO-9659
Change-Id: I03a09dd796074d0872010672bdd85688bb7f1715
(cherry picked from commit 903b230f389ac8fce2816a8d46a0675019af0b04)
2025-09-10 08:53:00 +08:00
Alexandre Folle de Menezes
6d020e7792 Update strings for keyboard shortcuts (#10399)
* Update strings for keyboard shortcuts
2025-09-09 21:48:42 +08:00
xun.zhang
5551e14db4 ENH: update trans
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iec86e9f51c10d10f81764eef09aa81a3562bd273
(cherry picked from commit 69ff576c2d505030f2ee4d5b3154eeb8c219769c)
2025-09-09 17:22:41 +08:00
xun.zhang
f1eebaea8f ENH: some tip logic optimize
1. Only check printablily if have explicit filament map
2. Refine some sentences

jira:STUDIO-9753,STUDIO-9727

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2fc3aa2276dc6f514c50ac2fcaf9509f41e778f3
(cherry picked from commit 73f92d27dab667c8893ab96e47f3832ce9d2de60)
2025-09-09 17:16:41 +08:00
zhimin.zeng
83accbed25 ENH: add PPS-CF/PPA-CF detection for multi-extruder printer
jira: STUDIO-9660

Change-Id: I1df024e178b8561569b493888d6057d8f96aea3c
(cherry picked from commit b68a7b3bd6ad5c980885fbaed3c635ae1a424f73)
2025-09-09 14:41:23 +08:00
zhou.xu
8d1369d3cf NEW:add "obj preview thumnailData" function
jira: none

Change-Id: I688c2f05bf85fca376418115acddb5066ef980eb
(cherry picked from commit 16f2b2bcb5fd157f25aa7012dabd99a8d31aec07)
(cherry picked from commit 7cc21b5e9745a84d75ea13b66f5653520bb1cba3)
2025-09-09 09:39:43 +08:00
zhou.xu
b1932f99a0 ENH:move get_extruders_colors api to plater class
jira: none
Change-Id: I8c2b31d4963b01cb193b7f2a2a3650cf7252ebc5
(cherry picked from commit 3eeabc0722027b789c59130762bd57c2745cf188)
2025-09-07 18:52:14 +08:00
xun.zhang
445d6650f4 FIX: wrong filament map when switch printer preset
1. Clear filament map info in plate when switch to single extruder
profile
2. Use real filament map when check tpu validality

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I45a3e8c91dd52e7300a563eda3ffb167c19b7074
(cherry picked from commit d27304e5ef2f43424046b1a1fabc8d999508be4e)
2025-09-06 23:52:49 +08:00
xun.zhang
f5a8c96924 ENH: filament map params switch to global param
1.Add more filament map modes
2.Filament map and mode are set as project config
3.Plate filament map is only valid when plate filament mode is
manual

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I33b2f853e0b77b9d605be1f2f1172b44df43da15
(cherry picked from commit e45f8c6dc2146e1e31a1c21e8aaada540af112d0)
2025-09-06 23:49:11 +08:00
zhimin.zeng
a8dfbef921 FIX: cannot show printable area error
jira: STUDIO-9199
Change-Id: I1a02175b173496e2b9b4fd67e2c6b8680a3e3bb3
(cherry picked from commit 3daf67ef2115e196034e9012bdfb6d29a1eb3dbc)
2025-09-06 22:22:47 +08:00
Alexandre Folle de Menezes
e2a056a09f Fix misc issues with the translated strings (#10400)
* Spell check "part selectiont" and "printetrs"

* Remove translation of "°"

* Fix the abbreviation of Watts

* Fix capitalization issues

* Fix punctuation issues

* Fix spacing issues

* Adding more missing periods
2025-08-26 22:39:14 +08:00
lane.wei
1b060b1b24 FIX: cali: fix the 3mf wrong issue when cali for multi-extruder
jira: no-jira
Change-Id: I352e4dd499f4e4dd22cdc21f3f62428a0baa5bfb
(cherry picked from commit f9cd3dd8764ab551c2aa85cdb7383b19bc345f36)
2025-08-26 20:27:08 +08:00
lane.wei
671dfa5f0c ENH: buildvolume: add logic to support extruder_printable_height
jira: no-jira
Change-Id: I962c4aed8c536c0fd8b89ae090cd0463c5d645db
(cherry picked from commit 43773d77010492453473797e77e83e9a4630c25f)
2025-08-24 23:18:30 +08:00
zhimin.zeng
243abf442d ENH: Add extruder_printable_height
to support different printable height of multi_extruder
jira:none

Change-Id: I265c65e15fc8f598c3456556557bb6977b5de820
(cherry picked from commit 933adbaaf0eaf361e39f131dd5536dca91214d43)
2025-08-24 23:18:29 +08:00
xun.zhang
bd272e231f ENH: wrong filament id in MultiExtPrintableError
jira:STUDIO-8645

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I20d84fab66486ef6d90e86f0f2d8c5db98175b5e
(cherry picked from commit f618caa07711d86e69832161d0e26b08dd3bfa3f)
2025-08-24 23:18:27 +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
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
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
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
be5d9d7c19 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
qing.zhang
31767cd80f ENH: check wethether filaments print on first layer
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1cc7cd9e9bbbcdf72112c0949196c09ef414cf91
(cherry picked from commit 67039a6f4d51482fe689a2aad0a900f3339a5c62)
2025-08-24 23:18:14 +08:00
zhimin.zeng
b9e1193ba7 FIX: limit the wipe tower to common areas for multi_extruder
jira: none
Change-Id: I58d061904610a5e33679e7254721bc43dcc22e64
(cherry picked from commit 64f471c2cceb9c08ff8b5f6af10ca95771ccaf57)
2025-08-24 23:18:14 +08:00
zhimin.zeng
3ec82dd90f FIX: fix build error
(cherry picked from commit 885e96d8db30a688c3fc65f828c2c4b78499b4c3)
2025-08-24 23:18:14 +08:00
zhimin.zeng
e8420e93d3 ENH: Add gcode check for multi_extruder
jira: none
Change-Id: Iebc43e608c4509eb62b280af2d401fa9e0e089ba
(cherry picked from commit c75c10e312b8d0bd5404d92db88c95a9e6186bc1)
2025-08-24 23:18:14 +08:00
lane.wei
8069133261 ENH: dual_extruder: add logic to process extruder_printable_area
JIRA: STUDIO-7498
Change-Id: I1cf53db93acf41b06cb1b9569a0679487c9f1e41
(cherry picked from commit e5be69dedd1ba6dc289a14b89598c9a6101dacb3)
2025-08-24 23:18:12 +08:00
Noisyfox
afb7387b90 Add fuzzy skin painting (#9979)
* SPE-2486: Refactor function apply_mm_segmentation() to prepare support for fuzzy skin painting.

(cherry picked from commit 2c06c81159f7aadd6ac20c7a7583c8f4959a5601)

* SPE-2585: Fix empty layers when multi-material painting and modifiers are used.

(cherry picked from commit 4b3da02ec26d43bfad91897cb34779fb21419e3e)

* Update project structure to match Prusa

* SPE-2486: Add a new gizmo for fuzzy skin painting.

(cherry picked from commit 886faac74ebe6978b828f51be62d26176e2900e5)

* Fix render

* Remove duplicated painting gizmo `render_triangles` code

* SPE-2486: Extend multi-material segmentation to allow segmentation of any painted faces.

(cherry picked from commit 519f5eea8e3be0d7c2cd5d030323ff264727e3d0)

---------

Co-authored-by: Lukáš Hejl <hejl.lukas@gmail.com>

* SPE-2486: Implement segmentation of layers based on fuzzy skin painting.

(cherry picked from commit 800b742b950438c5ed8323693074b6171300131c)

* SPE-2486: Separate fuzzy skin implementation into the separate file.

(cherry picked from commit efd95c1c66dc09fca7695fb82405056c687c2291)

* Move more fuzzy code to separate file

* Don't hide fuzzy skin option, so it can be applied to paint on fuzzy

* Fix build

* Add option group for fuzzy skin

* Update icon color

* Fix reset painting

* Update UI style

* Store fuzzy painting in bbs_3mf

* Add missing fuzzy paint code

* SPE-2486: Limit the depth of the painted fuzzy skin regions to make regions cover just external perimeters.

This reduces the possibility of artifacts that could happen during regions merging.

(cherry picked from commit fa2663f02647f80b239da4f45d92ef66f5ce048a)

* Update icons

---------

Co-authored-by: yw4z <ywsyildiz@gmail.com>

* Make the region compatible check a separate function

* Only warn about multi-material if it's truly multi-perimeters

* Improve gizmo UI & tooltips

---------

Co-authored-by: Lukáš Hejl <hejl.lukas@gmail.com>
Co-authored-by: yw4z <ywsyildiz@gmail.com>
2025-07-18 16:01:25 +08:00