Commit Graph

137 Commits

Author SHA1 Message Date
zhou.xu 1ace58b950 FIX:add exist_multi_color_filment logic
jira: STUDIO-11477
Change-Id: If30e0289096b6d465eace503fbe706fb31742f0c
2025-04-15 08:24:11 +08:00
xun.zhang e854174bc0 FIX: incorrect flush volume after sync ams
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I44d031b1fdcc02adbfc4346314f5001c56a941b8
2025-04-15 08:24:11 +08:00
chunmao.guo 4a270ee6d3 FIX: select printer preset with same printer_variant as old
Change-Id: Iccf72ed34da620f8ca728dfc56585f2ab2a496b9
Jira: STUDIO-11210
2025-04-15 08:24:09 +08:00
chunmao.guo f076d95d88 FIX: sync_ams_list find filament_type
Change-Id: If6d95c26fa128377d8b4414470b07ed5a40f0b09
Github: 6152
2025-04-15 08:24:08 +08:00
lane.wei cd4fcb292a ENH: updater: refine the config update logic
add more logic to process error
jira: no-jira

Change-Id: I7a23a25648f6965cd7ebe2d32212675ff11aa60e
2025-03-28 21:13:34 +08:00
Bastien Nocera a8d792ecf8 FIX: Fix missing L() localisation helper
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp: In member function ‘unsigned int Slic3r::PresetBundle::sync_ams_list(std::vector<std::pair<Slic3r::DynamicPrintConfig*, std::__cxx11::basic_string<char> > >&, bool, std::map<int, Slic3r::AMSMapInfo>&, bool, Slic3r::MergeFilamentInfo&)’:
/run/build/BambuStudio/src/libslic3r/PresetBundle.cpp:1973:49: error: ‘L’ was not declared in this scope
 1973 |                     unknowns.emplace_back(&ams, L("The filament model is unknown. Still using the previous filament preset."));
      |                                                 ^
2025-03-26 08:18:12 +08:00
chunmao.guo f1eb5e8292 FIX: show sync ams unknown details
Change-Id: I1febb10b73a87f98a477fea5fbe2583c752ab330
Jira: STUDIO-10969, STUDIO-10973, STUDIO-11011
2025-03-24 11:06:18 +08:00
lane.wei 2ccc72f16e FIX: config: add some error process logic when loading 3mf
jira: STUDIO-7956
Change-Id: I13084cfe5233da9e928dc8eb10d8ffe1bc38080c
2025-03-24 09:18:36 +08:00
xin.zhang 766c6e0041 FIX: remove some warnings
jira: [none]
Change-Id: I0e74b7316d0efe38c65e1f695b2a09eb09103552
2025-03-24 09:16:56 +08:00
zhimin.zeng 4af6386302 FIX: Fix the error throwing exception
when adding double-head related material parameters
jira: none

Change-Id: I666e1069746d2c284f59ca2ac0f44c664c578a63
2025-03-24 09:15:32 +08:00
zhou.xu 6be306e548 ENH:update image for plate type
jira: none
Change-Id: I590bf9d6596ccf5cd6e06844fb3ed247fa526ba6
2025-03-24 09:12:10 +08:00
zhou.xu 2ca82b096e FIX:Avoid array out of bounds
jira: none
Change-Id: I1ef5921a11ec7f9e2fc40edad4e954474628f7b5
2025-03-24 08:37:01 +08:00
xun.zhang 6d1b8f0324 ENH: protect build ams list
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4e8665df0bb24f056f79bd5cabab886bb5ff7921
2025-03-24 08:36:35 +08:00
zhou.xu c6f7e2e9e0 ENH:add log
jira: none
Change-Id: I95f709399f63a0d5093d4c6a3dd7bc8f5c4f04b0
2025-03-24 08:36:10 +08:00
zhou.xu 4166a156ea ENH:add log
jira: STUDIO-10445
Change-Id: If1c2b41b0f93a2f1f8bde4b3aa543a9ddeaccc08
2025-03-24 08:35:27 +08:00
lane.wei bc5514bbab ENH: config: allow invisible preset to be selected
when switch printer, we found some filament preset not visible
and we need to allow it to be selected
jira: STUDIO-9979

Change-Id: I9613747a755f449c2f48563082b6893e426f37ea
2025-03-24 08:34:32 +08:00
chunmao.guo 0b4795fd10 FIX: get_similar_printer_preset only visit system preset
Change-Id: Ib219e76cba37ace7b81f69e63f4edd1edb25ddc4
Jira: STUDIO-10338
2025-03-24 08:34:29 +08:00
zhou.xu 91df890100 ENH:Fix the issues discovered in the demo
jira: STUDIO-10384 STUDIO-10385 STUDIO-10387
Change-Id: I68f3099b9fbb6d6996373cae07b2e62930ce614c
2025-03-24 08:34:29 +08:00
xun.zhang 001144400b 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
2025-03-24 08:34:01 +08:00
zhou.xu 62fff9dadf FIX:add "read fail" deal for bambuStudio.conf
jira: STUDIO-10215?
Change-Id: Ib6dca514a43f3c91948df56195ba323aa9ce308e
2025-03-24 08:24:23 +08:00
zhou.xu 69f28a711f NEW:Display AMS mapping relationship in override mode
jira: none
Change-Id: Iac0b3563df2f76710a5bc461adab6dd8335ee62d
2025-03-23 20:31:58 +08:00
zhou.xu e74c9e710b ENH:add "not support bed type" function
jira: STUDIO-9028
Change-Id: Id1c6cc9005fc5073d885274e360d31282063a9a3
2025-03-23 20:31:25 +08:00
zhou.xu a1de92523f FIX:All plates share the current mapping
jira: STUDIO-10008
Change-Id: I5d04c95dea7bd6b56c97258863a190f0f0c3b4e6
2025-03-23 20:30:27 +08:00
zhou.xu a3a54934e0 FIX:not map for unknown material
jira: STUDIO-9960
Change-Id: Ifd1b5f42676e9aa127805caa919ed2e3ef3f2900
2025-03-23 20:30:10 +08:00
maosheng.wei 2ec50f771f FIX: Fix the issue where the 'get_imilar_printer_preset' method returns a null pointer
Jira: 9935

Change-Id: I4b001721780162d656b73df316387a33967e4a2c
2025-03-23 20:29:39 +08:00
lane.wei d09e023368 ENH: presets: add more logs to debug some issues
jira: no-jira
Change-Id: I84dd4eb8fb32bde2ebcefccfb89fa53d64b3ef7f
2025-03-23 20:29:33 +08:00
zhou.xu f7995d5a9f ENH:add "SyncAmsInfoDialog"
JIRA: none

Change-Id: I8e26178f6da816e102a40b429c565696924c58ea
(cherry picked from commit 2a46460d5a65279cbb42c8aef2474172b1e1ae30)
2025-03-23 20:14:29 +08:00
xun.zhang 78b00bd0e3 FIX: crash when delete filaments
1.fix crash when deleting filaments after sync ams or inital start up

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I00c96fcebf7e0fbc127414eae44f184e3caf4dd9
(cherry picked from commit 6fb0ef6e68ed673d04c1c2311835e9988b1c70d3)
2025-03-22 22:14:56 +08:00
xun.zhang e45f8c6dc2 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
2025-03-22 22:10:52 +08:00
zhimin.zeng 6aacef93af FIX: crash when sync printer status
jira: none
Change-Id: I7198f34b12c720519cc2e092254572fe6ee50778
2025-03-22 22:01:24 +08:00
chunmao.guo c990314567 ENH: printer nozzle diameter select
Change-Id: Ibf8b74e1f93a7c387db3f0fb5e6e733165322322
Jira: STUDIO-9140
2025-03-22 21:57:55 +08:00
zhimin.zeng 17edbd8cd5 FIX: the nums of nozzle_volume_type is incorrect
when save MW 3mf file as multi-extruder
jira:none

Change-Id: I848e348277fb047c2c3569508d2adbe940e40255
2025-03-22 21:11:23 +08:00
lane.wei d050aa4d36 FIX: config: fix some loading issue with filament_self_index
1. generate filament_self_index for old files in cli
2. set filament_self_index to default for old files using single extruder
jira: no-jira

Change-Id: I6e3f520723ee7f3a75634121604023ba319ff97a
2025-03-22 21:09:54 +08:00
zhimin.zeng 60cdf3b655 ENH: add tpu check before slicing
jira: none
Change-Id: I7d4f053e67f4a4aa22ef990d597d28cb894c4195
2025-03-22 20:59:25 +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
lane.wei 913bace1eb FIX: config: fix the 3mf export invalid issue when using single filament
JIRA: no-jira
Change-Id: I1faf1fd7ac2b3dfd99594856e3c84da12d805627
2025-03-22 20:53:56 +08:00
lane.wei 2636e44dc0 ENH: config: add exception when load old invalid 3mf
some param has been changed for the multi-extruder
currently we popup an exception
JIRA: no-jira

Change-Id: I1e892203d34c569a580694c1c28a1c7d695c1c64
2025-03-22 20:53:56 +08:00
zhimin.zeng b620a4122e ENH: Pass ams information for slicing
jira: none
Change-Id: I3fe12189b6e8246fd553dcd8659bf7f98e622767
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
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
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
lane.wei f122c4f4ef ENH: config: refine some small logic
1. always resize filament count when not matched in full_fff_print
2. remove no-use codes in Preset::normalize

jira: no-jira
Change-Id: Ie15a5977d28f28e0f63ba84f27f98f77d16665c0
2025-03-22 20:32:28 +08:00
zhimin.zeng da32b878b3 ENH: add extruder_ams_count behavior
1. save to appconfig and project setting
2. use it to group
jira: none

Change-Id: Id4048fc1b47f6904b2e9c0154aaa3a2b03590437
2025-03-22 20:32:27 +08:00
lane.wei 0434853bf3 ENH: config: remove unused custome_defined logic
also improve project_embedded
1. remove unused is_custom_defined
2. improve project_embedded to support multi-extruder diff

jira: no-jira

Change-Id: I1db28c3cfd59ccc31c6855af30305396c71c4e9a
2025-03-22 20:32:26 +08:00
lane.wei 7b7ebf1b95 ENH: config: add the extruder variant apply logic in Print::Apply()
we need to keep the original values and update after pre-slice
jira: no-jira

Change-Id: I232d3c43340b4a23bc42121bd05380746e736f20
2025-03-22 20:32:25 +08:00
lane.wei 603f93d97f ENH: config: add nill load/save logic for user config
Change-Id: I8da6c5b345cc088862f2c720aeb742b9617ff3e7
2025-03-22 20:31:45 +08:00
lane.wei 5defd2b7c3 ENH: config: add extrudrer variant check logic
when load config from 3mf

Change-Id: I946ba777853e479418fcd1b49209f75ed41f33f3
2025-03-22 20:31:44 +08:00
lane.wei bbc4d701bf ENH: add check logic of filament_map when Print::Apply
Change-Id: Ibab353c4b16183611d63d75bcdf5f370cb578f21
2025-03-22 20:31:43 +08:00
lane.wei e9081ba8d4 ENH: filament: delete filament_extruder_id related logic
jira: no jira
Change-Id: Ie0d8e31a6a3eef0400b3ba6238f817bad4daca24
2025-03-22 20:31:43 +08:00
lane.wei b0e3ab037e ENH: config: add filament_maps in partplate
Change-Id: I1183830788e703f1d33a8a4b620b58b822283dd4
2025-03-22 20:31:43 +08:00