mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-26 08:04:01 -06:00

* FIX: do not touch the plate with different printing sequence jira: STUDIO-5424 Change-Id: I8ad00fa991b753de126a5bef0d320c452033e2e7 (cherry picked from commit c4adfe16e285f238f2c5cd8938b2167fdfb6b1b0) * FIX: global arrange setting is wrong global arrange setting is wrong if a plate's setting is changed from object list jira: STUDIO-5438 Change-Id: Iaa7f35837edbacff9b97ca17a8ab34c8e6bb023d (cherry picked from commit fa2f56575b2e4305e35dd59ff55e0881720de025) * FIX: temperature symbols not shown correctly Need to use wxString::FromUTF8 to convert unicode symbols to wxString. jira: none Change-Id: Ia8b559d437c956a2cc28916d8963823356402d05 * FIX:Repair calculation process of plate_box Jira: STUDIO-5520 Change-Id: I4c3f9597542ad2dfec4d7849e75fa28272fa4ea3 * FIX:frequent calls to _update_imgui_select_plate_toolbar Jira: STUDIO-5488 Change-Id: I12e6f37c2fe94de004aa6da43421970d6df10f0f * FIX: & is not displayed on the sending print page Jira: STUDIO-5343 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I1736bb97433581ff117bfe09afe8ee70c1b08fc4 * FIX: file name is not fully displayed if it is too long Jira: STUDIO-5230 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I992fa0c0575afbd2eecb2af02c8a305eda028f7f (cherry picked from commit d0d7fb0b1394429ee9d28d8ef4060a286ba0112d) * FIX: The warning box still exits when the temperature has reset. Jira: STUDIO-5562 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I7532db69880449eb3fa0a14fc4dfc61e7f6d518e (cherry picked from commit 589ed5fe045b5e7ec3effe437c9685085960c0fc) * FIX: White circle is not clear on auto refill page Jira: STUDIO-3262 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I05ac6257638063d32a9943c09bb7c14cc9229b3a * FIX: Groove text ctrl is not wide engough Jira: STUDIO-5434 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I93c0995473a72b5c19bc413c38c090906e360455 (cherry picked from commit e4a8b0ef5e62ba0053dc782c30ea79b237a46ac3) * FIX: values are not saved when clicking on an empty space Jira: STUDIO-4637 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I837050029635f673b3ae671ea1ad049aaf4fdd16 * FIX: Temperature warning is not fully displayed Jira: STUDIO-5038 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I460cbe2a5d0a092c4257b7bd5192058bf2e4707b * NEW: display bitmap when calibrating Jira: STUDIO-4661 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I60cf4f9769feca74699012418880e93fcfe34432 (cherry picked from commit 1213aea816694405311dc0c1061655a4c2a1d067) * FIX: remember the flow ratio calibration type Jira: STUDIO-5181 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Id6125d1d4ea58972ce55c2c2498259596b25111e (cherry picked from commit 1af1038fd4824d989e992cb630cf34e00c787af7) * FIX: File panel crash on scroll Change-Id: I56833a376fa52c960efea5fbd60003367ba410c2 Jira: STUDIO-5337, STUDIO-5513 * FIX: auto arranging skip unprintable high items Jira: STUDIO-5646 Change-Id: I72dc3d8c71a075bab8204f4418e869a7a34c0c8e (cherry picked from commit 0afdf8361493485da2254c426719594fd9a982ed) * FIX: MediaFilePanel error state Change-Id: I318ef59fb97478ffee16dff594022b2b9029964a Jira: STUDIO-5638 * FIX: sync whole preset vendor directory Change-Id: I191dbe979a87ff35d38cab1149b7975664344838 Jira: STUDIO-5534 * ENH: support turn off liveview auto retry Change-Id: I24b39f74e0a40a13277d6eae3830c95c5c9de333 Jira: none (cherry picked from commit f6ceb3fb8e4df3f876c50a1c4ba96b4a1be60190) * FIX: SwitchButton auto scale font Change-Id: If4004c0963cc8bb2f41e8e71c304d5239bf252ab Jira: STUDIO-4969 STUDIO-4921 * FIX: set WEBKIT_DISABLE_COMPOSITING_MODE=1 for linux gtk Change-Id: I8a500585ca815948bab1210578ba5c45858ed78e Jira: STUDIO-5199 * FIX: Prefer old selection when sync AMS not compatible Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a Jira: STUDIO-5416 * ENH: show liveview stat Change-Id: I70d1f458aa2ed379ad7fe07dee76fbe035316420 Jira: none * NEW:remember custom color Jira: STUDIO-5635 Change-Id: I439080f6a8ddb6fde3899cffbabc3b6e66afbd96 * FIX: copy live555 dll Change-Id: Idf727b8e26107e93aa9934299e87dc71531d1c63 Jira: STUDIO-4480 * FIX: optimize batch update object list on macOS Change-Id: I92e24cc53c0b3bf0658d15abc64292f0e17c0a82 Jira: STUDIO-5440 STUDIO-5515 * FIX: network plugins tip disappear on dark mode Change-Id: I422ab63f71158a49920438f01dd9c39774c27744 Jira: STUDIO-4891 * FIX: Display inconsistence in parameter table JIra: STUDIO-3716 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I986473bcbb3efff4abd9c5917926d9e888a4f28c * FIX: Incomplete copy display in Transfer or discard dialog Jira: 5569 5549 Change-Id: I757b636259d7e1a222b9fc09276c12235360fd57 * FIX: Limit the max length of k when calibrating Jira: STUDIO-4291 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ie7cff086cf2a3c744213525d5d83f9ac4b55333d * fix build break * FIX: delete sdcard file crash Change-Id: I814fd4b557fa92ac4060cbeb18a53f5616e49662 Jira: STUDIO-5977 * FIX: Yield when join media thread Change-Id: I746d7df88a0de8363da7d9507cb63c9e0ffe970a Jira: STUDIO-5952 * FIX: Guide page can't show in screen with mainframe Jira: STUDIO-4911 Change-Id: I7e89614e0f1585263456c847a1b38dcfd0ad59e6 * FIX: filament combox has blank line Change-Id: Ia39ddb564b3c9cc943d0ea4c0cf7cc4d24bef799 * FIX: load 3mf crash when studio has no base filament Jira: none Change-Id: I4387f425f60e6a53a53cf68addb1ab2d6f8f8901 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:add resume button JIRA2860 Change-Id: I39035d929876ab3c84c5f5c3494376967300938c * FIX: CLI: fix an arrange issue when duplicate failed restore the wipe_tower position to original when duplicate fail JIRA: MAK-2638 Change-Id: I355056f1d87648cc1f6aafa15a98ff569359b44f * FIX: fix printer list without nozzle such as 0.35 or 0.75 Jira: 5409 Change-Id: I1a258fd10bcc03e297b791256880f2518d602905 * ENH:The first object should locate at plate center Jira: STUDIO-6023 Change-Id: If4284136fe63ca576463445f3ab16b6e18ead30f * FIX: Colored filament is not matched against. github: #2190 Colored filament is not matched against the same color in AMS slot. Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: Id4588fc9c8115a46881e2f5d198d79fe831f4371 * FIX: Revert "[STUDIO-4284] not set max height of liveview window" This reverts commit 0312aee4d9b92e23884be8802da9801ff3b9fe93. Reason for revert: STUDIO-5653 Jira: STUDIO-5653 Change-Id: If9d5f3e63968a0a54f9af1a2dae8f95f7f1f3f80 * ENH:modify file name rules when export stl Jira: STUDIO-6091 Change-Id: Ic27e4e341cc09099e98a5eab7dfd48416f2922ae * FIX: Flow calibration stage incorrect when switching printers Jira: 6093 Change-Id: I41f1ac10ac9422ac808eab3254f32ea14a0d3b76 * FIX: UserGuide Can not Click When Computer User name has chinese JIRA: None Change-Id: If50baa8c6a13eb501918fd5cdaf0ea3da7c788ef (cherry picked from commit 4e5ccc9f2de5ac429af6541c6a8bd412848801d0) * ENH: Little Optimize JS Code Execute Progress JIRA: STUDIO-5792 Change-Id: I12b03d8b968a9dd8dfce9eb3ef925fa8768e2046 (cherry picked from commit 2bf861092c9e306e1311eda8ac36fd981e73b6c2) * FIX: Delete Test Code JIRA: NONE Change-Id: I838a348edb22e09d2b1d5c41600c6fade535d184 (cherry picked from commit 51e664da0209ae8a3de5cbf30a72505c0b5bd028) * FIX: the object list order changed after clone github: 2798 Change-Id: I10a05ee7e00b05cb1255cfb708876ed784cabac7 * ENH: add alias for custom Filament preset Jira: XXXX Change-Id: I2fecc8b2bdb63618155e3d21f9db374a6119e416 * FIX: [5779] fix show alias logic when load preset Jira: 5779 Change-Id: I4fefe3c1ffbca9bd8296f1b3fdd5de48c6a36a28 * ENH: Optimize the logic for deleting third-party printers Mark the Filament and Process presets to be deleted first then delete the child presets first and then the parent presets. Jira: none Change-Id: I100b873baae96c6ba27af258e708e6ab8e6ee4ab * ENH:default selection of virtual tray jira:[for def selected] Change-Id: I0661f179f8e4bcac33ae12fbbeaeaf95c5b7c110 * ENH:add protection when no thumbnail data jira:[for protection] Change-Id: I3834a5ffde11ff54567dd854271184f06f94547f * FIX:fixed issue with chinese path jira:[Fixed the issue of failed loading of configuration files under Chinese path] Change-Id: I9badd8fc158fcf49f46411ac4e5f72d58823eeb2 * NEW:add new msg notification for hms jira:[STUDIO-6154] Change-Id: If1aa33030a99550d0c859d594a2711aea4dcea4a * NEW:using new humidity display ui jira:[STUDIO-5967] Change-Id: I13be4212e6b97f646d21e0af64cbc5006753fdeb * NEW:Dye materials above grade 10 with shortcut keys JIRA:STUDIO-5827 Change-Id: I002ecdd19167fb36772e4b4e9e2f7760e21079db * NEW:update automatically when inserting materials JIRA: STUDIO-6157 Change-Id: I2cefbb7b330ca4f13e841066548992b3fb3740f1 * FIX: check sdcard exists for file connect Change-Id: I69199a29294c04d1fe46ee66682085b1f1d1d049 Jira: none * FIX: not load printer files when it's busy Change-Id: Ie5a58befcfc0d7fa0d4e587e8429c0b1bfeff72a Jira: STUDIO-6105 * ENH: save video ctrl size to reduce layout change Change-Id: I470f29d7f029d304c9badeeb8f94bed281080b29 Jira: STUDIO-6141 * ENH: stop liveview track record Change-Id: Id4f236b239740bd919f2aa2f2892c1e63ce233bd Jira: STUDIO-6131 * FIX: thread safe of http extra headers Change-Id: I6ffa424be7ccb6abd78a66cc8be535f038b05469 Jira: none * optimize MeshBoolean * FIX: parse printer_model_id from 3mf Change-Id: Ib149c986885ee6412898f1f51dd5a4aaad0a596d Jira: none * ENH: find grid empty cells for fill bed if the item is too small jira: STUDIO-6015 Change-Id: I4e5eafdadd77482a27a8903d32bb83325283088d (cherry picked from commit 8df4da4a863cdc42c790a9d5da37f8633423e406) * ENH: always return product for firmware and lifycycle JIRA: STUDIO-6282 Change-Id: I1f942babdcb7afee2c9a9076ac539063c5406ad7 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH:STL tracking restricted area jira:[STUDIO-6155] Change-Id: I289c8b8aa8f62f0e5cc7004fb60437aa3337ca85 * NEW:add nozzle settings jira:[STUDIO-6226] Change-Id: I0db8333e5b5c8195add111fdcfa2e92387997815 * ENH:display the current humidity of AMS jira:[ENH] Change-Id: I98bdd6d70cd173ed640f0d96692fcb6836416bb8 * FIX: [6123] create printer for exist printer can not into next page Jira: 6123 Change-Id: I338ac0fde4f69b6f312f20e53851d91339e8156f * ENH: Display value of flushing volumes JIRA:STUDIO-6139 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I273fb22b0d378a839c34e9e0e9c414f0e5134799 * FIX: show printer file path & title Change-Id: Ie5eff188c3039deeca5da96b54407194bf8910a0 Jira: STUDIO-6268 * FIX: liveview error message Change-Id: Ie437e07916d7b6feae2dbcfa166c4e73bdcf31a1 Jira: STUDIO-6107 * FIX: file proto error message Change-Id: I2c4117961c615e424780fb3830441e6a93c50bcc Jira: none * ENH: earse sensitive fields when export configs Jira: None Change-Id: Id9ca0637240b80773f39d2308192f8c78a5de3c6 * fix build errors * FIX: unexpected layers in multi color print github: 3131 Change-Id: I2a42e3bbd2247fbc0957022e1baae43c9375a8fb * ENH: Add "New" button for PA cali Jira: XXXX Change-Id: Ic39f2508f2f9d390c2b9246fb3d3e281cde9b064 * NEW:add printer compatible check from sd card view jira:[STUDIO-5969] Change-Id: I86d10ebe2e9bc77e6350e26aeed6b4f0f9fdcecb * NEW:enable loadl/unload when printing pause jira:[STUDIO-5968] Change-Id: Ieb3ef2423378e44b81a61a2b18c16f68aa335922 * FIX:fixed HMS message not cleared jira:[STUDIO-6296] Change-Id: Ic7692ce337fd00ece4ab8d65214a8c406f8543f8 * ENH:error code setting default value jira:[for error code] Change-Id: Ica61344c8217d41adb2947a40f633dc8d19a197a * ENH:display conflict information jira:[STUDIO-6297] Change-Id: Ie1501323a7e8d9ceb4060ae6c0b4eab20f8b088a * ENH: refresh printer file list Change-Id: Ic86942d2b0b2e8383ef0f06311164aad59e837ad Github: 3383 * FIX: Unnecessary prime tower error prompts Custom gcode on other plate causes unnecessary prime tower error prompts Jira: 6305 Change-Id: If499659b364a6b6898db1587b7b2aeed03758667 * FIX:multi colour displayed as gradient color on AMS JIRA:5925 Change-Id: Ic7a925dda2e3bde066ba40ba27002569040f9518 * NEW:Color painting shortcut keys 10~16 JIRA:STUDIO-6238 Change-Id: I3cce838fad5e73d41f109b32f2e563716fd5b0da * ENH: Print when unnamed project, task named as object names github: #2286 Change-Id: I9be3fd25d16a00b78326ec43db9afcf3645d90f1 * ENH:reset user access code jira:[for lan mode] Change-Id: I2d0ed48411d683c3f20b2febc0d54747287870a7 * FIX:fixed crash when selecting new printer jira:[fix] Change-Id: I6a81186e822eb6bf6ce7aa70561dfae35d4de0e7 * FIX: not show printer's camera error when updating Jira: STUDIO-6232 Change-Id: I985d75b3772849e07100799c4f13db5d4cbafde3 * FIX: clear error after reload file list ok Change-Id: I5d5e4f2870302b198d3a9d40603a6fa8010b7e76 Jira: STUDIO-6306 * ENH: custom filament sync with printer 1. prompt sync user presets when create custom filament 2. Fix the issue of not displaying printers when creating custom Filaments based on presets when selecting PLA Aero Type. 3. Optimizing the traversal logic during AMS Setting Pop up reduces time complexity and allows for quick pop ups. Additionally, using nozzle calibers for retrieval and repairing custom materials may result in inaccurate retrieval. 4. Implement synchronization logic with the printer -a. Received slot information, reset the slot when the "filament_id" in the information does not exist in Studio -b. Received slot information, the nozzle temperature in the information is different from the preset nozzle temperature in Studio, reset the current temperature. Jira: none Change-Id: I511dc82563ec77a341839671d398607048ce1985 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * NEW: add api of "toggle_selected_volume_visibility" Jira: STUDIO-6166 Change-Id: I77eb988a3ea43cd37d50888d1753b973795d8b36 * FIX: No data in the drop-down menu of the AMS settings page Jira: 6342 6343 Change-Id: I6938fb4a7ae2816a4675d8d739622e25f219f469 * fix build error * FIX: label wrap all & ping test for liveview Change-Id: I7767ed0740e20bb578b6ef9f5e9873c8c79d172a Jira: STUDIO-5821 * ENH: reuse controls in param Field Change-Id: I42bb4da01e1e9b64c343b7fda4357a9553cf8684 Jira: STUDIO-5983 * FIX: use wide path to create camera process Change-Id: I5de31fce0dea14df9a0ad363f3cb16dc40c275bc Jira: STUDIO-4946 * ENH: optimize the get_tool_order func Use Dp to refine performance jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I38b0c875e4deee9d9fbe926087fb5b2e274f8f90 (cherry picked from commit 9b7b66dc7a1f5e3efa318227ae7694bec5ec1216) * Fix build errors * ENH: add customize other layers print sequence Jira: 6338 Change-Id: Ic14b2671ade37ab37583b81c5b509447b6c0d8f8 * ENH: [#3236] Unsaved changes to interface copy adjustment github: #3236 Change-Id: I53931859bdcdfedfa9f63f6239d0fd2fd6d2766c * NEW: support to adjust other layers print sequence Jira: 6338 Change-Id: I5e6aef71aa9e6e97c1859aaaeb9ada5f1340414a * FIX: imgui support toolbar window text wrapping issue jira: STUDIO-5821 Change-Id: I57ee984baffbb2f00a7ecc5d5c8061074b06aff6 * FIX: updater: fix force upgrade logic JIRA: STUDIO-6393 Change-Id: I46c51e09e7390e5ab0de40215911aac9635ab476 (cherry picked from commit 673ba6ff4ebda039d71dcbfdaa28c1252f5b8821) * FIX:final step of slicing is to execute post-processing script JIRA: STUDIO-5828 Change-Id: I8c33e2a66ac5c692244c778586040663b7b54bd7 * NEW:enable 3dMouse detect in .conf JIRA: 5830 Change-Id: I8731e0244d2f551130c84bcfbbb46967ae6b19cd * FIX:finish init "return" icon and hide it Jira: STUDIO-6350 Change-Id: I0f1efd4a64ea204daeac7de822602ef6dfa3e4a5 * FIX: seq_print: fix an invalid warning caused by sinking github: https://github.com/bambulab/BambuStudio/issues/3007 Change-Id: I1111910f2c625d5a871ea01b37dbfa7b04a849ee (cherry picked from commit a3db95bb0940d5afe07ef0bb07113cc2acd7cd0a) * ENH: plater: optimize the loading time of 3mf with large objects JIRA: STUDIO-6021 Change-Id: Ia97f681041bb553c5c4b5b1d9109e5e5c42daf6b * FIX:Fixed HMS issue jira:[STUDIO-6344 STUDIO-6310 STUDIO-6356 STUDIO-6348] Change-Id: I9d6660e7c349775004b69bfe41b651bfa8b359b7 * ENH:handling dirty data after nozzle settings jira:[STUDIO-6332] Change-Id: I00d6d1324376f973ec3cf9f2154ae83ef3302705 * ENH: use Bambu_StartStreamEx for agora tunnel Change-Id: I5c28dea49d267bf7ff967d0982dd83555899c8c4 Jira: none * FIX: use safe language code for http Change-Id: Id1f4927308350ee35b891a5352cbf1e2d0c2577e Github: 3655 * FIX: add cli_id, cli_ver to bambu url Change-Id: Ic527d1497c6dee0c723d7b4629f0be825a8f7545 Jira: none * FIX: not throw when _add_auxiliary_dir_to_archive Change-Id: Idf54bbbd0ef557ec5e1a8e51ed669a1eb1fb4261 Jira: STUDIO-6339 * NEW: vase mode can be applied to one plate jira: STUDIO-5838 Change-Id: Ifb315f7d79b570aeb7ee31d3495b4d465e3af0c6 * fix crashes * ENH: update overhang degree method on calssic mode Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I90f6e4c2ef618fdaef00bdaf1ca309893f484c1e * FIX: auto-arranging unprintable items may crash github: #3676 Change-Id: I68eb87c73ad2c0c269f60e661136fd1a72ee5e2f (cherry picked from commit 7e3c57eaa811424935fe8db6a4e77dd142ee2b58) * FIX: use old slicer_uuid for client_id Change-Id: I6c45e83213d613fc28eef04115f9cfb19dea703e Jira: none * ci: update network module based on commit 542ced8 Change-Id: I3ad5032cc56a99d1c3a687b2891d147b13af066d * NEW:Support OLTP file Jira: STUDIO-6421 Change-Id: I58bc94e978e6d2dd136ea370fb01f6ec80e14b23 * ENH: detect in_head_wrap_zone more precisly 1.Union first layer convex hull with object's bbox to detect whether model enter head_wrap_detect_zone jira:NEW Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: I11f26967d7421f41e9c824e62794c96591e6ae71 * FIX: fix the plate cannot be searched JIRA: STUDIO-6283 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I88206c91ea24c6a41a0bd06f05f0f3c2fdc58a36 * NEW:hms error code JIRA: STUDIO-6302 Change-Id: Ia33511f4c636c8ada39ed5a4e52d9b185da9c00b * FIX:Color adaptation for numpad JIRA:STUDIO-6410 Change-Id: If6e49638af8616fd349367073883592e6bebb503 * FIX: error overhang degree mapping Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ifa24aa0cad0a06b09ee62a8be8781188a765d1d0 * FIX:display correct humidity jira:[fix] Change-Id: I27aae54a8355911b5d88ed45be320d3c9178081c * ENH:Hide confirmation button when unable to send print jira:[STUDIO-6355, STUDIO-6332] Change-Id: I8f9c0edea4d5ee70e9fef1e9d42838d598dc32c4 * NEW: new type for Custom Filament Type: "PE", "PP", "EVA", "PHA", "BVOH", "PE-CF", "PP-CF", "PP-GF" Github: 3205 3169 3127 Change-Id: I8a30dd806c35460d9dae0f808190ce013b125d51 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:fixed filament settings page display error in French jira:[STUDIO-5821] Change-Id: I6cc6dd9b83c7570688c2adc55efe2407cbcb4390 * FIX:fixed thumbnail not updating when using multiple plates jira:[STUDIO-6313] Change-Id: If49daa5b38b9a580ae226ff00a1e0085d167c15c * FIX: Color Bleed in slicer github: 3681 jira: 6450 Change-Id: Icb6274f7ddb238c238c133b95167310b1af905f7 * ci: update network module based on commit 8befd46 Change-Id: I3a6420684f106bdde5897a50d27dfec69e0aa37f * ci: update network module based on commit e411785 Change-Id: I3a9c7bfa5ac5a942f339ad0194a24d9170847371 * FIX:reload paint after background process apply Jira: STUDIO-6493 Change-Id: I9a1986152f05163f236f58bb24210b690ca3d562 * FIX: use object name of plate when send task in untitled project Jira: 6430 Change-Id: I78ec811fab1cf028c0d5f81ac7738abdbeb6145f * FIX: auto arranging spacing can't be adjusted correctly jira: none Change-Id: Ibddfe85aab9f3fad6a1612e8db437e52c40e20a3 (cherry picked from commit 136bca01f45e62042bd699a9a0a9f6d13519712c) * FIX: fix change nozzle temp in Studio but printer not change Jira: 6510 Change-Id: Ia0e1ac586ff41ddbabdac0845415e70774299387 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:rename some img files jira:[STUDIO-6512] Change-Id: I69872533cccda37b94384bc219cc35c5dec9310b * ENH:PEI bed is no longer unchecked by default jira:[STUDIO-6508] Change-Id: Ic9ca99860d46c27ca4c36a735df3f57fe71417df * FIX:fix the load status of vtray jira:[STUDIO-6435] Change-Id: I8cafcc0b6caf19492aae6c153fb509f470dc7e83 * FIX: Supports automatic calibration of textured PEI jira: 6504 Change-Id: I3234fb555b9bf0ea97e73387651874733e761ee7 * ENH:add tooltip for search item JIRA: STUDIO-6459 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I7602a32159d21de8f37ea0208dd6a9f59b90dcce * ENH: CLI: add version check logic add option allow_newer_file Change-Id: I8e8e4a45f77ebdd6dae6189841e4a9952e95ca82 * ci: update build version to 01.09.00.52 Change-Id: Id6e32b5afcf5eaabce9c0c7ab2c422e97b00e632 * NEW: switch to object panel if double click on object jira: none switch to object panel if double click on object, otherwise switch to global panel if double click on background. Change-Id: I6e54d7957aa19f1ebb1f993bc38125bbee8a1c98 (cherry picked from commit cc2e07bc9489c76a7d767acff0406c83c996504c) * FIX:fixed loading img resource failure jira:[for fix img load] Change-Id: Ifb26b2ca23029abeda000322bf2ef7d2b3cda3b4 * FIX: Project Title can Click JIRA: none Change-Id: I614c60e76efe04875e36e3a8ef7a10acd3ef9ecf * FIX:Prioritize selecting filament with smaller serial numbers in AMS JIRA: 5909 Change-Id: If3030d4dd8d59af36bc1ae1801be1b89b0027a71 * NEW:material adaptation in select machine dialog JIRA:xxxx Change-Id: I625eac75c88cad804dd3741f750c5ea68a975421 * FIX:mac ams setting display JIRA: STUDIO-6228\6409 Change-Id: I432a3aa96601a8e223b5949bc0ad5234c1374dca * FIX: Image Scale Mode and Online Display JIRA: none Change-Id: I528f16e93b82748d86dc93e2dd3d85f317babaa7 * FIX: sequential_print_clearance_valid not working not working correctly with short objects jira: STUDIO-6489 Change-Id: I33e1a165f448e1c3e272d4045934c63ad345db2f (cherry picked from commit 9348eaa22a056db5384a38ea966cec9ba4a533a7) * NEW: add nozzle_height to machine profile and do not detect conflict Jira: request from 1.9 1. add nozzle_height to machine profile 2. auto arranging and sequential_print_clearance_valid don't consider objects conflicting if they are all shorter than nozzle_height and close. 3. do not detect conflict when all models are short. Change-Id: I8d1eebb15d5bfa8c40d7491e033149e360531b89 (cherry picked from commit 6b4b52653db5f08d724a556c5c766c0bfa00f34d) * FIX: sequential_print_clearance_valid not working not working correctly with short objects jira: STUDIO-6489 Change-Id: I33e1a165f448e1c3e272d4045934c63ad345db2f (cherry picked from commit 9348eaa22a056db5384a38ea966cec9ba4a533a7) * FIX: [6510] set nozzle temp incorrectly when popup AMS Setting Change-Id: I898f0b94794a3d67017b1917ce196c4019f5eb4a * FIX: auto-calculate flushing volumes JIRA: STUDIO-6547 FIX the first modification of consumable color after synchronizing filaments, without automatically calculating the flushing volumes Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I2bc76a29afde5241d100cc42a5161db0f9b901c4 * FIX: custom layer sequence from End to End comboBox display issue jira: new Change-Id: I413cd5896d7e921f2c7c03b91b08788fefb9a4f3 * FIX:fix the v tray's filament unload logic jira:[STUDIO-6627] Change-Id: I34420bc4d1d27b6b36defb9852bba2eaf77fdcf2 * NEW:reducing purge through retracting filament 1.reducing purge through retracting filament.Currently only applicable to X&P series github: PR#3100 Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: Ie328039872e50e699dc5e5082fa99f68ac5f5fd1 * FIX: wrong role cache in wipe tower 1. Add wipe tower role cache in GCodeProcessor result 2. Add wiki link for prime tower jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia766c7218df68fb1ffba567af193d6bfecacf588 * Fix plate settng icon * NEW:revert hms error code Change-Id: Ib5cc8bb8b8ced0f70d5bbe4751a1f97258218c6f * FIX: calibration page button broken display issue jira: STUDIO-3913 Change-Id: I2fd488e829d898b7d81d09db814ed6518f0c54a8 * FIX: do not check spiral vase mode config if an object is loaded jira: STUDIO-6514 Change-Id: Ib44ec8322ff178b5765f7fe94b588aa38339691d * FIX: implicitly set spiral vase config for objects just loading jira: 6514 Change-Id: I04bb2b1abeb62d4dfff4e526b723b1cf1bd5fd7f * FIX: filling bed fails if the bed is already full JIRA: STUDIO-6490 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I71b5a01a95cdffef7c0750e6347fa8911dcd781d * ci: update network module based on commit 868f5d7 Change-Id: I5584e4441e1f2ab400addaa87ee8013927fb9e15 * FIX: add query_real_volume_idx_from_other_view api Jira: STUDIO-6545 Change-Id: Ib8216981c5d2945a0221a5caa1fbc14ed74e930b * FIX: Can't edit text github: 3750 Change-Id: I1caecaa968e60cadcdbe9f7aa67cba141bb88230 * FIX: Slicer creates invalid color pattern github: 3749 Change-Id: I3fd74a9ca59b75873fcbca4437e4858c749ee853 * ENH: hide tuck did Change-Id: I9021d3f51c9a73bc9208b479f96b1ddbe7a2f8f8 Jira: none * FIX: PrinterFileSystem: retry connect on user action Change-Id: I3e8902298385ed2e5906fd15d1817b6e33522a76 Jira: STUDIO-6354 * FIX: Remove user ID and other information Jira: XXXX Change-Id: Ia63ec88a335d88fd40a29952abe6d40d8991efee * ENH: refine retraction before cut 1. Add filament retraction before cut control jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ifcb087c9791c0461b793ef811b21ebd4c007d880 * FIX: enable resumed read only Field Change-Id: Id09e671932458699c020f0a061d8cfc11a6958ab Jira: STUDIO-6641 * ENH: add precise_z_height jira: none Change-Id: Idb9fcf0063e773f1531a49961478460b91ded10f * ENH: modify the multi-material segmentation and voronoi This patch is cherry pick from Prusa, thanks to Prusa Rework multi-material segmentation to work directly on the Voronoi diagram without creating a copy of it. Previous algorithms assume that they can get an invalid Voronoi diagram. Because of that, during the multi-material segmentation, a copy of the Voronoi diagram was created, and there were several attempts to fix missing vertices and edges. But as it shows, this wasn't a good enough approach and sometimes led to several issues like bleeding layers. After generalization, our approach for detection and repairs of invalid Voronoi diagrams from Arachne, we could assume that multi-material segmentation gets non-invalid Voronoi diagrams. With this assumption, we reimplement multi-materials segmentation to work directly on the Voronoi diagram. That should make multi-material segmentation more stable. So, this should fix several issues like bleeding layers. Also, memory consumption should decrease by a lot. Also, there should be some speedup of multi-materials segmentation. Jira: none Change-Id: I72aa6e1f9634d9ee8759aa469a0b39a36ace62f5 * FIX: infill speed not work on region level Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ie3d17c5e3cbf91a8854e3b4cd80babeb2b1bd121 * ENH: support saving PA calibration results for P series Jira: none Change-Id: I9402b8bcce7b48a63d0e97e0708080701d065e7a * ENH: refine long retraction ui 1. associate button display logic 2. Add valid range tip 3. seperate the printer into three types jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ie14c8746eb20456dacd5c129a5449c1e7c7db372 * FIX:height range cut = volume_count * 2 Jira: none Change-Id: I539c2f9cda7985b4b3c318ca8aa1eb7c52fdce82 * FIX: auto arranging gets wrong object height obj->bounding_box().size() is not the real object size if the object has been rotated. jira: STUDIO-5999 Change-Id: I6553d4c990696efd674e3e57063802127d5d5282 (cherry picked from commit 479ea9fb02f55d24f27c94633f3d852bd5c62c83) * ENH: seperate support weight from model jira:NEW Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: I86bb34941269bf1aa29436a94ebbdff675497e85 * ENH: add support for gcodeviewer statistics jira: new Change-Id: Ied6d61e8c48ac82daf16579d9caed9723cf8e29d * FIX: invalid support weight per extruder jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I0e4b857c9c758ab7c54ef13aee1bf596f975640b * FIX: do not need reset bed_type for pa calibration jira: none Change-Id: I411064cf14d94a9bd1f0f6668ee23aa10d372f3d * FIX: P1P/S can not modify the k value in old version jira: 6745 Change-Id: I5c9dffe8e998213e6af6e1d01a6b0ae82521e8db * Add rotation support for 3D Honeycomb Ported from BS * ENH: add default params for long retraction 1. Only auto calculate flush when enabled 2. Add default params for long retraction 3. Disable filament override for unsupport machines jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib5d51505b58101839527e944f9a237483951f9fe * misc fixes * ENH: remove long retraction warning jira:NEW Signed-off-by: tao wang <tao.wang@bambulab.com> Change-Id: If60236b3282991a2d94df7d125427cff86899536 * avoid zero length path * FIX: check recommended nozzle temperature Jira: XXXX Change-Id: I4dbb274cf27ef9c6d20a8479b29af1069652b2bc * FIX: fix not popping up a prompt when the temperature is set to 0 Jira: 6497 Change-Id: I6498fc6962e7da376d4c652dab0a99a161932eef Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: When creating a custom Filament, use the system Filament type. Jira: 6301 Change-Id: I1bfddcf43d2ebaebca4eb494d1f64165c3d59e9e Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: seam and unretarct pos error on smooth vase casused by invalid path of smooth vase mode Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ib597e8c05760886aae2c42e42e8d46e82b844578 * FIX: unable to map if filament not used in model 1.Fix filament can not map if it's not used in model body jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibd2685ffd198b2e17dbf44289d0144b5b7c25788 * NEW:Update data only on device pages jira:[STUDIO-6776] Change-Id: I33b0c9f35c1dc6df2db3b6bd4f446f46b31ecf6c * set(SLIC3R_VERSION "01.09.00.70") * update BBL machine profile 01.09.00.04 * scarf clip start and end Ported from BambuStudio * fix linux build error --------- Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: wenjie.guo <wenjie.guo@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: hu.wang <hu.wang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: zorro.zhang <zorro.zhang@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: qing.zhang <qing.zhang@bambulab.com> Co-authored-by: gerrit <gerrit@bambulab.com> Co-authored-by: Leon Fisher-Skipper <47602359+LeonFisherSkipper@users.noreply.github.com> Co-authored-by: Lukas Matena <lukasmatena@seznam.cz> Co-authored-by: jianjia.ma <jianjia.ma@bambulab.com>
1603 lines
92 KiB
C++
1603 lines
92 KiB
C++
#include "Model.hpp"
|
|
#include "Print.hpp"
|
|
|
|
#include <boost/log/trivial.hpp>
|
|
#include <cfloat>
|
|
|
|
namespace Slic3r {
|
|
|
|
// Add or remove support modifier ModelVolumes from model_object_dst to match the ModelVolumes of model_object_new
|
|
// in the exact order and with the same IDs.
|
|
// It is expected, that the model_object_dst already contains the non-support volumes of model_object_new in the correct order.
|
|
// Friend to ModelVolume to allow copying.
|
|
// static is not accepted by gcc if declared as a friend of ModelObject.
|
|
/* static */ void model_volume_list_update_supports(ModelObject &model_object_dst, const ModelObject &model_object_new)
|
|
{
|
|
typedef std::pair<const ModelVolume*, bool> ModelVolumeWithStatus;
|
|
std::vector<ModelVolumeWithStatus> old_volumes;
|
|
old_volumes.reserve(model_object_dst.volumes.size());
|
|
for (const ModelVolume *model_volume : model_object_dst.volumes)
|
|
old_volumes.emplace_back(ModelVolumeWithStatus(model_volume, false));
|
|
auto model_volume_lower = [](const ModelVolumeWithStatus &mv1, const ModelVolumeWithStatus &mv2){ return mv1.first->id() < mv2.first->id(); };
|
|
auto model_volume_equal = [](const ModelVolumeWithStatus &mv1, const ModelVolumeWithStatus &mv2){ return mv1.first->id() == mv2.first->id(); };
|
|
std::sort(old_volumes.begin(), old_volumes.end(), model_volume_lower);
|
|
model_object_dst.volumes.clear();
|
|
model_object_dst.volumes.reserve(model_object_new.volumes.size());
|
|
for (const ModelVolume *model_volume_src : model_object_new.volumes) {
|
|
ModelVolumeWithStatus key(model_volume_src, false);
|
|
auto it = std::lower_bound(old_volumes.begin(), old_volumes.end(), key, model_volume_lower);
|
|
if (it != old_volumes.end() && model_volume_equal(*it, key)) {
|
|
// The volume was found in the old list. Just copy it.
|
|
assert(! it->second); // not consumed yet
|
|
it->second = true;
|
|
ModelVolume *model_volume_dst = const_cast<ModelVolume*>(it->first);
|
|
// For support modifiers, the type may have been switched from blocker to enforcer and vice versa.
|
|
assert((model_volume_dst->is_support_modifier() && model_volume_src->is_support_modifier()) || model_volume_dst->type() == model_volume_src->type());
|
|
model_object_dst.volumes.emplace_back(model_volume_dst);
|
|
if (model_volume_dst->is_support_modifier()) {
|
|
// For support modifiers, the type may have been switched from blocker to enforcer and vice versa.
|
|
model_volume_dst->set_type(model_volume_src->type());
|
|
model_volume_dst->set_transformation(model_volume_src->get_transformation());
|
|
}
|
|
assert(model_volume_dst->get_matrix().isApprox(model_volume_src->get_matrix()));
|
|
} else {
|
|
// The volume was not found in the old list. Create a new copy.
|
|
assert(model_volume_src->is_support_modifier());
|
|
model_object_dst.volumes.emplace_back(new ModelVolume(*model_volume_src));
|
|
model_object_dst.volumes.back()->set_model_object(&model_object_dst);
|
|
}
|
|
}
|
|
// Release the non-consumed old volumes (those were deleted from the new list).
|
|
for (ModelVolumeWithStatus &mv_with_status : old_volumes)
|
|
if (! mv_with_status.second)
|
|
delete mv_with_status.first;
|
|
}
|
|
|
|
static inline void model_volume_list_copy_configs(ModelObject &model_object_dst, const ModelObject &model_object_src, const ModelVolumeType type)
|
|
{
|
|
size_t i_src, i_dst;
|
|
for (i_src = 0, i_dst = 0; i_src < model_object_src.volumes.size() && i_dst < model_object_dst.volumes.size();) {
|
|
const ModelVolume &mv_src = *model_object_src.volumes[i_src];
|
|
ModelVolume &mv_dst = *model_object_dst.volumes[i_dst];
|
|
if (mv_src.type() != type) {
|
|
++ i_src;
|
|
continue;
|
|
}
|
|
if (mv_dst.type() != type) {
|
|
++ i_dst;
|
|
continue;
|
|
}
|
|
assert(mv_src.id() == mv_dst.id());
|
|
// Copy the ModelVolume data.
|
|
mv_dst.name = mv_src.name;
|
|
mv_dst.config.assign_config(mv_src.config);
|
|
assert(mv_dst.supported_facets.id() == mv_src.supported_facets.id());
|
|
mv_dst.supported_facets.assign(mv_src.supported_facets);
|
|
assert(mv_dst.seam_facets.id() == mv_src.seam_facets.id());
|
|
mv_dst.seam_facets.assign(mv_src.seam_facets);
|
|
assert(mv_dst.mmu_segmentation_facets.id() == mv_src.mmu_segmentation_facets.id());
|
|
mv_dst.mmu_segmentation_facets.assign(mv_src.mmu_segmentation_facets);
|
|
//FIXME what to do with the materials?
|
|
// mv_dst.m_material_id = mv_src.m_material_id;
|
|
++ i_src;
|
|
++ i_dst;
|
|
}
|
|
}
|
|
|
|
static inline void layer_height_ranges_copy_configs(t_layer_config_ranges &lr_dst, const t_layer_config_ranges &lr_src)
|
|
{
|
|
assert(lr_dst.size() == lr_src.size());
|
|
auto it_src = lr_src.cbegin();
|
|
for (auto &kvp_dst : lr_dst) {
|
|
const auto &kvp_src = *it_src ++;
|
|
assert(std::abs(kvp_dst.first.first - kvp_src.first.first ) <= EPSILON);
|
|
assert(std::abs(kvp_dst.first.second - kvp_src.first.second) <= EPSILON);
|
|
// Layer heights are allowed do differ in case the layer height table is being overriden by the smooth profile.
|
|
// assert(std::abs(kvp_dst.second.option("layer_height")->getFloat() - kvp_src.second.option("layer_height")->getFloat()) <= EPSILON);
|
|
kvp_dst.second = kvp_src.second;
|
|
}
|
|
}
|
|
|
|
static inline bool transform3d_lower(const Transform3d &lhs, const Transform3d &rhs)
|
|
{
|
|
typedef Transform3d::Scalar T;
|
|
const T *lv = lhs.data();
|
|
const T *rv = rhs.data();
|
|
for (size_t i = 0; i < 16; ++ i, ++ lv, ++ rv) {
|
|
if (*lv < *rv)
|
|
return true;
|
|
else if (*lv > *rv)
|
|
return false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static inline bool transform3d_equal(const Transform3d &lhs, const Transform3d &rhs)
|
|
{
|
|
typedef Transform3d::Scalar T;
|
|
const T *lv = lhs.data();
|
|
const T *rv = rhs.data();
|
|
for (size_t i = 0; i < 16; ++ i, ++ lv, ++ rv)
|
|
if (*lv != *rv)
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
struct PrintObjectTrafoAndInstances
|
|
{
|
|
Transform3d trafo;
|
|
PrintInstances instances;
|
|
bool operator<(const PrintObjectTrafoAndInstances &rhs) const { return transform3d_lower(this->trafo, rhs.trafo); }
|
|
};
|
|
|
|
// Generate a list of trafos and XY offsets for instances of a ModelObject
|
|
static std::vector<PrintObjectTrafoAndInstances> print_objects_from_model_object(const ModelObject &model_object)
|
|
{
|
|
std::set<PrintObjectTrafoAndInstances> trafos;
|
|
PrintObjectTrafoAndInstances trafo;
|
|
//BBS: add useful logs for debug
|
|
int index = 0;
|
|
for (ModelInstance *model_instance : model_object.instances) {
|
|
if (model_instance->is_printable()) {
|
|
trafo.trafo = model_instance->get_matrix();
|
|
auto shift = Point::new_scale(trafo.trafo.data()[12], trafo.trafo.data()[13]);
|
|
// Reset the XY axes of the transformation.
|
|
trafo.trafo.data()[12] = 0;
|
|
trafo.trafo.data()[13] = 0;
|
|
// Search or insert a trafo.
|
|
auto it = trafos.emplace(trafo).first;
|
|
const_cast<PrintObjectTrafoAndInstances&>(*it).instances.emplace_back(PrintInstance{ nullptr, model_instance, shift });
|
|
//BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", Line %1%: found object %2%'s instance %3% for print")%__LINE__ %model_object.name %index;
|
|
}
|
|
else {
|
|
//BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(", Line %1%: found object %2%'s instance %3% not printable")%__LINE__ %model_object.name %index;
|
|
//BOOST_LOG_TRIVIAL(debug) << boost::format(" object printable %1%, instance printable %2%, print_volume_state %3%")%model_object.printable %model_instance->printable %model_instance->print_volume_state;
|
|
}
|
|
index++;
|
|
}
|
|
|
|
//BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: got %2% print objects")%__LINE__ %trafos.size();
|
|
return std::vector<PrintObjectTrafoAndInstances>(trafos.begin(), trafos.end());
|
|
}
|
|
|
|
// Compare just the layer ranges and their layer heights, not the associated configs.
|
|
// Ignore the layer heights if check_layer_heights is false.
|
|
static bool layer_height_ranges_equal(const t_layer_config_ranges &lr1, const t_layer_config_ranges &lr2, bool check_layer_height)
|
|
{
|
|
if (lr1.size() != lr2.size())
|
|
return false;
|
|
auto it2 = lr2.begin();
|
|
for (const auto &kvp1 : lr1) {
|
|
const auto &kvp2 = *it2 ++;
|
|
if (!kvp2.second.has("layer_height") || !kvp1.second.has("layer_height"))
|
|
return false;
|
|
if (std::abs(kvp1.first.first - kvp2.first.first ) > EPSILON ||
|
|
std::abs(kvp1.first.second - kvp2.first.second) > EPSILON ||
|
|
(check_layer_height && std::abs(kvp1.second.option("layer_height")->getFloat() - kvp2.second.option("layer_height")->getFloat()) > EPSILON))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
// Returns true if va == vb when all CustomGCode items that are not ToolChangeCode are ignored.
|
|
static bool custom_per_printz_gcodes_tool_changes_differ(const std::vector<CustomGCode::Item> &va, const std::vector<CustomGCode::Item> &vb)
|
|
{
|
|
auto it_a = va.begin();
|
|
auto it_b = vb.begin();
|
|
while (it_a != va.end() || it_b != vb.end()) {
|
|
if (it_a != va.end() && it_a->type != CustomGCode::ToolChange) {
|
|
// Skip any CustomGCode items, which are not tool changes.
|
|
++ it_a;
|
|
continue;
|
|
}
|
|
if (it_b != vb.end() && it_b->type != CustomGCode::ToolChange) {
|
|
// Skip any CustomGCode items, which are not tool changes.
|
|
++ it_b;
|
|
continue;
|
|
}
|
|
if (it_a == va.end() || it_b == vb.end())
|
|
// va or vb contains more Tool Changes than the other.
|
|
return true;
|
|
assert(it_a->type == CustomGCode::ToolChange);
|
|
assert(it_b->type == CustomGCode::ToolChange);
|
|
if (*it_a != *it_b)
|
|
// The two Tool Changes differ.
|
|
return true;
|
|
++ it_a;
|
|
++ it_b;
|
|
}
|
|
// There is no change in custom Tool Changes.
|
|
return false;
|
|
}
|
|
|
|
// Collect changes to print config, account for overrides of extruder retract values by filament presets.
|
|
//BBS: add plate index
|
|
static t_config_option_keys print_config_diffs(
|
|
const PrintConfig ¤t_config,
|
|
const DynamicPrintConfig &new_full_config,
|
|
DynamicPrintConfig &filament_overrides,
|
|
int plate_index)
|
|
{
|
|
const std::vector<std::string> &extruder_retract_keys = print_config_def.extruder_retract_keys();
|
|
const std::string filament_prefix = "filament_";
|
|
t_config_option_keys print_diff;
|
|
for (const t_config_option_key &opt_key : current_config.keys()) {
|
|
const ConfigOption *opt_old = current_config.option(opt_key);
|
|
assert(opt_old != nullptr);
|
|
const ConfigOption *opt_new = new_full_config.option(opt_key);
|
|
// assert(opt_new != nullptr);
|
|
if (opt_new == nullptr)
|
|
//FIXME This may happen when executing some test cases.
|
|
continue;
|
|
const ConfigOption *opt_new_filament = std::binary_search(extruder_retract_keys.begin(), extruder_retract_keys.end(), opt_key) ? new_full_config.option(filament_prefix + opt_key) : nullptr;
|
|
if (opt_new_filament != nullptr && ! opt_new_filament->is_nil()) {
|
|
// An extruder retract override is available at some of the filament presets.
|
|
bool overriden = opt_new->overriden_by(opt_new_filament);
|
|
if (overriden || *opt_old != *opt_new) {
|
|
auto opt_copy = opt_new->clone();
|
|
if (!((opt_key == "long_retractions_when_cut" || opt_key == "retraction_distances_when_cut")
|
|
&& new_full_config.option<ConfigOptionInt>("enable_long_retraction_when_cut")->value != LongRectrationLevel::EnableFilament)) // ugly code, remove it later if firmware supports
|
|
opt_copy->apply_override(opt_new_filament);
|
|
bool changed = *opt_old != *opt_copy;
|
|
if (changed)
|
|
print_diff.emplace_back(opt_key);
|
|
if (changed || overriden) {
|
|
if ((opt_key == "long_retractions_when_cut" || opt_key == "retraction_distances_when_cut")
|
|
&& new_full_config.option<ConfigOptionInt>("enable_long_retraction_when_cut")->value != LongRectrationLevel::EnableFilament)
|
|
continue;
|
|
// filament_overrides will be applied to the placeholder parser, which layers these parameters over full_print_config.
|
|
filament_overrides.set_key_value(opt_key, opt_copy);
|
|
} else
|
|
delete opt_copy;
|
|
}
|
|
} else if (*opt_new != *opt_old) {
|
|
//BBS: add plate_index logic for wipe_tower_x/wipe_tower_y
|
|
if (!opt_key.compare("wipe_tower_x") || !opt_key.compare("wipe_tower_y")) {
|
|
const ConfigOptionFloats* option_new = dynamic_cast<const ConfigOptionFloats*>(opt_new);
|
|
const ConfigOptionFloats* option_old = dynamic_cast<const ConfigOptionFloats*>(opt_old);
|
|
if ((plate_index < option_new->values.size())&&(plate_index < option_old->values.size()))
|
|
{
|
|
float value_new = option_new->values[plate_index];
|
|
float value_old = option_old->values[plate_index];
|
|
if (value_old != value_new)
|
|
print_diff.emplace_back(opt_key);
|
|
}
|
|
else if ((plate_index < option_new->values.size())||(plate_index < option_old->values.size()))
|
|
print_diff.emplace_back(opt_key);
|
|
}
|
|
else
|
|
print_diff.emplace_back(opt_key);
|
|
}
|
|
}
|
|
|
|
return print_diff;
|
|
}
|
|
|
|
// Prepare for storing of the full print config into new_full_config to be exported into the G-code and to be used by the PlaceholderParser.
|
|
//BBS: add plate index
|
|
static t_config_option_keys full_print_config_diffs(const DynamicPrintConfig ¤t_full_config, const DynamicPrintConfig &new_full_config, int plate_index)
|
|
{
|
|
t_config_option_keys full_config_diff;
|
|
for (const t_config_option_key &opt_key : new_full_config.keys()) {
|
|
const ConfigOption *opt_old = current_full_config.option(opt_key);
|
|
const ConfigOption *opt_new = new_full_config.option(opt_key);
|
|
if (opt_old == nullptr || *opt_new != *opt_old) {
|
|
//BBS: add plate_index logic for wipe_tower_x/wipe_tower_y
|
|
if (opt_old && (!opt_key.compare("wipe_tower_x") || !opt_key.compare("wipe_tower_y"))) {
|
|
const ConfigOptionFloats* option_new = dynamic_cast<const ConfigOptionFloats*>(opt_new);
|
|
const ConfigOptionFloats* option_old = dynamic_cast<const ConfigOptionFloats*>(opt_old);
|
|
if ((plate_index < option_new->values.size())&&(plate_index < option_old->values.size()))
|
|
{
|
|
float value_new = option_new->values[plate_index];
|
|
float value_old = option_old->values[plate_index];
|
|
if (value_old != value_new)
|
|
full_config_diff.emplace_back(opt_key);
|
|
}
|
|
else if ((plate_index < option_new->values.size())||(plate_index < option_old->values.size()))
|
|
full_config_diff.emplace_back(opt_key);
|
|
}
|
|
else
|
|
full_config_diff.emplace_back(opt_key);
|
|
}
|
|
}
|
|
return full_config_diff;
|
|
}
|
|
|
|
// Repository for solving partial overlaps of ModelObject::layer_config_ranges.
|
|
// Here the const DynamicPrintConfig* point to the config in ModelObject::layer_config_ranges.
|
|
class LayerRanges
|
|
{
|
|
public:
|
|
struct LayerRange {
|
|
t_layer_height_range layer_height_range;
|
|
// Config is owned by the associated ModelObject.
|
|
const DynamicPrintConfig* config { nullptr };
|
|
|
|
bool operator<(const LayerRange &rhs) const throw() { return this->layer_height_range < rhs.layer_height_range; }
|
|
};
|
|
|
|
LayerRanges() = default;
|
|
LayerRanges(const t_layer_config_ranges &in) { this->assign(in); }
|
|
|
|
// Convert input config ranges into continuous non-overlapping sorted vector of intervals and their configs.
|
|
void assign(const t_layer_config_ranges &in) {
|
|
m_ranges.clear();
|
|
m_ranges.reserve(in.size());
|
|
// Input ranges are sorted lexicographically. First range trims the other ranges.
|
|
coordf_t last_z = 0;
|
|
for (const std::pair<const t_layer_height_range, ModelConfig> &range : in)
|
|
if (range.first.second > last_z) {
|
|
coordf_t min_z = std::max(range.first.first, 0.);
|
|
if (min_z > last_z + EPSILON) {
|
|
m_ranges.push_back({ t_layer_height_range(last_z, min_z) });
|
|
last_z = min_z;
|
|
}
|
|
if (range.first.second > last_z + EPSILON) {
|
|
const DynamicPrintConfig *cfg = &range.second.get();
|
|
m_ranges.push_back({ t_layer_height_range(last_z, range.first.second), cfg });
|
|
last_z = range.first.second;
|
|
}
|
|
}
|
|
if (m_ranges.empty())
|
|
m_ranges.push_back({ t_layer_height_range(0, DBL_MAX) });
|
|
else if (m_ranges.back().config == nullptr)
|
|
m_ranges.back().layer_height_range.second = DBL_MAX;
|
|
else
|
|
m_ranges.push_back({ t_layer_height_range(m_ranges.back().layer_height_range.second, DBL_MAX) });
|
|
}
|
|
|
|
const DynamicPrintConfig* config(const t_layer_height_range &range) const {
|
|
auto it = std::lower_bound(m_ranges.begin(), m_ranges.end(), LayerRange{ { range.first - EPSILON, range.second - EPSILON } });
|
|
// #ys_FIXME_COLOR
|
|
// assert(it != m_ranges.end());
|
|
// assert(it == m_ranges.end() || std::abs(it->first.first - range.first ) < EPSILON);
|
|
// assert(it == m_ranges.end() || std::abs(it->first.second - range.second) < EPSILON);
|
|
if (it == m_ranges.end() ||
|
|
std::abs(it->layer_height_range.first - range.first) > EPSILON ||
|
|
std::abs(it->layer_height_range.second - range.second) > EPSILON )
|
|
return nullptr; // desired range doesn't found
|
|
return it == m_ranges.end() ? nullptr : it->config;
|
|
}
|
|
|
|
std::vector<LayerRange>::const_iterator begin() const { return m_ranges.cbegin(); }
|
|
std::vector<LayerRange>::const_iterator end () const { return m_ranges.cend(); }
|
|
size_t size () const { return m_ranges.size(); }
|
|
|
|
private:
|
|
// Layer ranges with their config overrides and list of volumes with their snug bounding boxes in a given layer range.
|
|
std::vector<LayerRange> m_ranges;
|
|
};
|
|
|
|
// To track Model / ModelObject updates between the front end and back end, including layer height ranges, their configs,
|
|
// and snug bounding boxes of ModelVolumes.
|
|
struct ModelObjectStatus {
|
|
enum Status {
|
|
Unknown,
|
|
Old,
|
|
New,
|
|
Moved,
|
|
Deleted,
|
|
};
|
|
|
|
enum class PrintObjectRegionsStatus {
|
|
Invalid,
|
|
Valid,
|
|
PartiallyValid,
|
|
};
|
|
|
|
ModelObjectStatus(ObjectID id, Status status = Unknown) : id(id), status(status) {}
|
|
~ModelObjectStatus() { if (print_object_regions) print_object_regions->ref_cnt_dec(); }
|
|
|
|
// Key of the set.
|
|
ObjectID id;
|
|
// Status of this ModelObject with id on apply().
|
|
Status status;
|
|
// PrintObjects to be generated for this ModelObject including their base transformation.
|
|
std::vector<PrintObjectTrafoAndInstances> print_instances;
|
|
// Regions shared by the associated PrintObjects.
|
|
PrintObjectRegions *print_object_regions { nullptr };
|
|
// Status of the above.
|
|
PrintObjectRegionsStatus print_object_regions_status { PrintObjectRegionsStatus::Invalid };
|
|
|
|
// Search by id.
|
|
bool operator<(const ModelObjectStatus &rhs) const { return id < rhs.id; }
|
|
};
|
|
|
|
struct ModelObjectStatusDB
|
|
{
|
|
void add(const ModelObject &model_object, const ModelObjectStatus::Status status) {
|
|
assert(db.find(ModelObjectStatus(model_object.id())) == db.end());
|
|
db.emplace(model_object.id(), status);
|
|
}
|
|
|
|
bool add_if_new(const ModelObject &model_object, const ModelObjectStatus::Status status) {
|
|
auto it = db.find(ModelObjectStatus(model_object.id()));
|
|
if (it == db.end()) {
|
|
db.emplace_hint(it, model_object.id(), status);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const ModelObjectStatus& get(const ModelObject &model_object) {
|
|
auto it = db.find(ModelObjectStatus(model_object.id()));
|
|
assert(it != db.end());
|
|
return *it;
|
|
}
|
|
|
|
const ModelObjectStatus& reuse(const ModelObject &model_object) {
|
|
const ModelObjectStatus &result = this->get(model_object);
|
|
assert(result.status != ModelObjectStatus::Deleted);
|
|
return result;
|
|
}
|
|
|
|
std::set<ModelObjectStatus> db;
|
|
};
|
|
|
|
struct PrintObjectStatus {
|
|
enum Status {
|
|
Unknown,
|
|
Deleted,
|
|
Reused,
|
|
New
|
|
};
|
|
|
|
PrintObjectStatus(PrintObject *print_object, Status status = Unknown) :
|
|
id(print_object->model_object()->id()),
|
|
print_object(print_object),
|
|
trafo(print_object->trafo()),
|
|
status(status) {}
|
|
PrintObjectStatus(ObjectID id) : id(id), print_object(nullptr), trafo(Transform3d::Identity()), status(Unknown) {}
|
|
|
|
// ID of the ModelObject & PrintObject
|
|
ObjectID id;
|
|
// Pointer to the old PrintObject
|
|
PrintObject *print_object;
|
|
// Trafo generated with model_object->world_matrix(true)
|
|
Transform3d trafo;
|
|
Status status;
|
|
|
|
// Search by id.
|
|
bool operator<(const PrintObjectStatus &rhs) const { return id < rhs.id; }
|
|
};
|
|
|
|
class PrintObjectStatusDB {
|
|
public:
|
|
using iterator = std::multiset<PrintObjectStatus>::iterator;
|
|
using const_iterator = std::multiset<PrintObjectStatus>::const_iterator;
|
|
|
|
PrintObjectStatusDB(const PrintObjectPtrs &print_objects) {
|
|
for (PrintObject *print_object : print_objects)
|
|
m_db.emplace(PrintObjectStatus(print_object));
|
|
}
|
|
|
|
struct iterator_range : std::pair<const_iterator, const_iterator>
|
|
{
|
|
using std::pair<const_iterator, const_iterator>::pair;
|
|
iterator_range(const std::pair<const_iterator, const_iterator> in) : std::pair<const_iterator, const_iterator>(in) {}
|
|
|
|
const_iterator begin() throw() { return this->first; }
|
|
const_iterator end() throw() { return this->second; }
|
|
};
|
|
|
|
iterator_range get_range(const ModelObject &model_object) const {
|
|
return m_db.equal_range(PrintObjectStatus(model_object.id()));
|
|
}
|
|
|
|
iterator_range get_range(const ModelObjectStatus &model_object_status) const {
|
|
return m_db.equal_range(PrintObjectStatus(model_object_status.id));
|
|
}
|
|
|
|
size_t count(const ModelObject &model_object) {
|
|
return m_db.count(PrintObjectStatus(model_object.id()));
|
|
}
|
|
|
|
std::multiset<PrintObjectStatus>::iterator begin() { return m_db.begin(); }
|
|
std::multiset<PrintObjectStatus>::iterator end() { return m_db.end(); }
|
|
|
|
void clear() {
|
|
m_db.clear();
|
|
}
|
|
|
|
private:
|
|
std::multiset<PrintObjectStatus> m_db;
|
|
};
|
|
|
|
static inline bool model_volume_solid_or_modifier(const ModelVolume &mv)
|
|
{
|
|
ModelVolumeType type = mv.type();
|
|
return type == ModelVolumeType::MODEL_PART || type == ModelVolumeType::NEGATIVE_VOLUME || type == ModelVolumeType::PARAMETER_MODIFIER;
|
|
}
|
|
|
|
static inline Transform3f trafo_for_bbox(const Transform3d &object_trafo, const Transform3d &volume_trafo)
|
|
{
|
|
Transform3d m = object_trafo * volume_trafo;
|
|
m.translation().x() = 0.;
|
|
m.translation().y() = 0.;
|
|
return m.cast<float>();
|
|
}
|
|
|
|
static inline bool trafos_differ_in_rotation_by_z_and_mirroring_by_xy_only(const Transform3d &t1, const Transform3d &t2)
|
|
{
|
|
if (std::abs(t1.translation().z() - t2.translation().z()) > EPSILON)
|
|
// One of the object is higher than the other above the build plate (or below the build plate).
|
|
return false;
|
|
Matrix3d m1 = t1.matrix().block<3, 3>(0, 0);
|
|
Matrix3d m2 = t2.matrix().block<3, 3>(0, 0);
|
|
Matrix3d m = m2.inverse() * m1;
|
|
Vec3d z = m.block<3, 1>(0, 2);
|
|
if (std::abs(z.x()) > EPSILON || std::abs(z.y()) > EPSILON || std::abs(z.z() - 1.) > EPSILON)
|
|
// Z direction or length changed.
|
|
return false;
|
|
// Z still points in the same direction and it has the same length.
|
|
Vec3d x = m.block<3, 1>(0, 0);
|
|
Vec3d y = m.block<3, 1>(0, 1);
|
|
if (std::abs(x.z()) > EPSILON || std::abs(y.z()) > EPSILON)
|
|
return false;
|
|
double lx2 = x.squaredNorm();
|
|
double ly2 = y.squaredNorm();
|
|
if (lx2 - 1. > EPSILON * EPSILON || ly2 - 1. > EPSILON * EPSILON)
|
|
return false;
|
|
// Verify whether the vectors x, y are still perpendicular.
|
|
double d = x.dot(y);
|
|
return std::abs(d * d) < EPSILON * lx2 * ly2;
|
|
}
|
|
|
|
static PrintObjectRegions::BoundingBox transformed_its_bbox2d(const indexed_triangle_set &its, const Transform3f &m, float offset)
|
|
{
|
|
assert(! its.indices.empty());
|
|
|
|
PrintObjectRegions::BoundingBox bbox(m * its.vertices[its.indices.front()(0)]);
|
|
for (const stl_triangle_vertex_indices &tri : its.indices)
|
|
for (int i = 0; i < 3; ++ i)
|
|
bbox.extend(m * its.vertices[tri(i)]);
|
|
bbox.min() -= Vec3f(offset, offset, float(EPSILON));
|
|
bbox.max() += Vec3f(offset, offset, float(EPSILON));
|
|
return bbox;
|
|
}
|
|
|
|
static void transformed_its_bboxes_in_z_ranges(
|
|
const indexed_triangle_set &its,
|
|
const Transform3f &m,
|
|
const std::vector<t_layer_height_range> &z_ranges,
|
|
std::vector<std::pair<PrintObjectRegions::BoundingBox, bool>> &bboxes,
|
|
const float offset)
|
|
{
|
|
bboxes.assign(z_ranges.size(), std::make_pair(PrintObjectRegions::BoundingBox(), false));
|
|
for (const stl_triangle_vertex_indices &tri : its.indices) {
|
|
const Vec3f pts[3] = { m * its.vertices[tri(0)], m * its.vertices[tri(1)], m * its.vertices[tri(2)] };
|
|
for (size_t irange = 0; irange < z_ranges.size(); ++ irange) {
|
|
const t_layer_height_range &z_range = z_ranges[irange];
|
|
std::pair<PrintObjectRegions::BoundingBox, bool> &bbox = bboxes[irange];
|
|
auto bbox_extend = [&bbox](const Vec3f& p) {
|
|
if (bbox.second) {
|
|
bbox.first.extend(p);
|
|
} else {
|
|
bbox.first.min() = bbox.first.max() = p;
|
|
bbox.second = true;
|
|
}
|
|
};
|
|
int iprev = 2;
|
|
for (int iedge = 0; iedge < 3; ++ iedge) {
|
|
const Vec3f *p1 = &pts[iprev];
|
|
const Vec3f *p2 = &pts[iedge];
|
|
// Sort the edge points by Z.
|
|
if (p1->z() > p2->z())
|
|
std::swap(p1, p2);
|
|
if (p2->z() <= z_range.first || p1->z() >= z_range.second) {
|
|
// Out of this slab.
|
|
} else if (p1->z() < z_range.first) {
|
|
if (p2->z() > z_range.second) {
|
|
// Two intersections.
|
|
float zspan = p2->z() - p1->z();
|
|
float t1 = (z_range.first - p1->z()) / zspan;
|
|
float t2 = (z_range.second - p1->z()) / zspan;
|
|
Vec2f p = to_2d(*p1);
|
|
Vec2f v(p2->x() - p1->x(), p2->y() - p1->y());
|
|
bbox_extend(to_3d((p + v * t1).eval(), float(z_range.first)));
|
|
bbox_extend(to_3d((p + v * t2).eval(), float(z_range.second)));
|
|
} else {
|
|
// Single intersection with the lower limit.
|
|
float t = (z_range.first - p1->z()) / (p2->z() - p1->z());
|
|
Vec2f v(p2->x() - p1->x(), p2->y() - p1->y());
|
|
bbox_extend(to_3d((to_2d(*p1) + v * t).eval(), float(z_range.first)));
|
|
bbox_extend(*p2);
|
|
}
|
|
} else if (p2->z() > z_range.second) {
|
|
// Single intersection with the upper limit.
|
|
float t = (z_range.second - p1->z()) / (p2->z() - p1->z());
|
|
Vec2f v(p2->x() - p1->x(), p2->y() - p1->y());
|
|
bbox_extend(to_3d((to_2d(*p1) + v * t).eval(), float(z_range.second)));
|
|
bbox_extend(*p1);
|
|
} else {
|
|
// Both points are inside.
|
|
bbox_extend(*p1);
|
|
bbox_extend(*p2);
|
|
}
|
|
iprev = iedge;
|
|
}
|
|
}
|
|
}
|
|
|
|
for (std::pair<PrintObjectRegions::BoundingBox, bool> &bbox : bboxes) {
|
|
bbox.first.min() -= Vec3f(offset, offset, float(EPSILON));
|
|
bbox.first.max() += Vec3f(offset, offset, float(EPSILON));
|
|
}
|
|
}
|
|
|
|
// Last PrintObject for this print_object_regions has been fully invalidated (deleted).
|
|
// Keep print_object_regions, but delete those volumes, which were either removed from new_volumes, or which rotated or scaled, so they need
|
|
// their bounding boxes to be recalculated.
|
|
void print_objects_regions_invalidate_keep_some_volumes(PrintObjectRegions &print_object_regions, ModelVolumePtrs old_volumes, ModelVolumePtrs new_volumes)
|
|
{
|
|
print_object_regions.all_regions.clear();
|
|
|
|
model_volumes_sort_by_id(old_volumes);
|
|
model_volumes_sort_by_id(new_volumes);
|
|
|
|
size_t i_cached_volume = 0;
|
|
size_t last_cached_volume = 0;
|
|
size_t i_old = 0;
|
|
for (size_t i_new = 0; i_new < new_volumes.size(); ++ i_new)
|
|
if (model_volume_solid_or_modifier(*new_volumes[i_new])) {
|
|
for (; i_old < old_volumes.size(); ++ i_old)
|
|
if (old_volumes[i_old]->id() >= new_volumes[i_new]->id())
|
|
break;
|
|
if (i_old != old_volumes.size() && old_volumes[i_old]->id() == new_volumes[i_new]->id()) {
|
|
if (old_volumes[i_old]->get_matrix().isApprox(new_volumes[i_new]->get_matrix())) {
|
|
// Reuse the volume.
|
|
for (; print_object_regions.cached_volume_ids[i_cached_volume] < old_volumes[i_old]->id(); ++ i_cached_volume)
|
|
assert(i_cached_volume < print_object_regions.cached_volume_ids.size());
|
|
assert(i_cached_volume < print_object_regions.cached_volume_ids.size() && print_object_regions.cached_volume_ids[i_cached_volume] == old_volumes[i_old]->id());
|
|
print_object_regions.cached_volume_ids[last_cached_volume ++] = print_object_regions.cached_volume_ids[i_cached_volume ++];
|
|
} else {
|
|
// Don't reuse the volume.
|
|
}
|
|
}
|
|
}
|
|
print_object_regions.cached_volume_ids.erase(print_object_regions.cached_volume_ids.begin() + last_cached_volume, print_object_regions.cached_volume_ids.end());
|
|
}
|
|
|
|
// Find a bounding box of a volume's part intersecting layer_range. Such a bounding box will likely be smaller in XY than the full bounding box,
|
|
// thus it will intersect with lower number of other volumes.
|
|
const PrintObjectRegions::BoundingBox* find_volume_extents(const PrintObjectRegions::LayerRangeRegions &layer_range, const ModelVolume &volume)
|
|
{
|
|
auto it = lower_bound_by_predicate(layer_range.volumes.begin(), layer_range.volumes.end(), [&volume](const PrintObjectRegions::VolumeExtents &l){ return l.volume_id < volume.id(); });
|
|
return it != layer_range.volumes.end() && it->volume_id == volume.id() ? &it->bbox : nullptr;
|
|
}
|
|
|
|
// Find a bounding box of a topmost printable volume referenced by this modifier given this_region_id.
|
|
PrintObjectRegions::BoundingBox find_modifier_volume_extents(const PrintObjectRegions::LayerRangeRegions &layer_range, const int this_region_id)
|
|
{
|
|
// Find the top-most printable volume of this modifier, or the printable volume itself.
|
|
const PrintObjectRegions::VolumeRegion &this_region = layer_range.volume_regions[this_region_id];
|
|
const PrintObjectRegions::BoundingBox *this_extents = find_volume_extents(layer_range, *this_region.model_volume);
|
|
assert(this_extents);
|
|
PrintObjectRegions::BoundingBox out { *this_extents };
|
|
if (! this_region.model_volume->is_model_part())
|
|
for (int parent_region_id = this_region.parent;;) {
|
|
assert(parent_region_id >= 0);
|
|
const PrintObjectRegions::VolumeRegion &parent_region = layer_range.volume_regions[parent_region_id];
|
|
const PrintObjectRegions::BoundingBox *parent_extents = find_volume_extents(layer_range, *parent_region.model_volume);
|
|
assert(parent_extents);
|
|
out.extend(*parent_extents);
|
|
if (parent_region.model_volume->is_model_part())
|
|
break;
|
|
parent_region_id = parent_region.parent;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig &default_or_parent_region_config, const DynamicPrintConfig *layer_range_config, const ModelVolume &volume, size_t num_extruders);
|
|
|
|
void print_region_ref_inc(PrintRegion &r) { ++ r.m_ref_cnt; }
|
|
void print_region_ref_reset(PrintRegion &r) { r.m_ref_cnt = 0; }
|
|
int print_region_ref_cnt(const PrintRegion &r) { return r.m_ref_cnt; }
|
|
|
|
// Verify whether the PrintRegions of a PrintObject are still valid, possibly after updating the region configs.
|
|
// Before region configs are updated, callback_invalidate() is called to possibly stop background processing.
|
|
// Returns false if this object needs to be resliced because regions were merged or split.
|
|
bool verify_update_print_object_regions(
|
|
ModelVolumePtrs model_volumes,
|
|
const PrintRegionConfig &default_region_config,
|
|
size_t num_extruders,
|
|
const std::vector<unsigned int> &painting_extruders,
|
|
PrintObjectRegions &print_object_regions,
|
|
const std::function<void(const PrintRegionConfig&, const PrintRegionConfig&, const t_config_option_keys&)> &callback_invalidate)
|
|
{
|
|
// Sort by ModelVolume ID.
|
|
model_volumes_sort_by_id(model_volumes);
|
|
|
|
for (std::unique_ptr<PrintRegion> ®ion : print_object_regions.all_regions)
|
|
print_region_ref_reset(*region);
|
|
|
|
// Verify and / or update PrintRegions produced by ModelVolumes, layer range modifiers, modifier volumes.
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : print_object_regions.layer_ranges) {
|
|
// Each modifier ModelVolume intersecting this layer_range shall be referenced here at least once if it intersects some
|
|
// printable ModelVolume at this layer_range even if it does not modify its overlapping printable ModelVolume configuration yet.
|
|
// VolumeRegions reference ModelVolumes in layer_range.volume_regions the order they are stored in ModelObject volumes.
|
|
// Remember whether a given modifier ModelVolume was visited already.
|
|
auto it_model_volume_modifier_last = model_volumes.end();
|
|
for (PrintObjectRegions::VolumeRegion ®ion : layer_range.volume_regions)
|
|
if (region.model_volume->is_model_part() || region.model_volume->is_modifier()) {
|
|
auto it_model_volume = lower_bound_by_predicate(model_volumes.begin(), model_volumes.end(), [®ion](const ModelVolume *l){ return l->id() < region.model_volume->id(); });
|
|
assert(it_model_volume != model_volumes.end() && (*it_model_volume)->id() == region.model_volume->id());
|
|
if (region.model_volume->is_modifier() && it_model_volume != it_model_volume_modifier_last) {
|
|
// A modifier ModelVolume is visited for the first time.
|
|
// A visited modifier may not have had parent volume_regions created overlapping with some model parts or modifiers,
|
|
// if the visited modifier did not modify their properties. Now the visited modifier's configuration may have changed,
|
|
// which may require new regions to be created.
|
|
it_model_volume_modifier_last = it_model_volume;
|
|
int next_region_id = int(®ion - layer_range.volume_regions.data());
|
|
const PrintObjectRegions::BoundingBox *bbox = find_volume_extents(layer_range, *region.model_volume);
|
|
assert(bbox);
|
|
for (int parent_region_id = next_region_id - 1; parent_region_id >= 0; -- parent_region_id) {
|
|
const PrintObjectRegions::VolumeRegion &parent_region = layer_range.volume_regions[parent_region_id];
|
|
assert(parent_region.model_volume != region.model_volume);
|
|
if (parent_region.model_volume->is_model_part() || parent_region.model_volume->is_modifier()) {
|
|
// volume_regions are produced in decreasing order of parent volume_regions ids.
|
|
// Some regions may not have been generated the last time by generate_print_object_regions().
|
|
assert(next_region_id == int(layer_range.volume_regions.size()) ||
|
|
layer_range.volume_regions[next_region_id].model_volume != region.model_volume ||
|
|
layer_range.volume_regions[next_region_id].parent <= parent_region_id);
|
|
if (next_region_id < int(layer_range.volume_regions.size()) &&
|
|
layer_range.volume_regions[next_region_id].model_volume == region.model_volume &&
|
|
layer_range.volume_regions[next_region_id].parent == parent_region_id) {
|
|
// A parent region is already overridden.
|
|
++ next_region_id;
|
|
} else if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox))
|
|
// Such parent region does not exist. If it is needed, then we need to reslice.
|
|
// Only create new region for a modifier, which actually modifies config of it's parent.
|
|
if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, **it_model_volume, num_extruders);
|
|
config != parent_region.region->config())
|
|
// This modifier newly overrides a region, which it did not before. We need to reslice.
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
PrintRegionConfig cfg = region.parent == -1 ?
|
|
region_config_from_model_volume(default_region_config, layer_range.config, **it_model_volume, num_extruders) :
|
|
region_config_from_model_volume(layer_range.volume_regions[region.parent].region->config(), nullptr, **it_model_volume, num_extruders);
|
|
if (cfg != region.region->config()) {
|
|
// Region configuration changed.
|
|
if (print_region_ref_cnt(*region.region) == 0) {
|
|
// Region is referenced for the first time. Just change its parameters.
|
|
// Stop the background process before assigning new configuration to the regions.
|
|
t_config_option_keys diff = region.region->config().diff(cfg);
|
|
callback_invalidate(region.region->config(), cfg, diff);
|
|
region.region->config_apply_only(cfg, diff, false);
|
|
} else {
|
|
// Region is referenced multiple times, thus the region is being split. We need to reslice.
|
|
return false;
|
|
}
|
|
}
|
|
print_region_ref_inc(*region.region);
|
|
}
|
|
}
|
|
|
|
// Verify and / or update PrintRegions produced by color painting.
|
|
for (const PrintObjectRegions::LayerRangeRegions &layer_range : print_object_regions.layer_ranges)
|
|
for (const PrintObjectRegions::PaintedRegion ®ion : layer_range.painted_regions) {
|
|
const PrintObjectRegions::VolumeRegion &parent_region = layer_range.volume_regions[region.parent];
|
|
PrintRegionConfig cfg = parent_region.region->config();
|
|
cfg.wall_filament.value = region.extruder_id;
|
|
cfg.solid_infill_filament.value = region.extruder_id;
|
|
cfg.sparse_infill_filament.value = region.extruder_id;
|
|
if (cfg != region.region->config()) {
|
|
// Region configuration changed.
|
|
if (print_region_ref_cnt(*region.region) == 0) {
|
|
// Region is referenced for the first time. Just change its parameters.
|
|
// Stop the background process before assigning new configuration to the regions.
|
|
t_config_option_keys diff = region.region->config().diff(cfg);
|
|
callback_invalidate(region.region->config(), cfg, diff);
|
|
region.region->config_apply_only(cfg, diff, false);
|
|
} else {
|
|
// Region is referenced multiple times, thus the region is being split. We need to reslice.
|
|
return false;
|
|
}
|
|
}
|
|
print_region_ref_inc(*region.region);
|
|
}
|
|
|
|
// Lastly verify, whether some regions were not merged.
|
|
{
|
|
std::vector<const PrintRegion*> regions;
|
|
regions.reserve(print_object_regions.all_regions.size());
|
|
for (std::unique_ptr<PrintRegion> ®ion : print_object_regions.all_regions) {
|
|
assert(print_region_ref_cnt(*region) > 0);
|
|
regions.emplace_back(&(*region.get()));
|
|
}
|
|
std::sort(regions.begin(), regions.end(), [](const PrintRegion *l, const PrintRegion *r){ return l->config_hash() < r->config_hash(); });
|
|
for (size_t i = 0; i < regions.size(); ++ i) {
|
|
size_t hash = regions[i]->config_hash();
|
|
size_t j = i;
|
|
for (++ j; j < regions.size() && regions[j]->config_hash() == hash; ++ j)
|
|
if (regions[i]->config() == regions[j]->config()) {
|
|
// Regions were merged. We need to reslice.
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// Update caches of volume bounding boxes.
|
|
void update_volume_bboxes(
|
|
std::vector<PrintObjectRegions::LayerRangeRegions> &layer_ranges,
|
|
std::vector<ObjectID> &cached_volume_ids,
|
|
ModelVolumePtrs model_volumes,
|
|
const Transform3d &object_trafo,
|
|
const float offset)
|
|
{
|
|
// output will be sorted by the order of model_volumes sorted by their ObjectIDs.
|
|
model_volumes_sort_by_id(model_volumes);
|
|
|
|
if (layer_ranges.size() == 1) {
|
|
PrintObjectRegions::LayerRangeRegions &layer_range = layer_ranges.front();
|
|
std::vector<PrintObjectRegions::VolumeExtents> volumes_old(std::move(layer_range.volumes));
|
|
layer_range.volumes.reserve(model_volumes.size());
|
|
for (const ModelVolume *model_volume : model_volumes)
|
|
if (model_volume_solid_or_modifier(*model_volume)) {
|
|
if (std::binary_search(cached_volume_ids.begin(), cached_volume_ids.end(), model_volume->id())) {
|
|
auto it = lower_bound_by_predicate(volumes_old.begin(), volumes_old.end(), [model_volume](PrintObjectRegions::VolumeExtents &l) { return l.volume_id < model_volume->id(); });
|
|
if (it != volumes_old.end() && it->volume_id == model_volume->id())
|
|
layer_range.volumes.emplace_back(*it);
|
|
} else
|
|
layer_range.volumes.push_back({ model_volume->id(),
|
|
transformed_its_bbox2d(model_volume->mesh().its, trafo_for_bbox(object_trafo, model_volume->get_matrix()), offset) });
|
|
}
|
|
} else {
|
|
std::vector<std::vector<PrintObjectRegions::VolumeExtents>> volumes_old;
|
|
if (cached_volume_ids.empty())
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges)
|
|
layer_range.volumes.clear();
|
|
else {
|
|
volumes_old.reserve(layer_ranges.size());
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges)
|
|
volumes_old.emplace_back(std::move(layer_range.volumes));
|
|
}
|
|
|
|
std::vector<std::pair<PrintObjectRegions::BoundingBox, bool>> bboxes;
|
|
std::vector<t_layer_height_range> ranges;
|
|
ranges.reserve(layer_ranges.size());
|
|
for (const PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges) {
|
|
t_layer_height_range r = layer_range.layer_height_range;
|
|
r.first -= EPSILON;
|
|
r.second += EPSILON;
|
|
ranges.emplace_back(r);
|
|
}
|
|
for (const ModelVolume *model_volume : model_volumes)
|
|
if (model_volume_solid_or_modifier(*model_volume)) {
|
|
if (std::binary_search(cached_volume_ids.begin(), cached_volume_ids.end(), model_volume->id())) {
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges) {
|
|
const auto &vold = volumes_old[&layer_range - layer_ranges.data()];
|
|
auto it = lower_bound_by_predicate(vold.begin(), vold.end(), [model_volume](const PrintObjectRegions::VolumeExtents &l) { return l.volume_id < model_volume->id(); });
|
|
if (it != vold.end() && it->volume_id == model_volume->id())
|
|
layer_range.volumes.emplace_back(*it);
|
|
}
|
|
} else {
|
|
transformed_its_bboxes_in_z_ranges(model_volume->mesh().its, trafo_for_bbox(object_trafo, model_volume->get_matrix()), ranges, bboxes, offset);
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges)
|
|
if (auto &bbox = bboxes[&layer_range - layer_ranges.data()]; bbox.second)
|
|
layer_range.volumes.push_back({ model_volume->id(), bbox.first });
|
|
}
|
|
}
|
|
}
|
|
|
|
cached_volume_ids.clear();
|
|
cached_volume_ids.reserve(model_volumes.size());
|
|
for (const ModelVolume *v : model_volumes)
|
|
if (model_volume_solid_or_modifier(*v))
|
|
cached_volume_ids.emplace_back(v->id());
|
|
}
|
|
|
|
// Either a fresh PrintObject, or PrintObject regions were invalidated (merged, split).
|
|
// Generate PrintRegions from scratch.
|
|
static PrintObjectRegions* generate_print_object_regions(
|
|
PrintObjectRegions *print_object_regions_old,
|
|
const ModelVolumePtrs &model_volumes,
|
|
const LayerRanges &model_layer_ranges,
|
|
const PrintRegionConfig &default_region_config,
|
|
const Transform3d &trafo,
|
|
size_t num_extruders,
|
|
const float xy_contour_compensation,
|
|
const std::vector<unsigned int> & painting_extruders)
|
|
{
|
|
// Reuse the old object or generate a new one.
|
|
auto out = print_object_regions_old ? std::unique_ptr<PrintObjectRegions>(print_object_regions_old) : std::make_unique<PrintObjectRegions>();
|
|
auto &all_regions = out->all_regions;
|
|
auto &layer_ranges_regions = out->layer_ranges;
|
|
|
|
all_regions.clear();
|
|
|
|
bool reuse_old = print_object_regions_old && !print_object_regions_old->layer_ranges.empty();
|
|
|
|
if (reuse_old) {
|
|
// Reuse old bounding boxes of some ModelVolumes and their ranges.
|
|
// Verify that the old ranges match the new ranges.
|
|
assert(model_layer_ranges.size() == layer_ranges_regions.size());
|
|
for (const auto &range : model_layer_ranges) {
|
|
PrintObjectRegions::LayerRangeRegions &r = layer_ranges_regions[&range - &*model_layer_ranges.begin()];
|
|
assert(range.layer_height_range == r.layer_height_range);
|
|
// If model::assign_copy() is called, layer_ranges_regions is copied thus the pointers to configs are lost.
|
|
r.config = range.config;
|
|
r.volume_regions.clear();
|
|
r.painted_regions.clear();
|
|
}
|
|
} else {
|
|
out->trafo_bboxes = trafo;
|
|
layer_ranges_regions.reserve(model_layer_ranges.size());
|
|
for (const auto &range : model_layer_ranges)
|
|
layer_ranges_regions.push_back({ range.layer_height_range, range.config });
|
|
}
|
|
|
|
const bool is_mm_painted = num_extruders > 1 && std::any_of(model_volumes.cbegin(), model_volumes.cend(), [](const ModelVolume *mv) { return mv->is_mm_painted(); });
|
|
update_volume_bboxes(layer_ranges_regions, out->cached_volume_ids, model_volumes, out->trafo_bboxes, is_mm_painted ? 0.f : std::max(0.f, xy_contour_compensation));
|
|
|
|
std::vector<PrintRegion*> region_set;
|
|
auto get_create_region = [®ion_set, &all_regions](PrintRegionConfig &&config) -> PrintRegion* {
|
|
size_t hash = config.hash();
|
|
auto it = Slic3r::lower_bound_by_predicate(region_set.begin(), region_set.end(), [&config, hash](const PrintRegion* l) {
|
|
return l->config_hash() < hash || (l->config_hash() == hash && l->config() < config); });
|
|
if (it != region_set.end() && (*it)->config_hash() == hash && (*it)->config() == config)
|
|
return *it;
|
|
// Insert into a sorted array, it has O(n) complexity, but the calling algorithm has an O(n^2*log(n)) complexity anyways.
|
|
all_regions.emplace_back(std::make_unique<PrintRegion>(std::move(config), hash, int(all_regions.size())));
|
|
PrintRegion *region = all_regions.back().get();
|
|
region_set.emplace(it, region);
|
|
return region;
|
|
};
|
|
|
|
// Chain the regions in the order they are stored in the volumes list.
|
|
for (int volume_id = 0; volume_id < int(model_volumes.size()); ++ volume_id) {
|
|
const ModelVolume &volume = *model_volumes[volume_id];
|
|
if (model_volume_solid_or_modifier(volume)) {
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges_regions)
|
|
if (const PrintObjectRegions::BoundingBox *bbox = find_volume_extents(layer_range, volume); bbox) {
|
|
if (volume.is_model_part()) {
|
|
// Add a model volume, assign an existing region or generate a new one.
|
|
layer_range.volume_regions.push_back({
|
|
&volume, -1,
|
|
get_create_region(region_config_from_model_volume(default_region_config, layer_range.config, volume, num_extruders)),
|
|
bbox
|
|
});
|
|
} else if (volume.is_negative_volume()) {
|
|
// Add a negative (subtractor) volume. Such volume has neither region nor parent volume assigned.
|
|
layer_range.volume_regions.push_back({ &volume, -1, nullptr, bbox });
|
|
} else {
|
|
assert(volume.is_modifier());
|
|
// Modifiers may be chained one over the other. Check for overlap, merge DynamicPrintConfigs.
|
|
bool added = false;
|
|
int parent_model_part_id = -1;
|
|
for (int parent_region_id = int(layer_range.volume_regions.size()) - 1; parent_region_id >= 0; -- parent_region_id) {
|
|
const PrintObjectRegions::VolumeRegion &parent_region = layer_range.volume_regions[parent_region_id];
|
|
const ModelVolume &parent_volume = *parent_region.model_volume;
|
|
if (parent_volume.is_model_part() || parent_volume.is_modifier())
|
|
if (PrintObjectRegions::BoundingBox parent_bbox = find_modifier_volume_extents(layer_range, parent_region_id); parent_bbox.intersects(*bbox)) {
|
|
// Only create new region for a modifier, which actually modifies config of it's parent.
|
|
if (PrintRegionConfig config = region_config_from_model_volume(parent_region.region->config(), nullptr, volume, num_extruders);
|
|
config != parent_region.region->config()) {
|
|
added = true;
|
|
layer_range.volume_regions.push_back({ &volume, parent_region_id, get_create_region(std::move(config)), bbox });
|
|
} else if (parent_model_part_id == -1 && parent_volume.is_model_part())
|
|
parent_model_part_id = parent_region_id;
|
|
}
|
|
}
|
|
if (! added && parent_model_part_id >= 0)
|
|
// This modifier does not override any printable volume's configuration, however it may in the future.
|
|
// Store it so that verify_update_print_object_regions() will handle this modifier correctly if its configuration changes.
|
|
layer_range.volume_regions.push_back({ &volume, parent_model_part_id, layer_range.volume_regions[parent_model_part_id].region, bbox });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Finally add painting regions.
|
|
for (PrintObjectRegions::LayerRangeRegions &layer_range : layer_ranges_regions) {
|
|
for (unsigned int painted_extruder_id : painting_extruders)
|
|
for (int parent_region_id = 0; parent_region_id < int(layer_range.volume_regions.size()); ++ parent_region_id)
|
|
if (const PrintObjectRegions::VolumeRegion &parent_region = layer_range.volume_regions[parent_region_id];
|
|
parent_region.model_volume->is_model_part() || parent_region.model_volume->is_modifier()) {
|
|
PrintRegionConfig cfg = parent_region.region->config();
|
|
cfg.wall_filament.value = painted_extruder_id;
|
|
cfg.solid_infill_filament.value = painted_extruder_id;
|
|
cfg.sparse_infill_filament.value = painted_extruder_id;
|
|
layer_range.painted_regions.push_back({ painted_extruder_id, parent_region_id, get_create_region(std::move(cfg))});
|
|
}
|
|
// Sort the regions by parent region::print_object_region_id() and extruder_id to help the slicing algorithm when applying MMU segmentation.
|
|
std::sort(layer_range.painted_regions.begin(), layer_range.painted_regions.end(), [&layer_range](auto &l, auto &r) {
|
|
int lid = layer_range.volume_regions[l.parent].region->print_object_region_id();
|
|
int rid = layer_range.volume_regions[r.parent].region->print_object_region_id();
|
|
return lid < rid || (lid == rid && l.extruder_id < r.extruder_id); });
|
|
}
|
|
|
|
return out.release();
|
|
}
|
|
|
|
Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_config)
|
|
{
|
|
#ifdef _DEBUG
|
|
check_model_ids_validity(model);
|
|
#endif /* _DEBUG */
|
|
|
|
//BBS: add more logs
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", Line %1%: enter")%__LINE__;
|
|
// Normalize the config.
|
|
new_full_config.option("print_settings_id", true);
|
|
new_full_config.option("filament_settings_id", true);
|
|
new_full_config.option("printer_settings_id", true);
|
|
// BBS
|
|
int used_filaments = this->extruders(true).size();
|
|
|
|
//new_full_config.normalize_fdm(used_filaments);
|
|
new_full_config.normalize_fdm_1();
|
|
t_config_option_keys changed_keys = new_full_config.normalize_fdm_2(objects().size(), used_filaments);
|
|
if (changed_keys.size() > 0) {
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", got changed_keys, size=%1%")%changed_keys.size();
|
|
for (int i = 0; i < changed_keys.size(); i++)
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", i=%1%, key=%2%")%i %changed_keys[i];
|
|
}
|
|
}
|
|
const ConfigOption* enable_support_option = new_full_config.option("enable_support");
|
|
if (enable_support_option && enable_support_option->getBool())
|
|
m_support_used = true;
|
|
else
|
|
m_support_used = false;
|
|
|
|
{
|
|
const auto& o = model.objects;
|
|
const auto opt_has_scarf_joint_seam = [](const DynamicConfig& c) {
|
|
return c.has("seam_slope_type") && c.opt_enum<SeamScarfType>("seam_slope_type") != SeamScarfType::None;
|
|
};
|
|
const bool has_scarf_joint_seam = std::any_of(o.begin(), o.end(), [&new_full_config, &opt_has_scarf_joint_seam](ModelObject* obj) {
|
|
return obj->get_config_value<ConfigOptionEnum<SeamScarfType>>(new_full_config, "seam_slope_type")->value != SeamScarfType::None ||
|
|
std::any_of(obj->volumes.begin(), obj->volumes.end(), [&opt_has_scarf_joint_seam](const ModelVolume* v) { return opt_has_scarf_joint_seam(v->config.get());}) ||
|
|
std::any_of(obj->layer_config_ranges.begin(), obj->layer_config_ranges.end(), [&opt_has_scarf_joint_seam](const auto& r) { return opt_has_scarf_joint_seam(r.second.get());});
|
|
});
|
|
|
|
if (has_scarf_joint_seam) {
|
|
new_full_config.set("has_scarf_joint_seam", true);
|
|
}
|
|
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ", has_scarf_joint_seam:" << has_scarf_joint_seam;
|
|
}
|
|
|
|
// Find modified keys of the various configs. Resolve overrides extruder retract values by filament profiles.
|
|
DynamicPrintConfig filament_overrides;
|
|
//BBS: add plate index
|
|
t_config_option_keys print_diff = print_config_diffs(m_config, new_full_config, filament_overrides, this->m_plate_index);
|
|
t_config_option_keys full_config_diff = full_print_config_diffs(m_full_print_config, new_full_config, this->m_plate_index);
|
|
// Collect changes to object and region configs.
|
|
t_config_option_keys object_diff = m_default_object_config.diff(new_full_config);
|
|
t_config_option_keys region_diff = m_default_region_config.diff(new_full_config);
|
|
|
|
// Do not use the ApplyStatus as we will use the max function when updating apply_status.
|
|
unsigned int apply_status = APPLY_STATUS_UNCHANGED;
|
|
auto update_apply_status = [&apply_status](bool invalidated)
|
|
{ apply_status = std::max<unsigned int>(apply_status, invalidated ? APPLY_STATUS_INVALIDATED : APPLY_STATUS_CHANGED); };
|
|
if (! (print_diff.empty() && object_diff.empty() && region_diff.empty())) {
|
|
update_apply_status(false);
|
|
//BBS: add more logs
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", got print_diff %1%, object_diff %2%, region_diff %3%, set status to APPLY_STATUS_CHANGED")%print_diff.size() %object_diff.size() %region_diff.size();
|
|
}
|
|
|
|
// Grab the lock for the Print / PrintObject milestones.
|
|
std::scoped_lock<std::mutex> lock(this->state_mutex());
|
|
|
|
// The following call may stop the background processing.
|
|
if (! print_diff.empty())
|
|
update_apply_status(this->invalidate_state_by_config_options(new_full_config, print_diff));
|
|
|
|
// Apply variables to placeholder parser. The placeholder parser is used by G-code export,
|
|
// which should be stopped if print_diff is not empty.
|
|
size_t num_extruders = m_config.filament_diameter.size();
|
|
bool num_extruders_changed = false;
|
|
if (! full_config_diff.empty()) {
|
|
//BBS: add more logs
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: found full_config_diff changed.")%__LINE__;
|
|
update_apply_status(this->invalidate_step(psGCodeExport));
|
|
m_placeholder_parser.clear_config();
|
|
// Set the profile aliases for the PrintBase::output_filename()
|
|
m_placeholder_parser.set("print_preset", new_full_config.option("print_settings_id")->clone());
|
|
m_placeholder_parser.set("filament_preset", new_full_config.option("filament_settings_id")->clone());
|
|
m_placeholder_parser.set("printer_preset", new_full_config.option("printer_settings_id")->clone());
|
|
// We want the filament overrides to be applied over their respective extruder parameters by the PlaceholderParser.
|
|
// see "Placeholders do not respect filament overrides." GH issue #3649
|
|
m_placeholder_parser.apply_config(filament_overrides);
|
|
// It is also safe to change m_config now after this->invalidate_state_by_config_options() call.
|
|
m_config.apply_only(new_full_config, print_diff, true);
|
|
//FIXME use move semantics once ConfigBase supports it.
|
|
// Some filament_overrides may contain values different from new_full_config, but equal to m_config.
|
|
// As long as these config options don't reallocate memory when copying, we are safe overriding a value, which is in use by a worker thread.
|
|
m_config.apply(filament_overrides);
|
|
// Handle changes to object config defaults
|
|
m_default_object_config.apply_only(new_full_config, object_diff, true);
|
|
// Handle changes to regions config defaults
|
|
m_default_region_config.apply_only(new_full_config, region_diff, true);
|
|
//m_full_print_config = std::move(new_full_config);
|
|
m_full_print_config = new_full_config;
|
|
if (num_extruders != m_config.filament_diameter.size()) {
|
|
num_extruders = m_config.filament_diameter.size();
|
|
num_extruders_changed = true;
|
|
}
|
|
}
|
|
|
|
ModelObjectStatusDB model_object_status_db;
|
|
|
|
// 1) Synchronize model objects.
|
|
bool print_regions_reshuffled = false;
|
|
if (model.id() != m_model.id()) {
|
|
// Kill everything, initialize from scratch.
|
|
// Stop background processing.
|
|
this->call_cancel_callback();
|
|
update_apply_status(this->invalidate_all_steps());
|
|
for (PrintObject *object : m_objects) {
|
|
model_object_status_db.add(*object->model_object(), ModelObjectStatus::Deleted);
|
|
update_apply_status(object->invalidate_all_steps());
|
|
delete object;
|
|
}
|
|
m_objects.clear();
|
|
print_regions_reshuffled = true;
|
|
m_model.assign_copy(model);
|
|
for (const ModelObject *model_object : m_model.objects)
|
|
model_object_status_db.add(*model_object, ModelObjectStatus::New);
|
|
} else {
|
|
//BBS: replace model custom gcode with current plate custom gcode
|
|
m_model.curr_plate_index = model.curr_plate_index;
|
|
if (m_model.get_curr_plate_custom_gcodes() != model.get_curr_plate_custom_gcodes()) {
|
|
update_apply_status(num_extruders_changed ||
|
|
// Tool change G-codes are applied as color changes for a single extruder printer, no need to invalidate tool ordering.
|
|
//FIXME The tool ordering may be invalidated unnecessarily if the custom_gcode_per_print_z.mode is not applicable
|
|
// to the active print / model state, and then it is reset, so it is being applicable, but empty, thus the effect is the same.
|
|
(num_extruders > 1 && custom_per_printz_gcodes_tool_changes_differ(m_model.get_curr_plate_custom_gcodes().gcodes, model.get_curr_plate_custom_gcodes().gcodes)) ?
|
|
// The Tool Ordering and the Wipe Tower are no more valid.
|
|
this->invalidate_steps({ psWipeTower, psGCodeExport }) :
|
|
// There is no change in Tool Changes stored in custom_gcode_per_print_z, therefore there is no need to update Tool Ordering.
|
|
this->invalidate_step(psGCodeExport));
|
|
m_model.plates_custom_gcodes[m_model.curr_plate_index] = model.get_curr_plate_custom_gcodes();
|
|
}
|
|
if (model_object_list_equal(m_model, model)) {
|
|
// The object list did not change.
|
|
for (const ModelObject *model_object : m_model.objects)
|
|
model_object_status_db.add(*model_object, ModelObjectStatus::Old);
|
|
} else if (model_object_list_extended(m_model, model)) {
|
|
// Add new objects. Their volumes and configs will be synchronized later.
|
|
//BBS: we don't need to set invalid here, we judge it by comparing the print_object list
|
|
//update_apply_status(this->invalidate_step(psGCodeExport));
|
|
for (const ModelObject *model_object : m_model.objects)
|
|
model_object_status_db.add(*model_object, ModelObjectStatus::Old);
|
|
for (size_t i = m_model.objects.size(); i < model.objects.size(); ++ i) {
|
|
model_object_status_db.add(*model.objects[i], ModelObjectStatus::New);
|
|
m_model.objects.emplace_back(ModelObject::new_copy(*model.objects[i]));
|
|
m_model.objects.back()->set_model(&m_model);
|
|
}
|
|
//BBS: add more logs
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: new model objects added.")%__LINE__;
|
|
} else {
|
|
//BBS: add more logs
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: model object changed.")%__LINE__;
|
|
// Reorder the objects, add new objects.
|
|
// First stop background processing before shuffling or deleting the PrintObjects in the object list.
|
|
this->call_cancel_callback();
|
|
//BBS: we don't need to set invalid here, we judge it by comparing the print_object list
|
|
//update_apply_status(this->invalidate_step(psGCodeExport));
|
|
// Second create a new list of objects.
|
|
std::vector<ModelObject*> model_objects_old(std::move(m_model.objects));
|
|
m_model.objects.clear();
|
|
m_model.objects.reserve(model.objects.size());
|
|
auto by_id_lower = [](const ModelObject *lhs, const ModelObject *rhs){ return lhs->id() < rhs->id(); };
|
|
std::sort(model_objects_old.begin(), model_objects_old.end(), by_id_lower);
|
|
for (const ModelObject *mobj : model.objects) {
|
|
auto it = std::lower_bound(model_objects_old.begin(), model_objects_old.end(), mobj, by_id_lower);
|
|
if (it == model_objects_old.end() || (*it)->id() != mobj->id()) {
|
|
// New ModelObject added.
|
|
m_model.objects.emplace_back(ModelObject::new_copy(*mobj));
|
|
m_model.objects.back()->set_model(&m_model);
|
|
model_object_status_db.add(*mobj, ModelObjectStatus::New);
|
|
} else {
|
|
// Existing ModelObject re-added (possibly moved in the list).
|
|
m_model.objects.emplace_back(*it);
|
|
model_object_status_db.add(*mobj, ModelObjectStatus::Moved);
|
|
}
|
|
}
|
|
bool deleted_any = false;
|
|
for (ModelObject *&model_object : model_objects_old)
|
|
if (model_object_status_db.add_if_new(*model_object, ModelObjectStatus::Deleted))
|
|
deleted_any = true;
|
|
else
|
|
// Do not delete this ModelObject instance.
|
|
model_object = nullptr;
|
|
if (deleted_any) {
|
|
// Delete PrintObjects of the deleted ModelObjects.
|
|
PrintObjectPtrs print_objects_old = std::move(m_objects);
|
|
m_objects.clear();
|
|
m_objects.reserve(print_objects_old.size());
|
|
for (PrintObject *print_object : print_objects_old) {
|
|
const ModelObjectStatus &status = model_object_status_db.get(*print_object->model_object());
|
|
if (status.status == ModelObjectStatus::Deleted) {
|
|
update_apply_status(print_object->invalidate_all_steps());
|
|
delete print_object;
|
|
} else
|
|
m_objects.emplace_back(print_object);
|
|
}
|
|
for (ModelObject *model_object : model_objects_old)
|
|
delete model_object;
|
|
print_regions_reshuffled = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
// 2) Map print objects including their transformation matrices.
|
|
PrintObjectStatusDB print_object_status_db(m_objects);
|
|
|
|
// 3) Synchronize ModelObjects & PrintObjects.
|
|
const std::initializer_list<ModelVolumeType> solid_or_modifier_types { ModelVolumeType::MODEL_PART, ModelVolumeType::NEGATIVE_VOLUME, ModelVolumeType::PARAMETER_MODIFIER };
|
|
for (size_t idx_model_object = 0; idx_model_object < model.objects.size(); ++ idx_model_object) {
|
|
ModelObject &model_object = *m_model.objects[idx_model_object];
|
|
ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(model_object));
|
|
const ModelObject &model_object_new = *model.objects[idx_model_object];
|
|
if (model_object_status.status == ModelObjectStatus::New)
|
|
// PrintObject instances will be added in the next loop.
|
|
continue;
|
|
// Update the ModelObject instance, possibly invalidate the linked PrintObjects.
|
|
assert(model_object_status.status == ModelObjectStatus::Old || model_object_status.status == ModelObjectStatus::Moved);
|
|
// Check whether a model part volume was added or removed, their transformations or order changed.
|
|
// Only volume IDs, volume types, transformation matrices and their order are checked, configuration and other parameters are NOT checked.
|
|
bool solid_or_modifier_differ = model_volume_list_changed(model_object, model_object_new, solid_or_modifier_types) ||
|
|
model_mmu_segmentation_data_changed(model_object, model_object_new) ||
|
|
(model_object_new.is_mm_painted() && num_extruders_changed );
|
|
bool supports_differ = model_volume_list_changed(model_object, model_object_new, ModelVolumeType::SUPPORT_BLOCKER) ||
|
|
model_volume_list_changed(model_object, model_object_new, ModelVolumeType::SUPPORT_ENFORCER);
|
|
bool layer_height_ranges_differ = ! layer_height_ranges_equal(model_object.layer_config_ranges, model_object_new.layer_config_ranges, model_object_new.layer_height_profile.empty());
|
|
bool model_origin_translation_differ = model_object.origin_translation != model_object_new.origin_translation;
|
|
auto print_objects_range = print_object_status_db.get_range(model_object);
|
|
// The list actually can be empty if all instances are out of the print bed.
|
|
//assert(print_objects_range.begin() != print_objects_range.end());
|
|
// All PrintObjects in print_objects_range shall point to the same prints_objects_regions
|
|
if (print_objects_range.begin() != print_objects_range.end()) {
|
|
model_object_status.print_object_regions = print_objects_range.begin()->print_object->m_shared_regions;
|
|
model_object_status.print_object_regions->ref_cnt_inc();
|
|
}
|
|
if (solid_or_modifier_differ || model_origin_translation_differ || layer_height_ranges_differ ||
|
|
! model_object.layer_height_profile.timestamp_matches(model_object_new.layer_height_profile)) {
|
|
// The very first step (the slicing step) is invalidated. One may freely remove all associated PrintObjects.
|
|
model_object_status.print_object_regions_status =
|
|
model_object_status.print_object_regions == nullptr || model_origin_translation_differ || layer_height_ranges_differ ?
|
|
// Drop print_objects_regions.
|
|
ModelObjectStatus::PrintObjectRegionsStatus::Invalid :
|
|
// Reuse bounding boxes of print_objects_regions for ModelVolumes with unmodified transformation.
|
|
ModelObjectStatus::PrintObjectRegionsStatus::PartiallyValid;
|
|
for (const PrintObjectStatus &print_object_status : print_objects_range) {
|
|
update_apply_status(print_object_status.print_object->invalidate_all_steps());
|
|
const_cast<PrintObjectStatus&>(print_object_status).status = PrintObjectStatus::Deleted;
|
|
}
|
|
if (model_object_status.print_object_regions_status == ModelObjectStatus::PrintObjectRegionsStatus::PartiallyValid)
|
|
// Drop everything from PrintObjectRegions but those VolumeExtents (of their particular ModelVolumes) that are still valid.
|
|
print_objects_regions_invalidate_keep_some_volumes(*model_object_status.print_object_regions, model_object.volumes, model_object_new.volumes);
|
|
else if (model_object_status.print_object_regions != nullptr)
|
|
model_object_status.print_object_regions->clear();
|
|
// Copy content of the ModelObject including its ID, do not change the parent.
|
|
model_object.assign_copy(model_object_new);
|
|
} else {
|
|
model_object_status.print_object_regions_status = ModelObjectStatus::PrintObjectRegionsStatus::Valid;
|
|
if (supports_differ || model_custom_supports_data_changed(model_object, model_object_new)) {
|
|
// First stop background processing before shuffling or deleting the ModelVolumes in the ModelObject's list.
|
|
if (supports_differ) {
|
|
this->call_cancel_callback();
|
|
update_apply_status(false);
|
|
}
|
|
// Invalidate just the supports step.
|
|
for (const PrintObjectStatus &print_object_status : print_objects_range)
|
|
update_apply_status(print_object_status.print_object->invalidate_step(posSupportMaterial));
|
|
if (supports_differ) {
|
|
// Copy just the support volumes.
|
|
model_volume_list_update_supports(model_object, model_object_new);
|
|
}
|
|
} else if (model_custom_seam_data_changed(model_object, model_object_new)) {
|
|
update_apply_status(this->invalidate_step(psGCodeExport));
|
|
}
|
|
}
|
|
if (! solid_or_modifier_differ) {
|
|
// Synchronize Object's config.
|
|
bool object_config_changed = ! model_object.config.timestamp_matches(model_object_new.config);
|
|
if (object_config_changed)
|
|
model_object.config.assign_config(model_object_new.config);
|
|
if (! object_diff.empty() || object_config_changed || num_extruders_changed ) {
|
|
PrintObjectConfig new_config = PrintObject::object_config_from_model_object(m_default_object_config, model_object, num_extruders );
|
|
for (const PrintObjectStatus &print_object_status : print_object_status_db.get_range(model_object)) {
|
|
t_config_option_keys diff = print_object_status.print_object->config().diff(new_config);
|
|
if (! diff.empty()) {
|
|
update_apply_status(print_object_status.print_object->invalidate_state_by_config_options(print_object_status.print_object->config(), new_config, diff));
|
|
print_object_status.print_object->config_apply_only(new_config, diff, true);
|
|
}
|
|
}
|
|
}
|
|
// Synchronize (just copy) the remaining data of ModelVolumes (name, config, custom supports data).
|
|
//FIXME What to do with m_material_id?
|
|
model_volume_list_copy_configs(model_object /* dst */, model_object_new /* src */, ModelVolumeType::MODEL_PART);
|
|
model_volume_list_copy_configs(model_object /* dst */, model_object_new /* src */, ModelVolumeType::PARAMETER_MODIFIER);
|
|
layer_height_ranges_copy_configs(model_object.layer_config_ranges /* dst */, model_object_new.layer_config_ranges /* src */);
|
|
// Copy the ModelObject name, input_file and instances. The instances will be compared against PrintObject instances in the next step.
|
|
model_object.name = model_object_new.name;
|
|
model_object.input_file = model_object_new.input_file;
|
|
// Only refresh ModelInstances if there is any change.
|
|
if (model_object.instances.size() != model_object_new.instances.size() ||
|
|
! std::equal(model_object.instances.begin(), model_object.instances.end(), model_object_new.instances.begin(), [](auto l, auto r){ return l->id() == r->id(); })) {
|
|
// G-code generator accesses model_object.instances to generate sequential print ordering matching the Plater object list.
|
|
update_apply_status(this->invalidate_step(psGCodeExport));
|
|
model_object.clear_instances();
|
|
model_object.instances.reserve(model_object_new.instances.size());
|
|
for (const ModelInstance *model_instance : model_object_new.instances) {
|
|
model_object.instances.emplace_back(new ModelInstance(*model_instance));
|
|
model_object.instances.back()->set_model_object(&model_object);
|
|
}
|
|
} else if (! std::equal(model_object.instances.begin(), model_object.instances.end(), model_object_new.instances.begin(),
|
|
[](auto l, auto r){ return l->print_volume_state == r->print_volume_state && l->printable == r->printable &&
|
|
l->get_transformation().get_matrix().isApprox(r->get_transformation().get_matrix()); })) {
|
|
// If some of the instances changed, the bounding box of the updated ModelObject is likely no more valid.
|
|
// This is safe as the ModelObject's bounding box is only accessed from this function, which is called from the main thread only.
|
|
model_object.invalidate_bounding_box();
|
|
// Synchronize the content of instances.
|
|
auto new_instance = model_object_new.instances.begin();
|
|
for (auto old_instance = model_object.instances.begin(); old_instance != model_object.instances.end(); ++ old_instance, ++ new_instance) {
|
|
(*old_instance)->set_transformation((*new_instance)->get_transformation());
|
|
(*old_instance)->print_volume_state = (*new_instance)->print_volume_state;
|
|
(*old_instance)->printable = (*new_instance)->printable;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// 4) Generate PrintObjects from ModelObjects and their instances.
|
|
{
|
|
PrintObjectPtrs print_objects_new;
|
|
print_objects_new.reserve(std::max(m_objects.size(), m_model.objects.size()));
|
|
bool new_objects = false;
|
|
// Walk over all new model objects and check, whether there are matching PrintObjects.
|
|
for (ModelObject *model_object : m_model.objects) {
|
|
ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(*model_object));
|
|
model_object_status.print_instances = print_objects_from_model_object(*model_object);
|
|
std::vector<const PrintObjectStatus*> old;
|
|
old.reserve(print_object_status_db.count(*model_object));
|
|
for (const PrintObjectStatus &print_object_status : print_object_status_db.get_range(*model_object))
|
|
if (print_object_status.status != PrintObjectStatus::Deleted)
|
|
old.emplace_back(&print_object_status);
|
|
// Generate a list of trafos and XY offsets for instances of a ModelObject
|
|
// Producing the config for PrintObject on demand, caching it at print_object_last.
|
|
const PrintObject *print_object_last = nullptr;
|
|
auto print_object_apply_config = [this, &print_object_last, model_object, num_extruders ](PrintObject *print_object) {
|
|
print_object->config_apply(print_object_last ?
|
|
print_object_last->config() :
|
|
PrintObject::object_config_from_model_object(m_default_object_config, *model_object, num_extruders ));
|
|
print_object_last = print_object;
|
|
};
|
|
if (old.empty()) {
|
|
// Simple case, just generate new instances.
|
|
for (PrintObjectTrafoAndInstances &print_instances : model_object_status.print_instances) {
|
|
PrintObject *print_object = new PrintObject(this, model_object, print_instances.trafo, std::move(print_instances.instances));
|
|
print_object_apply_config(print_object);
|
|
print_objects_new.emplace_back(print_object);
|
|
// print_object_status.emplace(PrintObjectStatus(print_object, PrintObjectStatus::New));
|
|
new_objects = true;
|
|
}
|
|
continue;
|
|
}
|
|
// Complex case, try to merge the two lists.
|
|
// Sort the old lexicographically by their trafos.
|
|
std::sort(old.begin(), old.end(), [](const PrintObjectStatus *lhs, const PrintObjectStatus *rhs){ return transform3d_lower(lhs->trafo, rhs->trafo); });
|
|
// Merge the old / new lists.
|
|
auto it_old = old.begin();
|
|
for (PrintObjectTrafoAndInstances &new_instances : model_object_status.print_instances) {
|
|
for (; it_old != old.end() && transform3d_lower((*it_old)->trafo, new_instances.trafo); ++ it_old);
|
|
if (it_old == old.end() || ! transform3d_equal((*it_old)->trafo, new_instances.trafo)) {
|
|
// This is a new instance (or a set of instances with the same trafo). Just add it.
|
|
PrintObject *print_object = new PrintObject(this, model_object, new_instances.trafo, std::move(new_instances.instances));
|
|
print_object_apply_config(print_object);
|
|
print_objects_new.emplace_back(print_object);
|
|
// print_object_status.emplace(PrintObjectStatus(print_object, PrintObjectStatus::New));
|
|
new_objects = true;
|
|
if (it_old != old.end())
|
|
const_cast<PrintObjectStatus*>(*it_old)->status = PrintObjectStatus::Deleted;
|
|
} else {
|
|
// The PrintObject already exists and the copies differ.
|
|
PrintBase::ApplyStatus status = (*it_old)->print_object->set_instances(std::move(new_instances.instances));
|
|
if (status != PrintBase::APPLY_STATUS_UNCHANGED)
|
|
update_apply_status(status == PrintBase::APPLY_STATUS_INVALIDATED);
|
|
print_objects_new.emplace_back((*it_old)->print_object);
|
|
const_cast<PrintObjectStatus*>(*it_old)->status = PrintObjectStatus::Reused;
|
|
}
|
|
}
|
|
}
|
|
if (m_objects != print_objects_new) {
|
|
//BBS: add more logs
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: found print object changed.")%__LINE__;
|
|
this->call_cancel_callback();
|
|
update_apply_status(this->invalidate_all_steps());
|
|
m_objects = print_objects_new;
|
|
// Delete the PrintObjects marked as Unknown or Deleted.
|
|
bool deleted_objects = false;
|
|
for (const PrintObjectStatus &pos : print_object_status_db)
|
|
if (pos.status == PrintObjectStatus::Unknown || pos.status == PrintObjectStatus::Deleted) {
|
|
update_apply_status(pos.print_object->invalidate_all_steps());
|
|
delete pos.print_object;
|
|
deleted_objects = true;
|
|
}
|
|
if (new_objects || deleted_objects)
|
|
update_apply_status(this->invalidate_steps({ psSkirtBrim, psWipeTower, psGCodeExport }));
|
|
if (new_objects)
|
|
update_apply_status(false);
|
|
print_regions_reshuffled = true;
|
|
}
|
|
print_object_status_db.clear();
|
|
|
|
// BBS
|
|
for (PrintObject* object : m_objects) {
|
|
auto ept_iter = std::find(print_diff.begin(), print_diff.end(), "enable_prime_tower");
|
|
if (/*object->config().adaptive_layer_height &&*/ ept_iter != print_diff.end()) {
|
|
update_apply_status(object->invalidate_step(posSlice));
|
|
}
|
|
}
|
|
}
|
|
|
|
//BBS: check the config again
|
|
int new_used_filaments = this->extruders(true).size();
|
|
t_config_option_keys new_changed_keys = new_full_config.normalize_fdm_2(objects().size(), new_used_filaments);
|
|
if (new_changed_keys.size() > 0) {
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", got new_changed_keys, size=%1%")%new_changed_keys.size();
|
|
for (int i = 0; i < new_changed_keys.size(); i++)
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", i=%1%, key=%2%")%i %new_changed_keys[i];
|
|
}
|
|
|
|
update_apply_status(false);
|
|
|
|
// The following call may stop the background processing.
|
|
update_apply_status(this->invalidate_state_by_config_options(new_full_config, new_changed_keys));
|
|
|
|
update_apply_status(this->invalidate_step(psGCodeExport));
|
|
|
|
if (full_config_diff.empty()) {
|
|
//BBS: previous empty
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: full_config_diff previous empty, need to apply now.")%__LINE__;
|
|
|
|
m_placeholder_parser.clear_config();
|
|
// Set the profile aliases for the PrintBase::output_filename()
|
|
m_placeholder_parser.set("print_preset", new_full_config.option("print_settings_id")->clone());
|
|
m_placeholder_parser.set("filament_preset", new_full_config.option("filament_settings_id")->clone());
|
|
m_placeholder_parser.set("printer_preset", new_full_config.option("printer_settings_id")->clone());
|
|
|
|
//m_placeholder_parser.apply_config(filament_overrides);
|
|
}
|
|
// It is also safe to change m_config now after this->invalidate_state_by_config_options() call.
|
|
m_config.apply_only(new_full_config, new_changed_keys, true);
|
|
// Handle changes to object config defaults
|
|
m_default_object_config.apply_only(new_full_config, new_changed_keys, true);
|
|
// Handle changes to regions config defaults
|
|
m_default_region_config.apply_only(new_full_config, new_changed_keys, true);
|
|
m_full_print_config = std::move(new_full_config);
|
|
}
|
|
|
|
// All regions now have distinct settings.
|
|
// Check whether applying the new region config defaults we would get different regions,
|
|
// update regions or create regions from scratch.
|
|
for (auto it_print_object = m_objects.begin(); it_print_object != m_objects.end();) {
|
|
// Find the range of PrintObjects sharing the same associated ModelObject.
|
|
auto it_print_object_end = it_print_object;
|
|
PrintObject &print_object = *(*it_print_object);
|
|
const ModelObject &model_object = *print_object.model_object();
|
|
ModelObjectStatus &model_object_status = const_cast<ModelObjectStatus&>(model_object_status_db.reuse(model_object));
|
|
PrintObjectRegions *print_object_regions = model_object_status.print_object_regions;
|
|
for (++ it_print_object_end; it_print_object_end != m_objects.end() && (*it_print_object)->model_object() == (*it_print_object_end)->model_object(); ++ it_print_object_end)
|
|
assert((*it_print_object_end)->m_shared_regions == nullptr || (*it_print_object_end)->m_shared_regions == print_object_regions);
|
|
if (print_object_regions == nullptr) {
|
|
print_object_regions = new PrintObjectRegions{};
|
|
model_object_status.print_object_regions = print_object_regions;
|
|
print_object_regions->ref_cnt_inc();
|
|
}
|
|
std::vector<unsigned int> painting_extruders;
|
|
if (const auto &volumes = print_object.model_object()->volumes;
|
|
num_extruders > 1 &&
|
|
std::find_if(volumes.begin(), volumes.end(), [](const ModelVolume *v) { return ! v->mmu_segmentation_facets.empty(); }) != volumes.end()) {
|
|
//FIXME be more specific! Don't enumerate extruders that are not used for painting!
|
|
painting_extruders.assign(num_extruders , 0);
|
|
std::iota(painting_extruders.begin(), painting_extruders.end(), 1);
|
|
}
|
|
if (model_object_status.print_object_regions_status == ModelObjectStatus::PrintObjectRegionsStatus::Valid) {
|
|
// Verify that the trafo for regions & volume bounding boxes thus for regions is still applicable.
|
|
auto invalidate = [it_print_object, it_print_object_end, update_apply_status]() {
|
|
for (auto it = it_print_object; it != it_print_object_end; ++ it)
|
|
if ((*it)->m_shared_regions != nullptr)
|
|
update_apply_status((*it)->invalidate_all_steps());
|
|
};
|
|
if (print_object_regions && ! trafos_differ_in_rotation_by_z_and_mirroring_by_xy_only(print_object_regions->trafo_bboxes, model_object_status.print_instances.front().trafo)) {
|
|
invalidate();
|
|
print_object_regions->clear();
|
|
model_object_status.print_object_regions_status = ModelObjectStatus::PrintObjectRegionsStatus::Invalid;
|
|
print_regions_reshuffled = true;
|
|
} else if (print_object_regions &&
|
|
verify_update_print_object_regions(
|
|
print_object.model_object()->volumes,
|
|
m_default_region_config,
|
|
num_extruders ,
|
|
painting_extruders,
|
|
*print_object_regions,
|
|
[it_print_object, it_print_object_end, &update_apply_status](const PrintRegionConfig &old_config, const PrintRegionConfig &new_config, const t_config_option_keys &diff_keys) {
|
|
for (auto it = it_print_object; it != it_print_object_end; ++it)
|
|
if ((*it)->m_shared_regions != nullptr)
|
|
update_apply_status((*it)->invalidate_state_by_config_options(old_config, new_config, diff_keys));
|
|
})) {
|
|
// Regions are valid, just keep them.
|
|
} else {
|
|
// Regions were reshuffled.
|
|
invalidate();
|
|
// At least reuse layer ranges and bounding boxes of ModelVolumes.
|
|
model_object_status.print_object_regions_status = ModelObjectStatus::PrintObjectRegionsStatus::PartiallyValid;
|
|
print_regions_reshuffled = true;
|
|
}
|
|
}
|
|
if (print_object_regions == nullptr || model_object_status.print_object_regions_status != ModelObjectStatus::PrintObjectRegionsStatus::Valid) {
|
|
// Layer ranges with their associated configurations. Remove overlaps between the ranges
|
|
// and create the regions from scratch.
|
|
print_object_regions = generate_print_object_regions(
|
|
print_object_regions,
|
|
print_object.model_object()->volumes,
|
|
LayerRanges(print_object.model_object()->layer_config_ranges),
|
|
m_default_region_config,
|
|
model_object_status.print_instances.front().trafo,
|
|
num_extruders ,
|
|
print_object.is_mm_painted() ? 0.f : float(print_object.config().xy_contour_compensation.value),
|
|
painting_extruders);
|
|
}
|
|
for (auto it = it_print_object; it != it_print_object_end; ++it)
|
|
if ((*it)->m_shared_regions) {
|
|
assert((*it)->m_shared_regions == print_object_regions);
|
|
} else {
|
|
(*it)->m_shared_regions = print_object_regions;
|
|
print_object_regions->ref_cnt_inc();
|
|
}
|
|
it_print_object = it_print_object_end;
|
|
}
|
|
|
|
if (print_regions_reshuffled) {
|
|
// Update Print::m_print_regions from objects.
|
|
struct cmp { bool operator() (const PrintRegion *l, const PrintRegion *r) const { return l->config_hash() == r->config_hash() && l->config() == r->config(); } };
|
|
std::set<const PrintRegion*, cmp> region_set;
|
|
m_print_regions.clear();
|
|
PrintObjectRegions *print_object_regions = nullptr;
|
|
for (PrintObject *print_object : m_objects)
|
|
if (print_object_regions != print_object->m_shared_regions) {
|
|
print_object_regions = print_object->m_shared_regions;
|
|
for (std::unique_ptr<Slic3r::PrintRegion> &print_region : print_object_regions->all_regions)
|
|
if (auto it = region_set.find(print_region.get()); it == region_set.end()) {
|
|
int print_region_id = int(m_print_regions.size());
|
|
m_print_regions.emplace_back(print_region.get());
|
|
print_region->m_print_region_id = print_region_id;
|
|
} else {
|
|
print_region->m_print_region_id = (*it)->print_region_id();
|
|
}
|
|
}
|
|
}
|
|
|
|
// Update SlicingParameters for each object where the SlicingParameters is not valid.
|
|
// If it is not valid, then it is ensured that PrintObject.m_slicing_params is not in use
|
|
// (posSlicing and posSupportMaterial was invalidated).
|
|
for (PrintObject *object : m_objects)
|
|
{
|
|
object->update_slicing_parameters();
|
|
m_support_used |= object->config().enable_support;
|
|
}
|
|
|
|
#ifdef _DEBUG
|
|
check_model_ids_equal(m_model, model);
|
|
#endif /* _DEBUG */
|
|
|
|
//BBS: add timestamp logic
|
|
if (apply_status != APPLY_STATUS_UNCHANGED)
|
|
m_modified_count++;
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: finished, this %2%, m_modified_count %3%, apply_status %4%, m_support_used %5%")%__LINE__ %this %m_modified_count %apply_status %m_support_used;
|
|
return static_cast<ApplyStatus>(apply_status);
|
|
}
|
|
|
|
} // namespace Slic3r
|