Commit Graph

3821 Commits

Author SHA1 Message Date
zhou.xu 97584e0a1e FIX:fix warning for icon_size define
jira: none
Change-Id: I0393677c5c29354aeca41917daecc87721d9d9ce
2025-03-22 20:58:36 +08:00
lane.wei 270ae086fb 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
2025-03-22 20:58:36 +08:00
zhimin.zeng acd6016fc8 FIX: add object id for gcode check
and display plater limit error individually
jira: none

Change-Id: Ie6105642667530901be494b344ce853e728ae5fa
2025-03-22 20:58:36 +08:00
zhimin.zeng 2a028aa010 FIX: crash when third flow and PA calibration
jira: 8484
Change-Id: Ib4f1d4e38bd0d4af5a43777e2f077381b3887581
2025-03-22 20:58:36 +08:00
zhimin.zeng e956106c15 FIX: remove auto sync for extruder
jira: none
Change-Id: I924c5d8c8d15139dfcb1532322ad7cf813aece3b
2025-03-22 20:58:36 +08:00
Noisyfox a21779dd30 NEW: Port of Cura's multi-material interlocking (#5775)
* Init port of Cura's MM interlocking

* Refactor a bit

* Fix crash when bottom surface is multi-color

* Fix crash when boundary avoidance is 0

* Add config

---------

Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
jira: none
Change-Id: I81cacddf46ad5921a7a2a23fff07cc17addceb6f
2025-03-22 20:58:36 +08:00
tao wang 8dfa6839e5 FIX:fix the issue of macOS crashing easily
jira:[udesk 7578206]

Change-Id: If5e0b2d0969ca70815a5d2c9cca71654c9e1817b
2025-03-22 20:58:14 +08:00
zhimin.zeng f4379b3e19 FIX: Add a matching rule with the same name for PA value
jira: 8339
Change-Id: Ib11be988a8e3cdbcaa853627cb946446730062c4
2025-03-22 20:58:14 +08:00
Mack 3cb36b5111 ENH:colour arrangement ui text width limit
jira: nojira
Change-Id: I6a8f4341e671aa88704346bfeb1d8be3725619a1
2025-03-22 20:58:14 +08:00
zhou.xu 12912f6772 FIX: get nozzle_diameter error
jira: none
Change-Id: Ic33854a0d7322fe9154910480d2ea3ceae524f79
2025-03-22 20:58:14 +08:00
zhou.xu c26521470f FIX:reset is_load_extruder_only_area_textures flag
when change machine
jira:none

Change-Id: I97c97fae3d4ded0e25d518c0ae4a5cef9c640b45
2025-03-22 20:58:14 +08:00
tao wang 54a3e4786e FIX:Fix the issue of text wrapping
Change-Id: I360c08e37d58359b30df460df07ed8266ac5dd6a
2025-03-22 20:58:14 +08:00
tao wang 9f3c98dcfb FIX:fixed the crash when sent print when no printer available
Change-Id: I2974ff7c3f7e753239718f9bfd8b4977672dc651
2025-03-22 20:58:14 +08:00
zhimin.zeng 2a75d397c4 FIX: Inconsistent filament map box width at other resolutions
jira: none
Change-Id: Ib8d8478848252264ba43ad9a9091403f92d8314e
2025-03-22 20:58:14 +08:00
chunmao.guo 6a282118f8 FIX: not set extruder index of option to -1
Change-Id: I67b053db9936e71eed54cafe8f8f7a63a7f85822
Jira: none
2025-03-22 20:58:14 +08:00
chunmao.guo 0e0599c722 FIX: AMSCountPopupWindow wxPU_CONTAINS_CONTROLS
Change-Id: Iff7c79640e1fddc1bb4c5f73b4bbbe81122515d9
Jira: none
2025-03-22 20:58:14 +08:00
tao wang 370be63709 ENH:Hide multi disk switching
jira:[for demo]

Change-Id: I4cbfde15ec2b6f7e8aa68e8654ebea0e9cb09b9c
2025-03-22 20:58:13 +08:00
zhimin.zeng 5dce0ebc06 FIX: add set to Optimal button
2. modify the manual mode of filament_dialog
jira: none
Change-Id: I2ce6834eb65de2da70e7649346fc88b90f280b29

Change-Id: I18448e800fe3338f045d35f7a1fa6c3e3c8eef79
2025-03-22 20:58:13 +08:00
tao wang 65e8b4ee7e FIX:fix some new ui issues
jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
2025-03-22 20:58:13 +08:00
Mack c4cdc2e8f3 FIX:loss is_auto
jira: nojira
Change-Id: I3511b0abdbdb94b9517a1b21c95ce224d0f7422d
2025-03-22 20:58:13 +08:00
liz.li 3e633455de ENH: add filament arrangement drag image and other UI details
jira: new

Change-Id: I2ebbfd2a20c2d2f6059c2508467cd69dd272f943
2025-03-22 20:58:13 +08:00
Mack 785b8c7b2f ENH:change Color Arrangement ui
jira: nojira
Change-Id: I77f84675da0b4fe7069c76c14668026fc3d8932a
2025-03-22 20:58:13 +08:00
zhimin.zeng 927170c630 FIX: fix incorrect flush_volume_matrix size when switch printer
jira: none
Change-Id: Idaaaaa65b2ea7fdefd41d1c589e5404f8296ae4a
2025-03-22 20:58:13 +08:00
zhimin.zeng b17c5e7e01 FIX: flush_volume_matrix and flush_multiplier is incorrect
jira: none
Change-Id: Ie2d73b90b9ac7f5a6945b2bac859b76d2132f55a
2025-03-22 20:58:13 +08:00
hang.xu e6b14bdefb FIX: Aix and temp control
jira: none

Change-Id: I7a9db8178a77727c85ad2b727771179fc5e8050a
2025-03-22 20:58:12 +08:00
zhimin.zeng 2ee87600cb ENH: modify the error information of gcode check
jira: none
Change-Id: Icccd17e110408f2fdb9890307139de0f9821f008
2025-03-22 20:58:12 +08:00
zhimin.zeng f53e00ec6d FIX: crash when sending print with empty ams_id
jira: none
Change-Id: I89dc87af28b45c69eac86810444de2519dfccd08
2025-03-22 20:58:12 +08:00
zhimin.zeng a0b563dc8f FIX: modify color to empty string when reset filament
jira: none
Change-Id: I3a32dc8307ec5d65c8c5b7b05a5bc1e2d7d2b5b7
2025-03-22 20:58:12 +08:00
liz.li 12932832ae ENH: filament preset edit menu should not change to self
jira: new

Change-Id: Ia8eb3db05f83932d2eb0b8ef2ba8014e99c8e057
2025-03-22 20:58:12 +08:00
zhimin.zeng 9097efd869 FIX: FIX cali protocol
add extruder_id for start_cali and add protection for setting_id
jira:none

Change-Id: Idd8eeaa38c618c0ef8db10064d3e4d9793487aa6
2025-03-22 20:58:12 +08:00
zhimin.zeng a35d9b3138 FIX: change small filament to large filament is incorrect
jira: none
Change-Id: I0f7b10fb557ac5cb147bfebf0445de9ea862d602
2025-03-22 20:58:12 +08:00
liz.li 73c05eee3b ENH: refine dual extruder related UI details
jira: new

Change-Id: I63dd6278f3e7d22336482dba0f178150ebe55f1d
2025-03-22 20:58:12 +08:00
zhimin.zeng 8b8b6bdec8 ENH: enhance cali history dialog for mutli_extruder
jira: none
Change-Id: Id23ae2c12b93b9f49d3031fbb9a49930d072b02c
2025-03-22 20:58:12 +08:00
zhimin.zeng d479d1186a FIX: Modify calibration protocol
jira: none
Change-Id: Ib0fdf4fd1ab514c2db4d1731ad0d37d3dc38fce5
2025-03-22 20:55:55 +08:00
zhimin.zeng 65c00e00fe FIX: Prompt user when mix ams and vtslot in an extruder
jira: none
Change-Id: I9a1d4936056fc872c75bf0454e4ca89665ece2f8
2025-03-22 20:54:17 +08:00
zhimin.zeng c7486e1c5e FIX: modify UI of FilamentMapDialog
1. Modify dragging behavior
2. The swap button is grayed out in automatic mode
jira:none

Change-Id: Idff795bf092c4959c67d0711b0be316fba997684
2025-03-22 20:54:17 +08:00
zhimin.zeng 20837717d4 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
2025-03-22 20:54:17 +08:00
zhimin.zeng 8360bd2473 FIX: Should not sync when machine types are inconsistent
jira: none
Change-Id: If769fe0d19fb06c4a70e616416bf28f194ebcd45
2025-03-22 20:54:17 +08:00
zhimin.zeng 14ceceb3d7 FIX: auto filament map does not consider vt slot
when it has ams
jira:none

Change-Id: Id101a17375059a3aabc8e35d08352cd394a894e6
2025-03-22 20:54:17 +08:00
Mack 65e3829f92 ENH: color arrangement ui
jira: STUDIO-8124
Change-Id: Ibcde0e002ffd652b350bd05a9453ce7aaefd7bca
2025-03-22 20:54:17 +08:00
chunmao.guo c1e4be1652 FIX: Button text render pos on macOS
Change-Id: Icaa8cb95d81b3f906507dc74a3fcffc77a535fdb
Jira: STUDIO-8026
2025-03-22 20:54:16 +08:00
zhimin.zeng f30c7d3355 ENH: Enhance ams synchronization prompts
jira: none
Change-Id: Ide3141f980dc8de0284f3301414eca5c58a24204
2025-03-22 20:54:16 +08:00
zhimin.zeng f0d2ad3dbe ENH: add tpu check for send print and cali
jira: 8234
Change-Id: I5706071d900079477abc9558461811a8d85fb0ab
2025-03-22 20:54:16 +08:00
zhimin.zeng 51de6253ce NEW: Add "change filament to"
jira: none
Change-Id: Ic5550ed257e03033681de91ebca521390f902f66
2025-03-22 20:54:16 +08:00
zhimin.zeng 631baa3999 ENH: modify the UI of filament map dialog
jira: none
Change-Id: I513a518de4509fb7adbc81d9fc3b0fc43fb3244a
2025-03-22 20:54:16 +08:00
zhimin.zeng f68a8aed24 FIX: single ams should not include vt slot
jira: none
Change-Id: I338b57c031b551783abea78ef021537d2d89dee9
2025-03-22 20:54:16 +08:00
zhimin.zeng 0e848f4fba FIX: crash when opening old version file
jira: STUDIO-8155
Change-Id: I67ac46f8e01d7c3ed2dedf40c1dab9841a3af02b
2025-03-22 20:53:56 +08:00
zhimin.zeng 00a6e17c6c FIX: fix ui display problem
jira: STUDIO-8143 STUDIO-8142
Change-Id: I50abb78f9585378d3ef7278377dfb35d5db6189d
2025-03-22 20:53:56 +08:00
zhimin.zeng fec7129437 FIX: modify unprintable_filament_ids should regroup
jira: none
Change-Id: Ifb8105f6e301aaed9ca4e62a37b9d3a1616e755b
2025-03-22 20:53:56 +08:00
zhimin.zeng 71987627ef FIX: flush_volume use correct extra_flush_volume
and fix extruder_offset bug

jira: none
Change-Id: I84644ad5b54994ae65269531311386cacd972bf3
2025-03-22 20:53:56 +08:00
zhimin.zeng 85ebb46995 ENH: Add limited filament maps to slice info
jira: none
Change-Id: I7b08943ba5f4e7fa9be18ba3f64caee182888d45
2025-03-22 20:53:55 +08:00
tao wang a44ff5a95a ENH:show n3f/n3s version info
jira:[for n3s]

Change-Id: Ia0056dfdf7157036008cc63a37c9fd8076063a6a
2025-03-22 20:53:55 +08:00
hang.xu d1aac2513e FIX: Prevent sending print when nozzle type dismatch
jira: none

Change-Id: I0278fd9bc22a9d9fd44b4d776f54de5fc07db6d0
2025-03-22 20:53:55 +08:00
hang.xu c96102043b FIX: double nozzle hybrid mapping
jira: none

Change-Id: I64908776a6265da7809814e62c9e7a860f39bffd
2025-03-22 20:53:55 +08:00
zhimin.zeng b620a4122e ENH: Pass ams information for slicing
jira: none
Change-Id: I3fe12189b6e8246fd553dcd8659bf7f98e622767
2025-03-22 20:53:55 +08:00
maosheng.wei fd257a2910 FIX: Update the Filament information by nozzle diameter
Jira: no_jira

Change-Id: Ib5265691df6b4a9a05eb6c9df5708badd3211904
2025-03-22 20:53:55 +08:00
zhimin.zeng 64f471c2cc FIX: limit the wipe tower to common areas for multi_extruder
jira: none
Change-Id: I58d061904610a5e33679e7254721bc43dcc22e64
2025-03-22 20:53:55 +08:00
zhimin.zeng 885e96d8db FIX: fix build error 2025-03-22 20:53:55 +08:00
zhimin.zeng 5aecc67874 ENH: some fix of previous commit
fix to If495a343efdb1be6f46d11dd20f6ec7934266e87

Change-Id: I9a0afee5c78a23e92c9c76bceff7937bb983918e
2025-03-22 20:53:54 +08:00
zhimin.zeng c75c10e312 ENH: Add gcode check for multi_extruder
jira: none
Change-Id: Iebc43e608c4509eb62b280af2d401fa9e0e089ba
2025-03-22 20:53:54 +08:00
zhimin.zeng ed61d1d31b FIX: fix flow ratio calib bug for single extruder printer
2. modify the filament_flow_ratio to nullable
jira:none

Change-Id: I3f0569ee643cfe9473c6029ca0e04f4b80c8332e
2025-03-22 20:53:54 +08:00
zhimin.zeng 38b3c32b6a ENH: flow_ratio cali support multi_extuder
jira: none
Change-Id: I03399040a772043d3d20116b0588fd04e0725be1
2025-03-22 20:53:54 +08:00
zhimin.zeng c1bf153a19 FIX: recover delete filament button
jira: none
Change-Id: I4972883081e424f5e0ac1c60a7cfc28d5248f442
2025-03-22 20:53:54 +08:00
hang.xu 286eca79c2 FIX: Parse virtual slot info
jira: STUDIO-7724, STUDIO-7725

Change-Id: Id9181511b7503787fe06403be6ecb782d78cb21e
2025-03-22 20:53:54 +08:00
lane.wei 62b1d00d1f ENH: 3dbed: support rendering extruder area with different color
JIRA: STUDIO-7494
Change-Id: I717999e8b7ab1d7d350299b412a3a270c6ba7a9e
2025-03-22 20:53:53 +08:00
lane.wei e5be69dedd ENH: dual_extruder: add logic to process extruder_printable_area
JIRA: STUDIO-7498
Change-Id: I1cf53db93acf41b06cb1b9569a0679487c9f1e41
2025-03-22 20:53:19 +08:00
xun.zhang 2ebd14667e ENH: add some params for multi extruder
1. Nozzle Volume and Nozzle Type support multi extruder now

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie171b5105bd3830db3a992cadd365b785008c47a
2025-03-22 20:53:19 +08:00
hang.xu 4c644d4715 FIX: crash when select filament in device
jira: STUDIO-7972

Change-Id: Ice9e7360fbfe0c07bd49bbd696bb3cfb662e94e4
2025-03-22 20:53:18 +08:00
chunmao.guo 56ed912c3e ENH: vertical layout button
Change-Id: I0b205298688c9df88dcfe6eb6e72cc887a9ed5be
Jira: none
2025-03-22 20:53:18 +08:00
zhimin.zeng 7f473c2027 FIX:when ams cali_idx is unknown, use default item
2. use transparent color when reset filament
jira: 7946

Change-Id: I129dc0e6b7244cad3b5e61e1bc423938f4b92d7e
2025-03-22 20:53:18 +08:00
zhimin.zeng aba72bb04f FIX: single printer should not display summary item for default
jira: 7948
Change-Id: I9d13ebe8e52eb46e1ef9f7bd62f814bc7837dbe6
2025-03-22 20:53:18 +08:00
zhimin.zeng 52e890fba1 FIX: modify for virtual slot when multi_extruder
jira: none
Change-Id: Ic7284018ecb44e24536788b05dba572b96460e66
2025-03-22 20:53:18 +08:00
zhimin.zeng fb72d19a44 FIX: pa default item add filament_id
jira: none
Change-Id: Icfc24390e62cc1eca7e670311dc88502cea16fd7
2025-03-22 20:53:18 +08:00
zhimin.zeng 4c6316b981 FIX: add filament_id when reset ams setting
jira: none
Change-Id: Iedd2eec94bd1e41a51cededc06b304a2e29ef808
2025-03-22 20:53:18 +08:00
tao wang ee3cb45b4d FIX:use old tray_id for set ams filament
jira:[ams setting]

Change-Id: I965f532fbd590b501b40c2cc812d6d02054b3628
2025-03-22 20:53:18 +08:00
hang.xu 853825837a FIX: Device interface display details
jira: STUDIO-7898, STUDIO-7906

Change-Id: Ifd49321c91822e10b0adac9b62cce5b2fe74dcdc
2025-03-22 20:53:18 +08:00
hang.xu b2418c7417 FIX:Change text in stop printing dialog
jira: STUDIO-7899

Change-Id: Ic93f7322aa35c06dd98df2b70c9f24f94a62467c
2025-03-22 20:53:18 +08:00
zhimin.zeng 5c05bd2698 ENH: some fix of previous commit
fix for I5cabae467c62391156e7af1fb99afc0b18400fb6

Change-Id: Ib8bf0bd09ad284808ce8343d4b420726dde3f393
2025-03-22 20:53:18 +08:00
zhimin.zeng 135767f5c0 ENH: Add default pa item
jira: none
Change-Id: Idc632f945100ae7a6a0b674494f2a1844e0a42ef
2025-03-22 20:53:18 +08:00
zhimin.zeng 11f61abefa ENH: calib support multi_extruder(UI part)
jira: none
Change-Id: I3009c2f8b601dc078cfed787dc3531fc1d4848d6
2025-03-22 20:53:18 +08:00
tao wang 3119a84eb2 FIX:fixed unable to reset ams filament setting
jira:[for reset ams]

Change-Id: I9f2f8be4a6e16b05191e4076db4e3f53d7601db4
2025-03-22 20:53:17 +08:00
zhimin.zeng 1040f007b6 ENH: add summary for gcode preview
jira: none
Change-Id: I481536e0d950ebe695236e55ffca8113a26d8033
2025-03-22 20:52:56 +08:00
xun.zhang 7d4d5f2c9b ENH: change some params to nullable
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd91da26d089c78e2d5036e145b7f4404535b7a5
2025-03-22 20:52:56 +08:00
hang.xu 12b6f064a0 FIX:Use different ext-img for single/double nozzle
jira: STUDIO-7852

Change-Id: I4d8181834bc57ff3c3ba54fafe5ed266a7a2b843
2025-03-22 20:52:56 +08:00
hang.xu 2c3fa062c9 FIX: Bed type display
jira: none

Change-Id: Ibac2a7a80d6841ebea639e0a58547413df6f5c74
2025-03-22 20:52:56 +08:00
zhimin.zeng 6fb06eb779 ENH: some fix of previous patch
some fix to
Ib37896f9101d93ca63c7edb0b1e6328045a5ddb3
I4b5c8e158b073b302db6faad77bb8ca0f70f766a

Change-Id: Iec62a4df45159bac3db63c48feef16ec1aa35ae7
2025-03-22 20:52:56 +08:00
zhimin.zeng acdc8077e8 ENH: some modification to previous commit
some fix to I0a100746b2845bba57f57e8f6962eca1dbd562aa
FIX:Default option of stop printing is no

Change-Id: I683101f55c3113b9ba99dc59dded95c38b4b243f
2025-03-22 20:52:55 +08:00
hang.xu 7bb5060b73 FIX: Add bed type in send print page
jira: STUDIO-7824

Change-Id: I64d9ed41b862ed4e3b8c21218c289132d767105e
2025-03-22 20:52:55 +08:00
zhimin.zeng 9ee85bef34 FIX: enhance filament_map auto manual behavior
1. auto mode dragdrop is not allowed
2. not display filament_map when there is no result in auto mode

jira:none

Change-Id: I0800e0d832e27fe459a17bb1aa829b5e72d0ee8f
2025-03-22 20:52:55 +08:00
chunmao.guo 7df6f6c986 FIX: is_ams_need_update for vt slots
Change-Id: Iddf3aa9da6c0c4b434d91439828ec0223ecea9d5
Jira: STUDIO-7822
2025-03-22 20:52:55 +08:00
hang.xu 53d066a2b6 FIX: PA value display
jira: STUDIO-7725

Change-Id: If3fbdd831f848731587e66c273cc0317a2ba33fe
2025-03-22 20:52:55 +08:00
hang.xu 362fcd7a41 FIX: Add serial number for AMSLite
jira: STUDIO-7825

Change-Id: Ie17c4ce6953b7b46a39f51e038eacf10bfddc670
2025-03-22 20:52:55 +08:00
hang.xu 66701cc4c9 FIX: Mapping UI display
jira: STUDIO-7473, 7817

Change-Id: Ibd014985b3b4997bd86700537e1d8a7d0d18176f
2025-03-22 20:52:55 +08:00
chunmao.guo a80e60bd2b FIX: extruder sync visible & nozzle_volume_type
Change-Id: Id25c325fee6facbd15dbc99688ef3e9fb34efaf0
Jira: none
2025-03-22 20:52:55 +08:00
hang.xu ac1a1d69a1 FIX: N3S AMS display
jira: none

Change-Id: Ib6f4bdd0ada9df2d1aacc33568507471e29897c1
2025-03-22 20:52:55 +08:00
lane.wei fe8b904e75 ENH: config: add default_nozzle_volume_type in printer
1. also remove original nozzle_volume_type from printer
and move into project config
2. support save nozzle_volume_type into appconfig
and load from it at beginning or printer switch

jira: no-jira

Change-Id: I01fc82d142fc633fc59a238796a71b9f8d180efb
2025-03-22 20:52:24 +08:00
Mack 8bdac292a0 FIX: load_from_svg_file_change_color() supports 8bit colour values
JIRA: nojira
Change-Id: I72e68bd9cb547064736d130205074da0e7eabd60
2025-03-22 20:52:24 +08:00
hang.xu 02a38db9c4 FIX: UI of display two nozzles
jira: STUDIO-7785

Change-Id: I85298721191a6dbb0c93b2dfd9db85494179631d
2025-03-22 20:52:24 +08:00
zhimin.zeng 7bd3a5218a FIX: cannot cali for single nozzle printer
jira: none
Change-Id: I1cc0e5e4b0f9db2a66694c894f96a14047fde9e5
2025-03-22 20:52:24 +08:00
zhimin.zeng b7176bfdd1 FIX: only single extruder printer display the icon
of FilamentSettingDialog
jira: 7714

Change-Id: I5d6eca802b9be1fcdeaa28d9e4fbc4862d8c8378
2025-03-22 20:52:24 +08:00