sync codes to 02.08.02.60 - #11889
Merged
Merged
Conversation
1.Importing the assembly for the second step should automatically insert it to the right side of the existing assembly. 2.To exit the Gizmo tool from the assembly view, it is necessary to reapply ly_keyframe-display_made 3.update svg feishu: issue-7049752526 Change-Id: I0e37829381447a32dd32d6576efd3241525006bb
… 2026-07-16 14:10:09 Change-Id: I039fecf948027e85d1acd3f529cede432973aff6
feishu: issue-7047972741 Change-Id: I39d545d2295216738c6bf998fb4f9c651125c373
jira: STUDIO-18479 Change-Id: I311755c6179204fea145ce31efe9f7ada60dea36
feishu: story-7039146379 Change-Id: I394b4bf1cbdc17e66ac5dd43b44a8a49c4c13429
螺旋抬升（eager_lift / travel_to_xyz）圆心方向此前写死，从不判断整圆是否落在可打印区内；接缝贴近热床边界时圆弧会鼓出热床（如右上角接缝时 X 冲到约 258，超出 256）。 本次在 GCodeWriter 缓存热床包围盒，新增整圆边界判定，越界时按候选方向翻转，全部越界再回退为普通竖直抬升。默认方向不变，不越界场景输出保持一致。 feishu: issue-7050844045 自测结果: pass Change-Id: Ib7e840e8c9f83f88ae1993f5f5badba51780de28
- 单色图标统一走create_filament_bitmap()，修复透明/半透明色块 - 显示效果与多色不一致的问题。半透明棋盘格改为预计算混合实色绘制，消除 wxGraphicsContext 产生的格子接缝。 - 提取 draw_checkerboard() 和 draw_border() 消除重复 DC 代码。 feishu: none Change-Id: I5b128772ccad50c1a9d64166428a6f4736b24f5e
Percent and time. feishu: story-6961013071 Change-Id: Ic1208cb76e0a43698fba59db5e5a21d20c4e716c
…le_idxs jira: STUDIO-18480 Change-Id: I6a6cc00a93a9b7b3e219323eaa0eea2e67bd3f76
jira:[none] Change-Id: I4a77cc4cab2d32909617bdb79ea04ced5c0ea232
jira: STUDIO-16368 Change-Id: If11e42c29d898b5a74a7d17526d78c706d5b5562
…external boundary rebuilds On a plate with many objects, get_boundary_external() dominates slicing: for every external travel it walks all PrintObjects on the plate and rebuilds each object's expensive variable-offset boundary geometry. Add a per-(object, print_z) cache of each object's local boundary geometry, which depends only on the object and print height (not the PrintInstance's world-space shift). This removes the redundant recomputation of the same geometry across the many rebuilds that happen within one print height; the invalidation key is print_z rather than the Layer pointer, since GCode::process_layer resets gcodegen.layer() to each object's own Layer while iterating objects at the same height. On a 61-object plate this cuts slicing from ~25 min to ~59 s (~26x) with byte-identical gcode versus the pre-optimization baseline. feishu: issue-7031257586 Change-Id: I617e49abf429566d863fb18470c05ecb14353fc0 (cherry picked from commit 632e199)
editor: song.wu Change-Id: I15404f1d87fafcf313291b1a30fe2804229ed1a5
feishu: none Change-Id: I015eda1e8ae3416aebd2d6ed6491ad5caa833d81
…ectors The issue was caused by incorrectly using the volume index from the UI to index backend volumes, which prevented the modifier from taking effect. feishu: issue-7053387087 自测结果: pass Change-Id: Iba9442540c15205035a702e75d550213c7f190aa
引入槽位锚匹配、slot-mappings/sync 接口，修复可编辑槽重插回放旧料问题， is_exists 更新提前到 hold 守卫之前，identity 变更/删除时自动清空塔槽。 jira: none reason: other 自测结果: pass Change-Id: I2b8575b59153d7946a8fe4972cd2af59861995f1
feishu: issue-7045172769 Change-Id: I6039f4a9aecc7b76c568148813f0cdc1e745ae68
Change-Id: I37d9845929b1f352ff6952c36e965f88c16699ab
feishu: [issue-7040917411] Change-Id: I93150328de64815616bf3cf5ca8ac4da065e74a1
对会重建网格的操作，用面积误差驱动的细分，把颜色/支撑/接缝/绒毛表面等涂抹 标注重投影到新网格，使其得以保留。切割场景还补偿了网格居中偏移 （center_geometry_after_creation），避免两个切割半体收敛到同一源区域而继承 相同涂色。 将重投影逻辑抽取为公共模块 PaintReproject，供切割与修复复用：切割沿用精确的 新面到源面共面重叠采样；修复（set_mesh_keep_paint）改为按最近源面 + 三维最近 点采样重建全部四层标注，替代原先的逐面主导状态复制。布尔在同一几何入口上预留 为后续扩展点。 切割（GLGizmoAdvancedCut::perform_cut）与修复（ObjectList::fix_through_netfabb） 在执行前先检测目标对象/体是否带有涂色/多耗材、支撑、接缝或绒毛表面涂抹，仅当 存在任一涂抹时才复用 confirm_mesh_paint_warning 弹窗提示用户，取消则不执行； 修复由原先无条件弹窗改为按实际待修复范围（对象或指定 volume）检测后再提示。 feishu: issue-6990498356 自测结果: pass Change-Id: Ib476c37b0b188633563dab2b2255269e01c3dde8
1.The Chinese input syntax of imgui follows the input nearby 2.Screw labeling supports multiple arrows, with each arrow pointing to a component 3.The UI of the assembly tree list supports Ctrl/Shift selection 4.Support for unprintable synchronization 5.Continue optimizing the rendering of the overall view using data from the assembly view jira: STUDIO-18477 Change-Id: I16070cd36ea69196d6bb6cddda3352ecec644a41
feishu: issue-7043790979 Change-Id: I31d55ce37c3e5404bf060d0f7eccec0d8d1130d5
自绘面板已显示时 Show()/Layout() 不触发重绘，添加 Refresh()；同时将拆色类型列表与通用类型解耦。 JIRA: none reason: other（混色对话框 UI bug） 自测结果: pass Change-Id: I5efe783422f1df969ae36d9443780fc3aa648bb2
…numbering Prioritize using firmware remain_g for precise weight display, falling back to percent estimation only as a backup. Parse AMS tray state fields and skip cloud synchronization during Refreshing or Initializing states to prevent intermediate state pollution. Fix the issue where the first machine was not correctly selected by default in the "Add from AMS" interface. Replace hardcoded slot numbering in the "Add from AMS" UI with unified C++ GetTrayId calculation. Disable manual editing of remaining weight for RFID-tagged filaments. Fix display logic for slotId 255: it should now show as "External Spool" instead of "Slot 256". JIRA: none reason: other 自测结果: pass Change-Id: I7de2f13117e54a07764fb5c163d34e4b386605ac
JIRA: none reason: other 自测结果: pass Change-Id: Ifdea6479b30cbf216029f7d79bcd1b11fa2d47c8
1.Complete the new filament prompt state machine in render_lite_lib to fix the issue where no icon prompt is displayed when inserting new filaments into AMS Lite. 2.Retain existing stored remaining weight when firmware returns -1, fixing an issue where the value flickers between the original value and -10 during cloud synchronization. 3.Implement fallback fuzzy matching in match_tray using setting_id + color, allowing "in-place" status to be displayed for non-RFID filaments read from AMS. feishu: issue-7054683533，issue-7054853471，issue-7054883536 自测结果: pass Change-Id: Ia4ec6e065c6c311010b67199003bad1563fb5508
feishu: issue-7036832551 Change-Id: Ic8f33b742bc97775fc1900bc014084fe569ece0d
jira: none Change-Id: Ic2cad34ea9771509fc3e405fa19cf525fc63354b (cherry picked from commit 050025d)
【修复方式】： 切换机型时,每个盘判断整体包络盒是否超出新盘尺寸： （1）若超出,则直接重摆; （2）若未超出,则摆件和料塔保持相对位置关系,平移到新盘中心。 feishu: story-6961456485 Change-Id: Ied6aee6e1db5f35be65984f354fb224de1cb5dc0
在修复子线程内执行涂抹重投影，接入进度与取消回调；新网格与涂抹数据原子提交， 取消时整体回退到修复前状态。边界面改为按面积误差自适应细分（保留安全下限）， 不再强制细分到固定深度；每个面的收敛目标以模型总面积的 1e-6 作为绝对下限， 避免较小面片耗费过多计算时间；跳过修复新增的面（质心到原网格距离大于源模型 包围盒对角线 1/100 的面不采样涂抹）。 feishu: issue-7056511147 自测结果: pass Change-Id: I27c1311ffe12dc26a2ec9a1a8641e59c9afb83f1 Change-Id: I6eea84261342c08a3c37429c228c03864929becb
与材料组确认， Bambu PETG Matte参数更新有遗漏，只更新了主头的耗材最大体积流量参数，未更新辅头的参数，导致主头速度比辅头要慢， 单色模型切片省料模式在冲刷情况一致（单色为0）的情况下，会把耗材分配到打印速度快的那个喷嘴，导致PETG MAtte 的单色模型用省料模式切片就始终会分配到辅助喷嘴的bug feishu: issue-7071041791 自测结果: pass Change-Id: Ib46be70a4e2376c966feca15a7cdee4d53f1a7e7
1.keep the assembly tree panels inside the free canvas area 2.the 'Overall Preview' step shouldn't be added to the right-click menu. 3.Fix the issue with the collapse button not working feishu:issue-7072143224 Change-Id: Ife244b3642403dedb5bdf09315227d49f2719335
Rename the 3D preference to Show Thermal Preconditioning Area and reword its tooltip: warn when a model extends beyond the area, available only on supported printers. feishu: issue-7072105015 self-test: pass Change-Id: I8fcb68f5deb98c5d7448fa7140a329e62d532ef1
1. Fixed the bug in macOS 14 where PDF export failed due to missing font configuration 2. Fixed the issue on Mac where ImGui and the play bar overlap, causing clicks in the directory to not work feishu:issue-7072473029 Change-Id: Ied92714d1e72ab4ca49f90f6a6e2300c4ab2f7ff
feishu: issue-7071738672 issue-7071966349 Change-Id: I0eb888e412404e511b7fb8c13678f61ef11ef899
…mber of objects exceeding 10000 in a specific 3mf area If an abnormal threshold is detected, it will automatically reset to the origin feishu: issue-7072676213 Change-Id: I3cdc920f8e6b215c5b938828f58291d521d04dba
JIRA: NONE Change-Id: Iabe7ea8e106990ca8214193b1c48187eb5f4a05d
This reverts commit 5c02eda7224059256fbaa93cac1a65b1110d09ee. Reason for revert: <no need now> Change-Id: Ia503a97136adcf275f42438af837d922e26873eb
feishu: issue-7072827432
1.The issue of insufficient height in the UI for adding object lists in Mac optimization(mac) 2.Fix the issue of UI not being updated for consumables jira:STUDIO-18483 Change-Id: I79680f834454022f5957e212bfec073948cbf7cd
feishu:issue-7040627603 Change-Id: I37cc71b422efb11a0b112c748a620e3c2852451c
feishu: issue-7051845301
未连接打印机或未同步 AMS 时 machine_filament_info 为空，select_best_group_for_ams 的失配惩罚按分组数计算（固定 2 × fail_cost），使代价只与用到的挤出机个数相关，单头方案恒定比双头便宜，覆盖掉最小冲刷算出的最优分组。 改动： 1. 设备侧无任何耗材信息时直接返回最小冲刷方案，不参与 AMS 匹配打分； 2. 失配惩罚改为按耗材根数计算，与匹配分支保持同一尺度 feishu: issue-7072997667 自测结果: pass Change-Id: I178101fcef5d8cc166df8ae3c95e648255eb7e33
some codes missing when rebase and merge Change-Id: Iab48ca8e6a75e644b10779caacad5a323b61a8bc
提前升温和料塔的升温如果插在一个连续的路径中时，可能会造成因为等待前面运动完成而产生的暂停并导致瑕疵，而降温需要加上M400避免工具头还没用完就开始降温。 JIRA: none reason: other 无独立 Jira，修提前升降温升温前多余 M400 自测结果: pass Change-Id: I536ef7799c91f4536d5c28dc8bafec117fd50236
jira:None Change-Id: I256202ffca46080e3fe13c3c18673a1520306e47
JIRA: NONE Change-Id: I2105cafdc52f4d3241358a933bae8994eebd2cb6
jira:[none] Change-Id: I71e32596fd7891cf147f2c5f275dfd8e104f2905
… 2026-08-14 17:56:42
… 2026-08-14 18:53:59
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.