mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-09 16:51:12 +00:00
+13








bba367cde8
* FIX: user preset sync token Change-Id: Id2aa865b778ee9ac4cfddb68ceef0374507b519b Jira: none * FIX: Bitmap cache not take effect Change-Id: I972098fdbda0b4542c6c759a8f5e1f0f2a30852b Jira: STUDIO-4991 * NEW: Open HotModel Link With GetParam-From bambustudio JIRA: NO JIRA Change-Id: I4ac49bac5ee0c50988c76a38b00b7ba7dc3201f5 * NEW:AmsMaterialsSetting Support for user-preset JIRA: STUDIO-5135 Change-Id: If848047cd5dbd059d440de30989c505c361305a7 * FIX: upload custom root preset fail Change-Id: I621c8d542dd604b07cc5df63d97d7a31558d3aba Jira: none * FIX: show custom filament in AMS filament list Change-Id: I79b9f8f2f08db8c52bbed76f1ea133baff383c00 Jira: none * FIX: dailytips window and gcodeviwer legend window size issue reset to original logic of dailytips and legend window size jira: new Change-Id: Iacb016bb222ba3f87317cfbe1f2b003802d773a5 * ENH: add text translation jira: new Change-Id: I780cfb8a0a64d806b5e0a414b6598e3b7bdf52dc * FIX: Delete and search object outside the plate JIRA: 1. STUDIO-5132 Deleting object outside the plate will crash 2. STUDIO-5146 The search function cannot search for object outside the plate Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I84cb3fe990a9c2a182e7434c262466a70545280e * FIX: [5149 5142 5141 5140 5136] create printer and filament issue Jira: 5149 5142 5141 5140 5136 5149 process preset name can not show all 5142 improt configs combobox not update 5141 disable modify filament_vendor 5140 disable input Bambu and Generic vendor 5136 preset list window adjust Change-Id: I111a23996146cc16cc7f533c8616d50223d34c40 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.54 Change-Id: Ifd69c01a82f627a9c6cf4fe0d48a759563ee90e7 * FIX: print model from sdcard with p1p Change-Id: If85383ba762022ead3dd754ae02a08817b891114 Jira: none * FIX: dailytips text translation jira: STUDIO-2556 Change-Id: If44e503615b09ee1692f42ba1f998918ec5bd691 * FIX: clone shortcut key conflict with quit in macos jira: STUDIO-5166 Change-Id: I548f275bb68d3b0e6bb3cfad6fe93df09d507da3 * FIX:User preset material settings dependent on firmware JIRA: 5167 Change-Id: I82cf26848594b01155883ad0aa2e9ee77d371fb2 * ENH:update the description of nozzle detection Change-Id: Id27b25c69dc11fcf66fc82053af705906ae8c370 * FIX: [5159 5165 5171 5172] create printer and filament issue Jira: 5159 5165 5171 5172 5159 create printer dialog no refresh 5165 create printer 2 step dialog no refersh 5171 change font 5172 edit filament dialog darkUI issue input special character is prohibited '/' in preset name translate to '-' update printer combobox Change-Id: I5fa27836dab7f604f1a065c65efa099c7a2f0f96 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.55 Change-Id: If1865d561cf274719204662314de163497759e89 * FIX:fix GLmodel deconstruction causing section not to be rendered Jira: STUDIO-5156 Change-Id: Ibb2f459920989ee54f7b827352dc8893424b4de6 * FIX: missing unlock cause device or resource busy Change-Id: I87563312ea9c6ce4e4e471da7ce7a02b53b64762 * FIX: some translation Change-Id: I9758cbc758030b5a3945697a50ca4898af9fcb1b * ci: update build version to 01.08.00.56 Change-Id: Id5ee53dd2ebb0b37b6927dc58b3cca94a1f66a83 * ENH: remove PLA GLOW in A1 mini jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id99c1bbd4248e28df9150a85eecec831f6f32856 * ci: update build version to 01.08.00.57 Change-Id: Ib4dfa60f097128b76b95bb14ca04978619021b56 * Allow line width of nozzle diameter * 2.5 As it were, 1 mm would be disallowed but 0.99 would be allowed for 0.4 nozzle. 1 mm is the sane maximum and 0.99 is unnecessary tedious to write. * Russian translation update Russian translation Bambu Studio_v1.8.0 Beta * FIX: scale problem in needs_retraction jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Idfbe954b22fa6aa5769c55e46874fa6a80ecbf45 (cherry picked from commit 4e853f50b748e3af11e2d64862b6ee557fda361b) * ENH: CLI: support load_assemble_list JIRA: STUDIO-4848 Change-Id: Ife11533740988331ea71eac86c370e625970cb8b * FIX: align to Y not working This is a bug introduced in 7fbb650 when solving jira STUDIO-4695. Now we use a more decent way to solve it. Change-Id: I92deffcb9fe53e8a24c93fe973446ae37df07375 (cherry picked from commit bd98430dbd15eb6c9bb4b447990e0dcf8a50eef0) * ENH: Add buried points for cut and meshboolean JIRA: NONE Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I67ce498d0c335dd7a8582f56b880c2c8314f8541 * FIX: 5092 edit filament add scrolled window Jira: 5092 Change-Id: I53ae996b04e4e2f1b1ddce6a858d505001b11615 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: can not select user preset when create filament Jira: XXXX github: 1936 and fix add preset for printer dialog can not show selected printer Change-Id: Id4308c6bdca17d52d4aa321db359941aa87e0e45 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: template filament don't be show in filament list and sort Jira: 5160 5179 Change-Id: I56a7e1897e1ef3c061dc66d318896413ca25b76b Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [5174] export configs dialog issue filament name too long to can not show all Jira: 5174 Change-Id: I92018c9d7f86009b78b533592d899b4b5d78c3c8 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: add filament Bambu TPU 95A HF 1.As title jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I752ec43da6297a6c172679997ce68f2318a7b8fb * ENH: modify some params with filaments 1.Modify the PEI bed temperature of PLA Basic, Matte, and Tough to 65 in A1 mini. Set the bed temperature for the first layer of Bambu PETG-CF to 65 and 70 for the other layers jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia902bbb7f824082d5346709d781cac64296f47a8 * ENH: add more status during printing JIRA: STUDIO-5195 Change-Id: I85b3107839c6e2fdecbc10d90a876463e284468c Signed-off-by: Stone Li <stone.li@bambulab.com> * FIX:cut imgui has overlapping rendering on Apple Jira: STUDIO-5150 Change-Id: I7969e19dc189cd617026a183067dad628208955c * FIX:not TakeSnapshot for m_start_dragging_m Jira: STUDIO-5176 Change-Id: Ia03e3e2c2664dbdcffa19ec8d0fa97dfd95e6d35 * FIX: rendered color changes Jira: STUDIO-4956 during the drag processin connectors editing state Change-Id: I3027176ea9f93a9ba9d6a2052f41aaa4adef79f1 * FIX: merge the patch from Prusa Thanks for PrusaSlicer and YuSanka Jira:STUDIO-5175 commit 510d59687b3b19c4a0f4e6540620d0694dd1b7ac Author: YuSanka <yusanka@gmail.com> Date: Thu Oct 5 14:13:14 2023 +0200 Follow-up 1b451cdf: Fixed #11415 - Connectors disappear when slicing => only when using multiple cut planes AND excluding parts Change-Id: I9ccd5b85f482d723d21fccf5e104c9e0a9cc4849 * FIX:Press ESC directly to exit after entering the profile rendering rendering is not normal,Code from PrusaSlicer,thanks for PrusaSlicer and enricoturri1966 commit a078627552f54497ed0518dc7bc349d243576d19 Author: enricoturri1966 <enricoturri@seznam.cz> Date: Mon Jan 30 14:00:02 2023 +0100 Follow-up of 1218103fd620b319c56fd08116f81b581c537188 - Fixed gizmo missbehavior when closing a gizmo by resetting the selection clicking on the scene Jira: STUDIO-5164 Change-Id: I261da9dba2a5ac37f3e263c175fbccd80d8045bd * FIX: correct the strings and move create printer dialog center Jira: 5221 5183 Change-Id: Ida4eba63f0e962ffcc8000fcc04cf20849577217 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: CLI: skip layer height limit validate when slicing for existing models JIRA: no jira Change-Id: I1444a28b500ca7d08ed2606eecfa5cfaf261105e * ENH:update the translation of auto refill jira:[for translation] Change-Id: Iaa7b4f3d7cd88c8b4f69a3db721ebd8ca8986eea * FIX: icon issue for copying Jira: STUDIO-4168 Icon issue when filling bed with copies Change-Id: I61a03ecae02b75602c236ed2810e9c9cfe5a19f9 (cherry picked from commit b5079f8a2e79f19f65803f23ef4fd83aff17c84a) * ENH: update some filament params 1. Modify texture bed temp to 65 2. Modify max-v-speed for ABS 3. Modify some params in Generic PA 4. Modify PLA,PVA params jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I42584a6015b8526f6bbb93024316968198bd76ce * FIX: 3770 printable checkbox incorrect display in darkUI Jira: 3770 Change-Id: I97f67d7a0ffc41f6ee625abeecc52ee4e73cf318 * FIX:Display garbled code in AmsMaterialsSetting pop-up Change-Id: I50531e939afa7715ae376bac47172ccf7b248114 * ENH:Modifying the Line Color of Transparent Materials JIRA: STUDIO-4311,5088,4983 Change-Id: I9e63413dc9cd7d523f0f7f1a2e32c4537a84467a * FIX: crash when async delete printer file Change-Id: I92c5e812d04da263338fb0eea2fd7583cf9ecde0 Jira: STUDIO-5222 * FIX: 3733 backup time not effective Jira: 3733 Change-Id: I50c2ce156fcbd0a17aa8a6777bce04aa6093c830 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: enable edit and delete preset btn and fix issue Jira: XXXX Change-Id: I724d7236b28fcc4746698f094531948a8fbb5d93 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:send print job,file name displays error JIRA:3137 Change-Id: I1c113025d274a13fba1b845a58aada14058fadd4 * FIX: skip hold user preset from sync Change-Id: I2252246e19bd80903ad82170782ea49535d30d05 Jira: STUDIO-5185 * FIX: 5115 translations Jira: 5115 Change-Id: I21b03bdd4d28c0bb097226143177e763cf8c777f Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: add link for ironing parameter Change-Id: I451f5549db3ac2205aa5703a2e5edc831e946af8 * FIX: scale problem in lift type decide 1. Scale the travel threshhold jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib594d640fe63b0919bc9318af88577513f7dbf30 * ENH: add small perimeter speed and threshold The original param is added by Prusa. Thanks orca for adding threshold. 1. Re add small perimeter speed and threhold. github: #2221 Change-Id: I35b269b26f085d80f0edca28650bb21fc04898d7 * FIX: modify the picture of pa manual cali Jira: STUDIO-5102 Change-Id: Id87898959ad4461b7bd2505b159271f2aa589c36 * FIX: Filament preset is the same with the first one Jira: STUDIO-4519 Filament preset is the same wit the first one, it should align with the last one. Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I304d0ff0fbc1c8948d410ea552e4d42b6a4e8fd9 * FIX: scoreDailog dark mode issue Jira: 4570 Change-Id: I8be97b306a1494f73e3bba678ecc864e7ff88ca3 * FIX: CLI: fix the slicing issue while only one object with multicolor using seq-print JIRA: no-jira Change-Id: Iea2d23ff8e484bf2fd58aa2f596a8e4e4292fe39 * ENH: open support wall count for normal support 1. open support wall count for normal support Enabling this option makes normal support stronger and gives better overhang quality, but also more difficult to removal. Jira: STUDIO-5192 2. fix a bug where tree support (hybrid style) may get overlapped extrusions near the walls. 3. fix a bug where raft layers can't be 1 in tree support Jira: STUDIO-5261 Change-Id: Iadc0c67a9b50b5b221c8e83d5aa22ed282018cf8 (cherry picked from commit c0bb0084e386cb70ed6e16edf93190e4b38f5b90) * FIX: compiling error on linux jira: none Change-Id: I1a4563503b5ddf74a1979cc0cee7a15b8aced904 (cherry picked from commit de52c6ca62c9f3a6314ddf5a856c1d8534329886) * ENH: add translation for small perimeter jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I95013649e4e0c07c0f04b89a91488814c8d228cc * FIX: clone shortcut key issue on macos jira: STUDIO-5166 Change-Id: I1967da1d443ed43bd750dad8e11560688d7bd533 * FIX: custom gcode window cannot paste/ navigate jira: STUDIO-5208、STUDIO-5070 Change-Id: I4ecb9d06cf5db0ae53a4678181aae9298bac106b * ENH: modify dailytips collapse & expand interaction jira: STUDIO-5209、STUDIO-5210 Change-Id: Ifb0b998e5004d4b49390ba5a250eaf4743bf3471 * ENH:Add shortcut keys and lists for objects search JIRA: STUDIO-5157 STUDIO-5158 STUDIO-5240 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: Ic7cfaaa9b4bb8a85208bafab7fe3bafdb78f0045 * FIX:Re-calculate button with White Box displayed in dark mode JIRA: STUDIO-5098 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I07cc6c72d5dbd03b72573cd27dd5938bb0e6a29a * NEW: display plate index when printing a task JIRA: STUDIO-2689 display on the thumbnail of the current task Change-Id: I5f1f46c56e9d1e9120a66d491551908dfad099d6 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH:fixed incorrect path prefix jira:[for file path prefix] Change-Id: Ie9e3999f02b78272e528ceceb479e746d46a7e6c * FIX: thumbnail is not clear in dark mode JIRA: STUDIO-5087 Change-Id: Ie86493ed71b5554095927f061509a1f551758b61 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> * FIX: translation Jira: XXXX Change-Id: Id03f0d704aa852632a907ea628d1277400112062 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: first nozzle change to 0.4 and nozzle change to mm Jira: XXXX Change-Id: I14defd36442dbd7008e46782b08415b6244224f1 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 STUDIO-5265 apply_selected_connectors should check_and_update_connectors_state Change-Id: I8c2c1c920cc4d197d1908815a3e62f4962335451 * FIX: fix new_bed_shape's calculation process Jira: STUDIO-5122 Change-Id: I5f3e6a301a297123af28692c90bef6759f425b06 * ENH:update some translations jira:[STUDIO-5262] Change-Id: Idb1d3586888043ac325f272bc7a2b788adb3e9e5 * FIX: edit text command resets object settings Jira: STUDIO-4655 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Iac25c4e40f1d0d32e6d1f40e62226cc22bc96042 * ci: update build version to 01.08.00.58 Change-Id: Iacfec02aa50c617e4c9fe566319b07b30d47dce1 * FIX: remove GetUserAgent Change-Id: I92886e1f0dcb091109231a10da8c19d51178e13b Jira: STUDIO-5205 * FIX: nozzle_diameter_map data structure adjustment Change-Id: Ifb724afc0fcf974e6d331e73ecac723107a102cf * ENH:add _A and _B for perform_with_groove Jira: STUDIO-5267 Change-Id: Iee3310dfa1cd8e6680310f0af0eff5c817490813 * ENH:is_equal for min_z and max_z Jira: STUDIO-5267 Change-Id: I9493883d8be9d44e26ddc9afe62b7e9eb09c5052 * ci: update build version to 01.08.00.59 Change-Id: Ie8ed29ccf5d6c94594eb2ab8b717416fbeace3bd * FIX:Image display unclear in light mode JIRA:5161 Change-Id: I134cc64a2af0dfff60c47d0ff09d78d9c0f86b3f * FIX:fix bugs of non manifold edge Jira: STUDIO-5267 Change-Id: I8ac9a2cf96da0bc07ee00b309e65611b92fd174d * ENH:nozzle type detection jira:[STUDIO-5246] Change-Id: Ic41a2161a0e41d23f56af93ad8ec34cc83ada0e3 * ENH: upadte P1S start gcode 1.turn on MC board fan by default on P1S jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I5b2f7868e350942fb8b7baf7d429e22a0987184a (cherry picked from commit e866a575b6b7d9552f7412f84272f4b48dfc3961) * ENH: improve support style's tooltip jira: none Change-Id: I8ee858d7052f04ce7ea6b226a500c7d1bf8a482f (cherry picked from commit 665f31c4fcde22bd894cbb4a5fb160635947f2a4) * ENH: set layer range error to warning 1. If layer range exceeds maximum/minimum layer range in printer settings,pop up a window to warn jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I0304ee790e557ecf967f355c171993d1f51b5057 * ENH: CLI: remove the warning of layer height JIRA: no jira Change-Id: Idaceee4f52611479fc3f4238d016d891b4dc8cd1 * FIX: the word search is not translated Jira: STUDIO-5224 The world search in the device panel is not translated. Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ia3d651c2159a3aad94e10cd0a6da98848f53ee2a (cherry picked from commit 4a46a0a4750d82d49c9523f4b668a1a00c41ed83) * FIX: Bitmap will flash when sending printing task Jira: STUDIO-5278 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ib0c8710b8d5d6b98fad043c950f054aa35bea965 * ENH:display the euler angle of rotation plane Jira: STUDIO-5268 Change-Id: I6b7b431931d60f1a9a832908400417781798c472 * ci: update build version to 01.08.00.60 Change-Id: I1c15b5c6437554c43327cd6b537f7a5860dba5a0 * ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: I2832e1dccaf9755448debe7b2bd56426f90dfe0d * ci: update build version to 01.08.00.61 Change-Id: Ib03e664a20990322c788686550c491d0139d8237 * FIX: some translation problems jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: If9f2af53b4f0bfa9469e84bcba68cc182df4a473 * add: Ukrainian lang support for 1.8 * FIX: calibration selected preset is null in some case jira: STUDIO-5258 Change-Id: Iee63593c5f833c5a43e3b1d1c9ddb82f8c69569a * FIX: create filament issue Jira: 5296 5297 5295 5302 5311 5276 5296 create filament: list has same printer 5297 create filament: filament combobox has blank options 5298 edit filament: delete last preset prompt users 5302 create filament: filament combox has cili preset 5311 create filament: printer name too long to can not show all 5276 edit filament: PLA Aero filament type filter issue add prusa vendor Revised copy Change-Id: I5dcc615ce0951b1a9953fa12283f6090f5069045 * FIX: some translation Change-Id: Icb8614a0af18f96d15f3b97c17e0f6f708296847 * FIX:cancel is_equal for slicing function Jira: STUDIO-5267 Change-Id: I66d759aa2c968f8a28a6a5d8378929754f2db689 * FIX:UI stuck due to pop-up window with wrong chamber temperature JIRA: 5304 Change-Id: I1a49a7219b7a6f5700243704c348724e7930ce1a * FIX: allow input '+' and hide edit preset btn Change-Id: I97aec7c3ac4cc8b9d6c535f0126aaa1926553d86 * ENH: handle printer direct close and not retry Change-Id: I5dd55f8085cf6383a8420ab41e614ea6ae210c78 Jira: STUDIO-5305 * ci: update build version to 01.08.00.62 Change-Id: I09716bf79354b503197c751272fd3171e0abc8fd * add: new translation to ukr for AirFlow and Prusa * add: Texture Plate name fix * FIX:add slice_facet_for_cut_mesh api for cut tool and modify section_vertices_map 's traverse Jira: STUDIO-5267 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Change-Id: I52bfaef8926ef967b78a6cb712a1731a1b528a24 * FIX: Make the front smaller for Czech in device panel Jira: STUDIO-5151 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I315174b55f923da069854fb4fed8cf3937b82074 * FIX: there is no object can be jumped to in notification jira: new Change-Id: Ib81bf49236952ede24a2de126051572d63916e01 * FIX: add height range, modifier in Preview pane will crash jira: STUDIO-5340 1. fix crash at add height range, modifiers in Preview from objectList 2. fix an assert hit when slicing 3. fix an assert hit when enter AssembleView 4. forbidden popup menu by right-click objectList in Preview Change-Id: I444bc76b1a4307999b387e4f60386b2d272bd308 * FIX: Black spot in the sending printing task page Jira: STUDIO-5307 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I3bd97c063ec5f0faf7d12047da39f60ce55cae4b * FIX: reset_cut_by_contours should update_buffer_data Jira: STUDIO-5376 Change-Id: I5aacb1f7b65822031d7138abd61a45b09c743531 * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 STUDIO-5265 Change-Id: Ia958772bcb081817da621115f99328bb62770cd5 * ENH: bumped version to 1.8.1 Change-Id: I9d25403daa5b7b8ca415c0b364670da9e0f932b0 * FIX: create filament dialog: create btn can not show all Jira: 5310 5331 Change-Id: I185272c90d9ff1c3d6b47abbefbf488d0d965cca * FIX:update custom_texture when new_shape=false Jira: STUDIO-5287 Change-Id: I3add95f9f9345c14a48cc7467513d1b3ce95f4c9 * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 Change-Id: I9044129f4e0c8ca7469db05b3e547fca4754342a * FIX:add slash_to_back_slash for saving file path Jira: STUDIO-5287 Change-Id: I9f3c176cd0831c793958f08601c63efac98176a4 * FIX: a button color didn't response to dark mode change jira: STUDIO-5315 Change-Id: I95489f01ccd1f77b9e95b0d0f69e5398d2e88487 * FIX: height range layers displayed in wrong position jira: STUDIO-5341 Change-Id: I83918b4624f367efa54321f1898e1176cdb04ea9 * FIX: auto arranging issues with locked plates 1. global auto arranging may put items overlap with wipe tower if some plates are locked jira: STUDIO-5329 2. items outside bed may overlap with plate boundary if it's rotated jira: STUDIO-5329 3. plate-wise auto arranging uses wrong min_obj_distance if the plate is by-layer printing but global setting is by-object printing jira: STUDIO-5330 Change-Id: I5dba2f1317e183c9aeec1cb2bd227fbddf4316e6 (cherry picked from commit db1eac41efff5f1e8d5ac0af74c6fc7ab59fc253) * FIX: a mistake in upward machine jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibdb26c3d904634f322aef0dc0c7b8867d9fb5854 * FIX:a blank pop-up appears JIRA:XXXX Change-Id: Ice92b55204e4897fec024a6d99412eb810bddd4a * FIX:fixed failure in updating nozzle type jira:[STUDIO-5248] Change-Id: Iad37b5d5b76d37cb1723ef21d7c39b1e3fcaf8d7 * FIX:fixed issue with AI monitoring settings jira:[STUDIO-5082] Change-Id: I967fe3c1e9da61a55bcbfaa2a8e067dd5af18f72 * FIX:fixed issue with lan mode jira:[STUDIO-5189] Change-Id: I1d0a05f19dcea154cf3ef2b61ed0546d3581905e * FIX:update text for loading or unloading filaments jira:[STUDIO-5231] Change-Id: Ic7729c3ec012485b3d87e3d01f11e87502c67895 * FIX: Revert "ENH: do not leave a gap for top... Revert "ENH: do not leave a gap for top interface if the top z distance is 0" This reverts commit 79ea32c7cbbdb7e689637980af7c36caf42284c9. Revert reason: the supports are impossible to remove in some cases. jira: STUDIO-5385 Change-Id: I376a6f4dfd78da6dfea68b9ac3d552cddd0b4272 (cherry picked from commit 34e38b705fde7f5d7f9a3a89c96a3627ce0c998e) * ENH: improve normal support's quality 1. Add a base_interface_layer when using Supp.W 2. Fix a bug where base_angle and interface_angle are wong jira: STUDIO-5386 Change-Id: I52ab32c63b3cd1e6e2ba6463b01ae26699cf13d3 (cherry picked from commit 92ddd4a10b793572a1fa009da5b9e44fcdf81de2) * NEW:tracking stl model files jira:[STUDIO-5372] Change-Id: Idb1275b07441f0cd06c24588d5f7c20f81f1556c * FIX: edit filament dialog: preset name too long to del btn nan't show Jira: 5336 5174 and verify string normalization Change-Id: I380c3bed2bf43d01094b68979a8b67f4187c0b93 * FIX: some translation Jira: 5232 5300 5334 Change-Id: Ie474ca823011e81aab82a9809af3d6e42980496b * FIX: some translation Change-Id: Iaabe6087bed3b7d47d911cf4fb51c770804e72fb * ENH: change default tree_support_wall_count to 0 Now normal support also uses this option, so we can't default it to 1, otherwise normal supports will be too hard to remove. jira: none Change-Id: Ic5700af5c17e3a7b265c8915f28b0db35c6e06e6 (cherry picked from commit 6b84a9826da108b76569e686bd9def0b23ae29fd) * FIX:The name of the material in the error prompt is empty JIRA:STUDIO-4907 Change-Id: I3cf44f099256a51f21a44a89c89c000f734d1f36 * ci: update build version to 01.08.01.51 Change-Id: Ib20f5a12b65472102befec0a2adf82744fc29c46 * FIX: imgui textinput cannot paste on macos jira: STUDIO-5070、STUDIO-5365 Change-Id: Iea8f41e12744ecda0fbb95c1a8f2e014a7cdc384 * FIX: not cache printer file list on error Change-Id: I99843aedbf14d3d1d553ccac9b0bd26403274a82 Jira: none * FIX: thread of close BBLUserPresetExceedLimit notify Change-Id: I9698134ba1cc91fc83eac441f900d68c4c4b556a * ENH: Resolve non manifold edges by fixing model interfaces Jira: STUDIO-5124 Change-Id: I7ea86be44acb80b6c4762a76208b4a031acd0b27 * FIX:nozzle type sync jira:[STUDIO-5248] Change-Id: I63d48628832473d8d371ed643dc8528b00382531 * FIX: array bound happen in TriangleSelector::deserialize Jira: STUDIO-5170 Change-Id: I92b72a887845b462fad208f13607293b44d3d333 * FIX:cropping rendering without considering assembly views Jira: STUDIO-5260 Change-Id: Ia56cf80b305ae05f25f06ec277f85b3c5430a6df * FIX: PA for custom filament not available in BL Studio github: 2971 Change-Id: I6ccd36a183e7367d69557300f7242f5403f4bb33 * FIX: Bitmap is way too small on Mac Jira: STUDIO-5393 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I6b550669fa8cd5fc9bfa6ed96d64d19a949f01b2 * FIX: move shutdown wait to OnExit Change-Id: I70d9a2bb686525ae5273aa9d63e25691da4ab65c Jira: STUDIO-2884 * FIX: calibration manage result dialog issue on macos jira: STUDIO-4949 STUDIO-5378 Change-Id: I00abefd45a0d274a4b68bb1ab18debe8f91d169e * FIX: adjust bed shape dialog button UI style fix that button text is hard to see in dark mode jira: STUDIO-5247 Change-Id: I2cf5b3cdd2eff9b821bdf5525bec4f329fc58dd1 * FIX: 5331 rescale btn Jira: STUDIO-5331 Change-Id: If153424b8480e64b166018e3cd98c17db557d0a8 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: support do not generate jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ide9709d95203185538e280517f7aa6136beeda44 * FIX: remove not match printer config ota cache Change-Id: Ib73fc2ea31fa2186061cfcb5a170bc59b9db84ca Jira: none * FIX:cancel the variable of "checkbox_size" as a fixed value Jira: STUDIO-5150 Change-Id: I30d876d141b8b35ab4a3fee4889993d87b7c1741 * ENH:add reset_cut_by_contours in on_load function Jira:STUDIO-5269 m_connector_size_tolerance default value is 0.1f Change-Id: I6c67fff3cb0c1190e9141ed6f68fbfa848679f35 * ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Signed-off-by: zhou.xu <zhou.xu@bambulab.com> * FIX: dailytips should not change content frequently when slicing all jira: STUDIO-5234 Change-Id: Icb7e9c28404d9db8ebed58d937e13f89c5403b5c * FIX: objectList clone shortcut key issue jira: new Change-Id: Ia75bf58a7d53f962e1af6c2fd97497270b7eea84 * ENH:handling cases without msgs jira:[STUDIO-5401 STUDIO-5399] Change-Id: Iae651d5a19a45b0138a6aa621326a8b4a9649824 * ENH: optimize param description jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id0ca9224227a716b21fc0b8430722264dc319344 * ENH: add translation jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I3b1f04fee3cd6322793794ad8b8707859f6c7d26 * FIX: close edit preset paramsDialog, mac unresponsive Jira: 5298 Change-Id: I021e00567354cfb1f2f5f1f2bf6ba1fc35b164c5 * ENH:disable AI monitoring on the p1p series Change-Id: I514bb1fb1ced6c03dd619230a9adac3be63f2de2 * ci: update build version to 01.08.01.52 Change-Id: I9f5e30d3fc4b7ef9321c522d3c18fce98f03742f * FIX: close edit preset paramsDialog, mac unresponsive Change-Id: Ic816754a20b7f6a5cdb46475750eb301fec3ad3a * FIX: organic support not work with raft only There is no raft generated when only raft enabled but no support needed. jira: none Change-Id: Ic0c9269e2f98038d85c9bc54e4a85f892dc5d764 * FIX: CLI: add object config when assemble JIRA: no jira Change-Id: I945f820fb58f2f643170b4b0b66742f6bbbdfd29 * FIX: delete preset prompt Jira: XXXX Change-Id: I6511c806c56393d4f6bd72d1c506da59675d49ff * FIX:Reorganize the assignment of variables of "m_editing_window_width" Jira: STUDIO-5238 Change-Id: If369916f3f5c21510f5f297bfd05c1230bdda7a4 * ENH: CLI: re-compute flush_volumes_matrix when it is missed Change-Id: Ie8f53c6bef003b1434de02ea14de5787b376484f * FIX: some translation for delete filament Change-Id: Ib46a8eba33f2e21016476aaab4a57a740e86b1b8 * FIX: scrolled window / del preset / edit filament issue Jira: 5092 GitHub: 1936 edit filament: just one preset, the scroll bar obscures the preset name edit filament: delete selected preset, click no, but preset be deleted from UI edit filament: serial sometimes displays incorrectly Change-Id: Ibc91609e252179de0c05ca065099756da6631165 * ci: update build version to 01.08.01.53 Change-Id: I5563a2c0812ab9a0d7727df27e17e681066ffa08 * FIX: mistake in filament vendor jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I3af712e417379d8b98ae18feebffe465bfa1e72d * NEW:set customized materials for the A1 P1 series Change-Id: I9c34f62867c074bf9ebb315013e5e40526e0eac7 * ci: update build version to 01.08.01.54 Change-Id: I579dcee428417ae7e7f7a96bd315a7066d72d974 * FIX: the flow rate ratio crashes after load model for third party printer Jira: 5244 Change-Id: Idd829c9d99eeba9d180653ac8de4e51b9a0d6370 * FIX: The maximum value is not printed in PA line mode Jira: 5046 4951 Change-Id: Ic81f9a75ce7f088fe950fdde283ff5c942cd6e83 * ENH:add preset check for sending files Change-Id: Ia3313d281b5ce91e277b380498014ffdac5debd3 * ci: update build version to 01.08.01.55 Change-Id: Ia839344d01a43f7159f376d4147337575c4edbe1 * FIX: locale loading user preset Change-Id: I88521e4b10cb802d9253eb79a6b78b3286f15a33 Jira: STUDIO-5436 * FIX: sync user preset notify crash on exit Change-Id: I88f5dbcbd487293ea847ea6092efb61744399541 Jira: STUDIO-5413 * ci: update build version to 01.08.01.56 Change-Id: Id7a9718d5f920da50d52fd2ef220acf5d3270d3c * GUI/Field: Fix crash in color picker init (#2220) wxButton->GetBitmap() may return an invalid wxBitmap. Guard against this. * FIX: custom filament preset display in cali history issue jira: new Change-Id: I4145450a231adff542ab1a7428b3479f4074e06a * FIX: meshboolean transform result issue jira: STUDIO-5425 Change-Id: If66fe909ce4458c1b3192e4fd8a3d758fe7c7eaa * FIX: fix combobox and delete btn in filament setting enabled Jira: XXXX Change-Id: I8b659bd77ceb97c8cea9d3e5e931f4ea50822721 * ci: update build version to 01.08.01.57 Change-Id: I7a6f5439863ca81275ae8b80f1b5cf0bb36c4c0f * unix: Use canonical mime-type for 3MF files model/3mf is the canonical mime-type, but keep the application/vnd.ms-3mfdocument alias. See for details: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/179 * FIX: fix the compiling issue under windows github: https://github.com/bambulab/BambuStudio/issues/3028 Change-Id: Iafde9d2086c0cd31aa12e39cef7ded1e19e9d3e7 * add: K1 and K1Max Support * fix: Optimized STL and PNG for plates K1 & K1Max * fix: simple version of models * FIX: Close scan_first_layer when PA line cali Jira: XXXX Change-Id: Ide5c0038f4028b8f1d445a6b2d09b705d7872fb8 * FIX: CLI: fix the wipe tower disappear issue JIRA: no jira Change-Id: I547a8468b0bea06912d5d9ceee1c8deead85e28f * FIX: the preset is the same with the first one when switching printers Jira: STUDIO-5433 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Icf1979f2bcffbc9c59a072924df5073fc3eac363 * FIX: [5504] Optimization description Jira: 5540 Change-Id: I9379f2c69b6724ec1ef5294dd3c404b0e3189486 * FIX: [5451]Directly crash when memory is low Jira: 5451 Change-Id: I5c75994e2bd556bec7ce8de6be44888e6924ff56 * ci: update build version to 01.08.01.58 Change-Id: I12b1e3ca6b07ed13f3ad42ab2f40b825cb84a8dc * ENH: CLI: refine some logic 1. set wipe tower position to default when duplicate object 2. add cli_safe check logic when switch printers JIRA: no jira Change-Id: Iebe62f8be6acd6f44743abf3b0fe92ec04c94197 * ENH: CLI: allow height shrink when printer switch to let the error generated at validate JIRA: no jira Change-Id: I94db90db858659a9254dfdc0a6eed04fd40d3768 * ENH: add support for A1 jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I5dfd8f3b6b872c01d8093527df1a3c37b8a0d56d * ENH: refine description of interface not for base jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibe11e845b90ef2caf96d5780eaaf8764755cce1d * ENH: version: bumped to 1.8.2 Change-Id: Ic9acb5607ec94188112999afa41f2052281a08f1 * ENH: update some machine settings 1. Update A1 mini start gcode 2. Update A1 load/unload filament time jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I84825a47f2741e95ca122382e4119d35a61bdbf6 * ENH: support for head wrap detect 1.Add "in_head_wrap_detect_zone".Detect if the model projection enters a specified area. jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I6aed5a782d2f33f023bdc19cf06dff0957828eeb * ENH: modify default head detect zone 1. Set default head detect to empty jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I686c4c3115041471bc016cf3b0972ed730af64d3 * ENH: change head wrap detect zone Change to (156,156)-(180,180) jira:[new] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I7b9dec3fbf44d31311fd7eb331e52f307f45ede1 * FIX:backup iterator location Jira: STUDIO-5267 Change-Id: Id035c9225a858bb551aa4f09870fc4c6bb30b255 * NEW:compatible with p1p (plus) jira:[p1p] Change-Id: I7b30903dc0a728604c4f33c325aa79fd3bd08f68 * NEW:installed & supported p1p(plus) jira:[pip plus] Change-Id: I0a69f8629749e3076465b85f28aa39d5e7ae6277 * ENH: modify default head wrap detect zone jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I39ccc810a19192919a21b5608d3fa2a806c787ee * FIX: excpetion when plate center is negative jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia1066bd7457181711d0a59b9544d65ed502410e0 * FIX: big window's scaling causes incomplete display Jira: STUDIO-5530 Change-Id: I1d69e60658e49e43d4b3de718f2fd6739bab73ce * ENH: update: remove the comment which is not used when updating preset JIRA: no jira Change-Id: Ic930eea50a7beb78aa6dc7c53fbb5c366857e825 (cherry picked from commit e0225fc147702cf73e6eda4830a2592c7598901c) * FIX: wrong initial layer height in profile jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I91f1779761a13f70d68ad51041b7f75ef872c138 * NEW:add N2S picture and printers JIRA: XXXX Change-Id: Id8eddd9fafd07c967abfb1543c1b01ad8c0e1b0c * ENH: rearrange machine pos on printer selection page Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Iccc52043c232d19384487884e4071343744976a9 * ci: update build version to 01.08.02.51 Change-Id: I1985730c4ea29528a6f9b03f56c73131a07779b0 * ENH: some translations Jira: STUDIO-5434 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ie6868728edfc40bd1d20dec6a78d8e5ea7f8edf8 * ENH: do not cancel printing job when timeout JIRA: STUDIO-5009 Change-Id: I067470173acc26d7ecd8ceb6f0e04ac7f03e3a4d Signed-off-by: Stone Li <stone.li@bambulab.com> (cherry picked from commit 7ab5817c7229c5179adca026ffacb97c2affd292) * ENH: udpate A1 series gcode 1. Update A1 mini change layer gcode 2. Update A1 start gcode jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I131676a991f4727bca1ea2fa727f40f293d06139 * ENH:After cutting,fix non manifold edges needed confirmed by user Jira: STUDIO-5217 Change-Id: I52ba0db27ebe0b7b763c49311c7aa305bc4dcd5a * ENH: linux: refine the d-bus name github: #3075 Change-Id: Icf997f4f9203f4d429e3b6058d6d6e5f23bf29ac (cherry picked from commit 5c766bff445cefee488ba9d057121b04c8e1445d) * NEW:add "bed type to follow machine preset" function Jira: STUDIO-5535 Change-Id: I2ef99a0a783a074d9379685adde11fddfd6f8cec * NEW:add "default_bed_type" Jira: STUDIO-5535 Change-Id: Ice1262937923b62854b0196229d5fb99392470af * ENH:comment out two line code Jira: STUDIO-5535 Change-Id: I5475e4f9ec6fb7e4abdb3d950da34fadead3b606 * ENH:translate three texts Jira: STUDIO-5535 Change-Id: I00938567f0ae30bb354042769021451364bef308 * FIX: incorrect flag in A1 mini gcode jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: If587678bf0aa06c079a9d3cbff9f2c7628c5e380 * ci: update build version to 01.08.02.52 Change-Id: I2d8310b7321fefcb742d4cdbe5e4bc9a035ec45a * FIX: Allow vendors that are not entirely numerical github: #3082 Change-Id: I318f4df7f65c934ab6703e0970d775b754b24276 * ENH: update A1 series first layer speed jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I597bcf86f202f681eccfda4306be5619d669ea5a * FIX: CLI: fix the wipe tower issue while mapping to one filament JIRA: STUDIO-5550 Change-Id: I0b8d3af09d16bdfc45cdc5951d182f7e33dc9b93 * FIX: crash when support type and style are inconsistent jira: STUDIO-5428 Change-Id: Ib1e79c71736810099e15282c30524e55e8f60f34 (cherry picked from commit aefb7fbaf25146c03bd2eb336f58ed2eb0e83ea6) * NEW:display beta version JIRA: XXXX Change-Id: I78d748e53b266c3397b1c038c3425a52c573cc88 * FIX: slice error: WipeTowerIntegration::append_tcr when print by object with multi-color Jira: XXXX Change-Id: Ic9ee2f6de45abb4a118fdb4cf89dea9ca7335094 * ci: update build version to 01.08.02.53 Change-Id: I980bff783b59fc6e9d6fd12a016c2daa2840991f * FIX: remove duplicated profiles jira:[NEW] Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: Iaa87233ae6c327faf43a152bdb0cd6fa8c5131d7 * FIX: translation: vendor can not be number Jira: XXXX Change-Id: I7bd45de944e8b25b30c88ab742b35d996c933966 * ci: update build version to 01.08.02.54 Change-Id: Ib83b131c533a03d6e48e9ded5e6f9ba574819756 * ENH: update A1 extruder clearance radius jira:[NEW] Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: I13cfb882c672083dcd1af2c1be448c5422fdbc0a * ci: update build version to 01.08.02.55 Change-Id: I8d7016d27166b457e4cdc198b61e6aa36a72b8c1 * FIX: bed_type not follow machine preset Jira: STUDIO-5578 when direct open project from https://makerworld.com/ Change-Id: I3281cf45e3057d766008487975b4585d2e277110 * ci: update build version to 01.08.02.56 Change-Id: I43cadeeb1a2fa150fa9396a63b9bc471da1500d5 * update strings * autofix mesh after cut --------- Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Signed-off-by: Stone Li <stone.li@bambulab.com> Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Signed-off-by: zhou.xu <zhou.xu@bambulab.com> Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: zorro.zhang <zorro.zhang@bambulab.com> Co-authored-by: hu.wang <hu.wang@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: gerrit <gerrit@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: the Raz <rasmus@abc.se> Co-authored-by: Andy <andylg@yandex.ru> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: enricoturri1966 <enricoturri@seznam.cz> Co-authored-by: wenjie.guo <wenjie.guo@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: Dmytro Chystiakov <dlchistyakov@gmail.com> Co-authored-by: mia <652892+mia-0@users.noreply.github.com> Co-authored-by: Bastien Nocera <hadess@hadess.net> Co-authored-by: qing.zhang <qing.zhang@bambulab.com>
3992 lines
210 KiB
C++
3992 lines
210 KiB
C++
#include <cassert>
|
||
|
||
#include "PresetBundle.hpp"
|
||
#include "libslic3r.h"
|
||
#include "Utils.hpp"
|
||
#include "Model.hpp"
|
||
#include "format.hpp"
|
||
|
||
#include <algorithm>
|
||
#include <set>
|
||
#include <fstream>
|
||
#include <unordered_set>
|
||
#include <boost/filesystem.hpp>
|
||
#include <boost/algorithm/clamp.hpp>
|
||
#include <boost/algorithm/string/predicate.hpp>
|
||
#include <boost/range/adaptor/transformed.hpp>
|
||
#include <boost/nowide/cenv.hpp>
|
||
#include <boost/nowide/cstdio.hpp>
|
||
#include <boost/nowide/fstream.hpp>
|
||
#include <boost/property_tree/ini_parser.hpp>
|
||
#include <boost/property_tree/ptree.hpp>
|
||
#include <boost/locale.hpp>
|
||
#include <boost/log/trivial.hpp>
|
||
#include <miniz/miniz.h>
|
||
|
||
|
||
// Store the print/filament/printer presets into a "presets" subdirectory of the Slic3rPE config dir.
|
||
// This breaks compatibility with the upstream Slic3r if the --datadir is used to switch between the two versions.
|
||
//#define SLIC3R_PROFILE_USE_PRESETS_SUBDIR
|
||
|
||
namespace Slic3r {
|
||
|
||
static std::vector<std::string> s_project_options {
|
||
"flush_volumes_vector",
|
||
"flush_volumes_matrix",
|
||
// BBS
|
||
"filament_colour",
|
||
"wipe_tower_x",
|
||
"wipe_tower_y",
|
||
"wipe_tower_rotation_angle",
|
||
"curr_bed_type",
|
||
"flush_multiplier",
|
||
};
|
||
|
||
//BBS: add BBL as default
|
||
const char *PresetBundle::BBL_BUNDLE = "Custom";
|
||
const char *PresetBundle::BBL_DEFAULT_PRINTER_MODEL = "MyKlipper 0.4 nozzle";
|
||
const char *PresetBundle::BBL_DEFAULT_PRINTER_VARIANT = "0.4";
|
||
const char *PresetBundle::BBL_DEFAULT_FILAMENT = "My Generic PLA";
|
||
|
||
PresetBundle::PresetBundle()
|
||
: prints(Preset::TYPE_PRINT, Preset::print_options(), static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()))
|
||
, filaments(Preset::TYPE_FILAMENT, Preset::filament_options(), static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()), "Default Filament")
|
||
, sla_materials(Preset::TYPE_SLA_MATERIAL, Preset::sla_material_options(), static_cast<const SLAMaterialConfig &>(SLAFullPrintConfig::defaults()))
|
||
, sla_prints(Preset::TYPE_SLA_PRINT, Preset::sla_print_options(), static_cast<const SLAPrintObjectConfig &>(SLAFullPrintConfig::defaults()))
|
||
, printers(Preset::TYPE_PRINTER, Preset::printer_options(), static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()), "Default Printer")
|
||
, physical_printers(PhysicalPrinter::printer_options())
|
||
{
|
||
// The following keys are handled by the UI, they do not have a counterpart in any StaticPrintConfig derived classes,
|
||
// therefore they need to be handled differently. As they have no counterpart in StaticPrintConfig, they are not being
|
||
// initialized based on PrintConfigDef(), but to empty values (zeros, empty vectors, empty strings).
|
||
//
|
||
// "compatible_printers", "compatible_printers_condition", "inherits",
|
||
// "print_settings_id", "filament_settings_id", "printer_settings_id", "printer_settings_id"
|
||
// "printer_model", "printer_variant", "default_print_profile", "default_filament_profile"
|
||
|
||
// Create the ID config keys, as they are not part of the Static print config classes.
|
||
this->prints.default_preset().config.optptr("print_settings_id", true);
|
||
this->prints.default_preset().compatible_printers_condition();
|
||
this->prints.default_preset().inherits();
|
||
|
||
this->filaments.default_preset().config.option<ConfigOptionStrings>("filament_settings_id", true)->values = {""};
|
||
this->filaments.default_preset().compatible_printers_condition();
|
||
this->filaments.default_preset().inherits();
|
||
// Set all the nullable values to nils.
|
||
this->filaments.default_preset().config.null_nullables();
|
||
|
||
this->sla_materials.default_preset().config.optptr("sla_material_settings_id", true);
|
||
this->sla_materials.default_preset().compatible_printers_condition();
|
||
this->sla_materials.default_preset().inherits();
|
||
|
||
this->sla_prints.default_preset().config.optptr("sla_print_settings_id", true);
|
||
this->sla_prints.default_preset().config.opt_string("filename_format", true) = "[input_filename_base].sl1";
|
||
this->sla_prints.default_preset().compatible_printers_condition();
|
||
this->sla_prints.default_preset().inherits();
|
||
|
||
//this->printers.add_default_preset(Preset::sla_printer_options(), static_cast<const SLAMaterialConfig &>(SLAFullPrintConfig::defaults()), "- default SLA -");
|
||
//this->printers.preset(1).printer_technology_ref() = ptSLA;
|
||
for (size_t i = 0; i < 1; ++i) {
|
||
// The following ugly switch is to avoid printers.preset(0) to return the edited instance, as the 0th default is the current one.
|
||
Preset &preset = this->printers.default_preset(i);
|
||
for (const char *key : {"printer_settings_id", "printer_model", "printer_variant", "thumbnails"}) preset.config.optptr(key, true);
|
||
//if (i == 0) {
|
||
preset.config.optptr("default_print_profile", true);
|
||
preset.config.option<ConfigOptionStrings>("default_filament_profile", true);
|
||
//} else {
|
||
// preset.config.optptr("default_sla_print_profile", true);
|
||
// preset.config.optptr("default_sla_material_profile", true);
|
||
//}
|
||
// default_sla_material_profile
|
||
preset.inherits();
|
||
}
|
||
|
||
// Re-activate the default presets, so their "edited" preset copies will be updated with the additional configuration values above.
|
||
this->prints.select_preset(0);
|
||
this->sla_prints.select_preset(0);
|
||
this->filaments.select_preset(0);
|
||
this->sla_materials.select_preset(0);
|
||
this->printers.select_preset(0);
|
||
|
||
this->project_config.apply_only(FullPrintConfig::defaults(), s_project_options);
|
||
}
|
||
|
||
PresetBundle::PresetBundle(const PresetBundle &rhs)
|
||
{
|
||
*this = rhs;
|
||
}
|
||
|
||
PresetBundle& PresetBundle::operator=(const PresetBundle &rhs)
|
||
{
|
||
prints = rhs.prints;
|
||
sla_prints = rhs.sla_prints;
|
||
filaments = rhs.filaments;
|
||
sla_materials = rhs.sla_materials;
|
||
printers = rhs.printers;
|
||
physical_printers = rhs.physical_printers;
|
||
|
||
filament_presets = rhs.filament_presets;
|
||
project_config = rhs.project_config;
|
||
vendors = rhs.vendors;
|
||
obsolete_presets = rhs.obsolete_presets;
|
||
|
||
// Adjust Preset::vendor pointers to point to the copied vendors map.
|
||
prints .update_vendor_ptrs_after_copy(this->vendors);
|
||
sla_prints .update_vendor_ptrs_after_copy(this->vendors);
|
||
filaments .update_vendor_ptrs_after_copy(this->vendors);
|
||
sla_materials.update_vendor_ptrs_after_copy(this->vendors);
|
||
printers .update_vendor_ptrs_after_copy(this->vendors);
|
||
|
||
return *this;
|
||
}
|
||
|
||
void PresetBundle::reset(bool delete_files)
|
||
{
|
||
// Clear the existing presets, delete their respective files.
|
||
this->vendors.clear();
|
||
this->prints .reset(delete_files);
|
||
this->sla_prints .reset(delete_files);
|
||
this->filaments .reset(delete_files);
|
||
this->sla_materials.reset(delete_files);
|
||
this->printers .reset(delete_files);
|
||
// BBS: filament_presets is load from project config, not handled here
|
||
//this->filament_presets.clear();
|
||
if (this->filament_presets.empty())
|
||
this->filament_presets.emplace_back(this->filaments.get_selected_preset_name());
|
||
this->obsolete_presets.prints.clear();
|
||
this->obsolete_presets.sla_prints.clear();
|
||
this->obsolete_presets.filaments.clear();
|
||
this->obsolete_presets.sla_materials.clear();
|
||
this->obsolete_presets.printers.clear();
|
||
}
|
||
|
||
void PresetBundle::setup_directories()
|
||
{
|
||
boost::filesystem::path data_dir = boost::filesystem::path(Slic3r::data_dir());
|
||
//BBS: change directoties by design
|
||
std::initializer_list<boost::filesystem::path> paths = {
|
||
data_dir,
|
||
data_dir / "ota",
|
||
data_dir / PRESET_SYSTEM_DIR,
|
||
data_dir / PRESET_USER_DIR,
|
||
// Store the print/filament/printer presets at the same location as the upstream Slic3r.
|
||
//data_dir / PRESET_SYSTEM_DIR / PRESET_PRINT_NAME,
|
||
//data_dir / PRESET_SYSTEM_DIR / PRESET_FILAMENT_NAME,
|
||
//data_dir / PRESET_SYSTEM_DIR / PRESET_PRINTER_NAME
|
||
};
|
||
for (const boost::filesystem::path &path : paths) {
|
||
boost::filesystem::path subdir = path;
|
||
subdir.make_preferred();
|
||
if (! boost::filesystem::is_directory(subdir) &&
|
||
! boost::filesystem::create_directory(subdir)) {
|
||
if (boost::filesystem::is_directory(subdir)) {
|
||
BOOST_LOG_TRIVIAL(warning) << boost::format("creating directory %1% failed, maybe created by other instance, go on!")%subdir.string();
|
||
}
|
||
else
|
||
throw Slic3r::RuntimeError(std::string("Unable to create directory ") + subdir.string());
|
||
}
|
||
}
|
||
}
|
||
|
||
// recursively copy all files and dirs in from_dir to to_dir
|
||
static void copy_dir(const boost::filesystem::path& from_dir, const boost::filesystem::path& to_dir)
|
||
{
|
||
if(!boost::filesystem::is_directory(from_dir))
|
||
return;
|
||
// i assume to_dir.parent surely exists
|
||
if (!boost::filesystem::is_directory(to_dir))
|
||
boost::filesystem::create_directory(to_dir);
|
||
for (auto& dir_entry : boost::filesystem::directory_iterator(from_dir)) {
|
||
if (!boost::filesystem::is_directory(dir_entry.path())) {
|
||
std::string em;
|
||
CopyFileResult cfr = copy_file(dir_entry.path().string(), (to_dir / dir_entry.path().filename()).string(), em, false);
|
||
if (cfr != SUCCESS) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error when copying files from " << from_dir << " to " << to_dir << ": " << em;
|
||
}
|
||
} else {
|
||
copy_dir(dir_entry.path(), to_dir / dir_entry.path().filename());
|
||
}
|
||
}
|
||
}
|
||
|
||
void PresetBundle::copy_files(const std::string& from)
|
||
{
|
||
boost::filesystem::path data_dir = boost::filesystem::path(Slic3r::data_dir());
|
||
// list of searched paths based on current directory system in setup_directories()
|
||
// do not copy cache and snapshots
|
||
boost::filesystem::path from_data_dir = boost::filesystem::path(from);
|
||
//BBS: change directoties by design
|
||
std::initializer_list<boost::filesystem::path> from_dirs= {
|
||
//from_data_dir / "vendor",
|
||
// Store the print/filament/printer presets at the same location as the upstream Slic3r.
|
||
from_data_dir / PRESET_PRINT_NAME,
|
||
from_data_dir / PRESET_FILAMENT_NAME,
|
||
from_data_dir / PRESET_PRINTER_NAME
|
||
};
|
||
// copy recursively all files
|
||
//BBS: change directoties by design
|
||
for (const boost::filesystem::path& from_dir : from_dirs) {
|
||
copy_dir(from_dir, data_dir /"old"/from_dir.filename());
|
||
}
|
||
}
|
||
|
||
PresetsConfigSubstitutions PresetBundle::load_presets(AppConfig &config, ForwardCompatibilitySubstitutionRule substitution_rule,
|
||
const PresetPreferences& preferred_selection/* = PresetPreferences()*/)
|
||
{
|
||
// First load the vendor specific system presets.
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" enter, substitution_rule %1%, preferred printer_model_id %2%")%substitution_rule%preferred_selection.printer_model_id;
|
||
//BBS: change system config to json
|
||
std::tie(substitutions, errors_cummulative) = this->load_system_presets_from_json(substitution_rule);
|
||
|
||
// BBS load preset from user's folder, load system default if
|
||
// BBS: change directories by design
|
||
std::string dir_user_presets = config.get("preset_folder");
|
||
if (dir_user_presets.empty()) {
|
||
load_user_presets(DEFAULT_USER_FOLDER_NAME, substitution_rule);
|
||
} else {
|
||
load_user_presets(dir_user_presets, substitution_rule);
|
||
}
|
||
|
||
this->update_multi_material_filament_presets();
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
|
||
this->load_selections(config, preferred_selection);
|
||
|
||
set_calibrate_printer("");
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" finished, returned substitutions %1%")%substitutions.size();
|
||
return substitutions;
|
||
}
|
||
|
||
//BBS: add function to generate differed preset for save
|
||
//the pointer should be freed by the caller
|
||
Preset* PresetBundle::get_preset_differed_for_save(Preset& preset)
|
||
{
|
||
PresetCollection* preset_collection;
|
||
|
||
switch(preset.type) {
|
||
case Preset::TYPE_PRINT:
|
||
preset_collection = &(this->prints);
|
||
break;
|
||
case Preset::TYPE_PRINTER:
|
||
preset_collection = &(this->printers);
|
||
break;
|
||
case Preset::TYPE_FILAMENT:
|
||
preset_collection = &(this->filaments);
|
||
break;
|
||
default:
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" invalid type %1%, return directly")%preset.type;
|
||
return nullptr;
|
||
}
|
||
|
||
return preset_collection->get_preset_differed_for_save(preset);
|
||
}
|
||
|
||
int PresetBundle::get_differed_values_to_update(Preset& preset, std::map<std::string, std::string>& key_values)
|
||
{
|
||
PresetCollection* preset_collection;
|
||
|
||
switch(preset.type) {
|
||
case Preset::TYPE_PRINT:
|
||
preset_collection = &(this->prints);
|
||
break;
|
||
case Preset::TYPE_PRINTER:
|
||
preset_collection = &(this->printers);
|
||
break;
|
||
case Preset::TYPE_FILAMENT:
|
||
preset_collection = &(this->filaments);
|
||
break;
|
||
default:
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" invalid type %1%, return directly")%preset.type;
|
||
return -1;
|
||
}
|
||
|
||
return preset_collection->get_differed_values_to_update(preset, key_values);
|
||
}
|
||
|
||
//BBS: get vendor's current version
|
||
Semver PresetBundle::get_vendor_profile_version(std::string vendor_name)
|
||
{
|
||
Semver result_ver;
|
||
|
||
auto vendor_profile = vendors.find(vendor_name);
|
||
if (vendor_profile != vendors.end()) {
|
||
result_ver = vendor_profile->second.config_version;
|
||
}
|
||
|
||
return result_ver;
|
||
}
|
||
|
||
VendorType PresetBundle::get_current_vendor_type()
|
||
{
|
||
auto t = VendorType::Unknown;
|
||
auto config = &printers.get_edited_preset().config;
|
||
std::string vendor_name;
|
||
for (auto vendor_profile : vendors) {
|
||
for (auto vendor_model : vendor_profile.second.models)
|
||
if (vendor_model.name == config->opt_string("printer_model")) {
|
||
vendor_name = vendor_profile.first;
|
||
break;
|
||
}
|
||
}
|
||
if (!vendor_name.empty())
|
||
{
|
||
if(vendor_name.compare("BBL") == 0)
|
||
t = VendorType::Marlin_BBL;
|
||
}
|
||
return t;
|
||
}
|
||
|
||
//BBS: load project embedded presets
|
||
PresetsConfigSubstitutions PresetBundle::load_project_embedded_presets(std::vector<Preset*> project_presets, ForwardCompatibilitySubstitutionRule substitution_rule)
|
||
{
|
||
// First load the vendor specific system presets.
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, substitution_rule %1%, preset toltal count %2%")%substitution_rule% project_presets.size();
|
||
try {
|
||
this->prints.load_project_embedded_presets(project_presets, PRESET_PRINT_NAME, substitutions, substitution_rule);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
try {
|
||
this->filaments.load_project_embedded_presets(project_presets, PRESET_FILAMENT_NAME, substitutions, substitution_rule);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
try {
|
||
this->printers.load_project_embedded_presets(project_presets, PRESET_PRINTER_NAME, substitutions, substitution_rule);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
|
||
//this->update_multi_material_filament_presets();
|
||
//this->update_compatible(PresetSelectCompatibleType::Never);
|
||
if (! errors_cummulative.empty())
|
||
throw Slic3r::RuntimeError(errors_cummulative);
|
||
|
||
//this->load_selections(config, "");
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, returned substitutions %1%")%substitutions.size();
|
||
return substitutions;
|
||
}
|
||
|
||
//BBS: get current project embedded presets
|
||
std::vector<Preset*> PresetBundle::get_current_project_embedded_presets()
|
||
{
|
||
std::vector<Preset*> project_presets;
|
||
|
||
project_presets = this->prints.get_project_embedded_presets();
|
||
|
||
auto filament_presets = this->filaments.get_project_embedded_presets();
|
||
if (!filament_presets.empty())
|
||
std::copy(filament_presets.begin(), filament_presets.end(), std::back_inserter(project_presets));
|
||
auto printer_presets = this->printers.get_project_embedded_presets();
|
||
if (!printer_presets.empty())
|
||
std::copy(printer_presets.begin(), printer_presets.end(), std::back_inserter(project_presets));
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, returned project_presets count %1%")%project_presets.size();
|
||
return project_presets;
|
||
}
|
||
|
||
//BBS: reset project embedded presets
|
||
void PresetBundle::reset_project_embedded_presets()
|
||
{
|
||
std::string prefer_printer;
|
||
Preset& current_printer = this->printers.get_selected_preset();
|
||
ConfigOption* inherits = current_printer.config.option("inherits");
|
||
if (inherits) {
|
||
prefer_printer = dynamic_cast<ConfigOptionString *>(inherits)->value;
|
||
}
|
||
//first printer, then filament, then print
|
||
bool printer_reselect = this->printers.reset_project_embedded_presets();
|
||
bool filament_reselect = this->filaments.reset_project_embedded_presets();
|
||
bool print_reselect = this->prints.reset_project_embedded_presets();
|
||
|
||
if (printer_reselect) {
|
||
if (!prefer_printer.empty())
|
||
this->printers.select_preset_by_name(prefer_printer, true);
|
||
else
|
||
this->printers.select_preset(this->printers.first_visible_idx());
|
||
|
||
//this->update_multi_material_filament_presets();
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
}
|
||
else if (filament_reselect || print_reselect) {
|
||
//Preset& current_printer = this->printers.get_selected_preset();
|
||
/*if (filament_reselect) {
|
||
const std::vector<std::string> &prefered_filament_profiles = current_printer.config.option<ConfigOptionStrings>("default_filament_profile")->values;
|
||
const std::string prefered_filament_profile = prefered_filament_profiles.empty() ? std::string() : prefered_filament_profiles.front();
|
||
if (!prefered_filament_profile.empty())
|
||
this->filaments.select_preset_by_name(prefered_filament_profile, true);
|
||
else
|
||
this->filaments.select_preset(this->filaments.first_visible_idx());
|
||
}
|
||
|
||
if (print_reselect) {
|
||
}*/
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
}
|
||
|
||
//this->update_multi_material_filament_presets();
|
||
|
||
//update filament_presets
|
||
for (size_t i = 0; i < filament_presets.size(); ++ i)
|
||
{
|
||
Preset* selected_filament = this->filaments.find_preset(filament_presets[i], false);
|
||
if (!selected_filament) {
|
||
//it should be the project embedded presets
|
||
Preset& current_printer = this->printers.get_selected_preset();
|
||
const std::vector<std::string> &prefered_filament_profiles = current_printer.config.option<ConfigOptionStrings>("default_filament_profile")->values;
|
||
const std::string prefered_filament_profile = prefered_filament_profiles.empty() ? std::string() : prefered_filament_profiles.front();
|
||
if (!prefered_filament_profile.empty())
|
||
filament_presets[i] = prefered_filament_profile;
|
||
else
|
||
filament_presets[i] = this->filaments.first_visible().name;
|
||
}
|
||
}
|
||
}
|
||
|
||
//BBS: get bed texture for printer model
|
||
std::string PresetBundle::get_texture_for_printer_model(std::string model_name)
|
||
{
|
||
std::string texture_name, vendor_name, out;
|
||
|
||
for (auto vendor_profile: this->vendors)
|
||
{
|
||
for (auto vendor_model: vendor_profile.second.models)
|
||
{
|
||
if (vendor_model.name == model_name)
|
||
{
|
||
texture_name = vendor_model.bed_texture;
|
||
vendor_name = vendor_profile.first;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (!texture_name.empty())
|
||
{
|
||
out = Slic3r::data_dir() + "/vendor/" + vendor_name + "/" + texture_name;
|
||
if (!boost::filesystem::exists(boost::filesystem::path(out)))
|
||
out = Slic3r::resources_dir() + "/profiles/" + vendor_name + "/" + texture_name;
|
||
}
|
||
|
||
return out;
|
||
}
|
||
|
||
//BBS: get stl model for printer model
|
||
std::string PresetBundle::get_stl_model_for_printer_model(std::string model_name)
|
||
{
|
||
std::string stl_name, vendor_name, out;
|
||
|
||
for (auto vendor_profile: this->vendors)
|
||
{
|
||
for (auto vendor_model: vendor_profile.second.models)
|
||
{
|
||
if (vendor_model.name == model_name)
|
||
{
|
||
stl_name = vendor_model.bed_model;
|
||
vendor_name = vendor_profile.first;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (!stl_name.empty())
|
||
{
|
||
out = Slic3r::data_dir() + "/vendor/" + vendor_name + "/" + stl_name;
|
||
if (!boost::filesystem::exists(boost::filesystem::path(out)))
|
||
out = Slic3r::resources_dir() + "/profiles/" + vendor_name + "/" + stl_name;
|
||
}
|
||
|
||
return out;
|
||
}
|
||
|
||
std::string PresetBundle::get_hotend_model_for_printer_model(std::string model_name)
|
||
{
|
||
std::string hotend_stl, vendor_name, out;
|
||
|
||
for (auto vendor_profile: this->vendors)
|
||
{
|
||
for (auto vendor_model: vendor_profile.second.models)
|
||
{
|
||
if (vendor_model.name == model_name)
|
||
{
|
||
hotend_stl = vendor_model.hotend_model;
|
||
vendor_name = vendor_profile.first;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (!hotend_stl.empty())
|
||
{
|
||
out = Slic3r::data_dir() + "/vendor/" + vendor_name + "/" + hotend_stl;
|
||
if (!boost::filesystem::exists(boost::filesystem::path(out)))
|
||
out = Slic3r::resources_dir() + "/profiles/" + vendor_name + "/" + hotend_stl;
|
||
}
|
||
|
||
if (out.empty() ||!boost::filesystem::exists(boost::filesystem::path(out)))
|
||
out = Slic3r::resources_dir() + "/profiles/hotend.stl";
|
||
|
||
return out;
|
||
}
|
||
|
||
PresetsConfigSubstitutions PresetBundle::load_user_presets(std::string user, ForwardCompatibilitySubstitutionRule substitution_rule)
|
||
{
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " entry and user is: " << user;
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
|
||
fs::path user_folder(data_dir() + "/" + PRESET_USER_DIR);
|
||
if (!fs::exists(user_folder)) fs::create_directory(user_folder);
|
||
|
||
std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/" + user;
|
||
fs::path folder(user_folder / user);
|
||
if (!fs::exists(folder)) fs::create_directory(folder);
|
||
|
||
// BBS do not load sla_print
|
||
// BBS: change directoties by design
|
||
try {
|
||
std::string print_selected_preset_name = prints.get_selected_preset().name;
|
||
this->prints.load_presets(dir_user_presets, PRESET_PRINT_NAME, substitutions, substitution_rule);
|
||
prints.select_preset_by_name(print_selected_preset_name, false);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
try {
|
||
std::string filament_selected_preset_name = filaments.get_selected_preset().name;
|
||
this->filaments.load_presets(dir_user_presets, PRESET_FILAMENT_NAME, substitutions, substitution_rule);
|
||
filaments.select_preset_by_name(filament_selected_preset_name, false);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
try {
|
||
std::string printer_selected_preset_name = printers.get_selected_preset().name;
|
||
this->printers.load_presets(dir_user_presets, PRESET_PRINTER_NAME, substitutions, substitution_rule);
|
||
printers.select_preset_by_name(printer_selected_preset_name, false);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
if (!errors_cummulative.empty()) throw Slic3r::RuntimeError(errors_cummulative);
|
||
this->update_multi_material_filament_presets();
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
|
||
set_calibrate_printer("");
|
||
|
||
return PresetsConfigSubstitutions();
|
||
}
|
||
|
||
PresetsConfigSubstitutions PresetBundle::load_user_presets(AppConfig & config,
|
||
std::map<std::string, std::map<std::string, std::string>> &my_presets,
|
||
ForwardCompatibilitySubstitutionRule substitution_rule)
|
||
{
|
||
// First load the vendor specific system presets.
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
bool process_added = false, filament_added = false, machine_added = false;
|
||
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" enter, substitution_rule %1%, preset toltal count %2%")%substitution_rule%my_presets.size();
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" print's selected_idx %1%, selected_name %2%") %prints.get_selected_idx() %prints.get_selected_preset_name();
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" filament's selected_idx %1%, selected_name %2%") %filaments.get_selected_idx() %filaments.get_selected_preset_name();
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" printers's selected_idx %1%, selected_name %2%") %printers.get_selected_idx() %printers.get_selected_preset_name();
|
||
|
||
// Sync removing
|
||
remove_users_preset(config, &my_presets);
|
||
|
||
std::map<std::string, std::map<std::string, std::string>>::iterator it;
|
||
for (int pass = 0; pass < 2; ++pass)
|
||
for (it = my_presets.begin(); it != my_presets.end(); it++) {
|
||
std::string name = it->first;
|
||
std::map<std::string, std::string>& value_map = it->second;
|
||
// Load user root presets at first pass
|
||
std::map<std::string, std::string>::iterator inherits_iter = value_map.find(BBL_JSON_KEY_INHERITS);
|
||
if ((pass == 1) == (inherits_iter == value_map.end() || inherits_iter->second.empty()))
|
||
continue;
|
||
//get the type first
|
||
std::map<std::string, std::string>::iterator type_iter = value_map.find(BBL_JSON_KEY_TYPE);
|
||
if (type_iter == value_map.end()) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(" can not find type for setting %1%")%name;
|
||
continue;
|
||
}
|
||
try {
|
||
PresetCollection *preset_collection = nullptr;
|
||
if (type_iter->second == PRESET_IOT_PRINT_TYPE) {
|
||
preset_collection = &(this->prints);
|
||
process_added |= preset_collection->load_user_preset(name, value_map, substitutions, substitution_rule);
|
||
}
|
||
else if (type_iter->second == PRESET_IOT_FILAMENT_TYPE) {
|
||
preset_collection = &(this->filaments);
|
||
filament_added |= preset_collection->load_user_preset(name, value_map, substitutions, substitution_rule);
|
||
}
|
||
else if (type_iter->second == PRESET_IOT_PRINTER_TYPE) {
|
||
preset_collection = &(this->printers);
|
||
machine_added |= preset_collection->load_user_preset(name, value_map, substitutions, substitution_rule);
|
||
}
|
||
else {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format("invalid type %1% for setting %2%") %type_iter->second %name;
|
||
continue;
|
||
}
|
||
}
|
||
catch (const std::runtime_error& err) {
|
||
errors_cummulative += err.what();
|
||
}
|
||
}
|
||
/*if (process_added) {
|
||
this->prints.update_after_user_presets_loaded();
|
||
}
|
||
if (filament_added) {
|
||
this->filaments.update_after_user_presets_loaded();
|
||
}
|
||
if (machine_added) {
|
||
this->printers.update_after_user_presets_loaded();
|
||
}*/
|
||
|
||
this->update_multi_material_filament_presets();
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
//this->load_selections(config, PresetPreferences());
|
||
|
||
set_calibrate_printer("");
|
||
|
||
if (! errors_cummulative.empty())
|
||
throw Slic3r::RuntimeError(errors_cummulative);
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, process_added %1%, filament_added %2%, machine_added %3%")%process_added %filament_added %machine_added;
|
||
return substitutions;
|
||
}
|
||
|
||
PresetsConfigSubstitutions PresetBundle::import_presets(std::vector<std::string> & files,
|
||
std::function<int(std::string const &)> override_confirm,
|
||
ForwardCompatibilitySubstitutionRule rule)
|
||
{
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " entry";
|
||
PresetsConfigSubstitutions substitutions;
|
||
int overwrite = 0;
|
||
std::vector<std::string> result;
|
||
for (auto &file : files) {
|
||
if (Slic3r::is_json_file(file)) {
|
||
import_json_presets(substitutions, file, override_confirm, rule, overwrite, result);
|
||
}
|
||
// Determine if it is a preset bundle
|
||
if (boost::iends_with(file, ".bbscfg") || boost::iends_with(file, ".bbsflmt") || boost::iends_with(file, ".zip")) {
|
||
boost::system::error_code ec;
|
||
// create user folder
|
||
fs::path user_folder(data_dir() + "/" + PRESET_USER_DIR);
|
||
if (!fs::exists(user_folder)) fs::create_directory(user_folder, ec);
|
||
if (ec) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " create directory failed: " << ec.message();
|
||
// create default folder
|
||
fs::path default_folder(user_folder / DEFAULT_USER_FOLDER_NAME);
|
||
if (!fs::exists(default_folder)) fs::create_directory(default_folder, ec);
|
||
if (ec) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " create directory failed: " << ec.message();
|
||
//create temp folder
|
||
//std::string user_default_temp_dir = data_dir() + "/" + PRESET_USER_DIR + "/" + DEFAULT_USER_FOLDER_NAME + "/" + "temp";
|
||
fs::path temp_folder(default_folder / "temp");
|
||
std::string user_default_temp_dir = temp_folder.make_preferred().string();
|
||
if (fs::exists(temp_folder)) fs::remove_all(temp_folder);
|
||
fs::create_directory(temp_folder, ec);
|
||
if (ec) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " create directory failed: " << ec.message();
|
||
|
||
file = boost::filesystem::path(file).make_preferred().string();
|
||
mz_zip_archive zip_archive;
|
||
mz_zip_zero_struct(&zip_archive);
|
||
mz_bool status;
|
||
|
||
/*if (!open_zip_reader(&zip_archive, file)) {
|
||
BOOST_LOG_TRIVIAL(info) << "Failed to initialize reader ZIP archive";
|
||
return substitutions;
|
||
} else {
|
||
BOOST_LOG_TRIVIAL(info) << "Success to initialize reader ZIP archive";
|
||
}*/
|
||
|
||
FILE *zipFile = boost::nowide::fopen(file.c_str(), "rb");
|
||
status = mz_zip_reader_init_cfile(&zip_archive, zipFile, 0, MZ_ZIP_FLAG_CASE_SENSITIVE | MZ_ZIP_FLAG_IGNORE_PATH);
|
||
if (MZ_FALSE == status) {
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Failed to initialize reader ZIP archive";
|
||
return substitutions;
|
||
} else {
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Success to initialize reader ZIP archive";
|
||
}
|
||
|
||
// Extract Files
|
||
int num_files = mz_zip_reader_get_num_files(&zip_archive);
|
||
for (int i = 0; i < num_files; i++) {
|
||
mz_zip_archive_file_stat file_stat;
|
||
status = mz_zip_reader_file_stat(&zip_archive, i, &file_stat);
|
||
if (status) {
|
||
std::string file_name = file_stat.m_filename;
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Form zip file: " << file << ". Read file name: " << file_stat.m_filename;
|
||
size_t index = file_name.find_last_of('/');
|
||
if (std::string::npos != index) {
|
||
file_name = file_name.substr(index + 1);
|
||
}
|
||
if (BUNDLE_STRUCTURE_JSON_NAME == file_name) continue;
|
||
// create target file path
|
||
std::string target_file_path = boost::filesystem::path(temp_folder / file_name).make_preferred().string();
|
||
|
||
status = mz_zip_reader_extract_to_file(&zip_archive, i, encode_path(target_file_path.c_str()).c_str(), MZ_ZIP_FLAG_CASE_SENSITIVE);
|
||
// target file is opened
|
||
if (MZ_FALSE == status) {
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Failed to open target file: " << target_file_path;
|
||
} else {
|
||
bool is_success = import_json_presets(substitutions, target_file_path, override_confirm, rule, overwrite, result);
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " import target file: " << target_file_path << " import result" << is_success;
|
||
}
|
||
}
|
||
}
|
||
fclose(zipFile);
|
||
if (fs::exists(temp_folder)) fs::remove_all(temp_folder, ec);
|
||
if (ec) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " remove directory failed: " << ec.message();
|
||
}
|
||
}
|
||
files = result;
|
||
return substitutions;
|
||
}
|
||
|
||
bool PresetBundle::import_json_presets(PresetsConfigSubstitutions & substitutions,
|
||
std::string & file,
|
||
std::function<int(std::string const &)> override_confirm,
|
||
ForwardCompatibilitySubstitutionRule rule,
|
||
int & overwrite,
|
||
std::vector<std::string> & result)
|
||
{
|
||
try {
|
||
DynamicPrintConfig config;
|
||
// BBS: change to json format
|
||
// ConfigSubstitutions config_substitutions = config.load_from_ini(preset.file, substitution_rule);
|
||
std::map<std::string, std::string> key_values;
|
||
std::string reason;
|
||
ConfigSubstitutions config_substitutions = config.load_from_json(file, rule, key_values, reason);
|
||
std::string name = key_values[BBL_JSON_KEY_NAME];
|
||
std::string version_str = key_values[BBL_JSON_KEY_VERSION];
|
||
boost::optional<Semver> version = Semver::parse(version_str);
|
||
if (!version) return false;
|
||
Semver app_version = *(Semver::parse(SLIC3R_VERSION));
|
||
if (version->maj() != app_version.maj()) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << " Preset incompatibla, not loading: " << name;
|
||
return false;
|
||
}
|
||
|
||
PresetCollection *collection = nullptr;
|
||
if (config.has("printer_settings_id"))
|
||
collection = &printers;
|
||
else if (config.has("print_settings_id"))
|
||
collection = &prints;
|
||
else if (config.has("filament_settings_id"))
|
||
collection = &filaments;
|
||
if (collection == nullptr) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << " Preset type is unknown, not loading: " << name;
|
||
return false;
|
||
}
|
||
if (overwrite == 0) overwrite = 1;
|
||
if (auto p = collection->find_preset(name, false)) {
|
||
if (p->is_default || p->is_system) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << " Preset already present and is system preset, not loading: " << name;
|
||
return false;
|
||
}
|
||
if (overwrite != 2 && overwrite != 3) overwrite = override_confirm(name); //3: yes to all 2: no to all
|
||
}
|
||
if (overwrite == 0 || overwrite == 2) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << " Preset already present, not loading: " << name;
|
||
return false;
|
||
}
|
||
|
||
DynamicPrintConfig new_config;
|
||
Preset * inherit_preset = nullptr;
|
||
ConfigOption * inherits_config = config.option(BBL_JSON_KEY_INHERITS);
|
||
std::string inherits_value;
|
||
if (inherits_config) {
|
||
ConfigOptionString *option_str = dynamic_cast<ConfigOptionString *>(inherits_config);
|
||
inherits_value = option_str->value;
|
||
inherit_preset = collection->find_preset(inherits_value, false, true);
|
||
}
|
||
if (inherit_preset) {
|
||
new_config = inherit_preset->config;
|
||
} else {
|
||
// We support custom root preset now
|
||
auto inherits_config2 = dynamic_cast<ConfigOptionString *>(inherits_config);
|
||
if (inherits_config2 && !inherits_config2->value.empty()) {
|
||
// we should skip this preset here
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", can not find inherit preset for user preset %1%, just skip") % name;
|
||
return false;
|
||
}
|
||
// Find a default preset for the config. The PrintPresetCollection provides different default preset based on the "printer_technology" field.
|
||
const Preset &default_preset = collection->default_preset_for(config);
|
||
new_config = default_preset.config;
|
||
}
|
||
new_config.apply(std::move(config));
|
||
|
||
Preset &preset = collection->load_preset(collection->path_from_name(name, inherit_preset == nullptr), name, std::move(new_config), false);
|
||
if (key_values.find(BBL_JSON_KEY_FILAMENT_ID) != key_values.end())
|
||
preset.filament_id = key_values[BBL_JSON_KEY_FILAMENT_ID];
|
||
preset.is_external = true;
|
||
preset.version = *version;
|
||
inherit_preset = collection->find_preset(inherits_value, false, true); // pointer maybe wrong after insert, redo find
|
||
if (inherit_preset) preset.base_id = inherit_preset->setting_id;
|
||
Preset::normalize(preset.config);
|
||
// Report configuration fields, which are misplaced into a wrong group.
|
||
const Preset &default_preset = collection->default_preset_for(new_config);
|
||
std::string incorrect_keys = Preset::remove_invalid_keys(preset.config, default_preset.config);
|
||
if (!incorrect_keys.empty())
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a preset file: The preset \"" << preset.file << "\" contains the following incorrect keys: " << incorrect_keys
|
||
<< ", which were removed";
|
||
if (!config_substitutions.empty())
|
||
substitutions.push_back({name, collection->type(), PresetConfigSubstitutions::Source::UserFile, file, std::move(config_substitutions)});
|
||
|
||
preset.save(inherit_preset ? &inherit_preset->config : nullptr);
|
||
result.push_back(file);
|
||
} catch (const std::ifstream::failure &err) {
|
||
BOOST_LOG_TRIVIAL(error) << boost::format("The config cannot be loaded: %1%. Reason: %2%") % file % err.what();
|
||
} catch (const std::runtime_error &err) {
|
||
BOOST_LOG_TRIVIAL(error) << boost::format("Failed importing config file: %1%. Reason: %2%") % file % err.what();
|
||
}
|
||
return true;
|
||
}
|
||
|
||
//BBS save user preset to user_id preset folder
|
||
void PresetBundle::save_user_presets(AppConfig& config, std::vector<std::string>& need_to_delete_list)
|
||
{
|
||
std::string user_sub_folder = DEFAULT_USER_FOLDER_NAME;
|
||
if (!config.get("preset_folder").empty())
|
||
user_sub_folder = config.get("preset_folder");
|
||
//BBS: change directory by design
|
||
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/"+ user_sub_folder;
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, save to %1%")%dir_user_presets;
|
||
|
||
fs::path user_folder(data_dir() + "/" + PRESET_USER_DIR);
|
||
if (!fs::exists(user_folder))
|
||
fs::create_directory(user_folder);
|
||
|
||
fs::path folder(dir_user_presets);
|
||
if (!fs::exists(folder))
|
||
fs::create_directory(folder);
|
||
|
||
this->prints.save_user_presets(dir_user_presets, PRESET_PRINT_NAME, need_to_delete_list);
|
||
this->filaments.save_user_presets(dir_user_presets, PRESET_FILAMENT_NAME, need_to_delete_list);
|
||
this->printers.save_user_presets(dir_user_presets, PRESET_PRINTER_NAME, need_to_delete_list);
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished");
|
||
}
|
||
|
||
//BBS: save user preset to user_id preset folder
|
||
void PresetBundle::update_user_presets_directory(const std::string preset_folder)
|
||
{
|
||
//BBS: change directory by design
|
||
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/"+ preset_folder;
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, update directory to %1%")%dir_user_presets;
|
||
|
||
fs::path user_folder(data_dir() + "/" + PRESET_USER_DIR);
|
||
if (!fs::exists(user_folder))
|
||
fs::create_directory(user_folder);
|
||
|
||
fs::path folder(dir_user_presets);
|
||
if (!fs::exists(folder))
|
||
fs::create_directory(folder);
|
||
|
||
this->prints.update_user_presets_directory(dir_user_presets, PRESET_PRINT_NAME);
|
||
this->filaments.update_user_presets_directory(dir_user_presets, PRESET_FILAMENT_NAME);
|
||
this->printers.update_user_presets_directory(dir_user_presets, PRESET_PRINTER_NAME);
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished");
|
||
}
|
||
|
||
void PresetBundle::remove_user_presets_directory(const std::string preset_folder)
|
||
{
|
||
const std::string dir_user_presets = data_dir() + "/" + PRESET_USER_DIR + "/" + preset_folder;
|
||
|
||
if (preset_folder.empty()) {
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": preset_folder is empty, no need to remove directory : %1%") % dir_user_presets;
|
||
return;
|
||
}
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, delete directory : %1%") % dir_user_presets;
|
||
fs::path folder(dir_user_presets);
|
||
if (fs::exists(folder)) {
|
||
fs::remove_all(folder);
|
||
}
|
||
}
|
||
|
||
void PresetBundle::update_system_preset_setting_ids(std::map<std::string, std::map<std::string, std::string>>& system_presets)
|
||
{
|
||
for (auto iterator: system_presets)
|
||
{
|
||
std::string name = iterator.first;
|
||
std::map<std::string, std::string>& value_map = iterator.second;
|
||
//get the type first
|
||
std::map<std::string, std::string>::iterator type_iter = value_map.find(BBL_JSON_KEY_TYPE);
|
||
if (type_iter == value_map.end()) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(" can not find type for setting %1%")%name;
|
||
continue;
|
||
}
|
||
PresetCollection *preset_collection = nullptr;
|
||
if (type_iter->second == PRESET_IOT_PRINTER_TYPE) {
|
||
preset_collection = &(this->printers);
|
||
}
|
||
else if (type_iter->second == PRESET_IOT_PRINTER_TYPE) {
|
||
preset_collection = &(this->printers);
|
||
}
|
||
else if (type_iter->second == PRESET_IOT_PRINTER_TYPE) {
|
||
preset_collection = &(this->printers);
|
||
}
|
||
else {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format("invalid type %1% for setting %2%") %type_iter->second %name;
|
||
continue;
|
||
}
|
||
std::string setting_id;
|
||
if (value_map.count(BBL_JSON_KEY_SETTING_ID) > 0)
|
||
setting_id = value_map[BBL_JSON_KEY_SETTING_ID];
|
||
else {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(" can not find setting_id for setting %1%")%name;
|
||
continue;
|
||
}
|
||
Preset* preset = preset_collection->find_preset(name, false, true);
|
||
if (preset) {
|
||
if (!preset->setting_id.empty() && (preset->setting_id.compare(setting_id) != 0)) {
|
||
BOOST_LOG_TRIVIAL(error) << boost::format("name %1%, local setting_id %2% is different with remote id %3%")
|
||
%preset->name %preset->setting_id %setting_id;
|
||
}
|
||
else if (preset->setting_id.empty())
|
||
preset->setting_id = setting_id;
|
||
}
|
||
else {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format("can not find setting %1% in system presets, type %2%") %name %type_iter->second;
|
||
continue;
|
||
}
|
||
}
|
||
return;
|
||
}
|
||
|
||
//BBS: validate printers from previous project
|
||
static std::set<std::string> gcodes_key_set = {"filament_end_gcode", "filament_start_gcode", "change_filament_gcode", "layer_change_gcode", "machine_end_gcode", "machine_pause_gcode", "machine_start_gcode",
|
||
"template_custom_gcode", "printing_by_object_gcode", "before_layer_change_gcode", "time_lapse_gcode"};
|
||
int PresetBundle::validate_presets(const std::string &file_name, DynamicPrintConfig& config, std::set<std::string>& different_gcodes)
|
||
{
|
||
bool validated = false;
|
||
std::vector<std::string> inherits_values = config.option<ConfigOptionStrings>("inherits_group", true)->values;
|
||
std::vector<std::string> filament_preset_name = config.option<ConfigOptionStrings>("filament_settings_id", true)->values;
|
||
std::string printer_preset = config.option<ConfigOptionString>("printer_settings_id", true)->value;
|
||
bool has_different_settings_to_system = config.option("different_settings_to_system")?true:false;
|
||
std::vector<std::string> different_values;
|
||
int ret = VALIDATE_PRESETS_SUCCESS;
|
||
|
||
if (has_different_settings_to_system)
|
||
different_values = config.option<ConfigOptionStrings>("different_settings_to_system", true)->values;
|
||
|
||
//PrinterTechnology printer_technology = Preset::printer_technology(config);
|
||
size_t filament_count = config.option<ConfigOptionFloats>("filament_diameter")->values.size();
|
||
inherits_values.resize(filament_count + 2, std::string());
|
||
different_values.resize(filament_count + 2, std::string());
|
||
filament_preset_name.resize(filament_count, std::string());
|
||
|
||
std::string printer_inherits = inherits_values[filament_count + 1];
|
||
|
||
validated = this->printers.validate_preset(printer_preset, printer_inherits);
|
||
if (!validated) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(":file_name %1%, found the printer preset not inherit from system") % file_name;
|
||
different_gcodes.emplace(printer_preset);
|
||
ret = VALIDATE_PRESETS_PRINTER_NOT_FOUND;
|
||
}
|
||
for(unsigned int index = 0; index < filament_count; index ++)
|
||
{
|
||
std::string filament_preset = filament_preset_name[index];
|
||
std::string filament_inherits = inherits_values[index+1];
|
||
|
||
validated = this->filaments.validate_preset(filament_preset, filament_inherits);
|
||
if (!validated) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(":file_name %1%, found the filament %2% preset not inherit from system") % file_name %(index+1);
|
||
different_gcodes.emplace(filament_preset);
|
||
ret = VALIDATE_PRESETS_FILAMENTS_NOT_FOUND;
|
||
}
|
||
}
|
||
|
||
//self defined presets, return directly
|
||
if (ret)
|
||
{
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(":file_name %1%, found self defined presets, count %2%") %file_name %different_gcodes.size();
|
||
return ret;
|
||
}
|
||
|
||
for(unsigned int index = 1; index < filament_count; index ++)
|
||
{
|
||
std::string different_settingss = different_values[index];
|
||
|
||
std::vector<std::string> different_keys;
|
||
|
||
Slic3r::unescape_strings_cstyle(different_settingss, different_keys);
|
||
|
||
for (unsigned int j = 0; j < different_keys.size(); j++) {
|
||
if (gcodes_key_set.find(different_keys[j]) != gcodes_key_set.end()) {
|
||
different_gcodes.emplace(different_keys[j]);
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(":preset index %1%, different key %2%") %index %different_keys[j];
|
||
}
|
||
}
|
||
}
|
||
|
||
if (!different_gcodes.empty())
|
||
{
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(":file_name %1%, found different gcodes count %2%") %file_name %different_gcodes.size();
|
||
return VALIDATE_PRESETS_MODIFIED_GCODES;
|
||
}
|
||
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(":file_name %1%, validate presets success!") % file_name;
|
||
|
||
return VALIDATE_PRESETS_SUCCESS;
|
||
}
|
||
|
||
void PresetBundle::remove_users_preset(AppConfig &config, std::map<std::string, std::map<std::string, std::string>> *my_presets)
|
||
{
|
||
auto check_removed = [my_presets, this](Preset &preset) -> bool {
|
||
if (my_presets == nullptr) return true;
|
||
if (my_presets->find(preset.name) != my_presets->end()) return false;
|
||
if (!preset.sync_info.empty()) return false; // syncing, not remove
|
||
if (preset.setting_id.empty()) return false; // no id, not remove
|
||
// Saved preset is removed by another session
|
||
if (preset.is_dirty) {
|
||
preset.setting_id.clear();
|
||
return false;
|
||
}
|
||
preset.remove_files();
|
||
return true;
|
||
};
|
||
std::string preset_folder_user_id = config.get("preset_folder");
|
||
std::string printer_selected_preset_name = printers.get_selected_preset().name;
|
||
bool need_reset_printer_preset = false;
|
||
for (auto it = printers.begin(); it != printers.end();) {
|
||
if (it->is_user() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) {
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":printers erase %1%, type %2%, user_id %3%") % it->name % Preset::get_type_string(it->type) % it->user_id;
|
||
if (it->name == printer_selected_preset_name)
|
||
need_reset_printer_preset = true;
|
||
it = printers.erase(it);
|
||
}
|
||
else {
|
||
it++;
|
||
}
|
||
}
|
||
|
||
if (need_reset_printer_preset) {
|
||
std::string default_printer_model = BBL_DEFAULT_PRINTER_MODEL;
|
||
std::string default_printer_name;
|
||
for (auto it = printers.begin(); it != printers.end(); it++) {
|
||
if (it->config.has("printer_model")) {
|
||
if (it->config.opt_string("printer_model") == default_printer_model) {
|
||
default_printer_name = it->name;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
printers.select_preset_by_name(default_printer_name, true);
|
||
} else {
|
||
printers.select_preset_by_name(printer_selected_preset_name, false);
|
||
}
|
||
|
||
std::string selected_print_name = prints.get_selected_preset().name;
|
||
bool need_reset_print_preset = false;
|
||
// remove preset if user_id is not current user
|
||
for (auto it = prints.begin(); it != prints.end();) {
|
||
if (it->is_user() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) {
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":prints erase %1%, type %2%, user_id %3%")%it->name %Preset::get_type_string(it->type) %it->user_id;
|
||
if (it->name == selected_print_name)
|
||
need_reset_print_preset = true;
|
||
it = prints.erase(it);
|
||
}
|
||
else {
|
||
it++;
|
||
}
|
||
}
|
||
if (need_reset_print_preset && printers.get_selected_preset().config.has("default_print_profile")) {
|
||
std::string default_print_profile_name = printers.get_selected_preset().config.opt_string("default_print_profile");
|
||
prints.select_preset_by_name(default_print_profile_name, true);
|
||
} else {
|
||
prints.select_preset_by_name(selected_print_name, false);
|
||
}
|
||
|
||
std::string selected_filament_name = filaments.get_selected_preset().name;
|
||
bool need_reset_filament_preset = false;
|
||
for (auto it = filaments.begin(); it != filaments.end();) {
|
||
if (it->is_user() && it->user_id.compare(preset_folder_user_id) == 0 && check_removed(*it)) {
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":filaments erase %1%, type %2%, user_id %3%")%it->name %Preset::get_type_string(it->type) %it->user_id;
|
||
if (it->name == selected_filament_name)
|
||
need_reset_filament_preset = true;
|
||
it = filaments.erase(it);
|
||
}
|
||
else {
|
||
it++;
|
||
}
|
||
}
|
||
if (need_reset_filament_preset && printers.get_selected_preset().config.has("default_filament_profile")) {
|
||
const std::vector<std::string>& prefered_filament_profiles = printers.get_selected_preset().config.option<ConfigOptionStrings>("default_filament_profile")->values;
|
||
if (prefered_filament_profiles.size() > 0)
|
||
filaments.select_preset_by_name(prefered_filament_profiles[0], true);
|
||
} else {
|
||
filaments.select_preset_by_name(selected_filament_name, false);
|
||
}
|
||
|
||
update_compatible(PresetSelectCompatibleType::Always);
|
||
|
||
/* set selected preset */
|
||
for (size_t i = 0; i < filament_presets.size(); ++i)
|
||
{
|
||
auto preset = this->filaments.find_preset(filament_presets[i]);
|
||
if (preset == nullptr)
|
||
filament_presets[i] = filaments.get_selected_preset_name();
|
||
}
|
||
}
|
||
|
||
// Load system presets into this PresetBundle.
|
||
// For each vendor, there will be a single PresetBundle loaded.
|
||
/*std::pair<PresetsConfigSubstitutions, std::string> PresetBundle::load_system_presets(ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, compatibility_rule %1%")%compatibility_rule;
|
||
if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSystemSilent)
|
||
// Loading system presets, don't log substitutions.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::EnableSilent;
|
||
else if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem)
|
||
// Loading system presets, throw on unknown option value.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::Disable;
|
||
|
||
// Here the vendor specific read only Config Bundles are stored.
|
||
//BBS: change directory by design
|
||
boost::filesystem::path dir = (boost::filesystem::path(data_dir()) / PRESET_SYSTEM_DIR).make_preferred();
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
bool first = true;
|
||
for (auto &dir_entry : boost::filesystem::directory_iterator(dir))
|
||
if (Slic3r::is_ini_file(dir_entry)) {
|
||
std::string name = dir_entry.path().filename().string();
|
||
// Remove the .ini suffix.
|
||
name.erase(name.size() - 4);
|
||
try {
|
||
// Load the config bundle, flatten it.
|
||
if (first) {
|
||
// Reset this PresetBundle and load the first vendor config.
|
||
append(substitutions, this->load_configbundle(dir_entry.path().string(), PresetBundle::LoadSystem, compatibility_rule).first);
|
||
first = false;
|
||
} else {
|
||
// Load the other vendor configs, merge them with this PresetBundle.
|
||
// Report duplicate profiles.
|
||
PresetBundle other;
|
||
append(substitutions, other.load_configbundle(dir_entry.path().string(), PresetBundle::LoadSystem, compatibility_rule).first);
|
||
std::vector<std::string> duplicates = this->merge_presets(std::move(other));
|
||
if (! duplicates.empty()) {
|
||
errors_cummulative += "Vendor configuration file " + name + " contains the following presets with names used by other vendors: ";
|
||
for (size_t i = 0; i < duplicates.size(); ++ i) {
|
||
if (i > 0)
|
||
errors_cummulative += ", ";
|
||
errors_cummulative += duplicates[i];
|
||
}
|
||
}
|
||
}
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
errors_cummulative += "\n";
|
||
}
|
||
}
|
||
if (first) {
|
||
// No config bundle loaded, reset.
|
||
this->reset(false);
|
||
}
|
||
|
||
this->update_system_maps();
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, errors_cummulative %1%")%errors_cummulative;
|
||
return std::make_pair(std::move(substitutions), errors_cummulative);
|
||
}*/
|
||
|
||
//BBS: add json related logic, load system presets from json
|
||
std::pair<PresetsConfigSubstitutions, std::string> PresetBundle::load_system_presets_from_json(ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, compatibility_rule %1%")%compatibility_rule;
|
||
if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSystemSilent)
|
||
// Loading system presets, don't log substitutions.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::EnableSilent;
|
||
else if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem)
|
||
// Loading system presets, throw on unknown option value.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::Disable;
|
||
|
||
// Here the vendor specific read only Config Bundles are stored.
|
||
//BBS: change directory by design
|
||
boost::filesystem::path dir = (boost::filesystem::path(data_dir()) / PRESET_SYSTEM_DIR).make_preferred();
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
bool first = true;
|
||
for (auto &dir_entry : boost::filesystem::directory_iterator(dir))
|
||
{
|
||
std::string vendor_file = dir_entry.path().string();
|
||
if (Slic3r::is_json_file(vendor_file)) {
|
||
std::string vendor_name = dir_entry.path().filename().string();
|
||
// Remove the .json suffix.
|
||
vendor_name.erase(vendor_name.size() - 5);
|
||
try {
|
||
// Load the config bundle, flatten it.
|
||
if (first) {
|
||
// Reset this PresetBundle and load the first vendor config.
|
||
append(substitutions, this->load_vendor_configs_from_json(dir.string(), vendor_name, PresetBundle::LoadSystem, compatibility_rule).first);
|
||
first = false;
|
||
} else {
|
||
// Load the other vendor configs, merge them with this PresetBundle.
|
||
// Report duplicate profiles.
|
||
PresetBundle other;
|
||
append(substitutions, other.load_vendor_configs_from_json(dir.string(), vendor_name, PresetBundle::LoadSystem, compatibility_rule).first);
|
||
std::vector<std::string> duplicates = this->merge_presets(std::move(other));
|
||
if (! duplicates.empty()) {
|
||
errors_cummulative += "Found duplicated settings in vendor " + vendor_name + "'s json file lists: ";
|
||
for (size_t i = 0; i < duplicates.size(); ++ i) {
|
||
if (i > 0)
|
||
errors_cummulative += ", ";
|
||
errors_cummulative += duplicates[i];
|
||
}
|
||
}
|
||
}
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
errors_cummulative += "\n";
|
||
}
|
||
}
|
||
}
|
||
|
||
if (first) {
|
||
// No config bundle loaded, reset.
|
||
this->reset(false);
|
||
}
|
||
|
||
this->update_system_maps();
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, errors_cummulative %1%")%errors_cummulative;
|
||
return std::make_pair(std::move(substitutions), errors_cummulative);
|
||
}
|
||
|
||
std::pair<PresetsConfigSubstitutions, std::string> PresetBundle::load_system_models_from_json(ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, compatibility_rule %1%") % compatibility_rule;
|
||
if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSystemSilent)
|
||
// Loading system presets, don't log substitutions.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::EnableSilent;
|
||
else if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem)
|
||
// Loading system presets, throw on unknown option value.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::Disable;
|
||
|
||
// Here the vendor specific read only Config Bundles are stored.
|
||
boost::filesystem::path dir = (boost::filesystem::path(resources_dir()) / "profiles").make_preferred();
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
for (auto &dir_entry : boost::filesystem::directory_iterator(dir)) {
|
||
std::string vendor_file = dir_entry.path().string();
|
||
if (Slic3r::is_json_file(vendor_file)) {
|
||
std::string vendor_name = dir_entry.path().filename().string();
|
||
// Remove the .json suffix.
|
||
vendor_name.erase(vendor_name.size() - 5);
|
||
try {
|
||
// Load the config bundle, flatten it.
|
||
append(substitutions, load_vendor_configs_from_json(dir.string(), vendor_name, PresetBundle::LoadVendorOnly, compatibility_rule).first);
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
errors_cummulative += "\n";
|
||
}
|
||
}
|
||
}
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, errors_cummulative %1%") % errors_cummulative;
|
||
return std::make_pair(std::move(substitutions), errors_cummulative);
|
||
}
|
||
|
||
std::pair<PresetsConfigSubstitutions, std::string> PresetBundle::load_system_filaments_json(ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, compatibility_rule %1%") % compatibility_rule;
|
||
if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSystemSilent)
|
||
// Loading system presets, don't log substitutions.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::EnableSilent;
|
||
else if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem)
|
||
// Loading system presets, throw on unknown option value.
|
||
compatibility_rule = ForwardCompatibilitySubstitutionRule::Disable;
|
||
|
||
// Here the vendor specific read only Config Bundles are stored.
|
||
boost::filesystem::path dir = (boost::filesystem::path(resources_dir()) / "profiles").make_preferred();
|
||
PresetsConfigSubstitutions substitutions;
|
||
std::string errors_cummulative;
|
||
bool first = true;
|
||
for (auto &dir_entry : boost::filesystem::directory_iterator(dir)) {
|
||
std::string vendor_file = dir_entry.path().string();
|
||
if (Slic3r::is_json_file(vendor_file)) {
|
||
std::string vendor_name = dir_entry.path().filename().string();
|
||
// Remove the .json suffix.
|
||
vendor_name.erase(vendor_name.size() - 5);
|
||
try {
|
||
if (first) {
|
||
// Reset this PresetBundle and load the first vendor config.
|
||
append(substitutions, this->load_vendor_configs_from_json(dir.string(), vendor_name, PresetBundle::LoadSystem | PresetBundle::LoadFilamentOnly, compatibility_rule).first);
|
||
first = false;
|
||
} else {
|
||
// Load the other vendor configs, merge them with this PresetBundle.
|
||
// Report duplicate profiles.
|
||
PresetBundle other;
|
||
append(substitutions, other.load_vendor_configs_from_json(dir.string(), vendor_name, PresetBundle::LoadSystem | PresetBundle::LoadFilamentOnly, compatibility_rule).first);
|
||
std::vector<std::string> duplicates = this->merge_presets(std::move(other));
|
||
if (!duplicates.empty()) {
|
||
errors_cummulative += "Found duplicated settings in vendor " + vendor_name + "'s json file lists: ";
|
||
for (size_t i = 0; i < duplicates.size(); ++i) {
|
||
if (i > 0) errors_cummulative += ", ";
|
||
errors_cummulative += duplicates[i];
|
||
}
|
||
}
|
||
}
|
||
} catch (const std::runtime_error &err) {
|
||
errors_cummulative += err.what();
|
||
errors_cummulative += "\n";
|
||
}
|
||
}
|
||
}
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" finished, errors_cummulative %1%") % errors_cummulative;
|
||
return std::make_pair(std::move(substitutions), errors_cummulative);
|
||
}
|
||
|
||
VendorProfile PresetBundle::get_custom_vendor_models() const
|
||
{
|
||
VendorProfile vendor;
|
||
vendor.name = PRESET_CUSTOM_VENDOR;
|
||
vendor.id = PRESET_CUSTOM_VENDOR;
|
||
for (auto &preset : printers.get_presets()) {
|
||
if (preset.is_system) continue;
|
||
if (printers.get_preset_base(preset) != &preset) continue;
|
||
if (preset.is_default) continue;
|
||
auto model = preset.config.opt_string("printer_model");
|
||
auto variant = preset.config.opt_string("printer_variant");
|
||
auto iter_model = std::find_if(vendor.models.begin(), vendor.models.end(), [model](VendorProfile::PrinterModel &m) {
|
||
return m.name == model;
|
||
});
|
||
if (iter_model == vendor.models.end()) {
|
||
iter_model = vendor.models.emplace(vendor.models.end(), VendorProfile::PrinterModel{});
|
||
iter_model->id = model;
|
||
iter_model->name = model;
|
||
iter_model->variants = {VendorProfile::PrinterVariant(variant)};
|
||
} else {
|
||
iter_model->variants.push_back(VendorProfile::PrinterVariant(variant));
|
||
}
|
||
}
|
||
return vendor;
|
||
}
|
||
|
||
// Merge one vendor's presets with the other vendor's presets, report duplicates.
|
||
std::vector<std::string> PresetBundle::merge_presets(PresetBundle &&other)
|
||
{
|
||
this->vendors.insert(other.vendors.begin(), other.vendors.end());
|
||
std::vector<std::string> duplicate_prints = this->prints .merge_presets(std::move(other.prints), this->vendors);
|
||
std::vector<std::string> duplicate_sla_prints = this->sla_prints .merge_presets(std::move(other.sla_prints), this->vendors);
|
||
std::vector<std::string> duplicate_filaments = this->filaments .merge_presets(std::move(other.filaments), this->vendors);
|
||
std::vector<std::string> duplicate_sla_materials = this->sla_materials.merge_presets(std::move(other.sla_materials), this->vendors);
|
||
std::vector<std::string> duplicate_printers = this->printers .merge_presets(std::move(other.printers), this->vendors);
|
||
append(this->obsolete_presets.prints, std::move(other.obsolete_presets.prints));
|
||
append(this->obsolete_presets.sla_prints, std::move(other.obsolete_presets.sla_prints));
|
||
append(this->obsolete_presets.filaments, std::move(other.obsolete_presets.filaments));
|
||
append(this->obsolete_presets.sla_materials, std::move(other.obsolete_presets.sla_materials));
|
||
append(this->obsolete_presets.printers, std::move(other.obsolete_presets.printers));
|
||
append(duplicate_prints, std::move(duplicate_sla_prints));
|
||
append(duplicate_prints, std::move(duplicate_filaments));
|
||
append(duplicate_prints, std::move(duplicate_sla_materials));
|
||
append(duplicate_prints, std::move(duplicate_printers));
|
||
return duplicate_prints;
|
||
}
|
||
|
||
void PresetBundle::update_system_maps()
|
||
{
|
||
this->prints .update_map_system_profile_renamed();
|
||
this->sla_prints .update_map_system_profile_renamed();
|
||
this->filaments .update_map_system_profile_renamed();
|
||
this->sla_materials.update_map_system_profile_renamed();
|
||
this->printers .update_map_system_profile_renamed();
|
||
|
||
this->prints .update_map_alias_to_profile_name();
|
||
this->sla_prints .update_map_alias_to_profile_name();
|
||
this->filaments .update_map_alias_to_profile_name();
|
||
this->sla_materials.update_map_alias_to_profile_name();
|
||
}
|
||
|
||
static inline std::string remove_ini_suffix(const std::string &name)
|
||
{
|
||
std::string out = name;
|
||
if (boost::iends_with(out, ".ini"))
|
||
out.erase(out.end() - 4, out.end());
|
||
return out;
|
||
}
|
||
|
||
// Set the "enabled" flag for printer vendors, printer models and printer variants
|
||
// based on the user configuration.
|
||
// If the "vendor" section is missing, enable all models and variants of the particular vendor.
|
||
void PresetBundle::load_installed_printers(const AppConfig &config)
|
||
{
|
||
this->update_system_maps();
|
||
for (auto &preset : printers)
|
||
preset.set_visible_from_appconfig(config);
|
||
}
|
||
|
||
const std::string& PresetBundle::get_preset_name_by_alias( const Preset::Type& preset_type, const std::string& alias) const
|
||
{
|
||
// there are not aliases for Printers profiles
|
||
if (preset_type == Preset::TYPE_PRINTER || preset_type == Preset::TYPE_INVALID)
|
||
return alias;
|
||
|
||
const PresetCollection& presets = preset_type == Preset::TYPE_PRINT ? prints :
|
||
preset_type == Preset::TYPE_SLA_PRINT ? sla_prints :
|
||
preset_type == Preset::TYPE_FILAMENT ? filaments :
|
||
sla_materials;
|
||
|
||
return presets.get_preset_name_by_alias(alias);
|
||
}
|
||
|
||
//BBS: get filament required hrc by filament type
|
||
const int PresetBundle::get_required_hrc_by_filament_type(const std::string& filament_type) const
|
||
{
|
||
static std::unordered_map<std::string, int>filament_type_to_hrc;
|
||
if (filament_type_to_hrc.empty()) {
|
||
for (auto iter = filaments.m_presets.begin(); iter != filaments.m_presets.end(); iter++) {
|
||
if (iter->vendor && iter->vendor->id == "BBL") {
|
||
if (iter->config.has("filament_type") && iter->config.has("required_nozzle_HRC")) {
|
||
auto type = iter->config.opt_string("filament_type", 0);
|
||
auto hrc = iter->config.opt_int("required_nozzle_HRC", 0);
|
||
filament_type_to_hrc[type] = hrc;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
auto iter = filament_type_to_hrc.find(filament_type);
|
||
if (iter != filament_type_to_hrc.end())
|
||
return iter->second;
|
||
else
|
||
return 0;
|
||
}
|
||
|
||
//BBS: add project embedded preset logic
|
||
void PresetBundle::save_changes_for_preset(const std::string& new_name, Preset::Type type,
|
||
const std::vector<std::string>& unselected_options, bool save_to_project)
|
||
{
|
||
PresetCollection& presets = type == Preset::TYPE_PRINT ? prints :
|
||
type == Preset::TYPE_SLA_PRINT ? sla_prints :
|
||
type == Preset::TYPE_FILAMENT ? filaments :
|
||
type == Preset::TYPE_SLA_MATERIAL ? sla_materials : printers;
|
||
|
||
// if we want to save just some from selected options
|
||
if (!unselected_options.empty()) {
|
||
// revert unselected options to the old values
|
||
presets.get_edited_preset().config.apply_only(presets.get_selected_preset().config, unselected_options);
|
||
}
|
||
|
||
// Save the preset into Slic3r::data_dir / presets / section_name / preset_name.ini
|
||
//BBS: add project embedded preset logic
|
||
//presets.save_current_preset(new_name);
|
||
presets.save_current_preset(new_name, false, save_to_project);
|
||
// Mark the print & filament enabled if they are compatible with the currently selected preset.
|
||
// If saving the preset changes compatibility with other presets, keep the now incompatible dependent presets selected, however with a "red flag" icon showing that they are no more compatible.
|
||
update_compatible(PresetSelectCompatibleType::Never);
|
||
|
||
if (type == Preset::TYPE_FILAMENT) {
|
||
// synchronize the first filament presets.
|
||
set_filament_preset(0, filaments.get_selected_preset_name());
|
||
}
|
||
}
|
||
|
||
void PresetBundle::load_installed_filaments(AppConfig &config)
|
||
{
|
||
//if (! config.has_section(AppConfig::SECTION_FILAMENTS)
|
||
// || config.get_section(AppConfig::SECTION_FILAMENTS).empty()) {
|
||
// Compatibility with the PrusaSlicer 2.1.1 and older, where the filament profiles were not installable yet.
|
||
// Find all filament profiles, which are compatible with installed printers, and act as if these filament profiles
|
||
// were installed.
|
||
std::unordered_set<const Preset*> compatible_filaments;
|
||
for (const Preset &printer : printers)
|
||
if (printer.is_visible && printer.printer_technology() == ptFFF && printer.vendor && (!printer.vendor->models.empty())) {
|
||
bool add_default_materials = true;
|
||
if (config.has_section(AppConfig::SECTION_FILAMENTS))
|
||
{
|
||
const std::map<std::string, std::string>& installed_filament = config.get_section(AppConfig::SECTION_FILAMENTS);
|
||
for (auto filament_iter : installed_filament)
|
||
{
|
||
Preset* filament = filaments.find_preset(filament_iter.first, false, true);
|
||
if (filament && is_compatible_with_printer(PresetWithVendorProfile(*filament, filament->vendor), PresetWithVendorProfile(printer, printer.vendor)))
|
||
{
|
||
//already has compatible filament
|
||
add_default_materials = false;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (!add_default_materials)
|
||
continue;
|
||
|
||
const VendorProfile::PrinterModel *printer_model = PresetUtils::system_printer_model(printer);
|
||
if (!printer_model) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": can not find printer_model for printer %1%")%printer.name;
|
||
continue;
|
||
}
|
||
for (auto default_filament: printer_model->default_materials)
|
||
{
|
||
Preset* filament = filaments.find_preset(default_filament, false, true);
|
||
if (filament && filament->is_system)
|
||
compatible_filaments.insert(filament);
|
||
}
|
||
//const PresetWithVendorProfile printer_with_vendor_profile = printers.get_preset_with_vendor_profile(printer);
|
||
//for (const Preset &filament : filaments)
|
||
// if (filament.is_system && is_compatible_with_printer(filaments.get_preset_with_vendor_profile(filament), printer_with_vendor_profile))
|
||
// compatible_filaments.insert(&filament);
|
||
}
|
||
// and mark these filaments as installed, therefore this code will not be executed at the next start of the application.
|
||
for (const auto &filament: compatible_filaments)
|
||
config.set(AppConfig::SECTION_FILAMENTS, filament->name, "true");
|
||
//}
|
||
|
||
for (auto &preset : filaments)
|
||
preset.set_visible_from_appconfig(config);
|
||
}
|
||
|
||
void PresetBundle::load_installed_sla_materials(AppConfig &config)
|
||
{
|
||
if (! config.has_section(AppConfig::SECTION_MATERIALS)) {
|
||
std::unordered_set<const Preset*> comp_sla_materials;
|
||
// Compatibility with the PrusaSlicer 2.1.1 and older, where the SLA material profiles were not installable yet.
|
||
// Find all SLA material profiles, which are compatible with installed printers, and act as if these SLA material profiles
|
||
// were installed.
|
||
for (const Preset &printer : printers)
|
||
if (printer.is_visible && printer.printer_technology() == ptSLA) {
|
||
const PresetWithVendorProfile printer_with_vendor_profile = printers.get_preset_with_vendor_profile(printer);
|
||
for (const Preset &material : sla_materials)
|
||
if (material.is_system && is_compatible_with_printer(sla_materials.get_preset_with_vendor_profile(material), printer_with_vendor_profile))
|
||
comp_sla_materials.insert(&material);
|
||
}
|
||
// and mark these SLA materials as installed, therefore this code will not be executed at the next start of the application.
|
||
for (const auto &material: comp_sla_materials)
|
||
config.set(AppConfig::SECTION_MATERIALS, material->name, "true");
|
||
}
|
||
|
||
for (auto &preset : sla_materials)
|
||
preset.set_visible_from_appconfig(config);
|
||
}
|
||
|
||
void PresetBundle::update_selections(AppConfig &config)
|
||
{
|
||
std::string initial_printer_profile_name = printers.get_selected_preset_name();
|
||
// Orca: load from orca_presets
|
||
std::string initial_print_profile_name = config.get_printer_setting(initial_printer_profile_name, PRESET_PRINT_NAME);
|
||
std::string initial_filament_profile_name = config.get_printer_setting(initial_printer_profile_name, PRESET_FILAMENT_NAME);
|
||
|
||
// Selects the profiles, which were selected at the last application close.
|
||
prints.select_preset_by_name_strict(initial_print_profile_name);
|
||
filaments.select_preset_by_name_strict(initial_filament_profile_name);
|
||
|
||
// Load the names of the other filament profiles selected for a multi-material printer.
|
||
// Load it even if the current printer technology is SLA.
|
||
// The possibly excessive filament names will be later removed with this->update_multi_material_filament_presets()
|
||
// once the FFF technology gets selected.
|
||
this->filament_presets = { filaments.get_selected_preset_name() };
|
||
for (unsigned int i = 1; i < 1000; ++ i) {
|
||
char name[64];
|
||
sprintf(name, "filament_%02u", i);
|
||
auto f_name = config.get_printer_setting(initial_printer_profile_name, name);
|
||
if (f_name.empty())
|
||
break;
|
||
this->filament_presets.emplace_back(remove_ini_suffix(f_name));
|
||
}
|
||
std::vector<std::string> filament_colors;
|
||
auto f_colors = config.get_printer_setting(initial_printer_profile_name, "filament_colors");
|
||
if (!f_colors.empty()) {
|
||
boost::algorithm::split(filament_colors, f_colors, boost::algorithm::is_any_of(","));
|
||
}
|
||
filament_colors.resize(filament_presets.size(), "#26A69A");
|
||
project_config.option<ConfigOptionStrings>("filament_colour")->values = filament_colors;
|
||
std::vector<std::string> matrix;
|
||
if (config.has_printer_setting(initial_printer_profile_name, "flush_volumes_matrix")) {
|
||
boost::algorithm::split(matrix, config.get_printer_setting(initial_printer_profile_name, "flush_volumes_matrix"), boost::algorithm::is_any_of("|"));
|
||
auto flush_volumes_matrix = matrix | boost::adaptors::transformed(boost::lexical_cast<double, std::string>);
|
||
project_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values = std::vector<double>(flush_volumes_matrix.begin(), flush_volumes_matrix.end());
|
||
}
|
||
if (config.has_printer_setting(initial_printer_profile_name, "flush_volumes_vector")) {
|
||
boost::algorithm::split(matrix, config.get_printer_setting(initial_printer_profile_name, "flush_volumes_vector"), boost::algorithm::is_any_of("|"));
|
||
auto flush_volumes_vector = matrix | boost::adaptors::transformed(boost::lexical_cast<double, std::string>);
|
||
project_config.option<ConfigOptionFloats>("flush_volumes_vector")->values = std::vector<double>(flush_volumes_vector.begin(), flush_volumes_vector.end());
|
||
}
|
||
if (config.has("app", "flush_multiplier")) {
|
||
std::string str_flush_multiplier = config.get("app", "flush_multiplier");
|
||
if (!str_flush_multiplier.empty())
|
||
project_config.option<ConfigOptionFloat>("flush_multiplier")->set(new ConfigOptionFloat(std::stof(str_flush_multiplier)));
|
||
}
|
||
|
||
// Update visibility of presets based on their compatibility with the active printer.
|
||
// Always try to select a compatible print and filament preset to the current printer preset,
|
||
// as the application may have been closed with an active "external" preset, which does not
|
||
// exist.
|
||
this->update_compatible(PresetSelectCompatibleType::Always);
|
||
this->update_multi_material_filament_presets();
|
||
|
||
std::string first_visible_filament_name;
|
||
for (auto & fp : filament_presets) {
|
||
if (auto it = filaments.find_preset_internal(fp); it == filaments.end() || !it->is_visible || !it->is_compatible) {
|
||
if (first_visible_filament_name.empty())
|
||
first_visible_filament_name = filaments.first_compatible().name;
|
||
fp = first_visible_filament_name;
|
||
}
|
||
}
|
||
|
||
}
|
||
|
||
// Load selections (current print, current filaments, current printer) from config.ini
|
||
// This is done on application start up or after updates are applied.
|
||
void PresetBundle::load_selections(AppConfig &config, const PresetPreferences& preferred_selection/* = PresetPreferences()*/)
|
||
{
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": enter, preferred printer_model_id %1%")%preferred_selection.printer_model_id;
|
||
// Update visibility of presets based on application vendor / model / variant configuration.
|
||
this->load_installed_printers(config);
|
||
|
||
// Update visibility of filament and sla material presets
|
||
this->load_installed_filaments(config);
|
||
this->load_installed_sla_materials(config);
|
||
|
||
// Parse the initial print / filament / printer profile names.
|
||
// std::string initial_sla_print_profile_name = remove_ini_suffix(config.get("presets", PRESET_SLA_PRINT_NAME));
|
||
// std::string initial_sla_material_profile_name = remove_ini_suffix(config.get("presets", PRESET_SLA_MATERIALS_NAME));
|
||
std::string initial_printer_profile_name = remove_ini_suffix(config.get("presets", PRESET_PRINTER_NAME));
|
||
|
||
// Activate print / filament / printer profiles from either the config,
|
||
// or from the preferred_model_id suggestion passed in by ConfigWizard.
|
||
// If the printer profile enumerated by the config are not visible, select an alternate preset.
|
||
// Do not select alternate profiles for the print / filament profiles as those presets
|
||
// will be selected by the following call of this->update_compatible(PresetSelectCompatibleType::Always).
|
||
|
||
const Preset *initial_printer = printers.find_preset(initial_printer_profile_name);
|
||
// If executed due to a Config Wizard update, preferred_printer contains the first newly installed printer, otherwise nullptr.
|
||
const Preset *preferred_printer = printers.find_system_preset_by_model_and_variant(preferred_selection.printer_model_id, preferred_selection.printer_variant);
|
||
printers.select_preset_by_name(preferred_printer ? preferred_printer->name : initial_printer_profile_name, true);
|
||
|
||
// Orca: load from orca_presets
|
||
// const auto os_presets = config.get_machine_settings(initial_printer_profile_name);
|
||
std::string initial_print_profile_name = config.get_printer_setting(initial_printer_profile_name, PRESET_PRINT_NAME);
|
||
std::string initial_filament_profile_name = config.get_printer_setting(initial_printer_profile_name, PRESET_FILAMENT_NAME);
|
||
|
||
//BBS: set default print/filament profiles to BBL's default setting
|
||
if (preferred_printer)
|
||
{
|
||
const std::string& prefered_print_profile = preferred_printer->config.opt_string("default_print_profile");
|
||
if ((!initial_print_profile_name.compare("Default Setting")) && (prefered_print_profile.size() > 0))
|
||
initial_print_profile_name = prefered_print_profile;
|
||
|
||
const std::vector<std::string>& prefered_filament_profiles = preferred_printer->config.option<ConfigOptionStrings>("default_filament_profile")->values;
|
||
if ((!initial_filament_profile_name.compare("Default Filament")) && (prefered_filament_profiles.size() > 0))
|
||
initial_filament_profile_name = prefered_filament_profiles[0];
|
||
}
|
||
|
||
// Selects the profile, leaves it to -1 if the initial profile name is empty or if it was not found.
|
||
prints.select_preset_by_name_strict(initial_print_profile_name);
|
||
filaments.select_preset_by_name_strict(initial_filament_profile_name);
|
||
// sla_prints.select_preset_by_name_strict(initial_sla_print_profile_name);
|
||
// sla_materials.select_preset_by_name_strict(initial_sla_material_profile_name);
|
||
|
||
// Load the names of the other filament profiles selected for a multi-material printer.
|
||
// Load it even if the current printer technology is SLA.
|
||
// The possibly excessive filament names will be later removed with this->update_multi_material_filament_presets()
|
||
// once the FFF technology gets selected.
|
||
this->filament_presets = { filaments.get_selected_preset_name() };
|
||
for (unsigned int i = 1; i < 1000; ++ i) {
|
||
char name[64];
|
||
sprintf(name, "filament_%02u", i);
|
||
auto f_name = config.get_printer_setting(initial_printer_profile_name, name);
|
||
if (f_name.empty())
|
||
break;
|
||
this->filament_presets.emplace_back(remove_ini_suffix(f_name));
|
||
}
|
||
std::vector<std::string> filament_colors;
|
||
auto f_colors = config.get_printer_setting(initial_printer_profile_name, "filament_colors");
|
||
if (!f_colors.empty()) {
|
||
boost::algorithm::split(filament_colors, f_colors, boost::algorithm::is_any_of(","));
|
||
}
|
||
filament_colors.resize(filament_presets.size(), "#26A69A");
|
||
project_config.option<ConfigOptionStrings>("filament_colour")->values = filament_colors;
|
||
std::vector<std::string> matrix;
|
||
if (config.has_printer_setting(initial_printer_profile_name, "flush_volumes_matrix")) {
|
||
boost::algorithm::split(matrix, config.get_printer_setting(initial_printer_profile_name, "flush_volumes_matrix"), boost::algorithm::is_any_of("|"));
|
||
auto flush_volumes_matrix = matrix | boost::adaptors::transformed(boost::lexical_cast<double, std::string>);
|
||
project_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values = std::vector<double>(flush_volumes_matrix.begin(), flush_volumes_matrix.end());
|
||
}
|
||
if (config.has_printer_setting(initial_printer_profile_name, "flush_volumes_vector")) {
|
||
boost::algorithm::split(matrix, config.get_printer_setting(initial_printer_profile_name, "flush_volumes_vector"), boost::algorithm::is_any_of("|"));
|
||
auto flush_volumes_vector = matrix | boost::adaptors::transformed(boost::lexical_cast<double, std::string>);
|
||
project_config.option<ConfigOptionFloats>("flush_volumes_vector")->values = std::vector<double>(flush_volumes_vector.begin(), flush_volumes_vector.end());
|
||
}
|
||
if (config.has("app", "flush_multiplier")) {
|
||
std::string str_flush_multiplier = config.get("app", "flush_multiplier");
|
||
if (!str_flush_multiplier.empty())
|
||
project_config.option<ConfigOptionFloat>("flush_multiplier")->set(new ConfigOptionFloat(std::stof(str_flush_multiplier)));
|
||
}
|
||
|
||
// Update visibility of presets based on their compatibility with the active printer.
|
||
// Always try to select a compatible print and filament preset to the current printer preset,
|
||
// as the application may have been closed with an active "external" preset, which does not
|
||
// exist.
|
||
this->update_compatible(PresetSelectCompatibleType::Always);
|
||
this->update_multi_material_filament_presets();
|
||
|
||
if (initial_printer != nullptr && (preferred_printer == nullptr || initial_printer == preferred_printer)) {
|
||
// Don't run the following code, as we want to activate default filament / SLA material profiles when installing and selecting a new printer.
|
||
// Only run this code if just a filament / SLA material was installed by Config Wizard for an active Printer.
|
||
auto printer_technology = printers.get_selected_preset().printer_technology();
|
||
if (printer_technology == ptFFF && ! preferred_selection.filament.empty()) {
|
||
std::string preferred_preset_name = get_preset_name_by_alias(Preset::Type::TYPE_FILAMENT, preferred_selection.filament);
|
||
if (auto it = filaments.find_preset_internal(preferred_preset_name);
|
||
it != filaments.end() && (it->name == preferred_preset_name ) && it->is_visible && it->is_compatible) {
|
||
filaments.select_preset_by_name_strict(preferred_preset_name);
|
||
this->filament_presets.front() = filaments.get_selected_preset_name();
|
||
}
|
||
} else if (printer_technology == ptSLA && ! preferred_selection.sla_material.empty()) {
|
||
std::string preferred_preset_name = get_preset_name_by_alias(Preset::Type::TYPE_SLA_MATERIAL, preferred_selection.sla_material);
|
||
if (auto it = sla_materials.find_preset_internal(preferred_preset_name);
|
||
it != sla_materials.end() && it->is_visible && it->is_compatible)
|
||
sla_materials.select_preset_by_name_strict(preferred_preset_name);
|
||
}
|
||
}
|
||
|
||
std::string first_visible_filament_name;
|
||
for (auto & fp : filament_presets) {
|
||
if (auto it = filaments.find_preset_internal(fp); it == filaments.end() || !it->is_visible || !it->is_compatible) {
|
||
if (first_visible_filament_name.empty())
|
||
first_visible_filament_name = filaments.first_compatible().name;
|
||
fp = first_visible_filament_name;
|
||
}
|
||
}
|
||
|
||
// Parse the initial physical printer name.
|
||
std::string initial_physical_printer_name = remove_ini_suffix(config.get("presets", "physical_printer"));
|
||
|
||
// Activate physical printer from the config
|
||
if (!initial_physical_printer_name.empty())
|
||
physical_printers.select_printer(initial_physical_printer_name);
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": finished, preferred printer_model_id %1%")%preferred_selection.printer_model_id;
|
||
}
|
||
|
||
// Export selections (current print, current filaments, current printer) into config.ini
|
||
//BBS: change directories by design
|
||
void PresetBundle::export_selections(AppConfig &config)
|
||
{
|
||
assert(this->printers.get_edited_preset().printer_technology() != ptFFF || filament_presets.size() >= 1);
|
||
//assert(this->printers.get_edited_preset().printer_technology() != ptFFF || filament_presets.size() > 1 || filaments.get_selected_preset_name() == filament_presets.front());
|
||
config.clear_section("presets");
|
||
auto printer_name = printers.get_selected_preset_name();
|
||
config.set("presets", PRESET_PRINTER_NAME, printer_name);
|
||
|
||
config.clear_printer_settings(printer_name);
|
||
config.set_printer_setting(printer_name, PRESET_PRINTER_NAME, printer_name);
|
||
config.set_printer_setting(printer_name, PRESET_PRINT_NAME, prints.get_selected_preset_name());
|
||
config.set_printer_setting(printer_name, PRESET_FILAMENT_NAME, filament_presets.front());
|
||
config.set_printer_setting(printer_name, "curr_bed_type", config.get("curr_bed_type"));
|
||
for (unsigned i = 1; i < filament_presets.size(); ++i) {
|
||
char name[64];
|
||
assert(!filament_presets[i].empty());
|
||
sprintf(name, "filament_%02u", i);
|
||
config.set_printer_setting(printer_name, name, filament_presets[i]);
|
||
}
|
||
CNumericLocalesSetter locales_setter;
|
||
std::string filament_colors = boost::algorithm::join(project_config.option<ConfigOptionStrings>("filament_colour")->values, ",");
|
||
config.set_printer_setting(printer_name, "filament_colors", filament_colors);
|
||
std::string flush_volumes_matrix = boost::algorithm::join(project_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values |
|
||
boost::adaptors::transformed(static_cast<std::string (*)(double)>(std::to_string)),
|
||
"|");
|
||
config.set_printer_setting(printer_name, "flush_volumes_matrix", flush_volumes_matrix);
|
||
std::string flush_volumes_vector = boost::algorithm::join(project_config.option<ConfigOptionFloats>("flush_volumes_vector")->values |
|
||
boost::adaptors::transformed(static_cast<std::string (*)(double)>(std::to_string)),
|
||
"|");
|
||
config.set_printer_setting(printer_name, "flush_volumes_vector", flush_volumes_vector);
|
||
|
||
|
||
auto flush_multi_opt = project_config.option<ConfigOptionFloat>("flush_multiplier");
|
||
config.set("flush_multiplier", std::to_string(flush_multi_opt ? flush_multi_opt->getFloat() : 1.0f));
|
||
// BBS
|
||
//config.set("presets", "sla_print", sla_prints.get_selected_preset_name());
|
||
//config.set("presets", "sla_material", sla_materials.get_selected_preset_name());
|
||
//config.set("presets", "physical_printer", physical_printers.get_selected_full_printer_name());
|
||
//BBS: add config related log
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": printer %1%, print %2%, filaments[0] %3% ")%printers.get_selected_preset_name() % prints.get_selected_preset_name() %filament_presets[0];
|
||
}
|
||
|
||
// BBS
|
||
void PresetBundle::set_num_filaments(unsigned int n, std::string new_color)
|
||
{
|
||
int old_filament_count = this->filament_presets.size();
|
||
if (n > old_filament_count && old_filament_count != 0)
|
||
filament_presets.resize(n, filament_presets.back());
|
||
else {
|
||
filament_presets.resize(n);
|
||
}
|
||
|
||
ConfigOptionStrings* filament_color = project_config.option<ConfigOptionStrings>("filament_colour");
|
||
filament_color->resize(n);
|
||
|
||
//BBS set new filament color to new_color
|
||
if (old_filament_count < n) {
|
||
if (!new_color.empty()) {
|
||
for (int i = old_filament_count; i < n; i++) {
|
||
filament_color->values[i] = new_color;
|
||
}
|
||
}
|
||
}
|
||
|
||
update_multi_material_filament_presets();
|
||
}
|
||
|
||
unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns)
|
||
{
|
||
std::vector<std::string> filament_presets;
|
||
std::vector<std::string> filament_colors;
|
||
for (auto &entry : filament_ams_list) {
|
||
auto & ams = entry.second;
|
||
auto filament_id = ams.opt_string("filament_id", 0u);
|
||
auto filament_color = ams.opt_string("filament_colour", 0u);
|
||
auto filament_changed = !ams.has("filament_changed") || ams.opt_bool("filament_changed");
|
||
if (filament_id.empty()) continue;
|
||
if (!filament_changed && this->filament_presets.size() > filament_presets.size()) {
|
||
filament_presets.push_back(this->filament_presets[filament_presets.size()]);
|
||
filament_colors.push_back(filament_color);
|
||
continue;
|
||
}
|
||
auto iter = std::find_if(filaments.begin(), filaments.end(), [this, &filament_id](auto &f) {
|
||
return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; });
|
||
if (iter == filaments.end()) {
|
||
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id;
|
||
auto filament_type = ams.opt_string("filament_type", 0u);
|
||
if (!filament_type.empty()) {
|
||
filament_type = "Generic " + filament_type;
|
||
iter = std::find_if(filaments.begin(), filaments.end(), [&filament_type](auto &f) {
|
||
return f.is_compatible && f.is_system
|
||
&& boost::algorithm::starts_with(f.name, filament_type);
|
||
});
|
||
}
|
||
if (iter == filaments.end())
|
||
iter = std::find_if(filaments.begin(), filaments.end(), [&filament_type](auto &f) {
|
||
return f.is_compatible && f.is_system;
|
||
});
|
||
if (iter == filaments.end())
|
||
continue;
|
||
++unknowns;
|
||
filament_id = iter->filament_id;
|
||
}
|
||
filament_presets.push_back(iter->name);
|
||
filament_colors.push_back(filament_color);
|
||
}
|
||
if (filament_presets.empty())
|
||
return 0;
|
||
this->filament_presets = filament_presets;
|
||
ConfigOptionStrings *filament_color = project_config.option<ConfigOptionStrings>("filament_colour");
|
||
filament_color->resize(filament_presets.size());
|
||
filament_color->values = filament_colors;
|
||
update_multi_material_filament_presets();
|
||
return filament_presets.size();
|
||
}
|
||
|
||
void PresetBundle::set_calibrate_printer(std::string name)
|
||
{
|
||
if (name.empty()) {
|
||
calibrate_filaments.clear();
|
||
return;
|
||
}
|
||
if (!name.empty())
|
||
calibrate_printer = printers.find_preset(name);
|
||
const Preset & printer_preset = calibrate_printer ? *calibrate_printer : printers.get_edited_preset();
|
||
const PresetWithVendorProfile active_printer = printers.get_preset_with_vendor_profile(printer_preset);
|
||
DynamicPrintConfig config;
|
||
config.set_key_value("printer_preset", new ConfigOptionString(active_printer.preset.name));
|
||
const ConfigOption *opt = active_printer.preset.config.option("nozzle_diameter");
|
||
if (opt) config.set_key_value("num_extruders", new ConfigOptionInt((int) static_cast<const ConfigOptionFloats *>(opt)->values.size()));
|
||
calibrate_filaments.clear();
|
||
for (size_t i = filaments.num_default_presets(); i < filaments.size(); ++i) {
|
||
const Preset & preset = filaments.m_presets[i];
|
||
const PresetWithVendorProfile this_preset_with_vendor_profile = filaments.get_preset_with_vendor_profile(preset);
|
||
bool is_compatible = is_compatible_with_printer(this_preset_with_vendor_profile, active_printer, &config);
|
||
if (is_compatible) calibrate_filaments.insert(&preset);
|
||
}
|
||
}
|
||
|
||
//BBS: check whether this is the only edited filament
|
||
bool PresetBundle::is_the_only_edited_filament(unsigned int filament_index)
|
||
{
|
||
int n = this->filament_presets.size();
|
||
if (filament_index >= n)
|
||
return false;
|
||
|
||
std::string name = this->filament_presets[filament_index];
|
||
Preset& edited_preset = this->filaments.get_edited_preset();
|
||
if (edited_preset.name != name)
|
||
return false;
|
||
|
||
int index = 0;
|
||
while (index < n)
|
||
{
|
||
if (index == filament_index) {
|
||
index ++;
|
||
continue;
|
||
}
|
||
std::string filament_preset = this->filament_presets[index];
|
||
if (edited_preset.name == filament_preset)
|
||
return false;
|
||
else
|
||
index ++;
|
||
}
|
||
return true;
|
||
}
|
||
|
||
DynamicPrintConfig PresetBundle::full_config() const
|
||
{
|
||
return (this->printers.get_edited_preset().printer_technology() == ptFFF) ?
|
||
this->full_fff_config() :
|
||
this->full_sla_config();
|
||
}
|
||
|
||
DynamicPrintConfig PresetBundle::full_config_secure() const
|
||
{
|
||
DynamicPrintConfig config = this->full_config();
|
||
//FIXME legacy, the keys should not be there after conversion to a Physical Printer profile.
|
||
config.erase("print_host");
|
||
config.erase("print_host_webui");
|
||
config.erase("printhost_apikey");
|
||
config.erase("printhost_cafile"); return config;
|
||
}
|
||
|
||
const std::set<std::string> ignore_settings_list ={
|
||
"inherits",
|
||
"print_settings_id", "filament_settings_id", "printer_settings_id"
|
||
};
|
||
|
||
DynamicPrintConfig PresetBundle::full_fff_config() const
|
||
{
|
||
DynamicPrintConfig out;
|
||
out.apply(FullPrintConfig::defaults());
|
||
out.apply(this->prints.get_edited_preset().config);
|
||
// Add the default filament preset to have the "filament_preset_id" defined.
|
||
out.apply(this->filaments.default_preset().config);
|
||
out.apply(this->printers.get_edited_preset().config);
|
||
out.apply(this->project_config);
|
||
|
||
// BBS
|
||
size_t num_filaments = this->filament_presets.size();
|
||
auto* extruder_diameter = dynamic_cast<const ConfigOptionFloats*>(out.option("nozzle_diameter"));
|
||
// Collect the "compatible_printers_condition" and "inherits" values over all presets (print, filaments, printers) into a single vector.
|
||
std::vector<std::string> compatible_printers_condition;
|
||
std::vector<std::string> compatible_prints_condition;
|
||
std::vector<std::string> inherits;
|
||
std::vector<std::string> filament_ids;
|
||
std::vector<std::string> print_compatible_printers;
|
||
//BBS: add logic for settings check between different system presets
|
||
std::vector<std::string> different_settings;
|
||
std::string different_print_settings, different_printer_settings;
|
||
compatible_printers_condition.emplace_back(this->prints.get_edited_preset().compatible_printers_condition());
|
||
|
||
const ConfigOptionStrings* compatible_printers = (const_cast<PresetBundle*>(this))->prints.get_edited_preset().config.option<ConfigOptionStrings>("compatible_printers", false);
|
||
if (compatible_printers)
|
||
print_compatible_printers = compatible_printers->values;
|
||
//BBS: add logic for settings check between different system presets
|
||
std::string print_inherits = this->prints.get_edited_preset().inherits();
|
||
inherits .emplace_back(print_inherits);
|
||
const Preset* print_parent_preset = this->prints.get_selected_preset_parent();
|
||
if (print_parent_preset) {
|
||
std::vector<std::string> dirty_options = this->prints.dirty_options_without_option_list(&(this->prints.get_edited_preset()), print_parent_preset, ignore_settings_list, false);
|
||
if (!dirty_options.empty()) {
|
||
different_print_settings = Slic3r::escape_strings_cstyle(dirty_options);
|
||
}
|
||
}
|
||
different_settings.emplace_back(different_print_settings);
|
||
|
||
if (num_filaments <= 1) {
|
||
out.apply(this->filaments.get_edited_preset().config);
|
||
compatible_printers_condition.emplace_back(this->filaments.get_edited_preset().compatible_printers_condition());
|
||
compatible_prints_condition .emplace_back(this->filaments.get_edited_preset().compatible_prints_condition());
|
||
//BBS: add logic for settings check between different system presets
|
||
//std::string filament_inherits = this->filaments.get_edited_preset().inherits();
|
||
std::string current_preset_name = this->filament_presets[0];
|
||
const Preset* preset = this->filaments.find_preset(current_preset_name, true);
|
||
std::string filament_inherits = preset->inherits();
|
||
inherits .emplace_back(filament_inherits);
|
||
filament_ids.emplace_back(this->filaments.get_edited_preset().filament_id);
|
||
|
||
std::string different_filament_settings;
|
||
const Preset* filament_parent_preset = this->filaments.get_selected_preset_parent();
|
||
if (filament_parent_preset) {
|
||
std::vector<std::string> dirty_options = this->filaments.dirty_options_without_option_list(&(this->filaments.get_edited_preset()), filament_parent_preset, ignore_settings_list, false);
|
||
if (!dirty_options.empty()) {
|
||
different_filament_settings = Slic3r::escape_strings_cstyle(dirty_options);
|
||
}
|
||
}
|
||
|
||
different_settings.emplace_back(different_filament_settings);
|
||
} else {
|
||
// Retrieve filament presets and build a single config object for them.
|
||
// First collect the filament configurations based on the user selection of this->filament_presets.
|
||
// Here this->filaments.find_preset() and this->filaments.first_visible() return the edited copy of the preset if active.
|
||
std::vector<const DynamicPrintConfig*> filament_configs;
|
||
std::vector<const Preset*> filament_presets;
|
||
for (const std::string& filament_preset_name : this->filament_presets) {
|
||
const Preset* preset = this->filaments.find_preset(filament_preset_name, true);
|
||
filament_presets.emplace_back(preset);
|
||
filament_configs.emplace_back(&(preset->config));
|
||
}
|
||
while (filament_configs.size() < num_filaments) {
|
||
const Preset* preset = &this->filaments.first_visible();
|
||
filament_presets.emplace_back(preset);
|
||
filament_configs.emplace_back(&(preset->config));
|
||
}
|
||
for (int index = 0; index < num_filaments; index++) {
|
||
const DynamicPrintConfig *cfg = filament_configs[index];
|
||
const Preset *preset = filament_presets[index];
|
||
// The compatible_prints/printers_condition() returns a reference to configuration key, which may not yet exist.
|
||
DynamicPrintConfig &cfg_rw = *const_cast<DynamicPrintConfig*>(cfg);
|
||
compatible_printers_condition.emplace_back(Preset::compatible_printers_condition(cfg_rw));
|
||
compatible_prints_condition .emplace_back(Preset::compatible_prints_condition(cfg_rw));
|
||
|
||
//BBS: add logic for settings check between different system presets
|
||
std::string filament_inherits = Preset::inherits(cfg_rw);
|
||
inherits .emplace_back(filament_inherits);
|
||
filament_ids.emplace_back(preset->filament_id);
|
||
std::string different_filament_settings;
|
||
|
||
const Preset* filament_parent_preset = nullptr;
|
||
if (preset->is_system || preset->is_default) {
|
||
bool is_selected = this->filaments.get_selected_preset_name() == preset->name;
|
||
if (is_selected) {
|
||
//use the real preset
|
||
filament_parent_preset = const_cast<PresetBundle*>(this)->filaments.find_preset(preset->name, false, true);
|
||
}
|
||
else {
|
||
filament_parent_preset = preset;
|
||
}
|
||
}
|
||
else if (!filament_inherits.empty())
|
||
filament_parent_preset = const_cast<PresetBundle*>(this)->filaments.find_preset(filament_inherits, false, true);
|
||
|
||
if (filament_parent_preset) {
|
||
std::vector<std::string> dirty_options = cfg_rw.diff(filament_parent_preset->config);
|
||
if (!dirty_options.empty()) {
|
||
auto iter = dirty_options.begin();
|
||
while (iter != dirty_options.end()) {
|
||
if (ignore_settings_list.find(*iter) != ignore_settings_list.end()) {
|
||
iter = dirty_options.erase(iter);
|
||
}
|
||
else {
|
||
++iter;
|
||
}
|
||
}
|
||
different_filament_settings = Slic3r::escape_strings_cstyle(dirty_options);
|
||
}
|
||
}
|
||
|
||
different_settings.emplace_back(different_filament_settings);
|
||
}
|
||
|
||
// loop through options and apply them to the resulting config.
|
||
for (const t_config_option_key &key : this->filaments.default_preset().config.keys()) {
|
||
if (key == "compatible_prints" || key == "compatible_printers")
|
||
continue;
|
||
// Get a destination option.
|
||
ConfigOption *opt_dst = out.option(key, false);
|
||
if (opt_dst->is_scalar()) {
|
||
// Get an option, do not create if it does not exist.
|
||
const ConfigOption *opt_src = filament_configs.front()->option(key);
|
||
if (opt_src != nullptr)
|
||
opt_dst->set(opt_src);
|
||
} else {
|
||
// BBS
|
||
ConfigOptionVectorBase* opt_vec_dst = static_cast<ConfigOptionVectorBase*>(opt_dst);
|
||
{
|
||
std::vector<const ConfigOption*> filament_opts(num_filaments, nullptr);
|
||
// Setting a vector value from all filament_configs.
|
||
for (size_t i = 0; i < filament_opts.size(); ++i)
|
||
filament_opts[i] = filament_configs[i]->option(key);
|
||
opt_vec_dst->set(filament_opts);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
//BBS: add logic for settings check between different system presets
|
||
std::string printer_inherits = this->printers.get_edited_preset().inherits();
|
||
// Don't store the "compatible_printers_condition" for the printer profile, there is none.
|
||
inherits .emplace_back(printer_inherits);
|
||
const Preset* printer_parent_preset = this->printers.get_selected_preset_parent();
|
||
if (printer_parent_preset) {
|
||
std::vector<std::string> dirty_options = this->printers.dirty_options_without_option_list(&(this->printers.get_edited_preset()), printer_parent_preset, ignore_settings_list, false);
|
||
if (!dirty_options.empty()) {
|
||
different_printer_settings = Slic3r::escape_strings_cstyle(dirty_options);
|
||
}
|
||
}
|
||
different_settings.emplace_back(different_printer_settings);
|
||
|
||
// These value types clash between the print and filament profiles. They should be renamed.
|
||
out.erase("compatible_prints");
|
||
out.erase("compatible_prints_condition");
|
||
out.erase("compatible_printers");
|
||
out.erase("compatible_printers_condition");
|
||
out.erase("inherits");
|
||
//BBS: add logic for settings check between different system presets
|
||
out.erase("different_settings_to_system");
|
||
|
||
static const char *keys[] = { "support_filament", "support_interface_filament" };
|
||
for (size_t i = 0; i < sizeof(keys) / sizeof(keys[0]); ++ i) {
|
||
std::string key = std::string(keys[i]);
|
||
auto *opt = dynamic_cast<ConfigOptionInt*>(out.option(key, false));
|
||
assert(opt != nullptr);
|
||
opt->value = boost::algorithm::clamp<int>(opt->value, 0, int(num_filaments));
|
||
}
|
||
|
||
out.option<ConfigOptionString >("print_settings_id", true)->value = this->prints.get_selected_preset_name();
|
||
out.option<ConfigOptionStrings>("filament_settings_id", true)->values = this->filament_presets;
|
||
out.option<ConfigOptionString >("printer_settings_id", true)->value = this->printers.get_selected_preset_name();
|
||
out.option<ConfigOptionStrings>("filament_ids", true)->values = filament_ids;
|
||
// Serialize the collected "compatible_printers_condition" and "inherits" fields.
|
||
// There will be 1 + num_exturders fields for "inherits" and 2 + num_extruders for "compatible_printers_condition" stored.
|
||
// The vector will not be stored if all fields are empty strings.
|
||
auto add_if_some_non_empty = [&out](std::vector<std::string> &&values, const std::string &key) {
|
||
bool nonempty = false;
|
||
for (const std::string &v : values)
|
||
if (! v.empty()) {
|
||
nonempty = true;
|
||
break;
|
||
}
|
||
if (nonempty)
|
||
out.set_key_value(key, new ConfigOptionStrings(std::move(values)));
|
||
};
|
||
add_if_some_non_empty(std::move(compatible_printers_condition), "compatible_machine_expression_group");
|
||
add_if_some_non_empty(std::move(compatible_prints_condition), "compatible_process_expression_group");
|
||
add_if_some_non_empty(std::move(inherits), "inherits_group");
|
||
//BBS: add logic for settings check between different system presets
|
||
add_if_some_non_empty(std::move(different_settings), "different_settings_to_system");
|
||
add_if_some_non_empty(std::move(print_compatible_printers), "print_compatible_printers");
|
||
|
||
out.option<ConfigOptionEnumGeneric>("printer_technology", true)->value = ptFFF;
|
||
return out;
|
||
}
|
||
|
||
DynamicPrintConfig PresetBundle::full_sla_config() const
|
||
{
|
||
DynamicPrintConfig out;
|
||
out.apply(SLAFullPrintConfig::defaults());
|
||
out.apply(this->sla_prints.get_edited_preset().config);
|
||
out.apply(this->sla_materials.get_edited_preset().config);
|
||
out.apply(this->printers.get_edited_preset().config);
|
||
// There are no project configuration values as of now, the project_config is reserved for FFF printers.
|
||
// out.apply(this->project_config);
|
||
|
||
// Collect the "compatible_printers_condition" and "inherits" values over all presets (sla_prints, sla_materials, printers) into a single vector.
|
||
std::vector<std::string> compatible_printers_condition;
|
||
std::vector<std::string> compatible_prints_condition;
|
||
std::vector<std::string> inherits;
|
||
compatible_printers_condition.emplace_back(this->sla_prints.get_edited_preset().compatible_printers_condition());
|
||
inherits .emplace_back(this->sla_prints.get_edited_preset().inherits());
|
||
compatible_printers_condition.emplace_back(this->sla_materials.get_edited_preset().compatible_printers_condition());
|
||
compatible_prints_condition .emplace_back(this->sla_materials.get_edited_preset().compatible_prints_condition());
|
||
inherits .emplace_back(this->sla_materials.get_edited_preset().inherits());
|
||
inherits .emplace_back(this->printers.get_edited_preset().inherits());
|
||
|
||
// These two value types clash between the print and filament profiles. They should be renamed.
|
||
out.erase("compatible_printers");
|
||
out.erase("compatible_printers_condition");
|
||
out.erase("inherits");
|
||
|
||
out.option<ConfigOptionString >("sla_print_settings_id", true)->value = this->sla_prints.get_selected_preset_name();
|
||
out.option<ConfigOptionString >("sla_material_settings_id", true)->value = this->sla_materials.get_selected_preset_name();
|
||
out.option<ConfigOptionString >("printer_settings_id", true)->value = this->printers.get_selected_preset_name();
|
||
|
||
// Serialize the collected "compatible_printers_condition" and "inherits" fields.
|
||
// There will be 1 + num_exturders fields for "inherits" and 2 + num_extruders for "compatible_printers_condition" stored.
|
||
// The vector will not be stored if all fields are empty strings.
|
||
auto add_if_some_non_empty = [&out](std::vector<std::string> &&values, const std::string &key) {
|
||
bool nonempty = false;
|
||
for (const std::string &v : values)
|
||
if (! v.empty()) {
|
||
nonempty = true;
|
||
break;
|
||
}
|
||
if (nonempty)
|
||
out.set_key_value(key, new ConfigOptionStrings(std::move(values)));
|
||
};
|
||
add_if_some_non_empty(std::move(compatible_printers_condition), "compatible_machine_expression_group");
|
||
add_if_some_non_empty(std::move(compatible_prints_condition), "compatible_process_expression_group");
|
||
add_if_some_non_empty(std::move(inherits), "inherits_group");
|
||
|
||
out.option<ConfigOptionEnumGeneric>("printer_technology", true)->value = ptSLA;
|
||
return out;
|
||
}
|
||
|
||
// Load an external config file containing the print, filament and printer presets.
|
||
// Instead of a config file, a G-code may be loaded containing the full set of parameters.
|
||
// In the future the configuration will likely be read from an AMF file as well.
|
||
// If the file is loaded successfully, its print / filament / printer profiles will be activated.
|
||
ConfigSubstitutions PresetBundle::load_config_file(const std::string &path, ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
if (is_gcode_file(path)) {
|
||
DynamicPrintConfig config;
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, gcodefile %1%, compatibility_rule %2%")%path %compatibility_rule;
|
||
config.apply(FullPrintConfig::defaults());
|
||
ConfigSubstitutions config_substitutions = config.load_from_gcode_file(path, compatibility_rule);
|
||
Preset::normalize(config);
|
||
load_config_file_config(path, true, std::move(config));
|
||
return config_substitutions;
|
||
}
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" can not load config file %1% not from gcode")%path ;
|
||
throw Slic3r::RuntimeError(std::string("Unknown configuration file: ") + path);
|
||
// 1) Try to load the config file into a boost property tree.
|
||
/*boost::property_tree::ptree tree;
|
||
try {
|
||
boost::nowide::ifstream ifs(path);
|
||
boost::property_tree::read_ini(ifs, tree);
|
||
} catch (const std::ifstream::failure &err) {
|
||
throw Slic3r::RuntimeError(std::string("The Config Bundle cannot be loaded: ") + path + "\n\tReason: " + err.what());
|
||
} catch (const boost::property_tree::file_parser_error &err) {
|
||
throw Slic3r::RuntimeError(format("Failed loading the Config Bundle \"%1%\": %2% at line %3%",
|
||
err.filename(), err.message(), err.line()));
|
||
} catch (const std::runtime_error &err) {
|
||
throw Slic3r::RuntimeError(std::string("Failed loading the preset file: ") + path + "\n\tReason: " + err.what());
|
||
}
|
||
|
||
// 2) Continue based on the type of the configuration file.
|
||
ConfigFileType config_file_type = guess_config_file_type(tree);
|
||
ConfigSubstitutions config_substitutions;
|
||
try {
|
||
switch (config_file_type) {
|
||
case CONFIG_FILE_TYPE_UNKNOWN:
|
||
throw Slic3r::RuntimeError(std::string("Unknown configuration file type: ") + path);
|
||
case CONFIG_FILE_TYPE_APP_CONFIG:
|
||
throw Slic3r::RuntimeError(std::string("Invalid configuration file: ") + path + ". This is an application config file.");
|
||
case CONFIG_FILE_TYPE_CONFIG:
|
||
{
|
||
// Initialize a config from full defaults.
|
||
DynamicPrintConfig config;
|
||
config.apply(FullPrintConfig::defaults());
|
||
config_substitutions = config.load(tree, compatibility_rule);
|
||
Preset::normalize(config);
|
||
load_config_file_config(path, true, std::move(config));
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": normal config, finished, got %1% substitutions")%config_substitutions.size();
|
||
return config_substitutions;
|
||
}
|
||
case CONFIG_FILE_TYPE_CONFIG_BUNDLE:
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": found config bundle");
|
||
return load_config_file_config_bundle(path, tree, compatibility_rule);
|
||
}
|
||
} catch (const ConfigurationError &e) {
|
||
throw Slic3r::RuntimeError(format("Invalid configuration file %1%: %2%", path, e.what()));
|
||
}
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" finished, should not be here");
|
||
// This shall never happen. Suppres compiler warnings.
|
||
assert(false);*/
|
||
return ConfigSubstitutions{};
|
||
}
|
||
|
||
// Load a config file from a boost property_tree. This is a private method called from load_config_file.
|
||
// is_external == false on if called from ConfigWizard
|
||
void PresetBundle::load_config_file_config(const std::string &name_or_path, bool is_external, DynamicPrintConfig &&config, Semver file_version, bool selected, bool is_custom_defined)
|
||
{
|
||
PrinterTechnology printer_technology = Preset::printer_technology(config);
|
||
|
||
auto clear_compatible_printers = [](DynamicPrintConfig& config){
|
||
ConfigOption *opt_compatible = config.optptr("compatible_printers");
|
||
if (opt_compatible != nullptr) {
|
||
assert(opt_compatible->type() == coStrings);
|
||
if (opt_compatible->type() == coStrings)
|
||
static_cast<ConfigOptionStrings*>(opt_compatible)->values.clear();
|
||
}
|
||
};
|
||
clear_compatible_printers(config);
|
||
|
||
#if 0
|
||
size_t num_extruders = (printer_technology == ptFFF) ?
|
||
std::min(config.option<ConfigOptionFloats>("nozzle_diameter" )->values.size(),
|
||
config.option<ConfigOptionFloats>("filament_diameter")->values.size()) :
|
||
// 1 SLA material
|
||
1;
|
||
#else
|
||
// BBS: use filament_colour insteadof filament_settings_id, filament_settings_id sometimes is not generated
|
||
size_t num_filaments = config.option<ConfigOptionStrings>("filament_colour")->size();
|
||
#endif
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": , name_or_path %1%, is_external %2%, num_filaments %3%") % name_or_path % is_external % num_filaments;
|
||
// Make a copy of the "compatible_machine_expression_group" and "inherits_group" vectors, which
|
||
// accumulate values over all presets (print, filaments, printers).
|
||
// These values will be distributed into their particular presets when loading.
|
||
std::vector<std::string> compatible_printers_condition_values = std::move(config.option<ConfigOptionStrings>("compatible_machine_expression_group", true)->values);
|
||
std::vector<std::string> compatible_prints_condition_values = std::move(config.option<ConfigOptionStrings>("compatible_process_expression_group", true)->values);
|
||
std::vector<std::string> inherits_values = std::move(config.option<ConfigOptionStrings>("inherits_group", true)->values);
|
||
std::vector<std::string> filament_ids = std::move(config.option<ConfigOptionStrings>("filament_ids", true)->values);
|
||
std::vector<std::string> print_compatible_printers = std::move(config.option<ConfigOptionStrings>("print_compatible_printers", true)->values);
|
||
//BBS: add different settings check logic
|
||
bool has_different_settings_to_system = config.option("different_settings_to_system")?true:false;
|
||
std::vector<std::string> different_values = std::move(config.option<ConfigOptionStrings>("different_settings_to_system", true)->values);
|
||
std::string &compatible_printers_condition = Preset::compatible_printers_condition(config);
|
||
std::string &compatible_prints_condition = Preset::compatible_prints_condition(config);
|
||
std::string &inherits = Preset::inherits(config);
|
||
compatible_printers_condition_values.resize(num_filaments + 2, std::string());
|
||
compatible_prints_condition_values.resize(num_filaments, std::string());
|
||
inherits_values.resize(num_filaments + 2, std::string());
|
||
different_values.resize(num_filaments + 2, std::string());
|
||
filament_ids.resize(num_filaments, std::string());
|
||
// The "default_filament_profile" will be later extracted into the printer profile.
|
||
switch (printer_technology) {
|
||
case ptFFF:
|
||
config.option<ConfigOptionString>("default_print_profile", true);
|
||
config.option<ConfigOptionStrings>("default_filament_profile", true);
|
||
break;
|
||
case ptSLA:
|
||
config.option<ConfigOptionString>("default_sla_print_profile", true);
|
||
config.option<ConfigOptionString>("default_sla_material_profile", true);
|
||
break;
|
||
default: break;
|
||
}
|
||
|
||
// 1) Create a name from the file name.
|
||
// Keep the suffix (.ini, .gcode, .amf, .3mf etc) to differentiate it from the normal profiles.
|
||
std::string name = is_external ? boost::filesystem::path(name_or_path).filename().string() : name_or_path;
|
||
|
||
// 2) If the loading succeeded, split and load the config into print / filament / printer settings.
|
||
// First load the print and printer presets.
|
||
|
||
auto load_preset =
|
||
[&config, &inherits, &inherits_values,
|
||
&compatible_printers_condition, &compatible_printers_condition_values,
|
||
&compatible_prints_condition, &compatible_prints_condition_values,
|
||
is_external, &name, &name_or_path, file_version, selected, is_custom_defined]
|
||
(PresetCollection &presets, size_t idx, const std::string &key, const std::set<std::string> &different_keys, std::string filament_id) {
|
||
// Split the "compatible_printers_condition" and "inherits" values one by one from a single vector to the print & printer profiles.
|
||
inherits = inherits_values[idx];
|
||
compatible_printers_condition = compatible_printers_condition_values[idx];
|
||
if (idx > 0 && idx - 1 < compatible_prints_condition_values.size())
|
||
compatible_prints_condition = compatible_prints_condition_values[idx - 1];
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": , name %1%, is_external %2%, inherits %3%")%name %is_external %inherits;
|
||
if (is_external)
|
||
presets.load_external_preset(name_or_path, name, config.opt_string(key, true), config, different_keys, PresetCollection::LoadAndSelect::Always, file_version, filament_id);
|
||
else
|
||
presets.load_preset(presets.path_from_name(name, inherits.empty()), name, config, selected, file_version, is_custom_defined).save(nullptr);
|
||
};
|
||
|
||
switch (Preset::printer_technology(config)) {
|
||
case ptFFF:
|
||
{
|
||
//BBS: add different settings logic
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": load print preset from print_settings_id");
|
||
std::vector<std::string> print_different_keys_vector;
|
||
std::string print_different_settings = different_values[0];
|
||
Slic3r::unescape_strings_cstyle(print_different_settings, print_different_keys_vector);
|
||
std::set<std::string> print_different_keys_set(print_different_keys_vector.begin(), print_different_keys_vector.end());
|
||
//if (!has_different_settings_to_system) {
|
||
// print_different_keys_set.clear();
|
||
//}
|
||
//else
|
||
print_different_keys_set.insert(ignore_settings_list.begin(), ignore_settings_list.end());
|
||
if (!print_compatible_printers.empty()) {
|
||
ConfigOptionStrings* compatible_printers = config.option<ConfigOptionStrings>("compatible_printers", true);
|
||
compatible_printers->values = print_compatible_printers;
|
||
}
|
||
|
||
load_preset(this->prints, 0, "print_settings_id", print_different_keys_set, std::string());
|
||
|
||
//clear compatible printers
|
||
clear_compatible_printers(config);
|
||
|
||
std::vector<std::string> printer_different_keys_vector;
|
||
std::string printer_different_settings = different_values[num_filaments + 1];
|
||
Slic3r::unescape_strings_cstyle(printer_different_settings, printer_different_keys_vector);
|
||
std::set<std::string> printer_different_keys_set(printer_different_keys_vector.begin(), printer_different_keys_vector.end());
|
||
//if (!has_different_settings_to_system) {
|
||
// printer_different_keys_set.clear();
|
||
//}
|
||
//else
|
||
printer_different_keys_set.insert(ignore_settings_list.begin(), ignore_settings_list.end());
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": load printer preset from printer_settings_id");
|
||
load_preset(this->printers, num_filaments + 1, "printer_settings_id", printer_different_keys_set, std::string());
|
||
|
||
// 3) Now load the filaments. If there are multiple filament presets, split them and load them.
|
||
auto old_filament_profile_names = config.option<ConfigOptionStrings>("filament_settings_id", true);
|
||
old_filament_profile_names->values.resize(num_filaments, std::string());
|
||
|
||
if (num_filaments <= 1) {
|
||
// Split the "compatible_printers_condition" and "inherits" from the cummulative vectors to separate filament presets.
|
||
inherits = inherits_values[1];
|
||
compatible_printers_condition = compatible_printers_condition_values[1];
|
||
compatible_prints_condition = compatible_prints_condition_values.front();
|
||
Preset *loaded = nullptr;
|
||
|
||
//BBS: add different settings logic
|
||
std::vector<std::string> filament_different_keys_vector;
|
||
std::string filament_different_settings = different_values[1];
|
||
Slic3r::unescape_strings_cstyle(filament_different_settings, filament_different_keys_vector);
|
||
std::set<std::string> filament_different_keys_set(filament_different_keys_vector.begin(), filament_different_keys_vector.end());
|
||
//if (!has_different_settings_to_system) {
|
||
// filament_different_keys_set.clear();
|
||
//}
|
||
//else
|
||
filament_different_keys_set.insert(ignore_settings_list.begin(), ignore_settings_list.end());
|
||
|
||
std::string filament_id = filament_ids[0];
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": load single filament preset from filament_settings_id");
|
||
if (is_external)
|
||
loaded = this->filaments.load_external_preset(name_or_path, name, old_filament_profile_names->values.front(), config, filament_different_keys_set, PresetCollection::LoadAndSelect::Always, file_version, filament_id).first;
|
||
else {
|
||
// called from Config Wizard.
|
||
loaded= &this->filaments.load_preset(this->filaments.path_from_name(name, inherits.empty()), name, config, true, file_version, is_custom_defined);
|
||
loaded->save(nullptr);
|
||
}
|
||
this->filament_presets.clear();
|
||
this->filament_presets.emplace_back(loaded->name);
|
||
} else {
|
||
assert(is_external);
|
||
// Split the filament presets, load each of them separately.
|
||
std::vector<DynamicPrintConfig> configs(num_filaments, this->filaments.default_preset().config);
|
||
// loop through options and scatter them into configs.
|
||
for (const t_config_option_key &key : this->filaments.default_preset().config.keys()) {
|
||
const ConfigOption *other_opt = config.option(key);
|
||
if (other_opt == nullptr)
|
||
continue;
|
||
if (other_opt->is_scalar()) {
|
||
for (size_t i = 0; i < configs.size(); ++ i)
|
||
configs[i].option(key, false)->set(other_opt);
|
||
}
|
||
else if (key != "compatible_printers" && key != "compatible_prints") {
|
||
for (size_t i = 0; i < configs.size(); ++i)
|
||
static_cast<ConfigOptionVectorBase*>(configs[i].option(key, false))->set_at(other_opt, 0, i);
|
||
}
|
||
}
|
||
// Load the configs into this->filaments and make them active.
|
||
this->filament_presets = std::vector<std::string>(configs.size());
|
||
// To avoid incorrect selection of the first filament preset (means a value of Preset->m_idx_selected)
|
||
// in a case when next added preset take a place of previosly selected preset,
|
||
// we should add presets from last to first
|
||
bool any_modified = false;
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": load multiple filament preset from filament_settings_id");
|
||
for (int i = (int)configs.size()-1; i >= 0; i--) {
|
||
DynamicPrintConfig &cfg = configs[i];
|
||
// Split the "compatible_printers_condition" and "inherits" from the cummulative vectors to separate filament presets.
|
||
cfg.opt_string("compatible_printers_condition", true) = compatible_printers_condition_values[i + 1];
|
||
cfg.opt_string("compatible_prints_condition", true) = compatible_prints_condition_values[i];
|
||
cfg.opt_string("inherits", true) = inherits_values[i + 1];
|
||
|
||
//BBS: add different settings logic
|
||
std::vector<std::string> filament_different_keys_vector;
|
||
std::string filament_different_settings = different_values[i+1];
|
||
Slic3r::unescape_strings_cstyle(filament_different_settings, filament_different_keys_vector);
|
||
std::set<std::string> filament_different_keys_set(filament_different_keys_vector.begin(), filament_different_keys_vector.end());
|
||
//if (!has_different_settings_to_system) {
|
||
// filament_different_keys_set.clear();
|
||
//}
|
||
//else
|
||
filament_different_keys_set.insert(ignore_settings_list.begin(), ignore_settings_list.end());
|
||
|
||
std::string filament_id = filament_ids[i];
|
||
|
||
// Load all filament presets, but only select the first one in the preset dialog.
|
||
auto [loaded, modified] = this->filaments.load_external_preset(name_or_path, name,
|
||
(i < int(old_filament_profile_names->values.size())) ? old_filament_profile_names->values[i] : "",
|
||
std::move(cfg),
|
||
filament_different_keys_set,
|
||
i == 0 ?
|
||
PresetCollection::LoadAndSelect::Always :
|
||
any_modified ?
|
||
PresetCollection::LoadAndSelect::Never :
|
||
PresetCollection::LoadAndSelect::OnlyIfModified,
|
||
file_version,
|
||
filament_id);
|
||
any_modified |= modified;
|
||
this->filament_presets[i] = loaded->name;
|
||
}
|
||
}
|
||
|
||
// 4) Load the project config values (the per extruder wipe matrix etc).
|
||
this->project_config.apply_only(config, s_project_options);
|
||
|
||
break;
|
||
}
|
||
case ptSLA:
|
||
{
|
||
/*std::set<std::string> different_keys_set;
|
||
load_preset(this->sla_prints, 0, "sla_print_settings_id", different_keys_set);
|
||
load_preset(this->sla_materials, 1, "sla_material_settings_id", different_keys_set);
|
||
load_preset(this->printers, 2, "printer_settings_id", different_keys_set);*/
|
||
break;
|
||
}
|
||
default:
|
||
break;
|
||
}
|
||
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
this->update_multi_material_filament_presets();
|
||
|
||
//BBS
|
||
//const std::string &physical_printer = config.option<ConfigOptionString>("physical_printer_settings_id", true)->value;
|
||
const std::string physical_printer;
|
||
if (this->printers.get_edited_preset().is_external || physical_printer.empty()) {
|
||
this->physical_printers.unselect_printer();
|
||
} else {
|
||
// Activate the physical printer profile if possible.
|
||
PhysicalPrinter *pp = this->physical_printers.find_printer(physical_printer, true);
|
||
if (pp != nullptr && std::find(pp->preset_names.begin(), pp->preset_names.end(), this->printers.get_edited_preset().name) != pp->preset_names.end())
|
||
this->physical_printers.select_printer(pp->name, this->printers.get_edited_preset().name);
|
||
else
|
||
this->physical_printers.unselect_printer();
|
||
}
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": finished");
|
||
}
|
||
|
||
// Load the active configuration of a config bundle from a boost property_tree. This is a private method called from load_config_file.
|
||
/*ConfigSubstitutions PresetBundle::load_config_file_config_bundle(
|
||
const std::string &path, const boost::property_tree::ptree &tree, ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
// 1) Load the config bundle into a temp data.
|
||
PresetBundle tmp_bundle;
|
||
// Load the config bundle, but don't save the loaded presets to user profile directory, as only the presets marked as active in the loaded preset bundle
|
||
// will be loaded into the master PresetBundle and activated.
|
||
auto [presets_substitutions, presets_imported] = tmp_bundle.load_configbundle(path, {}, compatibility_rule);
|
||
UNUSED(presets_imported);
|
||
|
||
std::string bundle_name = std::string(" - ") + boost::filesystem::path(path).filename().string();
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": enter, bundle_name %1%")%bundle_name;
|
||
// 2) Extract active configs from the config bundle, copy them and activate them in this bundle.
|
||
ConfigSubstitutions config_substitutions;
|
||
auto load_one = [&path, &bundle_name, &presets_substitutions = presets_substitutions, &config_substitutions](
|
||
PresetCollection &collection_dst, PresetCollection &collection_src, const std::string &preset_name_src, bool activate) -> std::string {
|
||
// If there are substitutions reported for this preset, move them to config_substitutions.
|
||
if (auto it = std::find_if(presets_substitutions.begin(), presets_substitutions.end(), [&preset_name_src](const PresetConfigSubstitutions& subs){ return subs.preset_name == preset_name_src; });
|
||
it != presets_substitutions.end() && ! it->substitutions.empty())
|
||
append(config_substitutions, std::move(it->substitutions));
|
||
Preset *preset_src = collection_src.find_preset(preset_name_src, false);
|
||
Preset *preset_dst = collection_dst.find_preset(preset_name_src, false);
|
||
assert(preset_src != nullptr);
|
||
std::string preset_name_dst;
|
||
if (preset_dst != nullptr && preset_dst->is_default) {
|
||
// No need to copy a default preset, it always exists in collection_dst.
|
||
if (activate)
|
||
collection_dst.select_preset(0);
|
||
return preset_name_src;
|
||
} else if (preset_dst != nullptr && preset_src->config == preset_dst->config) {
|
||
// Don't save as the config exists in the current bundle and its content is the same.
|
||
return preset_name_src;
|
||
} else {
|
||
// Generate a new unique name.
|
||
preset_name_dst = preset_name_src + bundle_name;
|
||
Preset *preset_dup = nullptr;
|
||
for (size_t i = 1; (preset_dup = collection_dst.find_preset(preset_name_dst, false)) != nullptr; ++ i) {
|
||
if (preset_src->config == preset_dup->config)
|
||
// The preset has been already copied into collection_dst.
|
||
return preset_name_dst;
|
||
// Try to generate another name.
|
||
char buf[64];
|
||
sprintf(buf, " (%d)", (int)i);
|
||
preset_name_dst = preset_name_src + buf + bundle_name;
|
||
}
|
||
}
|
||
assert(! preset_name_dst.empty());
|
||
// Save preset_src->config into collection_dst under preset_name_dst.
|
||
// The "compatible_printers" field should not have been exported into a config.ini or a G-code anyway,
|
||
// but some of the alpha versions of Slic3r did.
|
||
ConfigOption *opt_compatible = preset_src->config.optptr("compatible_printers");
|
||
if (opt_compatible != nullptr) {
|
||
assert(opt_compatible->type() == coStrings);
|
||
if (opt_compatible->type() == coStrings)
|
||
static_cast<ConfigOptionStrings*>(opt_compatible)->values.clear();
|
||
}
|
||
(collection_dst.type() == Preset::TYPE_FILAMENT ?
|
||
collection_dst.load_preset(path, preset_name_dst, preset_src->config, activate) :
|
||
// Only move the source config for non filament profiles, as single filament profile may be referenced multiple times.
|
||
collection_dst.load_preset(path, preset_name_dst, std::move(preset_src->config), activate))
|
||
.is_external = true;
|
||
return preset_name_dst;
|
||
};
|
||
load_one(this->prints, tmp_bundle.prints, tmp_bundle.prints .get_selected_preset_name(), true);
|
||
load_one(this->sla_prints, tmp_bundle.sla_prints, tmp_bundle.sla_prints .get_selected_preset_name(), true);
|
||
load_one(this->filaments, tmp_bundle.filaments, tmp_bundle.filaments .get_selected_preset_name(), true);
|
||
load_one(this->sla_materials, tmp_bundle.sla_materials, tmp_bundle.sla_materials.get_selected_preset_name(), true);
|
||
load_one(this->printers, tmp_bundle.printers, tmp_bundle.printers .get_selected_preset_name(), true);
|
||
this->update_multi_material_filament_presets();
|
||
for (size_t i = 1; i < std::min(tmp_bundle.filament_presets.size(), this->filament_presets.size()); ++ i)
|
||
this->filament_presets[i] = load_one(this->filaments, tmp_bundle.filaments, tmp_bundle.filament_presets[i], false);
|
||
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
|
||
sort_remove_duplicates(config_substitutions);
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": finished, got %1% substitutions")%config_substitutions.size();
|
||
return config_substitutions;
|
||
}*/
|
||
|
||
// Process the Config Bundle loaded as a Boost property tree.
|
||
// For each print, filament and printer preset (group defined by group_name), apply the inherited presets.
|
||
// The presets starting with '*' are considered non-terminal and they are
|
||
// removed through the flattening process by this function.
|
||
// This function will never fail, but it will produce error messages through boost::log.
|
||
// system_profiles will not be flattened, and they will be kept inside the "inherits" field
|
||
/*static void flatten_configbundle_hierarchy(boost::property_tree::ptree &tree, const std::string &group_name, const std::vector<std::string> &system_profiles)
|
||
{
|
||
namespace pt = boost::property_tree;
|
||
|
||
// 1) For the group given by group_name, initialize the presets.
|
||
struct Prst {
|
||
Prst(const std::string &name, pt::ptree *node) : name(name), node(node) {}
|
||
// Name of this preset. If the name starts with '*', it is an intermediate preset,
|
||
// which will not make it into the result.
|
||
const std::string name;
|
||
// Link to the source boost property tree node, owned by tree.
|
||
pt::ptree *node;
|
||
// Link to the presets, from which this preset inherits.
|
||
std::vector<Prst*> inherits;
|
||
// Link to the presets, for which this preset is a direct parent.
|
||
std::vector<Prst*> parent_of;
|
||
// When running the Kahn's Topological sorting algorithm, this counter is decreased from inherits.size() to zero.
|
||
// A cycle is indicated, if the number does not drop to zero after the Kahn's algorithm finishes.
|
||
size_t num_incoming_edges_left = 0;
|
||
// Sorting by the name, to be used when inserted into std::set.
|
||
bool operator==(const Prst &rhs) const { return this->name == rhs.name; }
|
||
bool operator< (const Prst &rhs) const { return this->name < rhs.name; }
|
||
};
|
||
// Find the presets, store them into a std::map, addressed by their names.
|
||
std::set<Prst> presets;
|
||
std::string group_name_preset = group_name + ":";
|
||
for (auto §ion : tree)
|
||
if (boost::starts_with(section.first, group_name_preset) && section.first.size() > group_name_preset.size())
|
||
presets.emplace(section.first.substr(group_name_preset.size()), §ion.second);
|
||
// Fill in the "inherits" and "parent_of" members, report invalid inheritance fields.
|
||
for (const Prst &prst : presets) {
|
||
// Parse the list of comma separated values, possibly enclosed in quotes.
|
||
std::vector<std::string> inherits_names;
|
||
std::vector<std::string> inherits_system;
|
||
if (Slic3r::unescape_strings_cstyle(prst.node->get<std::string>("inherits", ""), inherits_names)) {
|
||
// Resolve the inheritance by name.
|
||
std::vector<Prst*> &inherits_nodes = const_cast<Prst&>(prst).inherits;
|
||
for (const std::string &node_name : inherits_names) {
|
||
auto it_system = std::lower_bound(system_profiles.begin(), system_profiles.end(), node_name);
|
||
if (it_system != system_profiles.end() && *it_system == node_name) {
|
||
// Loading a user config budnle, this preset is derived from a system profile.
|
||
inherits_system.emplace_back(node_name);
|
||
} else {
|
||
auto it = presets.find(Prst(node_name, nullptr));
|
||
if (it == presets.end())
|
||
BOOST_LOG_TRIVIAL(error) << "flatten_configbundle_hierarchy: The preset " << prst.name << " inherits an unknown preset \"" << node_name << "\"";
|
||
else {
|
||
inherits_nodes.emplace_back(const_cast<Prst*>(&(*it)));
|
||
inherits_nodes.back()->parent_of.emplace_back(const_cast<Prst*>(&prst));
|
||
}
|
||
}
|
||
}
|
||
} else {
|
||
BOOST_LOG_TRIVIAL(error) << "flatten_configbundle_hierarchy: The preset " << prst.name << " has an invalid \"inherits\" field";
|
||
}
|
||
// Remove the "inherits" key, it has no meaning outside of the config bundle.
|
||
const_cast<pt::ptree*>(prst.node)->erase("inherits");
|
||
if (! inherits_system.empty()) {
|
||
// Loaded a user config bundle, where a profile inherits a system profile.
|
||
// User profile should be derived from a single system profile only.
|
||
assert(inherits_system.size() == 1);
|
||
if (inherits_system.size() > 1)
|
||
BOOST_LOG_TRIVIAL(error) << "flatten_configbundle_hierarchy: The preset " << prst.name << " inherits from more than single system preset";
|
||
prst.node->put("inherits", Slic3r::escape_string_cstyle(inherits_system.front()));
|
||
}
|
||
}
|
||
|
||
// 2) Create a linear ordering for the directed acyclic graph of preset inheritance.
|
||
// https://en.wikipedia.org/wiki/Topological_sorting
|
||
// Kahn's algorithm.
|
||
std::vector<Prst*> sorted;
|
||
{
|
||
// Initialize S with the set of all nodes with no incoming edge.
|
||
std::deque<Prst*> S;
|
||
for (const Prst &prst : presets)
|
||
if (prst.inherits.empty())
|
||
S.emplace_back(const_cast<Prst*>(&prst));
|
||
else
|
||
const_cast<Prst*>(&prst)->num_incoming_edges_left = prst.inherits.size();
|
||
while (! S.empty()) {
|
||
Prst *n = S.front();
|
||
S.pop_front();
|
||
sorted.emplace_back(n);
|
||
for (Prst *m : n->parent_of) {
|
||
assert(m->num_incoming_edges_left > 0);
|
||
if (-- m->num_incoming_edges_left == 0) {
|
||
// We have visited all parents of m.
|
||
S.emplace_back(m);
|
||
}
|
||
}
|
||
}
|
||
if (sorted.size() < presets.size()) {
|
||
for (const Prst &prst : presets)
|
||
if (prst.num_incoming_edges_left)
|
||
BOOST_LOG_TRIVIAL(error) << "flatten_configbundle_hierarchy: The preset " << prst.name << " has cyclic dependencies";
|
||
}
|
||
}
|
||
|
||
// Apply the dependencies in their topological ordering.
|
||
for (Prst *prst : sorted) {
|
||
// Merge the preset nodes in their order of application.
|
||
// Iterate in a reverse order, so the last change will be placed first in merged.
|
||
for (auto it_inherits = prst->inherits.rbegin(); it_inherits != prst->inherits.rend(); ++ it_inherits)
|
||
for (auto it = (*it_inherits)->node->begin(); it != (*it_inherits)->node->end(); ++ it)
|
||
if (it->first == "renamed_from") {
|
||
// Don't inherit "renamed_from" flag, it does not make sense. The "renamed_from" flag only makes sense for a concrete preset.
|
||
if (boost::starts_with((*it_inherits)->name, "*"))
|
||
BOOST_LOG_TRIVIAL(error) << boost::format("Nonpublic intermediate preset %1% contains a \"renamed_from\" field, which is ignored") % (*it_inherits)->name;
|
||
} else if (prst->node->find(it->first) == prst->node->not_found())
|
||
prst->node->add_child(it->first, it->second);
|
||
}
|
||
|
||
// Remove the "internal" presets from the ptree. These presets are marked with '*'.
|
||
group_name_preset += '*';
|
||
for (auto it_section = tree.begin(); it_section != tree.end(); ) {
|
||
if (boost::starts_with(it_section->first, group_name_preset) && it_section->first.size() > group_name_preset.size())
|
||
// Remove the "internal" preset from the ptree.
|
||
it_section = tree.erase(it_section);
|
||
else
|
||
// Keep the preset.
|
||
++ it_section;
|
||
}
|
||
}*/
|
||
|
||
// preset_bundle is set when loading user config bundles, which must not overwrite the system profiles.
|
||
/*static void flatten_configbundle_hierarchy(boost::property_tree::ptree &tree, const PresetBundle *preset_bundle)
|
||
{
|
||
flatten_configbundle_hierarchy(tree, "print", preset_bundle ? preset_bundle->prints.system_preset_names() : std::vector<std::string>());
|
||
flatten_configbundle_hierarchy(tree, "filament", preset_bundle ? preset_bundle->filaments.system_preset_names() : std::vector<std::string>());
|
||
flatten_configbundle_hierarchy(tree, "sla_print", preset_bundle ? preset_bundle->sla_prints.system_preset_names() : std::vector<std::string>());
|
||
flatten_configbundle_hierarchy(tree, "sla_material", preset_bundle ? preset_bundle->sla_materials.system_preset_names() : std::vector<std::string>());
|
||
flatten_configbundle_hierarchy(tree, "printer", preset_bundle ? preset_bundle->printers.system_preset_names() : std::vector<std::string>());
|
||
}*/
|
||
|
||
// Load a config bundle file, into presets and store the loaded presets into separate files
|
||
// of the local configuration directory.
|
||
/*std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_configbundle(
|
||
const std::string &path, LoadConfigBundleAttributes flags, ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
// Enable substitutions for user config bundle, throw an exception when loading a system profile.
|
||
ConfigSubstitutionContext substitution_context { compatibility_rule };
|
||
PresetsConfigSubstitutions substitutions;
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(" enter, path %1%, compatibility_rule %2%")%path.c_str()%compatibility_rule;
|
||
if (flags.has(LoadConfigBundleAttribute::ResetUserProfile) || flags.has(LoadConfigBundleAttribute::LoadSystem))
|
||
// Reset this bundle, delete user profile files if SaveImported.
|
||
this->reset(flags.has(LoadConfigBundleAttribute::SaveImported));
|
||
|
||
// 1) Read the complete config file into a boost::property_tree.
|
||
namespace pt = boost::property_tree;
|
||
pt::ptree tree;
|
||
boost::nowide::ifstream ifs(path);
|
||
try {
|
||
pt::read_ini(ifs, tree);
|
||
} catch (const boost::property_tree::ini_parser::ini_parser_error &err) {
|
||
throw Slic3r::RuntimeError(format("Failed loading config bundle \"%1%\"\nError: \"%2%\" at line %3%", path, err.message(), err.line()).c_str());
|
||
}
|
||
|
||
const VendorProfile *vendor_profile = nullptr;
|
||
if (flags.has(LoadConfigBundleAttribute::LoadSystem) || flags.has(LoadConfigBundleAttribute::LoadVendorOnly)) {
|
||
auto vp = VendorProfile::from_ini(tree, path);
|
||
if (vp.models.size() == 0) {
|
||
BOOST_LOG_TRIVIAL(error) << boost::format("Vendor bundle: `%1%`: No printer model defined.") % path;
|
||
return std::make_pair(PresetsConfigSubstitutions{}, 0);
|
||
} else if (vp.num_variants() == 0) {
|
||
BOOST_LOG_TRIVIAL(error) << boost::format("Vendor bundle: `%1%`: No printer variant defined") % path;
|
||
return std::make_pair(PresetsConfigSubstitutions{}, 0);
|
||
}
|
||
vendor_profile = &this->vendors.insert({vp.id, vp}).first->second;
|
||
}
|
||
|
||
//BBS: add config related logs
|
||
if (vendor_profile)
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", loaded vendor profile, name %1%, id %2%, version %3%")%vendor_profile->name%vendor_profile->id%vendor_profile->config_version.to_string();
|
||
|
||
if (flags.has(LoadConfigBundleAttribute::LoadVendorOnly))
|
||
return std::make_pair(PresetsConfigSubstitutions{}, 0);
|
||
|
||
// 1.5) Flatten the config bundle by applying the inheritance rules. Internal profiles (with names starting with '*') are removed.
|
||
// If loading a user config bundle, do not flatten with the system profiles, but keep the "inherits" flag intact.
|
||
flatten_configbundle_hierarchy(tree, flags.has(LoadConfigBundleAttribute::LoadSystem) ? nullptr : this);
|
||
|
||
// 2) Parse the property_tree, extract the active preset names and the profiles, save them into local config files.
|
||
// Parse the obsolete preset names, to be deleted when upgrading from the old configuration structure.
|
||
std::vector<std::string> loaded_prints;
|
||
std::vector<std::string> loaded_filaments;
|
||
std::vector<std::string> loaded_sla_prints;
|
||
std::vector<std::string> loaded_sla_materials;
|
||
std::vector<std::string> loaded_printers;
|
||
std::vector<std::string> loaded_physical_printers;
|
||
std::string active_print;
|
||
std::vector<std::string> active_filaments;
|
||
std::string active_sla_print;
|
||
std::string active_sla_material;
|
||
std::string active_printer;
|
||
std::string active_physical_printer;
|
||
size_t presets_loaded = 0;
|
||
size_t ph_printers_loaded = 0;
|
||
|
||
for (const auto §ion : tree) {
|
||
PresetCollection *presets = nullptr;
|
||
std::string preset_name;
|
||
PhysicalPrinterCollection *ph_printers = nullptr;
|
||
std::string ph_printer_name;
|
||
if (boost::starts_with(section.first, "print:")) {
|
||
presets = &this->prints;
|
||
preset_name = section.first.substr(6);
|
||
} else if (boost::starts_with(section.first, "filament:")) {
|
||
presets = &this->filaments;
|
||
preset_name = section.first.substr(9);
|
||
} else if (boost::starts_with(section.first, "sla_print:")) {
|
||
presets = &this->sla_prints;
|
||
preset_name = section.first.substr(10);
|
||
} else if (boost::starts_with(section.first, "sla_material:")) {
|
||
presets = &this->sla_materials;
|
||
preset_name = section.first.substr(13);
|
||
} else if (boost::starts_with(section.first, "printer:")) {
|
||
presets = &this->printers;
|
||
preset_name = section.first.substr(8);
|
||
} else if (boost::starts_with(section.first, "physical_printer:")) {
|
||
ph_printers = &this->physical_printers;
|
||
ph_printer_name = section.first.substr(17);
|
||
} else if (section.first == "presets") {
|
||
// Load the names of the active presets.
|
||
for (auto &kvp : section.second) {
|
||
if (kvp.first == "print") {
|
||
active_print = kvp.second.data();
|
||
} else if (boost::starts_with(kvp.first, "filament")) {
|
||
int idx = 0;
|
||
if (kvp.first == "filament" || sscanf(kvp.first.c_str(), "filament_%d", &idx) == 1) {
|
||
if (int(active_filaments.size()) <= idx)
|
||
active_filaments.resize(idx + 1, std::string());
|
||
active_filaments[idx] = kvp.second.data();
|
||
}
|
||
} else if (kvp.first == "sla_print") {
|
||
active_sla_print = kvp.second.data();
|
||
} else if (kvp.first == "sla_material") {
|
||
active_sla_material = kvp.second.data();
|
||
} else if (kvp.first == "printer") {
|
||
active_printer = kvp.second.data();
|
||
} else if (kvp.first == "physical_printer") {
|
||
active_physical_printer = kvp.second.data();
|
||
}
|
||
}
|
||
} else if (section.first == "obsolete_presets") {
|
||
// Parse the names of obsolete presets. These presets will be deleted from user's
|
||
// profile directory on installation of this vendor preset.
|
||
for (auto &kvp : section.second) {
|
||
std::vector<std::string> *dst = nullptr;
|
||
if (kvp.first == "print")
|
||
dst = &this->obsolete_presets.prints;
|
||
else if (kvp.first == "filament")
|
||
dst = &this->obsolete_presets.filaments;
|
||
else if (kvp.first == "sla_print")
|
||
dst = &this->obsolete_presets.sla_prints;
|
||
else if (kvp.first == "sla_material")
|
||
dst = &this->obsolete_presets.sla_materials;
|
||
else if (kvp.first == "printer")
|
||
dst = &this->obsolete_presets.printers;
|
||
if (dst)
|
||
unescape_strings_cstyle(kvp.second.data(), *dst);
|
||
}
|
||
} else if (section.first == "settings") {
|
||
#ifdef SUPPORT_AUTO_CENTER
|
||
// Load the settings.
|
||
for (auto &kvp : section.second) {
|
||
if (kvp.first == "autocenter") {
|
||
}
|
||
}
|
||
#endif
|
||
} else
|
||
// Ignore an unknown section.
|
||
continue;
|
||
if (presets != nullptr) {
|
||
// Load the print, filament or printer preset.
|
||
const DynamicPrintConfig *default_config = nullptr;
|
||
DynamicPrintConfig config;
|
||
std::string alias_name;
|
||
std::vector<std::string> renamed_from;
|
||
try {
|
||
auto parse_config_section = [§ion, &alias_name, &renamed_from, &substitution_context, &path](DynamicPrintConfig &config) {
|
||
substitution_context.substitutions.clear();
|
||
for (auto &kvp : section.second) {
|
||
if (kvp.first == "alias")
|
||
alias_name = kvp.second.data();
|
||
else if (kvp.first == "renamed_from") {
|
||
if (! unescape_strings_cstyle(kvp.second.data(), renamed_from)) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The preset \"" <<
|
||
section.first << "\" contains invalid \"renamed_from\" key, which is being ignored.";
|
||
}
|
||
}
|
||
// Throws on parsing error. For system presets, no substituion is being done, but an exception is thrown.
|
||
config.set_deserialize(kvp.first, kvp.second.data(), substitution_context);
|
||
}
|
||
};
|
||
if (presets == &this->printers) {
|
||
// Select the default config based on the printer_technology field extracted from kvp.
|
||
DynamicPrintConfig config_src;
|
||
parse_config_section(config_src);
|
||
default_config = &presets->default_preset_for(config_src).config;
|
||
config = *default_config;
|
||
config.apply(config_src);
|
||
} else {
|
||
default_config = &presets->default_preset().config;
|
||
config = *default_config;
|
||
parse_config_section(config);
|
||
}
|
||
} catch (const ConfigurationError &e) {
|
||
throw ConfigurationError(format("Invalid configuration bundle \"%1%\", section [%2%]: ", path, section.first) + e.what());
|
||
}
|
||
Preset::normalize(config);
|
||
// Report configuration fields, which are misplaced into a wrong group.
|
||
std::string incorrect_keys = Preset::remove_invalid_keys(config, *default_config);
|
||
if (! incorrect_keys.empty())
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
section.first << "\" contains the following incorrect keys: " << incorrect_keys << ", which were removed";
|
||
if (flags.has(LoadConfigBundleAttribute::LoadSystem) && presets == &printers) {
|
||
// Filter out printer presets, which are not mentioned in the vendor profile.
|
||
// These presets are considered not installed.
|
||
auto printer_model = config.opt_string("printer_model");
|
||
if (printer_model.empty()) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
section.first << "\" defines no printer model, it will be ignored.";
|
||
continue;
|
||
}
|
||
auto printer_variant = config.opt_string("printer_variant");
|
||
if (printer_variant.empty()) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
section.first << "\" defines no printer variant, it will be ignored.";
|
||
continue;
|
||
}
|
||
auto it_model = std::find_if(vendor_profile->models.cbegin(), vendor_profile->models.cend(),
|
||
[&](const VendorProfile::PrinterModel &m) { return m.id == printer_model; }
|
||
);
|
||
if (it_model == vendor_profile->models.end()) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
section.first << "\" defines invalid printer model \"" << printer_model << "\", it will be ignored.";
|
||
continue;
|
||
}
|
||
auto it_variant = it_model->variant(printer_variant);
|
||
if (it_variant == nullptr) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
section.first << "\" defines invalid printer variant \"" << printer_variant << "\", it will be ignored.";
|
||
continue;
|
||
}
|
||
const Preset *preset_existing = presets->find_preset(section.first, false);
|
||
if (preset_existing != nullptr) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
section.first << "\" has already been loaded from another Confing Bundle.";
|
||
continue;
|
||
}
|
||
} else if (! flags.has(LoadConfigBundleAttribute::LoadSystem)) {
|
||
// This is a user config bundle.
|
||
const Preset *existing = presets->find_preset(preset_name, false);
|
||
if (existing != nullptr) {
|
||
if (existing->is_system) {
|
||
assert(existing->vendor != nullptr);
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a user provided Config Bundle \"" << path << "\": The " << presets->name() << " preset \"" <<
|
||
existing->name << "\" is a system preset of vendor " << existing->vendor->name << " and it will be ignored.";
|
||
continue;
|
||
} else {
|
||
assert(existing->vendor == nullptr);
|
||
BOOST_LOG_TRIVIAL(trace) << "A " << presets->name() << " preset \"" << existing->name << "\" was overwritten with a preset from user Config Bundle \"" << path << "\"";
|
||
}
|
||
} else {
|
||
BOOST_LOG_TRIVIAL(trace) << "A new " << presets->name() << " preset \"" << preset_name << "\" was imported from user Config Bundle \"" << path << "\"";
|
||
}
|
||
}
|
||
// Decide a full path to this .ini file.
|
||
auto file_name = boost::algorithm::iends_with(preset_name, ".json") ? preset_name : preset_name + ".json";
|
||
//BBS: change directoties by design
|
||
auto file_path = (boost::filesystem::path(data_dir()) /PRESET_SYSTEM_DIR/ presets->section_name() / file_name).make_preferred();
|
||
// Load the preset into the list of presets, save it to disk.
|
||
Preset &loaded = presets->load_preset(file_path.string(), preset_name, std::move(config), false);
|
||
if (flags.has(LoadConfigBundleAttribute::SaveImported))
|
||
loaded.save(nullptr);
|
||
if (flags.has(LoadConfigBundleAttribute::LoadSystem)) {
|
||
loaded.is_system = true;
|
||
loaded.vendor = vendor_profile;
|
||
}
|
||
|
||
// Derive the profile logical name aka alias from the preset name if the alias was not stated explicitely.
|
||
if (alias_name.empty()) {
|
||
size_t end_pos = preset_name.find_first_of("@");
|
||
if (end_pos != std::string::npos) {
|
||
alias_name = preset_name.substr(0, end_pos);
|
||
if (renamed_from.empty())
|
||
// Add the preset name with the '@' character removed into the "renamed_from" list.
|
||
renamed_from.emplace_back(alias_name + preset_name.substr(end_pos + 1));
|
||
boost::trim_right(alias_name);
|
||
}
|
||
}
|
||
if (alias_name.empty())
|
||
loaded.alias = preset_name;
|
||
else
|
||
loaded.alias = std::move(alias_name);
|
||
loaded.renamed_from = std::move(renamed_from);
|
||
if (! substitution_context.empty())
|
||
substitutions.push_back({
|
||
preset_name, presets->type(), PresetConfigSubstitutions::Source::ConfigBundle,
|
||
std::string(), std::move(substitution_context.substitutions) });
|
||
++ presets_loaded;
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", got preset %1%, from %2%")%loaded.name %path;
|
||
}
|
||
|
||
if (ph_printers != nullptr) {
|
||
// Load the physical printer
|
||
const DynamicPrintConfig& default_config = ph_printers->default_config();
|
||
DynamicPrintConfig config = default_config;
|
||
|
||
substitution_context.substitutions.clear();
|
||
try {
|
||
for (auto& kvp : section.second)
|
||
config.set_deserialize(kvp.first, kvp.second.data(), substitution_context);
|
||
} catch (const ConfigurationError &e) {
|
||
throw ConfigurationError(format("Invalid configuration bundle \"%1%\", section [%2%]: ", path, section.first) + e.what());
|
||
}
|
||
|
||
// Report configuration fields, which are misplaced into a wrong group.
|
||
std::string incorrect_keys = Preset::remove_invalid_keys(config, default_config);
|
||
if (!incorrect_keys.empty())
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The physical printer \"" <<
|
||
section.first << "\" contains the following incorrect keys: " << incorrect_keys << ", which were removed";
|
||
|
||
const PhysicalPrinter* ph_printer_existing = ph_printers->find_printer(ph_printer_name, false);
|
||
if (ph_printer_existing != nullptr) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The physical printer \"" <<
|
||
section.first << "\" has already been loaded from another Confing Bundle.";
|
||
continue;
|
||
}
|
||
|
||
// Decide a full path to this .ini file.
|
||
//BBS: change directoties by design
|
||
auto file_name = boost::algorithm::iends_with(ph_printer_name, ".json") ? ph_printer_name : ph_printer_name + ".json";
|
||
auto file_path = (boost::filesystem::path(data_dir())/PRESET_SYSTEM_DIR/"physical_printer" / file_name).make_preferred();
|
||
// Load the preset into the list of presets, save it to disk.
|
||
ph_printers->load_printer(file_path.string(), ph_printer_name, std::move(config), false, flags.has(LoadConfigBundleAttribute::SaveImported));
|
||
if (! substitution_context.empty())
|
||
substitutions.push_back({
|
||
ph_printer_name, Preset::TYPE_PHYSICAL_PRINTER, PresetConfigSubstitutions::Source::ConfigBundle,
|
||
std::string(), std::move(substitution_context.substitutions) });
|
||
++ ph_printers_loaded;
|
||
}
|
||
}
|
||
|
||
// 3) Activate the presets and physical printer if any exists.
|
||
if (! flags.has(LoadConfigBundleAttribute::LoadSystem)) {
|
||
if (! active_print.empty())
|
||
prints.select_preset_by_name(active_print, true);
|
||
if (! active_sla_print.empty())
|
||
sla_prints.select_preset_by_name(active_sla_print, true);
|
||
if (! active_sla_material.empty())
|
||
sla_materials.select_preset_by_name(active_sla_material, true);
|
||
if (! active_printer.empty())
|
||
printers.select_preset_by_name(active_printer, true);
|
||
if (! active_physical_printer.empty())
|
||
physical_printers.select_printer(active_physical_printer, active_printer);
|
||
// Activate the first filament preset.
|
||
if (! active_filaments.empty() && ! active_filaments.front().empty())
|
||
filaments.select_preset_by_name(active_filaments.front(), true);
|
||
this->update_multi_material_filament_presets();
|
||
for (size_t i = 0; i < std::min(this->filament_presets.size(), active_filaments.size()); ++ i)
|
||
this->filament_presets[i] = filaments.find_preset(active_filaments[i], true)->name;
|
||
this->update_compatible(PresetSelectCompatibleType::Never);
|
||
}
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", finished, presets_loaded %1%, ph_printers_loaded %2%")%presets_loaded %ph_printers_loaded;
|
||
return std::make_pair(std::move(substitutions), presets_loaded + ph_printers_loaded);
|
||
}*/
|
||
|
||
//BBS: Load a config bundle file from json
|
||
std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_vendor_configs_from_json(
|
||
const std::string &path, const std::string &vendor_name, LoadConfigBundleAttributes flags, ForwardCompatibilitySubstitutionRule compatibility_rule)
|
||
{
|
||
// Enable substitutions for user config bundle, throw an exception when loading a system profile.
|
||
ConfigSubstitutionContext substitution_context { compatibility_rule };
|
||
PresetsConfigSubstitutions substitutions;
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" enter, path %1%, compatibility_rule %2%")%path.c_str()%compatibility_rule;
|
||
if (flags.has(LoadConfigBundleAttribute::ResetUserProfile) || flags.has(LoadConfigBundleAttribute::LoadSystem))
|
||
// Reset this bundle, delete user profile files if SaveImported.
|
||
this->reset(flags.has(LoadConfigBundleAttribute::SaveImported));
|
||
|
||
// 1) load the vroot json and construct the vendor profile
|
||
VendorProfile vendor_profile(vendor_name);
|
||
std::string root_file = path + "/" + vendor_name + ".json";
|
||
std::vector<std::pair<std::string, std::string>> machine_model_subfiles;
|
||
std::vector<std::pair<std::string, std::string>> process_subfiles;
|
||
std::vector<std::pair<std::string, std::string>> filament_subfiles;
|
||
std::vector<std::pair<std::string, std::string>> machine_subfiles;
|
||
auto get_name_and_subpath = [](json::iterator& it, std::vector<std::pair<std::string, std::string>>& subfile_map) {
|
||
if (it.value().is_array()) {
|
||
for (auto iter1 = it.value().begin(); iter1 != it.value().end(); iter1++) {
|
||
if (iter1.value().is_object()) {
|
||
std::string name, subpath;
|
||
for (auto iter2 = iter1.value().begin(); iter2 != iter1.value().end(); iter2++) {
|
||
if (iter2.value().is_string()) {
|
||
if (boost::iequals(iter2.key(), BBL_JSON_KEY_NAME)) {
|
||
name = iter2.value();
|
||
} else if (boost::iequals(iter2.key(), BBL_JSON_KEY_SUB_PATH)) {
|
||
subpath = iter2.value();
|
||
}
|
||
}
|
||
else {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": invalid value type for " << iter2.key();
|
||
}
|
||
}
|
||
if (!name.empty() && !subpath.empty())
|
||
subfile_map.push_back(std::make_pair(name, subpath));
|
||
}
|
||
else
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": invalid type for " << iter1.key();
|
||
}
|
||
}
|
||
else
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": invalid type for " << it.key();
|
||
};
|
||
try {
|
||
boost::nowide::ifstream ifs(root_file);
|
||
json j;
|
||
ifs >> j;
|
||
//parse the json elements
|
||
for (auto it = j.begin(); it != j.end(); it++) {
|
||
if (boost::iequals(it.key(), BBL_JSON_KEY_VERSION)) {
|
||
//get version
|
||
std::string version_str = it.value();
|
||
auto config_version = Semver::parse(version_str);
|
||
if (! config_version) {
|
||
throw ConfigurationError((boost::format("vendor %1%'s config version: %2% invalid\nSuggest cleaning the directory %3% firstly")
|
||
% vendor_name % version_str % path).str());
|
||
} else {
|
||
vendor_profile.config_version = std::move(*config_version);
|
||
}
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_URL)) {
|
||
//get url
|
||
vendor_profile.config_update_url = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_DESCRIPTION)) {
|
||
//get description
|
||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< ": parse "<<root_file<<", got description: " << it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_NAME)) {
|
||
//get name
|
||
vendor_profile.name = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_MACHINE_MODEL_LIST)) {
|
||
//get machine model list
|
||
get_name_and_subpath(it, machine_model_subfiles);
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_PROCESS_LIST)) {
|
||
//get process list
|
||
get_name_and_subpath(it, process_subfiles);
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_FILAMENT_LIST)) {
|
||
//get filament list
|
||
get_name_and_subpath(it, filament_subfiles);
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_MACHINE_LIST)) {
|
||
//get machine list
|
||
get_name_and_subpath(it, machine_subfiles);
|
||
}
|
||
}
|
||
}
|
||
catch(nlohmann::detail::parse_error &err) {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": parse "<<root_file<<" got a nlohmann::detail::parse_error, reason = " << err.what();
|
||
throw ConfigurationError((boost::format("Failed loading configuration file %1%: %2%\nSuggest cleaning the directory %3% firstly")
|
||
%root_file %err.what() % path).str());
|
||
//goto __error_process;
|
||
}
|
||
|
||
if (flags.has(LoadConfigBundleAttribute::LoadFilamentOnly)) {
|
||
machine_model_subfiles.clear();
|
||
machine_subfiles.clear();
|
||
process_subfiles.clear();
|
||
}
|
||
|
||
//2) paste the machine model
|
||
for (auto& machine_model : machine_model_subfiles)
|
||
{
|
||
std::string subfile = path + "/" + vendor_name + "/" + machine_model.second;
|
||
VendorProfile::PrinterModel model;
|
||
model.id = machine_model.first;
|
||
try {
|
||
boost::nowide::ifstream ifs(subfile);
|
||
json j;
|
||
ifs >> j;
|
||
//parse the json elements
|
||
for (auto it = j.begin(); it != j.end(); it++) {
|
||
if (boost::iequals(it.key(), BBL_JSON_KEY_VERSION)) {
|
||
//get version
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_URL)) {
|
||
//get url
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_NAME)) {
|
||
//get name
|
||
model.name = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_MODEL_ID)) {
|
||
//get model_id
|
||
model.model_id = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_NOZZLE_DIAMETER)) {
|
||
//get nozzle diameter
|
||
std::string nozzle_diameters = it.value();
|
||
std::vector<std::string> variants;
|
||
if (Slic3r::unescape_strings_cstyle(nozzle_diameters, variants)) {
|
||
for (const std::string &variant_name : variants) {
|
||
if (model.variant(variant_name) == nullptr)
|
||
model.variants.emplace_back(VendorProfile::PrinterVariant(variant_name));
|
||
}
|
||
} else {
|
||
BOOST_LOG_TRIVIAL(error)<< __FUNCTION__ << boost::format(": invalid nozzle_diameters %1% for Vendor %1%") % nozzle_diameters % vendor_name;
|
||
}
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_PRINTER_TECH)) {
|
||
//get printer tech
|
||
if (boost::algorithm::starts_with(it.value(), "SL"))
|
||
model.technology = ptSLA;
|
||
else
|
||
model.technology = ptFFF;
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_FAMILY)) {
|
||
//get family
|
||
model.family = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_BED_MODEL)) {
|
||
//get bed model
|
||
model.bed_model = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_BED_TEXTURE)) {
|
||
//get bed texture
|
||
model.bed_texture = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_HOTEND_MODEL)) {
|
||
model.hotend_model = it.value();
|
||
}
|
||
else if (boost::iequals(it.key(), BBL_JSON_KEY_DEFAULT_MATERIALS)) {
|
||
//get machine list
|
||
std::string default_materials_field = it.value();
|
||
if (Slic3r::unescape_strings_cstyle(default_materials_field, model.default_materials)) {
|
||
Slic3r::sort_remove_duplicates(model.default_materials);
|
||
if (! model.default_materials.empty() && model.default_materials.front().empty())
|
||
// An empty material was inserted into the list of default materials. Remove it.
|
||
model.default_materials.erase(model.default_materials.begin());
|
||
} else {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": invalid default_materials %1% for Vendor %1%") % default_materials_field % vendor_name;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
catch(nlohmann::detail::parse_error &err) {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": parse "<< subfile <<" got a nlohmann::detail::parse_error, reason = " << err.what();
|
||
throw ConfigurationError((boost::format("Failed loading configuration file %1%: %2%\nSuggest cleaning the directory %3% firstly")
|
||
%subfile %err.what() % path).str());
|
||
}
|
||
|
||
if (! model.id.empty() && ! model.variants.empty())
|
||
vendor_profile.models.push_back(std::move(model));
|
||
}
|
||
|
||
//insert the vendor profile
|
||
this->vendors.emplace(vendor_name, vendor_profile);
|
||
const VendorProfile* current_vendor_profile = &this->vendors[vendor_name];
|
||
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", loaded vendor profile, name %1%, id %2%, version %3%")%vendor_profile.name%vendor_profile.id%vendor_profile.config_version.to_string();
|
||
|
||
if (flags.has(LoadConfigBundleAttribute::LoadVendorOnly))
|
||
return std::make_pair(PresetsConfigSubstitutions{}, 0);
|
||
|
||
// 3) paste the process/filament/print configs
|
||
PresetCollection *presets = nullptr;
|
||
size_t presets_loaded = 0;
|
||
|
||
auto parse_subfile = [path, vendor_name, presets_loaded, current_vendor_profile](\
|
||
ConfigSubstitutionContext& substitution_context,
|
||
PresetsConfigSubstitutions& substitutions,
|
||
LoadConfigBundleAttributes& flags,
|
||
std::pair<std::string, std::string>& subfile_iter,
|
||
std::map<std::string, DynamicPrintConfig>& config_maps,
|
||
std::map<std::string, std::string>& filament_id_maps,
|
||
PresetCollection* presets_collection,
|
||
size_t& count) -> std::string {
|
||
|
||
std::string subfile = path + "/" + vendor_name + "/" + subfile_iter.second;
|
||
// Load the print, filament or printer preset.
|
||
std::string preset_name;
|
||
DynamicPrintConfig config;
|
||
std::string alias_name, inherits, instantiation, setting_id, filament_id;
|
||
std::vector<std::string> renamed_from;
|
||
const DynamicPrintConfig* default_config = nullptr;
|
||
std::string reason;
|
||
try {
|
||
std::map<std::string, std::string> key_values;
|
||
substitution_context.substitutions.clear();
|
||
|
||
//parse the json elements
|
||
DynamicPrintConfig config_src;
|
||
config_src.load_from_json(subfile, substitution_context, false, key_values, reason);
|
||
if (!reason.empty()) {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": load config file "<<subfile<<" Failed!";
|
||
return reason;
|
||
}
|
||
preset_name = key_values[BBL_JSON_KEY_NAME];
|
||
instantiation = key_values[BBL_JSON_KEY_INSTANTIATION];
|
||
auto setting_it = key_values.find(BBL_JSON_KEY_SETTING_ID);
|
||
if (setting_it != key_values.end())
|
||
setting_id = setting_it->second;
|
||
auto filament_it = key_values.find(BBL_JSON_KEY_FILAMENT_ID);
|
||
if (filament_it != key_values.end())
|
||
filament_id = filament_it->second;
|
||
//check whether it inherits other preset or not
|
||
auto it1 = key_values.find(BBL_JSON_KEY_INHERITS);
|
||
if (it1 != key_values.end()) {
|
||
inherits = it1->second;
|
||
auto it2 = config_maps.find(inherits);
|
||
if (it2 != config_maps.end()) {
|
||
default_config = &(it2->second);
|
||
if (filament_id.empty() && (presets_collection->type() == Preset::TYPE_FILAMENT)) {
|
||
auto filament_id_map_iter = filament_id_maps.find(inherits);
|
||
if (filament_id_map_iter != filament_id_maps.end()) {
|
||
filament_id = filament_id_map_iter->second;
|
||
}
|
||
}
|
||
}
|
||
else {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": can not find inherits "<<inherits<<" for " << preset_name;
|
||
//throw ConfigurationError(format("can not find inherits %1% for %2%", inherits, preset_name));
|
||
reason = "Can not find inherits: " + inherits;
|
||
return reason;
|
||
}
|
||
}
|
||
else {
|
||
if (presets_collection->type() == Preset::TYPE_PRINTER)
|
||
default_config = &presets_collection->default_preset_for(config_src).config;
|
||
else
|
||
default_config = &presets_collection->default_preset().config;
|
||
}
|
||
config = *default_config;
|
||
config.apply(config_src);
|
||
if (instantiation == "false" && "Template" != vendor_name) {
|
||
config_maps.emplace(preset_name, std::move(config));
|
||
if ((presets_collection->type() == Preset::TYPE_FILAMENT) && (!filament_id.empty()))
|
||
filament_id_maps.emplace(preset_name, filament_id);
|
||
return reason;
|
||
}
|
||
if (config.has("alias"))
|
||
alias_name = (dynamic_cast<const ConfigOptionString *>(config.option("alias")))->value;
|
||
if (config.has("renamed_from")) {
|
||
const ConfigOptionVectorBase *vec = static_cast<const ConfigOptionVectorBase*>(config.option("renamed_from"));
|
||
renamed_from = vec->vserialize();
|
||
}
|
||
Preset::normalize(config);
|
||
}
|
||
catch(nlohmann::detail::parse_error &err) {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": parse "<< subfile <<" got a nlohmann::detail::parse_error, reason = " << err.what();
|
||
reason = std::string("json parse error") + err.what();
|
||
return reason;
|
||
}
|
||
|
||
// Report configuration fields, which are misplaced into a wrong group.
|
||
std::string incorrect_keys = Preset::remove_invalid_keys(config, *default_config);
|
||
if (! incorrect_keys.empty())
|
||
BOOST_LOG_TRIVIAL(error)<< __FUNCTION__ << ": The config " <<
|
||
subfile << " contains incorrect keys: " << incorrect_keys << ", which were removed";
|
||
|
||
if (presets_collection->type() == Preset::TYPE_PRINTER) {
|
||
// Filter out printer presets, which are not mentioned in the vendor profile.
|
||
// These presets are considered not installed.
|
||
auto printer_model = config.opt_string("printer_model");
|
||
if (printer_model.empty()) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
preset_name << "\" defines no printer model, it will be ignored.";
|
||
reason = std::string("can not find printer_model");
|
||
return reason;
|
||
}
|
||
auto printer_variant = config.opt_string("printer_variant");
|
||
if (printer_variant.empty()) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
preset_name << "\" defines no printer variant, it will be ignored.";
|
||
reason = std::string("can not find printer_variant");
|
||
return reason;
|
||
}
|
||
auto it_model = std::find_if(current_vendor_profile->models.cbegin(), current_vendor_profile->models.cend(),
|
||
[&](const VendorProfile::PrinterModel &m) { return m.id == printer_model; }
|
||
);
|
||
if (it_model == current_vendor_profile->models.end()) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
preset_name << "\" defines invalid printer model \"" << printer_model << "\", it will be ignored.";
|
||
reason = std::string("can not find printer model in vendor profile");
|
||
return reason;
|
||
}
|
||
auto it_variant = it_model->variant(printer_variant);
|
||
if (it_variant == nullptr) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
preset_name << "\" defines invalid printer variant \"" << printer_variant << "\", it will be ignored.";
|
||
reason = std::string("can not find printer_variant in vendor profile");
|
||
return reason;
|
||
}
|
||
}
|
||
const Preset *preset_existing = presets_collection->find_preset(preset_name, false);
|
||
if (preset_existing != nullptr) {
|
||
BOOST_LOG_TRIVIAL(error) << "Error in a Vendor Config Bundle \"" << path << "\": The printer preset \"" <<
|
||
preset_name << "\" has already been loaded from another Confing Bundle.";
|
||
reason = std::string("duplicated defines");
|
||
return reason;
|
||
}
|
||
|
||
auto file_path = (boost::filesystem::path(data_dir()) /PRESET_SYSTEM_DIR/ vendor_name / subfile_iter.second).make_preferred();
|
||
// Load the preset into the list of presets, save it to disk.
|
||
Preset &loaded = presets_collection->load_preset(file_path.string(), preset_name, std::move(config), false);
|
||
if (flags.has(LoadConfigBundleAttribute::LoadSystem)) {
|
||
loaded.is_system = true;
|
||
loaded.vendor = current_vendor_profile;
|
||
loaded.version = current_vendor_profile->config_version;
|
||
loaded.setting_id = setting_id;
|
||
loaded.filament_id = filament_id;
|
||
if (presets_collection->type() == Preset::TYPE_FILAMENT) {
|
||
if (filament_id.empty() && "Template" != vendor_name) {
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": can not find filament_id for " << preset_name;
|
||
//throw ConfigurationError(format("can not find inherits %1% for %2%", inherits, preset_name));
|
||
reason = "Can not find filament_id for " + preset_name;
|
||
return reason;
|
||
}
|
||
else {
|
||
filament_id_maps.emplace(preset_name, filament_id);
|
||
}
|
||
}
|
||
}
|
||
|
||
// Derive the profile logical name aka alias from the preset name if the alias was not stated explicitely.
|
||
if (alias_name.empty()) {
|
||
size_t end_pos = preset_name.find_first_of("@");
|
||
if (end_pos != std::string::npos) {
|
||
alias_name = preset_name.substr(0, end_pos);
|
||
if (renamed_from.empty())
|
||
// Add the preset name with the '@' character removed into the "renamed_from" list.
|
||
renamed_from.emplace_back(alias_name + preset_name.substr(end_pos + 1));
|
||
boost::trim_right(alias_name);
|
||
}
|
||
}
|
||
if (alias_name.empty())
|
||
loaded.alias = preset_name;
|
||
else
|
||
loaded.alias = std::move(alias_name);
|
||
loaded.renamed_from = std::move(renamed_from);
|
||
if (! substitution_context.empty())
|
||
substitutions.push_back({
|
||
preset_name, presets_collection->type(), PresetConfigSubstitutions::Source::ConfigBundle,
|
||
std::string(), std::move(substitution_context.substitutions) });
|
||
config_maps.emplace(preset_name, loaded.config);
|
||
++count;
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", got preset %1%, from %2%")%loaded.name %subfile;
|
||
return reason;
|
||
};
|
||
|
||
std::map<std::string, DynamicPrintConfig> configs;
|
||
std::map<std::string, std::string> filament_id_maps;
|
||
//3.1) paste the process
|
||
presets = &this->prints;
|
||
configs.clear();
|
||
filament_id_maps.clear();
|
||
for (auto& subfile : process_subfiles)
|
||
{
|
||
std::string reason = parse_subfile(substitution_context, substitutions, flags, subfile, configs, filament_id_maps, presets, presets_loaded);
|
||
if (!reason.empty()) {
|
||
//parse error
|
||
std::string subfile_path = path + "/" + vendor_name + "/" + subfile.second;
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", got error when parse process setting from %1%") % subfile_path;
|
||
throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly") % subfile_path % path).str());
|
||
}
|
||
}
|
||
|
||
//3.2) paste the filaments
|
||
presets = &this->filaments;
|
||
configs.clear();
|
||
filament_id_maps.clear();
|
||
for (auto& subfile : filament_subfiles)
|
||
{
|
||
std::string reason = parse_subfile(substitution_context, substitutions, flags, subfile, configs, filament_id_maps, presets, presets_loaded);
|
||
if (!reason.empty()) {
|
||
//parse error
|
||
std::string subfile_path = path + "/" + vendor_name + "/" + subfile.second;
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", got error when parse filament setting from %1%") % subfile_path;
|
||
throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly") % subfile_path % path).str());
|
||
}
|
||
}
|
||
|
||
//3.3) paste the printers
|
||
presets = &this->printers;
|
||
configs.clear();
|
||
filament_id_maps.clear();
|
||
for (auto& subfile : machine_subfiles)
|
||
{
|
||
std::string reason = parse_subfile(substitution_context, substitutions, flags, subfile, configs, filament_id_maps, presets, presets_loaded);
|
||
if (!reason.empty()) {
|
||
//parse error
|
||
std::string subfile_path = path + "/" + vendor_name + "/" + subfile.second;
|
||
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", got error when parse printer setting from %1%") % subfile_path;
|
||
throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly") % subfile_path % path).str());
|
||
}
|
||
}
|
||
|
||
//BBS: add config related logs
|
||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", finished, presets_loaded %1%")%presets_loaded;
|
||
return std::make_pair(std::move(substitutions), presets_loaded);
|
||
}
|
||
|
||
void PresetBundle::update_multi_material_filament_presets()
|
||
{
|
||
if (printers.get_edited_preset().printer_technology() != ptFFF)
|
||
return;
|
||
|
||
// BBS
|
||
#if 0
|
||
// Verify and select the filament presets.
|
||
auto *nozzle_diameter = static_cast<const ConfigOptionFloats*>(printers.get_edited_preset().config.option("nozzle_diameter"));
|
||
size_t num_extruders = nozzle_diameter->values.size();
|
||
// Verify validity of the current filament presets.
|
||
for (size_t i = 0; i < std::min(this->filament_presets.size(), num_extruders); ++ i)
|
||
this->filament_presets[i] = this->filaments.find_preset(this->filament_presets[i], true)->name;
|
||
// Append the rest of filament presets.
|
||
this->filament_presets.resize(num_extruders, this->filament_presets.empty() ? this->filaments.first_visible().name : this->filament_presets.back());
|
||
#else
|
||
size_t num_filaments = this->filament_presets.size();
|
||
#endif
|
||
|
||
// Now verify if flush_volumes_matrix has proper size (it is used to deduce number of extruders in wipe tower generator):
|
||
std::vector<double> old_matrix = this->project_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values;
|
||
size_t old_number_of_filaments = size_t(sqrt(old_matrix.size())+EPSILON);
|
||
if (num_filaments != old_number_of_filaments) {
|
||
// First verify if purging volumes presets for each extruder matches number of extruders
|
||
std::vector<double>& filaments = this->project_config.option<ConfigOptionFloats>("flush_volumes_vector")->values;
|
||
while (filaments.size() < 2* num_filaments) {
|
||
filaments.push_back(filaments.size()>1 ? filaments[0] : 140.); // copy the values from the first extruder
|
||
filaments.push_back(filaments.size()>1 ? filaments[1] : 140.);
|
||
}
|
||
while (filaments.size() > 2* num_filaments) {
|
||
filaments.pop_back();
|
||
filaments.pop_back();
|
||
}
|
||
|
||
std::vector<double> new_matrix;
|
||
for (unsigned int i=0;i< num_filaments;++i)
|
||
for (unsigned int j=0;j< num_filaments;++j) {
|
||
// append the value for this pair from the old matrix (if it's there):
|
||
if (i < old_number_of_filaments && j < old_number_of_filaments)
|
||
new_matrix.push_back(old_matrix[i* old_number_of_filaments + j]);
|
||
else
|
||
new_matrix.push_back( i == j ? 0. : filaments[2 * i] + filaments[2 * j + 1]); // so it matches new extruder volumes
|
||
}
|
||
this->project_config.option<ConfigOptionFloats>("flush_volumes_matrix")->values = new_matrix;
|
||
}
|
||
}
|
||
|
||
void PresetBundle::update_compatible(PresetSelectCompatibleType select_other_print_if_incompatible, PresetSelectCompatibleType select_other_filament_if_incompatible)
|
||
{
|
||
const Preset &printer_preset = this->printers.get_edited_preset();
|
||
const PresetWithVendorProfile printer_preset_with_vendor_profile = this->printers.get_preset_with_vendor_profile(printer_preset);
|
||
|
||
class PreferedProfileMatch
|
||
{
|
||
public:
|
||
PreferedProfileMatch(const std::string &prefered_alias, const std::string &prefered_name) :
|
||
m_prefered_alias(prefered_alias), m_prefered_name(prefered_name) {}
|
||
|
||
int operator()(const Preset &preset) const
|
||
{
|
||
return
|
||
preset.is_default || preset.is_external ?
|
||
// Don't match any properties of the "-- default --" profile or the external profiles when switching printer profile.
|
||
0 :
|
||
! m_prefered_alias.empty() && m_prefered_alias == preset.alias ?
|
||
// Matching an alias, always take this preset with priority.
|
||
std::numeric_limits<int>::max() :
|
||
// Otherwise take the prefered profile, or the first compatible.
|
||
preset.name == m_prefered_name;
|
||
}
|
||
|
||
private:
|
||
const std::string m_prefered_alias;
|
||
const std::string &m_prefered_name;
|
||
};
|
||
|
||
// Matching by the layer height in addition.
|
||
class PreferedPrintProfileMatch : public PreferedProfileMatch
|
||
{
|
||
public:
|
||
PreferedPrintProfileMatch(const Preset *preset, const std::string &prefered_name) :
|
||
PreferedProfileMatch(preset ? preset->alias : std::string(), prefered_name), m_prefered_layer_height(preset ? preset->config.opt_float("layer_height") : 0) {}
|
||
|
||
int operator()(const Preset &preset) const
|
||
{
|
||
// Don't match any properties of the "-- default --" profile or the external profiles when switching printer profile.
|
||
if (preset.is_default || preset.is_external)
|
||
return 0;
|
||
int match_quality = PreferedProfileMatch::operator()(preset);
|
||
if (match_quality < std::numeric_limits<int>::max()) {
|
||
match_quality += 1;
|
||
if (m_prefered_layer_height > 0. && std::abs(preset.config.opt_float("layer_height") - m_prefered_layer_height) < 0.0005)
|
||
match_quality *= 10;
|
||
}
|
||
return match_quality;
|
||
}
|
||
|
||
private:
|
||
const double m_prefered_layer_height;
|
||
};
|
||
|
||
// Matching by the layer height in addition.
|
||
class PreferedFilamentProfileMatch : public PreferedProfileMatch
|
||
{
|
||
public:
|
||
PreferedFilamentProfileMatch(const Preset *preset, const std::string &prefered_name) :
|
||
PreferedProfileMatch(preset ? preset->alias : std::string(), prefered_name),
|
||
m_prefered_filament_type(preset ? preset->config.opt_string("filament_type", 0) : std::string()) {}
|
||
|
||
int operator()(const Preset &preset) const
|
||
{
|
||
// Don't match any properties of the "-- default --" profile or the external profiles when switching printer profile.
|
||
if (preset.is_default || preset.is_external)
|
||
return 0;
|
||
int match_quality = PreferedProfileMatch::operator()(preset);
|
||
if (match_quality < std::numeric_limits<int>::max()) {
|
||
match_quality += 1;
|
||
if (! m_prefered_filament_type.empty() && m_prefered_filament_type == preset.config.opt_string("filament_type", 0))
|
||
match_quality *= 10;
|
||
}
|
||
return match_quality;
|
||
}
|
||
|
||
private:
|
||
const std::string m_prefered_filament_type;
|
||
};
|
||
|
||
// Matching by the layer height in addition.
|
||
class PreferedFilamentsProfileMatch
|
||
{
|
||
public:
|
||
PreferedFilamentsProfileMatch(const Preset *preset, const std::vector<std::string> &prefered_names) :
|
||
m_prefered_alias(preset ? preset->alias : std::string()),
|
||
m_prefered_filament_type(preset ? preset->config.opt_string("filament_type", 0) : std::string("PLA")), // BBS: default choose PLA
|
||
m_prefered_names(prefered_names)
|
||
{}
|
||
|
||
int operator()(const Preset &preset) const
|
||
{
|
||
// Don't match any properties of the "-- default --" profile or the external profiles when switching printer profile.
|
||
if (preset.is_default || preset.is_external)
|
||
return 0;
|
||
if (! m_prefered_alias.empty() && m_prefered_alias == preset.alias)
|
||
// Matching an alias, always take this preset with priority.
|
||
return std::numeric_limits<int>::max();
|
||
int match_quality = (std::find(m_prefered_names.begin(), m_prefered_names.end(), preset.name) != m_prefered_names.end()) + 1;
|
||
if (! m_prefered_filament_type.empty() && m_prefered_filament_type == preset.config.opt_string("filament_type", 0))
|
||
match_quality *= 10;
|
||
return match_quality;
|
||
}
|
||
|
||
private:
|
||
const std::string m_prefered_alias;
|
||
const std::string m_prefered_filament_type;
|
||
const std::vector<std::string> &m_prefered_names;
|
||
};
|
||
|
||
BOOST_LOG_TRIVIAL(info) << boost::format("update_compatibility for all presets enter");
|
||
switch (printer_preset.printer_technology()) {
|
||
case ptFFF:
|
||
{
|
||
assert(printer_preset.config.has("default_print_profile"));
|
||
assert(printer_preset.config.has("default_filament_profile"));
|
||
const std::vector<std::string> &prefered_filament_profiles = printer_preset.config.option<ConfigOptionStrings>("default_filament_profile")->values;
|
||
this->prints.update_compatible(printer_preset_with_vendor_profile, nullptr, select_other_print_if_incompatible,
|
||
PreferedPrintProfileMatch(this->prints.get_selected_idx() == size_t(-1) ? nullptr : &this->prints.get_edited_preset(), printer_preset.config.opt_string("default_print_profile")));
|
||
const PresetWithVendorProfile print_preset_with_vendor_profile = this->prints.get_edited_preset_with_vendor_profile();
|
||
// Remember whether the filament profiles were compatible before updating the filament compatibility.
|
||
std::vector<char> filament_preset_was_compatible(this->filament_presets.size(), false);
|
||
for (size_t idx = 0; idx < this->filament_presets.size(); ++ idx) {
|
||
Preset *preset = this->filaments.find_preset(this->filament_presets[idx], false);
|
||
filament_preset_was_compatible[idx] = preset != nullptr && preset->is_compatible;
|
||
}
|
||
// First select a first compatible profile for the preset editor.
|
||
this->filaments.update_compatible(printer_preset_with_vendor_profile, &print_preset_with_vendor_profile, select_other_filament_if_incompatible,
|
||
PreferedFilamentsProfileMatch(this->filaments.get_selected_idx() == size_t(-1) ? nullptr : &this->filaments.get_edited_preset(), prefered_filament_profiles));
|
||
if (select_other_filament_if_incompatible != PresetSelectCompatibleType::Never) {
|
||
// Verify validity of the current filament presets.
|
||
const std::string prefered_filament_profile = prefered_filament_profiles.empty() ? std::string() : prefered_filament_profiles.front();
|
||
if (this->filament_presets.size() == 1) {
|
||
// The compatible profile should have been already selected for the preset editor. Just use it.
|
||
if (select_other_filament_if_incompatible == PresetSelectCompatibleType::Always || filament_preset_was_compatible.front())
|
||
this->filament_presets.front() = this->filaments.get_edited_preset().name;
|
||
} else {
|
||
for (size_t idx = 0; idx < this->filament_presets.size(); ++ idx) {
|
||
std::string &filament_name = this->filament_presets[idx];
|
||
Preset *preset = this->filaments.find_preset(filament_name, false);
|
||
if (preset == nullptr || (! preset->is_compatible && (select_other_filament_if_incompatible == PresetSelectCompatibleType::Always || filament_preset_was_compatible[idx])))
|
||
// Pick a compatible profile. If there are prefered_filament_profiles, use them.
|
||
filament_name = this->filaments.first_compatible(
|
||
PreferedFilamentProfileMatch(preset,
|
||
(idx < prefered_filament_profiles.size()) ? prefered_filament_profiles[idx] : prefered_filament_profile)).name;
|
||
}
|
||
}
|
||
}
|
||
break;
|
||
}
|
||
case ptSLA:
|
||
{
|
||
assert(printer_preset.config.has("default_sla_print_profile"));
|
||
assert(printer_preset.config.has("default_sla_material_profile"));
|
||
this->sla_prints.update_compatible(printer_preset_with_vendor_profile, nullptr, select_other_print_if_incompatible,
|
||
PreferedPrintProfileMatch(this->sla_prints.get_selected_idx() == size_t(-1) ? nullptr : &this->sla_prints.get_edited_preset(), printer_preset.config.opt_string("default_sla_print_profile")));
|
||
const PresetWithVendorProfile sla_print_preset_with_vendor_profile = this->sla_prints.get_edited_preset_with_vendor_profile();
|
||
this->sla_materials.update_compatible(printer_preset_with_vendor_profile, &sla_print_preset_with_vendor_profile, select_other_filament_if_incompatible,
|
||
PreferedProfileMatch(this->sla_materials.get_selected_idx() == size_t(-1) ? std::string() : this->sla_materials.get_edited_preset().alias, printer_preset.config.opt_string("default_sla_material_profile")));
|
||
break;
|
||
}
|
||
default: break;
|
||
}
|
||
|
||
BOOST_LOG_TRIVIAL(info) << boost::format("update_compatibility for all presets exit");
|
||
}
|
||
|
||
//BBS: add a API to dump current configbundle as default configbundle
|
||
/*void PresetBundle::export_current_configbundle(const std::string &path)
|
||
{
|
||
boost::nowide::ofstream c;
|
||
c.open(path, std::ios::out | std::ios::trunc);
|
||
|
||
c << "# generate the configbundle for BBL" << std::endl;
|
||
|
||
const Preset& print_selected_preset = this->prints.get_selected_preset();
|
||
const Preset* system_print = NULL;
|
||
const Preset& filament_selected_preset = this->filaments.get_selected_preset();
|
||
const Preset* system_filament = NULL;
|
||
const Preset& printer_selected_preset = this->printers.get_selected_preset();
|
||
const Preset* system_printer = NULL;
|
||
|
||
// Export the print
|
||
std::string print_bbl = "@BBL-3DP";
|
||
size_t pos = print_selected_preset.name.find(print_bbl);
|
||
if (std::string::npos != pos)
|
||
{
|
||
std::string system_print_name = print_selected_preset.name.substr(0, pos + print_bbl.size());
|
||
system_print = this->prints.find_preset(system_print_name);
|
||
if (system_print)
|
||
{
|
||
c << std::endl << "[" << this->prints.section_name() << ":" << system_print->name << "]" << std::endl;
|
||
for (const std::string &opt_key : print_selected_preset.config.keys())
|
||
{
|
||
if (!opt_key.compare("inherits"))
|
||
continue;
|
||
const ConfigOption *option1 = system_print->config.option(opt_key);
|
||
const ConfigOption *option2 = print_selected_preset.config.option(opt_key);
|
||
if (option1 && option2 && (*option1 != *option2))
|
||
c << opt_key << " = " << print_selected_preset.config.opt_serialize(opt_key) << std::endl;
|
||
}
|
||
c << std::endl;
|
||
}
|
||
}
|
||
|
||
// Export the filament
|
||
std::string filament_bbl = "@BBL-3DP";
|
||
pos = filament_selected_preset.name.find(filament_bbl);
|
||
if (std::string::npos != pos)
|
||
{
|
||
std::string system_filamant_name = filament_selected_preset.name.substr(0, pos + filament_bbl.size());
|
||
system_filament = this->filaments.find_preset(system_filamant_name);
|
||
if (system_filament)
|
||
{
|
||
c << std::endl << "[" << this->filaments.section_name() << ":" << system_filament->name << "]" << std::endl;
|
||
for (const std::string &opt_key : filament_selected_preset.config.keys())
|
||
{
|
||
if (!opt_key.compare("inherits"))
|
||
continue;
|
||
const ConfigOption *option1 = system_filament->config.option(opt_key);
|
||
const ConfigOption *option2 = filament_selected_preset.config.option(opt_key);
|
||
if (option1 && option2 && (*option1 != *option2))
|
||
c << opt_key << " = " << filament_selected_preset.config.opt_serialize(opt_key) << std::endl;
|
||
}
|
||
c << std::endl;
|
||
}
|
||
}
|
||
|
||
// Export the printer
|
||
std::string printer_bbl = "BBL-3DP-001";
|
||
pos = printer_selected_preset.name.find(printer_bbl);
|
||
if (std::string::npos != pos)
|
||
{
|
||
std::string system_printer_name = printer_selected_preset.name.substr(0, pos + printer_bbl.size());
|
||
system_printer = this->printers.find_preset(system_printer_name);
|
||
if (system_printer)
|
||
{
|
||
c << std::endl << "[" << this->printers.section_name() << ":" << system_printer->name << "]" << std::endl;
|
||
for (const std::string &opt_key : printer_selected_preset.config.keys())
|
||
{
|
||
c << opt_key << " = " << printer_selected_preset.config.opt_serialize(opt_key) << std::endl;
|
||
}
|
||
c << std::endl;
|
||
}
|
||
}
|
||
|
||
c.close();
|
||
}*/
|
||
|
||
|
||
//void PresetBundle::export_configbundle(const std::string &path, bool export_system_settings, bool export_physical_printers/* = false*/)
|
||
//{
|
||
// boost::nowide::ofstream c;
|
||
// c.open(path, std::ios::out | std::ios::trunc);
|
||
//
|
||
// // Put a comment at the first line including the time stamp and Slic3r version.
|
||
// c << "# " << Slic3r::header_slic3r_generated() << std::endl;
|
||
//
|
||
// // Export the print, filament and printer profiles.
|
||
//
|
||
// for (const PresetCollection *presets : {
|
||
// (const PresetCollection*)&this->prints, (const PresetCollection*)&this->filaments,
|
||
// (const PresetCollection*)&this->sla_prints, (const PresetCollection*)&this->sla_materials,
|
||
// (const PresetCollection*)&this->printers }) {
|
||
// for (const Preset &preset : (*presets)()) {
|
||
// //BBS: add project embedded preset logic and refine is_external
|
||
// if (preset.is_default || preset.is_project_embedded || (preset.is_system && ! export_system_settings))
|
||
// //if (preset.is_default || preset.is_external || (preset.is_system && ! export_system_settings))
|
||
// // Only export the common presets, not external files or the default preset.
|
||
// continue;
|
||
// c << std::endl << "[" << presets->section_name() << ":" << preset.name << "]" << std::endl;
|
||
// for (const std::string &opt_key : preset.config.keys())
|
||
// c << opt_key << " = " << preset.config.opt_serialize(opt_key) << std::endl;
|
||
// }
|
||
// }
|
||
//
|
||
// if (export_physical_printers) {
|
||
// for (const PhysicalPrinter& ph_printer : this->physical_printers) {
|
||
// c << std::endl << "[physical_printer:" << ph_printer.name << "]" << std::endl;
|
||
// for (const std::string& opt_key : ph_printer.config.keys())
|
||
// c << opt_key << " = " << ph_printer.config.opt_serialize(opt_key) << std::endl;
|
||
// }
|
||
// }
|
||
//
|
||
// // Export the names of the active presets.
|
||
// c << std::endl << "[presets]" << std::endl;
|
||
// c << "print = " << this->prints.get_selected_preset_name() << std::endl;
|
||
// c << "sla_print = " << this->sla_prints.get_selected_preset_name() << std::endl;
|
||
// c << "sla_material = " << this->sla_materials.get_selected_preset_name() << std::endl;
|
||
// c << "printer = " << this->printers.get_selected_preset_name() << std::endl;
|
||
// for (size_t i = 0; i < this->filament_presets.size(); ++ i) {
|
||
// char suffix[64];
|
||
// if (i > 0)
|
||
// sprintf(suffix, "_%d", (int)i);
|
||
// else
|
||
// suffix[0] = 0;
|
||
// c << "filament" << suffix << " = " << this->filament_presets[i] << std::endl;
|
||
// }
|
||
//
|
||
// if (export_physical_printers && this->physical_printers.get_selected_idx() >= 0)
|
||
// c << "physical_printer = " << this->physical_printers.get_selected_printer_name() << std::endl;
|
||
//#if 0
|
||
// // Export the following setting values from the provided setting repository.
|
||
// static const char *settings_keys[] = { "autocenter" };
|
||
// c << "[settings]" << std::endl;
|
||
// for (size_t i = 0; i < sizeof(settings_keys) / sizeof(settings_keys[0]); ++ i)
|
||
// c << settings_keys[i] << " = " << settings.serialize(settings_keys[i]) << std::endl;
|
||
//#endif
|
||
//
|
||
// c.close();
|
||
//}
|
||
|
||
//BBS: add export system preset functions
|
||
/*void PresetBundle::export_system_configs(const std::string &path)
|
||
{
|
||
// Export the print, filament and printer profiles.
|
||
for (const PresetCollection *presets : {
|
||
(const PresetCollection*)&this->prints, (const PresetCollection*)&this->filaments,
|
||
(const PresetCollection*)&this->sla_prints, (const PresetCollection*)&this->sla_materials,
|
||
(const PresetCollection*)&this->printers }) {
|
||
for (const Preset &preset : (*presets)()) {
|
||
if (preset.is_system)
|
||
{
|
||
// Only export the system presets
|
||
boost::nowide::ofstream c;
|
||
std::string file_path = path + std::string("\\") + preset.name;
|
||
|
||
c.open(file_path, std::ios::out | std::ios::trunc);
|
||
|
||
// Put a comment at the first line including the time stamp and Slic3r version.
|
||
c << "# " << Slic3r::header_slic3r_generated() << std::endl;
|
||
//c << std::endl << "[" << presets->section_name() << ":" << preset.name << "]" << std::endl;
|
||
for (const std::string &opt_key : preset.config.keys())
|
||
c << opt_key << " = " << preset.config.opt_serialize(opt_key) << std::endl;
|
||
|
||
c.close();
|
||
}
|
||
}
|
||
}
|
||
}*/
|
||
|
||
std::vector<std::string> PresetBundle::export_current_configs(const std::string & path,
|
||
std::function<int(std::string const &)> override_confirm,
|
||
bool include_modify,
|
||
bool export_system_settings)
|
||
{
|
||
const Preset &print_preset = include_modify ? prints.get_edited_preset() : prints.get_selected_preset();
|
||
const Preset &printer_preset = include_modify ? printers.get_edited_preset() : printers.get_selected_preset();
|
||
std::set<Preset const *> presets { &print_preset, &printer_preset };
|
||
for (auto &f : filament_presets) {
|
||
auto filament_preset = filaments.find_preset(f, include_modify);
|
||
if (filament_preset) presets.insert(filament_preset);
|
||
}
|
||
|
||
int overwrite = 0;
|
||
std::vector<std::string> result;
|
||
for (auto preset : presets) {
|
||
if ((preset->is_system && !export_system_settings) || preset->is_default)
|
||
continue;
|
||
std::string file = path + "/" + preset->name + ".json";
|
||
if (overwrite == 0) overwrite = 1;
|
||
if (boost::filesystem::exists(file) && overwrite < 2) {
|
||
overwrite = override_confirm(preset->name);
|
||
if (overwrite == 0 || overwrite == 2)
|
||
continue;
|
||
}
|
||
preset->config.save_to_json(file, preset->name, "", preset->version.to_string());
|
||
result.push_back(file);
|
||
}
|
||
return result;
|
||
}
|
||
|
||
// Set the filament preset name. As the name could come from the UI selection box,
|
||
// an optional "(modified)" suffix will be removed from the filament name.
|
||
void PresetBundle::set_filament_preset(size_t idx, const std::string &name)
|
||
{
|
||
if (idx >= filament_presets.size()) {
|
||
BOOST_LOG_TRIVIAL(warning) << boost::format("Warning: set_filament_preset out of range %1% - %2%") % idx % filament_presets.size();
|
||
return;
|
||
}
|
||
filament_presets[idx] = Preset::remove_suffix_modified(name);
|
||
}
|
||
|
||
void PresetBundle::set_default_suppressed(bool default_suppressed)
|
||
{
|
||
prints.set_default_suppressed(default_suppressed);
|
||
filaments.set_default_suppressed(default_suppressed);
|
||
sla_prints.set_default_suppressed(default_suppressed);
|
||
sla_materials.set_default_suppressed(default_suppressed);
|
||
printers.set_default_suppressed(default_suppressed);
|
||
}
|
||
|
||
} // namespace Slic3r
|