* 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>
545 lines
23 KiB
C++
545 lines
23 KiB
C++
///|/ Copyright (c) Prusa Research 2018 - 2023 Oleksandra Iushchenko @YuSanka, Lukáš Matěna @lukasmatena, Lukáš Hejl @hejllukas, Enrico Turri @enricoturri1966, David Kocík @kocikdav, Vojtěch Bubník @bubnikv, Tomáš Mészáros @tamasmeszaros, Vojtěch Král @vojtechkral
|
|
///|/
|
|
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
|
|
///|/
|
|
#ifndef slic3r_GUI_ObjectDataViewModel_hpp_
|
|
#define slic3r_GUI_ObjectDataViewModel_hpp_
|
|
|
|
#include <boost/log/trivial.hpp>
|
|
#include <wx/dataview.h>
|
|
#include <vector>
|
|
#include <map>
|
|
|
|
#include "ExtraRenderers.hpp"
|
|
|
|
namespace Slic3r {
|
|
class ModelObject;
|
|
class ModelVolume;
|
|
enum class ModelVolumeType : int;
|
|
|
|
namespace GUI {
|
|
class PartPlate;
|
|
|
|
typedef double coordf_t;
|
|
typedef std::pair<coordf_t, coordf_t> t_layer_height_range;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// ObjectDataViewModelNode: a node inside ObjectDataViewModel
|
|
// ----------------------------------------------------------------------------
|
|
enum ItemType {
|
|
itUndef = 0,
|
|
itPlate = 1,
|
|
itObject = 2,
|
|
itVolume = 4,
|
|
itInstanceRoot = 8,
|
|
itInstance = 16,
|
|
itSettings = 32,
|
|
itLayerRoot = 64,
|
|
itLayer = 128,
|
|
itInfo = 256,
|
|
};
|
|
|
|
enum ColumnNumber
|
|
{
|
|
colName = 0, // item name
|
|
colPrint , // printable property
|
|
colFilament , // extruder selection
|
|
// BBS
|
|
colSupportPaint ,
|
|
colColorPaint ,
|
|
colSinking ,
|
|
colEditing , // item editing
|
|
colCount ,
|
|
};
|
|
|
|
enum PrintIndicator
|
|
{
|
|
piUndef = 0, // no print indicator
|
|
piPrintable , // printable
|
|
piUnprintable , // unprintable
|
|
};
|
|
|
|
enum class InfoItemType
|
|
{
|
|
Undef,
|
|
CustomSupports,
|
|
//CustomSeam,
|
|
MmuSegmentation,
|
|
//Sinking
|
|
CutConnectors,
|
|
};
|
|
|
|
class ObjectDataViewModelNode;
|
|
WX_DEFINE_ARRAY_PTR(ObjectDataViewModelNode*, MyObjectTreeModelNodePtrArray);
|
|
|
|
class ObjectDataViewModelNode
|
|
{
|
|
ObjectDataViewModelNode* m_parent;
|
|
MyObjectTreeModelNodePtrArray m_children;
|
|
wxBitmap m_empty_bmp;
|
|
size_t m_volumes_cnt = 0;
|
|
std::vector< std::string > m_opt_categories;
|
|
t_layer_height_range m_layer_range = { 0.0f, 0.0f };
|
|
|
|
wxString m_name;
|
|
wxBitmap& m_bmp = m_empty_bmp;
|
|
ItemType m_type;
|
|
int m_idx = -1;
|
|
int m_plate_idx = -1;
|
|
bool m_container = false;
|
|
// BBS
|
|
wxString m_extruder = wxEmptyString;
|
|
wxBitmap m_extruder_bmp;
|
|
wxBitmap m_action_icon;
|
|
// BBS
|
|
wxBitmap m_support_icon;
|
|
wxBitmap m_color_icon;
|
|
wxBitmap m_sinking_icon;
|
|
PrintIndicator m_printable {piUndef};
|
|
wxBitmap m_printable_icon;
|
|
std::string m_warning_icon_name{ "" };
|
|
bool m_has_lock{false}; // for cut object icon
|
|
|
|
std::string m_action_icon_name = "";
|
|
ModelVolumeType m_volume_type = ModelVolumeType(-1);
|
|
bool m_is_text_volume{ false };
|
|
bool m_is_svg_volume{false};
|
|
InfoItemType m_info_item_type {InfoItemType::Undef};
|
|
bool m_action_enable = false; // can undo all settings
|
|
// BBS
|
|
bool m_support_enable = false;
|
|
bool m_color_enable = false;
|
|
bool m_sink_enable = false;
|
|
|
|
public:
|
|
PartPlate* m_part_plate;
|
|
ModelObject* m_model_object;
|
|
|
|
public:
|
|
ObjectDataViewModelNode(const wxString& name,
|
|
const wxString& extruder,
|
|
const int plate_idx,
|
|
ModelObject *model_object):
|
|
m_parent(NULL),
|
|
m_name(name),
|
|
m_type(itObject),
|
|
m_extruder(extruder),
|
|
m_plate_idx(plate_idx),
|
|
m_model_object(model_object)
|
|
{
|
|
set_icons();
|
|
init_container();
|
|
}
|
|
|
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
|
|
const wxString& sub_obj_name,
|
|
Slic3r::ModelVolumeType type,
|
|
const bool is_text_volume,
|
|
const bool is_svg_volume,
|
|
const wxString& extruder,
|
|
const int idx = -1 );
|
|
|
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
|
|
const t_layer_height_range& layer_range,
|
|
const int idx = -1,
|
|
const wxString& extruder = wxEmptyString );
|
|
|
|
ObjectDataViewModelNode(PartPlate* part_plate, wxString name);
|
|
|
|
//BBS: add part plate related logic
|
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const ItemType type, const int plate_idx = -1);
|
|
// BBS: to be checked. Whether need to add plate_idx for the following constructor ?
|
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const InfoItemType type);
|
|
|
|
~ObjectDataViewModelNode()
|
|
{
|
|
// free all our children nodes
|
|
size_t count = m_children.GetCount();
|
|
for (size_t i = 0; i < count; i++)
|
|
{
|
|
ObjectDataViewModelNode *child = m_children[i];
|
|
delete child;
|
|
}
|
|
#ifndef NDEBUG
|
|
// Indicate that the object was deleted.
|
|
m_idx = -2;
|
|
#endif /* NDEBUG */
|
|
}
|
|
|
|
void init_container();
|
|
bool IsContainer() const
|
|
{
|
|
return m_container;
|
|
}
|
|
|
|
ObjectDataViewModelNode* GetParent()
|
|
{
|
|
assert(m_parent == nullptr || m_parent->valid());
|
|
return m_parent;
|
|
}
|
|
MyObjectTreeModelNodePtrArray& GetChildren()
|
|
{
|
|
return m_children;
|
|
}
|
|
ObjectDataViewModelNode* GetNthChild(unsigned int n)
|
|
{
|
|
return m_children.Item(n);
|
|
}
|
|
|
|
int GetChildIndex(ObjectDataViewModelNode* child) const
|
|
{
|
|
size_t child_count = GetChildCount();
|
|
for (int index = 0; index < child_count; index++)
|
|
{
|
|
if (m_children.Item(index) == child)
|
|
return index;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
void Insert(ObjectDataViewModelNode* child, unsigned int n)
|
|
{
|
|
if (!m_container)
|
|
m_container = true;
|
|
m_children.Insert(child, n);
|
|
}
|
|
void Append(ObjectDataViewModelNode* child)
|
|
{
|
|
if (!m_container)
|
|
m_container = true;
|
|
m_children.Add(child);
|
|
}
|
|
void RemoveAllChildren()
|
|
{
|
|
if (GetChildCount() == 0)
|
|
return;
|
|
for (int id = int(GetChildCount()) - 1; id >= 0; --id)
|
|
{
|
|
if (m_children.Item(id)->GetChildCount() > 0)
|
|
m_children[id]->RemoveAllChildren();
|
|
auto node = m_children[id];
|
|
m_children.RemoveAt(id);
|
|
delete node;
|
|
}
|
|
}
|
|
|
|
size_t GetChildCount() const
|
|
{
|
|
return m_children.GetCount();
|
|
}
|
|
void SetName(const wxString &);
|
|
bool SetValue(const wxVariant &variant, unsigned int col);
|
|
void SetVolumeType(ModelVolumeType type) { m_volume_type = type; }
|
|
void SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
|
|
void SetExtruder(const wxString &extruder) { m_extruder = extruder; }
|
|
void SetWarningIconName(const std::string& warning_icon_name) { m_warning_icon_name = warning_icon_name; }
|
|
void SetLock(bool has_lock) { m_has_lock = has_lock; }
|
|
const wxBitmap& GetBitmap() const { return m_bmp; }
|
|
const wxString& GetName() const { return m_name; }
|
|
ItemType GetType() const { return m_type; }
|
|
InfoItemType GetInfoItemType() const { return m_info_item_type; }
|
|
void SetIdx(const int& idx);
|
|
int GetIdx() const { return m_idx; }
|
|
//BBS: add part plate related logic
|
|
void SetPlateIdx(const int& idx);
|
|
int GetPlateIdx() const { return m_plate_idx; }
|
|
ModelVolumeType GetVolumeType() { return m_volume_type; }
|
|
t_layer_height_range GetLayerRange() const { return m_layer_range; }
|
|
wxString GetExtruder() { return m_extruder; }
|
|
PrintIndicator IsPrintable() const { return m_printable; }
|
|
// BBS
|
|
bool HasColorPainting() const { return m_color_enable; }
|
|
bool HasSupportPainting() const { return m_support_enable; }
|
|
bool HasSinking() const { return m_sink_enable; }
|
|
bool IsActionEnabled() const { return m_action_enable; }
|
|
void UpdateExtruderAndColorIcon(wxString extruder = "");
|
|
|
|
// use this function only for childrens
|
|
void AssignAllVal(ObjectDataViewModelNode& from_node)
|
|
{
|
|
// ! Don't overwrite other values because of equality of this values for all children --
|
|
m_name = from_node.m_name;
|
|
m_bmp = from_node.m_bmp;
|
|
m_idx = from_node.m_idx;
|
|
m_extruder = from_node.m_extruder;
|
|
m_type = from_node.m_type;
|
|
}
|
|
|
|
bool SwapChildrens(int frst_id, int scnd_id) {
|
|
if (GetChildCount() < 2 ||
|
|
frst_id < 0 || (size_t)frst_id >= GetChildCount() ||
|
|
scnd_id < 0 || (size_t)scnd_id >= GetChildCount())
|
|
return false;
|
|
|
|
ObjectDataViewModelNode new_scnd = *GetNthChild(frst_id);
|
|
ObjectDataViewModelNode new_frst = *GetNthChild(scnd_id);
|
|
|
|
new_scnd.m_idx = m_children.Item(scnd_id)->m_idx;
|
|
new_frst.m_idx = m_children.Item(frst_id)->m_idx;
|
|
|
|
m_children.Item(frst_id)->AssignAllVal(new_frst);
|
|
m_children.Item(scnd_id)->AssignAllVal(new_scnd);
|
|
return true;
|
|
}
|
|
|
|
// Set action and extruder(if any exist) icons for node
|
|
void set_icons();
|
|
// set extruder icon for node
|
|
void set_extruder_icon();
|
|
// Set printable icon for node
|
|
void set_printable_icon(PrintIndicator printable);
|
|
void set_action_icon(bool enable);
|
|
// BBS
|
|
void set_color_icon(bool enable);
|
|
void set_support_icon(bool enable);
|
|
void set_sinking_icon(bool enable);
|
|
|
|
// Set warning icon for node
|
|
void set_warning_icon(const std::string& warning_icon);
|
|
|
|
void update_settings_digest_bitmaps();
|
|
bool update_settings_digest(const std::vector<std::string>& categories);
|
|
int volume_type() const { return int(m_volume_type); }
|
|
bool is_text_volume() const { return m_is_text_volume; }
|
|
bool is_svg_volume() const { return m_is_svg_volume; }
|
|
void sys_color_changed();
|
|
void msw_rescale();
|
|
|
|
#ifndef NDEBUG
|
|
bool valid();
|
|
#endif /* NDEBUG */
|
|
bool invalid() const { return m_idx < -1; }
|
|
bool has_warning_icon() const { return !m_warning_icon_name.empty(); }
|
|
std::string warning_icon_name() const { return m_warning_icon_name; }
|
|
bool has_lock() const { return m_has_lock; }
|
|
|
|
private:
|
|
friend class ObjectDataViewModel;
|
|
};
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// ObjectDataViewModel
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// custom message the model sends to associated control to notify a last volume deleted from the object:
|
|
wxDECLARE_EVENT(wxCUSTOMEVT_LAST_VOLUME_IS_DELETED, wxCommandEvent);
|
|
|
|
class ObjectDataViewModel :public wxDataViewModel
|
|
{
|
|
std::vector<ObjectDataViewModelNode*> m_plates;
|
|
std::vector<ObjectDataViewModelNode*> m_objects;
|
|
std::vector<wxBitmap> m_volume_bmps;
|
|
std::vector<wxBitmap> m_text_volume_bmps;
|
|
std::vector<wxBitmap> m_svg_volume_bmps;
|
|
std::map<InfoItemType, wxBitmap> m_info_bmps;
|
|
wxBitmap m_empty_bmp;
|
|
wxBitmap m_warning_bmp;
|
|
wxBitmap m_warning_manifold_bmp;
|
|
wxBitmap m_lock_bmp;
|
|
|
|
ObjectDataViewModelNode* m_plate_outside;
|
|
|
|
wxDataViewCtrl* m_ctrl { nullptr };
|
|
std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> assembly_name_list;
|
|
std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> search_found_list;
|
|
std::map<int, int> m_ui_and_3d_volume_map;
|
|
|
|
public:
|
|
ObjectDataViewModel();
|
|
~ObjectDataViewModel();
|
|
|
|
void Init();
|
|
std::map<int, int> &get_ui_and_3d_volume_map() { return m_ui_and_3d_volume_map; }
|
|
int get_real_volume_index_in_3d(int ui_value)
|
|
{
|
|
if (m_ui_and_3d_volume_map.find(ui_value) != m_ui_and_3d_volume_map.end()) {
|
|
return m_ui_and_3d_volume_map[ui_value];
|
|
}
|
|
return ui_value;
|
|
}
|
|
int get_real_volume_index_in_ui(int _3d_value)
|
|
{
|
|
for (auto item: m_ui_and_3d_volume_map) {
|
|
if (item.second == _3d_value) {
|
|
return item.first;
|
|
}
|
|
}
|
|
return _3d_value;
|
|
}
|
|
wxDataViewItem AddPlate(PartPlate* part_plate, wxString name = wxEmptyString, bool refresh = true);
|
|
wxDataViewItem AddObject(ModelObject* model_object, std::string warning_bitmap, bool has_lock = false, bool refresh = true);
|
|
wxDataViewItem AddVolumeChild( const wxDataViewItem &parent_item,
|
|
const wxString &name,
|
|
const Slic3r::ModelVolumeType volume_type,
|
|
const bool is_text_volume,
|
|
const bool is_svg_volume,
|
|
const std::string& warning_icon_name = std::string(),
|
|
const int extruder = 0,
|
|
const bool create_frst_child = true);
|
|
wxDataViewItem AddSettingsChild(const wxDataViewItem &parent_item);
|
|
wxDataViewItem AddInfoChild(const wxDataViewItem &parent_item, InfoItemType info_type);
|
|
wxDataViewItem AddInstanceChild(const wxDataViewItem &parent_item, size_t num);
|
|
wxDataViewItem AddInstanceChild(const wxDataViewItem &parent_item, const std::vector<bool>& print_indicator, const std::vector<int>& plate_indicator);
|
|
wxDataViewItem AddLayersRoot(const wxDataViewItem &parent_item);
|
|
wxDataViewItem AddLayersChild( const wxDataViewItem &parent_item,
|
|
const t_layer_height_range& layer_range,
|
|
const int extruder = 0,
|
|
const int index = -1);
|
|
size_t GetItemIndexForFirstVolume(ObjectDataViewModelNode* node_parent);
|
|
wxDataViewItem DeletePlate(const int plate_idx);
|
|
wxDataViewItem Delete(const wxDataViewItem &item);
|
|
wxDataViewItem DeleteLastInstance(const wxDataViewItem &parent_item, size_t num);
|
|
void ResetAll();
|
|
void DeleteChildren(wxDataViewItem& parent);
|
|
void DeleteVolumeChildren(wxDataViewItem& parent);
|
|
void DeleteSettings(const wxDataViewItem& parent);
|
|
wxDataViewItem GetItemByPlateId(int plate_idx);
|
|
void SetCurSelectedPlateFullName(int plate_idx,const std::string &);
|
|
wxDataViewItem GetItemById(int obj_idx);
|
|
wxDataViewItem GetItemById(const int obj_idx, const int sub_obj_idx, const ItemType parent_type);
|
|
wxDataViewItem GetItemByVolumeId(int obj_idx, int volume_idx);
|
|
wxDataViewItem GetItemByInstanceId(int obj_idx, int inst_idx);
|
|
wxDataViewItem GetItemByLayerId(int obj_idx, int layer_idx);
|
|
wxDataViewItem GetItemByLayerRange(const int obj_idx, const t_layer_height_range& layer_range);
|
|
int GetItemIdByLayerRange(const int obj_idx, const t_layer_height_range& layer_range);
|
|
int GetIdByItem(const wxDataViewItem& item) const;
|
|
int GetPlateIdByItem(const wxDataViewItem& item) const;
|
|
int GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const;
|
|
int GetObjectIdByItem(const wxDataViewItem& item) const;
|
|
int GetVolumeIdByItem(const wxDataViewItem& item) const;
|
|
int GetInstanceIdByItem(const wxDataViewItem& item) const;
|
|
int GetLayerIdByItem(const wxDataViewItem& item) const;
|
|
void GetItemInfo(const wxDataViewItem& item, ItemType& type, int& obj_idx, int& idx);
|
|
int GetRowByItem(const wxDataViewItem& item) const;
|
|
bool IsEmpty() { return m_objects.empty(); }
|
|
bool InvalidItem(const wxDataViewItem& item);
|
|
|
|
// helper method for wxLog
|
|
|
|
wxString GetName(const wxDataViewItem &item) const;
|
|
wxBitmap& GetBitmap(const wxDataViewItem &item) const;
|
|
wxString GetExtruder(const wxDataViewItem &item) const;
|
|
int GetExtruderNumber(const wxDataViewItem &item) const;
|
|
|
|
// helper methods to change the model
|
|
|
|
unsigned int GetColumnCount() const override { return 3;}
|
|
wxString GetColumnType(unsigned int col) const override;
|
|
|
|
void GetValue( wxVariant &variant,
|
|
const wxDataViewItem &item,
|
|
unsigned int col) const override;
|
|
bool SetValue( const wxVariant &variant,
|
|
const wxDataViewItem &item,
|
|
unsigned int col) override;
|
|
bool SetValue( const wxVariant &variant,
|
|
const int item_idx,
|
|
unsigned int col);
|
|
|
|
void SetExtruder(const wxString& extruder, wxDataViewItem item);
|
|
void OnPlateChange(const int plate_idx, wxDataViewItem item);
|
|
void SetPlateIdx(const int plate_idx, wxDataViewItem item);
|
|
bool SetName (const wxString& new_name, wxDataViewItem item);
|
|
|
|
// For parent move child from cur_volume_id place to new_volume_id
|
|
// Remaining items will moved up/down accordingly
|
|
wxDataViewItem ReorganizeChildren( const int cur_volume_id,
|
|
const int new_volume_id,
|
|
const wxDataViewItem &parent);
|
|
wxDataViewItem ReorganizeObjects( int current_id, int new_id);
|
|
|
|
bool IsEnabled(const wxDataViewItem &item, unsigned int col) const override;
|
|
|
|
wxDataViewItem GetParent(const wxDataViewItem &item) const override;
|
|
// get object item
|
|
wxDataViewItem GetObject(const wxDataViewItem& item) const;
|
|
wxDataViewItem GetTopParent(const wxDataViewItem &item) const;
|
|
bool IsContainer(const wxDataViewItem &item) const override;
|
|
unsigned int GetChildren(const wxDataViewItem &parent, wxDataViewItemArray &array) const override;
|
|
void GetAllChildren(const wxDataViewItem &parent,wxDataViewItemArray &array) const;
|
|
// Is the container just a header or an item with all columns
|
|
// In our case it is an item with all columns
|
|
bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override { return true; }
|
|
bool HasInfoItem(InfoItemType type) const;
|
|
|
|
ItemType GetItemType(const wxDataViewItem &item) const;
|
|
ItemType GetItemType(const wxDataViewItem &item,int& plate_idx) const;
|
|
InfoItemType GetInfoItemType(const wxDataViewItem &item) const;
|
|
wxDataViewItem GetItemByType( const wxDataViewItem &parent_item,
|
|
ItemType type) const;
|
|
wxDataViewItem GetSettingsItem(const wxDataViewItem &item) const;
|
|
wxDataViewItem GetInstanceRootItem(const wxDataViewItem &item) const;
|
|
wxDataViewItem GetLayerRootItem(const wxDataViewItem &item) const;
|
|
wxDataViewItem GetInfoItemByType(const wxDataViewItem &parent_item, InfoItemType type) const;
|
|
// BBS
|
|
wxDataViewItem GetObjectItem(const ModelObject* mo) const;
|
|
wxDataViewItem GetVolumeItem(const wxDataViewItem& parent, int vol_idx) const;
|
|
bool IsSettingsItem(const wxDataViewItem &item) const;
|
|
void UpdateSettingsDigest( const wxDataViewItem &item,
|
|
const std::vector<std::string>& categories);
|
|
|
|
bool IsPrintable(const wxDataViewItem &item) const;
|
|
void UpdateObjectPrintable(wxDataViewItem parent_item);
|
|
void UpdateInstancesPrintable(wxDataViewItem parent_item);
|
|
void SetVolumeType(const wxDataViewItem &item, const Slic3r::ModelVolumeType type);
|
|
ModelVolumeType GetVolumeType(const wxDataViewItem &item);
|
|
wxDataViewItem SetPrintableState( PrintIndicator printable, int obj_idx,
|
|
int subobj_idx = -1,
|
|
ItemType subobj_type = itInstance);
|
|
wxDataViewItem SetObjectPrintableState(PrintIndicator printable, wxDataViewItem obj_item);
|
|
// BBS
|
|
bool IsColorPainted(wxDataViewItem& item) const;
|
|
bool IsSupportPainted(wxDataViewItem &item) const;
|
|
bool IsSinked(wxDataViewItem &item) const;
|
|
void SetColorPaintState(const bool painted, wxDataViewItem obj_item);
|
|
void SetSupportPaintState(const bool painted, wxDataViewItem obj_item);
|
|
void SetSinkState(const bool painted, wxDataViewItem obj_item);
|
|
|
|
void SetAssociatedControl(wxDataViewCtrl* ctrl) { m_ctrl = ctrl; }
|
|
// Rescale bitmaps for existing Items
|
|
void Rescale();
|
|
|
|
void AddWarningIcon(const wxDataViewItem& item, const std::string& warning_name);
|
|
void DeleteWarningIcon(const wxDataViewItem& item, const bool unmark_object = false);
|
|
void UpdateWarningIcon(const wxDataViewItem& item, const std::string& warning_name);
|
|
void UpdateCutObjectIcon(const wxDataViewItem &item, bool has_cut_icon);
|
|
bool HasWarningIcon(const wxDataViewItem& item) const;
|
|
t_layer_height_range GetLayerRangeByItem(const wxDataViewItem& item) const;
|
|
|
|
bool UpdateColumValues(unsigned col);
|
|
void UpdateExtruderBitmap(wxDataViewItem item);
|
|
// BBS: add use_obj_extruder
|
|
void UpdateVolumesExtruderBitmap(wxDataViewItem object_item, bool use_obj_extruder = false);
|
|
int GetDefaultExtruderIdx(wxDataViewItem item);
|
|
|
|
// BBS
|
|
void UpdateItemNames();
|
|
|
|
void assembly_name(ObjectDataViewModelNode* item, wxString name);
|
|
void assembly_name();
|
|
std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> get_assembly_name_list() const { return assembly_name_list; }
|
|
void search_object(wxString search_text);
|
|
std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> get_found_list() const { return search_found_list; }
|
|
|
|
void sys_color_changed();
|
|
|
|
private:
|
|
wxDataViewItem AddRoot(const wxDataViewItem& parent_item, const ItemType root_type);
|
|
wxDataViewItem AddInstanceRoot(const wxDataViewItem& parent_item);
|
|
void AddAllChildren(const wxDataViewItem& parent);
|
|
|
|
void ReparentObject(ObjectDataViewModelNode* plate, ObjectDataViewModelNode* object);
|
|
wxDataViewItem AddOutsidePlate(bool refresh = true);
|
|
|
|
void UpdateBitmapForNode(ObjectDataViewModelNode *node);
|
|
void UpdateBitmapForNode(ObjectDataViewModelNode* node, const std::string& warning_icon_name, bool has_lock);
|
|
};
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
#endif // slic3r_GUI_ObjectDataViewModel_hpp_
|
