Scott Mudge
3433e7bfa0
Fix build warnings on windows, fix various bugs/logic errors/missing returns/etc, update boost::bind ( #2229 )
...
Fix build warnings on windows, fix various bugs/logic errors/missing returns/etc, update boost::bind.
2023-09-27 23:55:23 +08:00
SoftFever
e65b11a831
Merge remote-tracking branch 'BS/v1.7.2'
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
# Conflicts:
# .github/ISSUE_TEMPLATE/bug_report.md
# .github/workflows/build_ubuntu.yml
# .gitignore
# Containerfile
# Dockerfile
# README.md
# deps/Boost/Boost.cmake
# deps/OpenEXR/OpenEXR.cmake
# deps/OpenVDB/OpenVDB.cmake
# doc/How to build - Mac OS.md
# localization/i18n/OrcaSlicer.pot
# localization/i18n/de/OrcaSlicer_de.po
# localization/i18n/en/OrcaSlicer_en.po
# localization/i18n/es/OrcaSlicer_es.po
# localization/i18n/fr/OrcaSlicer_fr.po
# localization/i18n/hu/OrcaSlicer_hu.po
# localization/i18n/it/OrcaSlicer_it.po
# localization/i18n/ja/OrcaSlicer_ja.po
# localization/i18n/list.txt
# localization/i18n/nl/OrcaSlicer_nl.po
# localization/i18n/sv/OrcaSlicer_sv.po
# localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
# resources/i18n/de/BambuStudio.mo
# resources/i18n/en/BambuStudio.mo
# resources/i18n/es/BambuStudio.mo
# resources/i18n/fr/BambuStudio.mo
# resources/i18n/hu/BambuStudio.mo
# resources/i18n/it/BambuStudio.mo
# resources/i18n/ja/BambuStudio.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/images/im_all_plates_stats.svg
# resources/profiles/Anker.json
# resources/profiles/Anker/filament/Generic ASA @Anker.json
# resources/profiles/Anker/filament/Generic PA @Anker.json
# resources/profiles/Anker/filament/Generic PA-CF @Anker.json
# resources/profiles/Anker/filament/Generic PC @Anker.json
# resources/profiles/Anker/filament/Generic PETG @Anker.json
# resources/profiles/Anker/filament/Generic PLA-CF @Anker.json
# resources/profiles/Anker/filament/Generic PVA @Anker.json
# resources/profiles/Anker/filament/Generic TPU @Anker.json
# resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json
# resources/profiles/Anker/machine/Anker M5.json
# resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json
# resources/profiles/Anker/machine/Anker M5C.json
# resources/profiles/Anker/machine/fdm_machine_common.json
# resources/profiles/Anker/process/0.05mm Ultradetail @Anker.json
# resources/profiles/Anker/process/0.15mm Fast @Anker.json
# resources/profiles/Anker/process/0.20mm Fast @Anker.json
# resources/profiles/Anker/process/0.20mm Standard @Anker.json
# resources/profiles/Anker/process/0.25mm Fast @Anker.json
# resources/profiles/Anker/process/fdm_process_common.json
# resources/profiles/Anycubic.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json
# resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
# resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic Chiron.json
# resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic Kobra Max.json
# resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic Vyper.json
# resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json
# resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json
# resources/profiles/Anycubic/machine/fdm_machine_common.json
# resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic 4MaxPro2.json
# resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Chiron.json
# resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Kobra2.json
# resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic KobraMax.json
# resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic Vyper.json
# resources/profiles/Anycubic/process/0.15mm Optimal @Anycubic i3MegaS.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic 4MaxPro.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic 4MaxPro2.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Chiron.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra2.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic KobraMax.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Vyper.json
# resources/profiles/Anycubic/process/0.20mm Standard @Anycubic i3MegaS.json
# resources/profiles/Anycubic/process/0.30mm Draft @Anycubic 4MaxPro2.json
# resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Chiron.json
# resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Kobra2.json
# resources/profiles/Anycubic/process/0.30mm Draft @Anycubic KobraMax.json
# resources/profiles/Anycubic/process/0.30mm Draft @Anycubic Vyper.json
# resources/profiles/Anycubic/process/0.30mm Draft @Anycubic i3MegaS.json
# resources/profiles/Anycubic/process/fdm_process_common.json
# resources/profiles/BBL.json
# resources/profiles/BBL/process/fdm_process_bbl_common.json
# resources/profiles/Creality.json
# resources/profiles/Creality/filament/fdm_filament_abs.json
# resources/profiles/Creality/filament/fdm_filament_pla.json
# resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-10 Max.json
# resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-10 V2.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json
# resources/profiles/Creality/machine/Creality Ender-3 S1.json
# resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 V2.json
# resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 Plus.json
# resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 S1.json
# resources/profiles/Creality/machine/Creality Ender-5.json
# resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5S.json
# resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-6.json
# resources/profiles/Creality/machine/fdm_creality_common.json
# resources/profiles/Creality/machine/fdm_machine_common.json
# resources/profiles/Creality/process/0.12mm Fine @Creality CR10Max.json
# resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V2.json
# resources/profiles/Creality/process/0.15mm Optimal @Creality CR10Max.json
# resources/profiles/Creality/process/0.15mm Optimal @Creality Ender3V2.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality CR10V2.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3S1.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3S1Pro.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Plus.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5S.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5S1.json
# resources/profiles/Creality/process/0.16mm Optimal @Creality Ender6.json
# resources/profiles/Creality/process/0.20mm Standard @Creality CR10Max.json
# resources/profiles/Creality/process/0.20mm Standard @Creality CR10V2.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender3S1.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender3S1Pro.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V2.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender5.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Plus.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender5S.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender5S1.json
# resources/profiles/Creality/process/0.20mm Standard @Creality Ender6.json
# resources/profiles/Creality/process/0.24mm Draft @Creality CR10Max.json
# resources/profiles/Creality/process/0.24mm Draft @Creality Ender3V2.json
# resources/profiles/Creality/process/0.24mm Draft @Creality.json
# resources/profiles/Creality/process/fdm_process_creality_common.json
# resources/profiles/Custom/filament/My Generic PETG.json
# resources/profiles/Custom/filament/My Generic PLA.json
# resources/profiles/Elegoo.json
# resources/profiles/Elegoo/filament/fdm_filament_common.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2D.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2S.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3.json
# resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune X.json
# resources/profiles/Elegoo/machine/Elegoo Neptune.json
# resources/profiles/Elegoo/machine/fdm_machine_common.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune2.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune2D.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune2S.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3Max.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3Plus.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo Neptune3Pro.json
# resources/profiles/Elegoo/process/0.08mm Extra Fine @Elegoo NeptuneX.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune2.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune2D.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune2S.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3Max.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3Plus.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo Neptune3Pro.json
# resources/profiles/Elegoo/process/0.12mm Fine @Elegoo NeptuneX.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune2.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune2D.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune2S.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3Max.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3Plus.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo Neptune3Pro.json
# resources/profiles/Elegoo/process/0.16mm Optimal @Elegoo NeptuneX.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune2.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune2D.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune2S.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3Max.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3Plus.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo Neptune3Pro.json
# resources/profiles/Elegoo/process/0.20mm Standard @Elegoo NeptuneX.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune2.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune2D.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune2S.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3Max.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3Plus.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo Neptune3Pro.json
# resources/profiles/Elegoo/process/0.24mm Draft @Elegoo NeptuneX.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune2.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune2D.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune2S.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3Max.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3Plus.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo Neptune3Pro.json
# resources/profiles/Elegoo/process/0.28mm Extra Draft @Elegoo NeptuneX.json
# resources/profiles/Prusa.json
# resources/profiles/Prusa/filament/fdm_filament_common.json
# resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json
# resources/profiles/Prusa/machine/Prusa MINI.json
# resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json
# resources/profiles/Prusa/machine/Prusa MK3S.json
# resources/profiles/Prusa/machine/fdm_machine_common.json
# resources/profiles/Prusa/process/0.20mm Standard @MINI.json
# resources/profiles/Prusa/process/0.20mm Standard @MK3S.json
# resources/profiles/Qidi.json
# resources/profiles/Qidi/filament/fdm_filament_abs.json
# resources/profiles/Qidi/filament/fdm_filament_asa.json
# resources/profiles/Qidi/filament/fdm_filament_common.json
# resources/profiles/Qidi/filament/fdm_filament_pa.json
# resources/profiles/Qidi/filament/fdm_filament_pc.json
# resources/profiles/Qidi/filament/fdm_filament_pet.json
# resources/profiles/Qidi/filament/fdm_filament_pla.json
# resources/profiles/Qidi/filament/fdm_filament_pva.json
# resources/profiles/Qidi/filament/fdm_filament_tpu.json
# resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-CF Pro.json
# resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Max 3.json
# resources/profiles/Qidi/machine/Qidi X-Max.json
# resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 3.json
# resources/profiles/Qidi/machine/Qidi X-Plus.json
# resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Smart 3.json
# resources/profiles/Qidi/machine/fdm_machine_common.json
# resources/profiles/Qidi/machine/fdm_qidi_common.json
# resources/profiles/Qidi/machine/fdm_qidi_x3_common.json
# resources/profiles/Qidi/process/0.12mm Fine @Qidi XCFPro.json
# resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax.json
# resources/profiles/Qidi/process/0.12mm Fine @Qidi XMax3.json
# resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus.json
# resources/profiles/Qidi/process/0.12mm Fine @Qidi XPlus3.json
# resources/profiles/Qidi/process/0.12mm Fine @Qidi XSmart3.json
# resources/profiles/Qidi/process/0.16mm Optimal @Qidi XCFPro.json
# resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax.json
# resources/profiles/Qidi/process/0.16mm Optimal @Qidi XMax3.json
# resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus.json
# resources/profiles/Qidi/process/0.16mm Optimal @Qidi XPlus3.json
# resources/profiles/Qidi/process/0.16mm Optimal @Qidi XSmart3.json
# resources/profiles/Qidi/process/0.20mm Standard @Qidi XCFPro.json
# resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax.json
# resources/profiles/Qidi/process/0.20mm Standard @Qidi XMax3.json
# resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus.json
# resources/profiles/Qidi/process/0.20mm Standard @Qidi XPlus3.json
# resources/profiles/Qidi/process/0.20mm Standard @Qidi XSmart3.json
# resources/profiles/Qidi/process/0.25mm Draft @Qidi XCFPro.json
# resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax.json
# resources/profiles/Qidi/process/0.25mm Draft @Qidi XMax3.json
# resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus.json
# resources/profiles/Qidi/process/0.25mm Draft @Qidi XPlus3.json
# resources/profiles/Qidi/process/0.25mm Draft @Qidi XSmart3.json
# resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XCFPro.json
# resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax.json
# resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XMax3.json
# resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus.json
# resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XPlus3.json
# resources/profiles/Qidi/process/0.30mm Extra Draft @Qidi XSmart3.json
# resources/profiles/Qidi/process/fdm_process_common.json
# resources/profiles/Qidi/process/fdm_process_qidi_common.json
# resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json
# resources/profiles/Tronxy/filament/Tronxy Generic ABS.json
# resources/profiles/Tronxy/process/0.12mm Fine @Tronxy.json
# resources/profiles/Tronxy/process/0.15mm Optimal @Tronxy.json
# resources/profiles/Tronxy/process/0.20mm Standard @Tronxy.json
# resources/profiles/Tronxy/process/0.24mm Draft @Tronxy.json
# resources/profiles/Voron.json
# resources/profiles/Voron/filament/Generic ABS @Voron.json
# resources/profiles/Voron/filament/Generic ASA @Voron.json
# resources/profiles/Voron/filament/Generic PA @Voron.json
# resources/profiles/Voron/filament/Generic PETG @Voron.json
# resources/profiles/Voron/filament/Generic PVA @Voron.json
# resources/profiles/Voron/filament/Voron Generic PA-CF.json
# resources/profiles/Voron/filament/Voron Generic PC.json
# resources/profiles/Voron/filament/Voron Generic PLA-CF.json
# resources/profiles/Voron/filament/Voron Generic PLA.json
# resources/profiles/Voron/filament/Voron Generic TPU.json
# resources/profiles/Voron/machine/Voron 0.1.json
# resources/profiles/Voron/machine/Voron 2.4 250.json
# resources/profiles/Voron/machine/Voron 2.4 300.json
# resources/profiles/Voron/machine/Voron 2.4 350.json
# resources/profiles/Voron/machine/Voron Trident 250.json
# resources/profiles/Voron/machine/Voron Trident 300.json
# resources/profiles/Voron/machine/Voron Trident 350.json
# resources/profiles/Voron/process/fdm_process_voron_common.json
# resources/profiles/Voxelab.json
# resources/profiles/Voxelab/filament/Generic ABS @Voxelab.json
# resources/profiles/Voxelab/filament/Generic PLA @Voxelab.json
# resources/profiles/Voxelab/filament/fdm_filament_common.json
# resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json
# resources/profiles/Voxelab/machine/Voxelab Aquila X2.json
# resources/profiles/Voxelab/machine/fdm_machine_common.json
# resources/profiles/Voxelab/process/0.16mm Optimal @Voxelab AquilaX2.json
# resources/profiles/Voxelab/process/0.20mm Standard @Voxelab AquilaX2.json
# resources/web/data/text.js
# resources/web/guide/21/21.js
# resources/web/guide/24/24.js
# src/BaseException.cpp
# src/OrcaSlicer.cpp
# src/libslic3r/AppConfig.cpp
# src/libslic3r/BoundingBox.hpp
# src/libslic3r/Extruder.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/Format/bbs_3mf.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode.hpp
# src/libslic3r/GCode/CoolingBuffer.cpp
# src/libslic3r/GCode/GCodeProcessor.cpp
# src/libslic3r/GCode/GCodeProcessor.hpp
# src/libslic3r/GCode/WipeTower.cpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/GCodeWriter.hpp
# src/libslic3r/Model.cpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/Preset.cpp
# src/libslic3r/Preset.hpp
# src/libslic3r/PresetBundle.cpp
# src/libslic3r/PresetBundle.hpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintBase.hpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/TreeSupport.cpp
# src/libslic3r/Utils.hpp
# src/mcut/CMakeLists.txt
# src/slic3r/CMakeLists.txt
# src/slic3r/GUI/3DBed.cpp
# src/slic3r/GUI/AMSMaterialsSetting.cpp
# src/slic3r/GUI/AMSMaterialsSetting.hpp
# src/slic3r/GUI/BBLTopbar.cpp
# src/slic3r/GUI/BBLTopbar.hpp
# src/slic3r/GUI/BackgroundSlicingProcess.hpp
# src/slic3r/GUI/BindDialog.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/DeviceManager.cpp
# src/slic3r/GUI/Field.cpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/GUI_App.hpp
# src/slic3r/GUI/GUI_Factories.cpp
# src/slic3r/GUI/GUI_Factories.hpp
# src/slic3r/GUI/GUI_ObjectList.cpp
# src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
# src/slic3r/GUI/Jobs/ArrangeJob.cpp
# src/slic3r/GUI/Jobs/FillBedJob.cpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/MediaPlayCtrl.cpp
# src/slic3r/GUI/Monitor.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/PartPlate.hpp
# src/slic3r/GUI/PlateSettingsDialog.cpp
# src/slic3r/GUI/PlateSettingsDialog.hpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/Plater.hpp
# src/slic3r/GUI/PresetComboBoxes.cpp
# src/slic3r/GUI/ReleaseNote.cpp
# src/slic3r/GUI/SelectMachine.cpp
# src/slic3r/GUI/StatusPanel.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Widgets/Label.cpp
# src/slic3r/GUI/Widgets/Label.hpp
# src/slic3r/GUI/Widgets/SideButton.cpp
# src/slic3r/GUI/calib_dlg.cpp
# src/slic3r/GUI/calib_dlg.hpp
# src/slic3r/GUI/wxExtensions.hpp
# src/slic3r/Utils/NetworkAgent.cpp
# src/slic3r/Utils/bambu_networking.hpp
# version.inc
2023-08-26 16:13:57 +08:00
SoftFever
3f15339345
fix linux build errors
2023-08-20 22:16:32 +08:00
SoftFever
6e1bdaf9d4
some misc changes ( #1848 )
...
* some misc changes
* stealth_mode: disable hms
* fix bbl camera #1091 #1830
* fix anker
2023-08-20 20:02:54 +08:00
SoftFever
37c54aa4f6
clean up
2023-08-09 13:42:41 +08:00
chunmao.guo
282c785304
FIX: [STUDIO-3551] pass worker thread id to DirectShow
...
Change-Id: If55e39768ec1e43103c59168b139bb115db6b092
2023-07-31 14:29:15 +08:00
chunmao.guo
02f2e51c2e
FIX: pass error from gstreamer to wxMediaCtrl
...
Change-Id: If275d0ebeb7089f67ad366811dc48009b86af564
2023-07-13 10:35:05 +08:00
chunmao.guo
b50838b155
FIX: [STUDIO-3309] MediaCtrl: Stop before Load({})
...
Change-Id: Id7c96fdf7fd717725e94b9ae28b261963b8f64e7
2023-07-07 17:52:43 +08:00
chunmao.guo
e44aa0e31c
FIX: [STUDIO-2431] unset audio sink from gst playbin
...
Change-Id: I4e3e1656842167b039d11003e75b7f4b6048b178
2023-07-07 17:29:08 +08:00
SoftFever
9f598046d1
Merge remote-tracking branch 'remote/master' into feature/merge_upstream
...
# Conflicts:
# bbl/i18n/OrcaSlicer.pot
# bbl/i18n/de/OrcaSlicer_de.po
# bbl/i18n/en/OrcaSlicer_en.po
# bbl/i18n/es/OrcaSlicer_es.po
# bbl/i18n/fr/OrcaSlicer_fr.po
# bbl/i18n/hu/OrcaSlicer_hu.po
# bbl/i18n/it/OrcaSlicer_it.po
# bbl/i18n/ja/OrcaSlicer_ja.po
# bbl/i18n/nl/OrcaSlicer_nl.po
# bbl/i18n/sv/OrcaSlicer_sv.po
# bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
# resources/config.json
# resources/i18n/de/BambuStudio.mo
# resources/i18n/en/BambuStudio.mo
# resources/i18n/es/BambuStudio.mo
# resources/i18n/fr/BambuStudio.mo
# resources/i18n/hu/BambuStudio.mo
# resources/i18n/it/BambuStudio.mo
# resources/i18n/ja/OrcaSlicer.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/images/ams_humidity_2.svg
# resources/images/ams_humidity_3.svg
# resources/images/ams_humidity_4.svg
# resources/images/ams_humidity_tips.svg
# resources/images/monitor_state_on.svg
# resources/images/sdcard_state_normal.svg
# resources/profiles/BBL.json
# resources/profiles/BBL/filament/Bambu PETG-CF @base.json
# resources/profiles/BBL/filament/Generic PETG-CF @base.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/web/data/text.js
# resources/web/guide/3/index.html
# resources/web/guide/31/index.html
# src/BambuStudio.cpp
# src/libslic3r/AABBTreeLines.hpp
# src/libslic3r/Brim.cpp
# src/libslic3r/CMakeLists.txt
# src/libslic3r/ExPolygon.hpp
# src/libslic3r/Fill/FillBase.hpp
# src/libslic3r/Format/bbs_3mf.cpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/Line.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/Preset.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/TreeSupport.cpp
# src/slic3r/GUI/AmsMappingPopup.cpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/GCodeViewer.cpp
# src/slic3r/GUI/GCodeViewer.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/Preferences.cpp
# src/slic3r/GUI/SelectMachine.cpp
# src/slic3r/GUI/Widgets/AMSControl.cpp
# src/slic3r/GUI/wxMediaCtrl2.cpp
# src/slic3r/Utils/Process.cpp
# version.inc
2023-04-19 08:48:07 +08:00
chunmao.guo
c0bcb2270a
FIX: [STUDIO-2557] use load() to stop media play on windows
...
Change-Id: I0d2d45569ef64a5a212ea04fe926a3a25ce7b50d
2023-04-17 15:39:02 +08:00
chunmao.guo
9f3a89320b
FIX: [STUDIO-1033] rm webview script handler on webview destory
...
Change-Id: If1465ba6bf997bf17b8a33bc33d0f20d34fcbdc7
2023-04-17 15:39:02 +08:00
chunmao.guo
a401c0fa2e
FIX: [STUDIO-2340] [STUDIO-2297] handle linux gstreamer error
...
Change-Id: Iadc6dcb9d7a9f2c5d1ce9cf979bbbfbd0f805d19
2023-04-17 15:39:02 +08:00
SoftFever
5b0ba1207e
Change Application name to OrcaSlicer
2023-03-12 10:05:22 +08:00
SoftFever
23189c8726
fix wrong dll path
...
(cherry picked from commit 7aa20a47843a3e747c484afb27d37ad57f08c1fb)
2023-03-05 01:45:34 +08:00
chunmao.guo
bea48a08d6
FIX: not play liveview when device is busy downloading
...
Change-Id: I48dc1c28fc78d69bfd37d1b531aa7daf5e6e4cbd
2023-02-01 16:24:44 +08:00
SoftFever
2492e5d39c
merge upstream changes
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
Joshua Wise
730aa890c3
wxMediaCtrl2: provide a better error message if the system does not have h.264 codecs installed
2023-01-12 14:56:04 +08:00
Joshua Wise
43a7f88c6c
Add support for Bambu Lab X1 series live video stream on Linux.
...
wxWidgets on Linux uses GStreamer as its back-end for wxMediaCtrl, which
doesn't have a bambu: URI handler. On Windows, this is handled by a Windows
Media subsystem plugin, and on Mac, this is handled with a BambuPlayer
class. Luckily, the libBambuSource.so binary that is distributed with the
network plugin package already contains support for receiving h.264 data
from the network, and the API is the same as is used by the tiny
bambusource.exe binary on Windows; we glue this into a GStreamer source
plugin that registers a URI handler for bambu:.
To make this work, we make a few additional changes elsewhere. GStreamer
seems to have trouble rendering an Xv overlay onto a 32bpp X visual, but
Bambu Slicer seems to request a 32bpp visual for some background
transparency in the Notebook; it doesn't seem to use it in an interesting
way on Linux, though, so we remove that request for transparency to allow
Bambu Studio to render to a 24bpp visual. The media controller
infrastructure also makes a few assumptions about when sizing information
can be queried from a wxMediaCtrl backend that do not hold true on Linux; we
either fix those assumptions, or fake them out, as needed. We also make a
few changes needed to successfully compile C.
This has only been tested with the GStreamer backend for wxWidgets --
notably, not the GStreamer-play backend (these are, astonishingly, two
different things!). If you find that this seems not to work, consider
*un*installing the libgstreamer-plugins-bad1.0-dev package and then
rebuilding wxWidgets.
2023-01-12 14:56:04 +08:00
chunmao.guo
f6ff0f6131
FIX: re-register BambuSource when maybe installed under administrator
...
Change-Id: Iff4c4dc9a581de33e08681b7033c1f29ebacb6a4
2022-12-15 04:38:15 -05:00
chunmao.guo
e44e1c1f19
FIX: video error message when lan ip missing
...
Change-Id: I5adaa89e2631a4e7853d806a53f41da927cc0ea7
2022-12-15 04:33:48 -05:00
chunmao.guo
48083f7c0c
FIX: use shellex to open file, avoid cmd window
...
Change-Id: I6ae868381003c85a319e9c3bad37b0bffc3dbdd7
2022-10-20 19:34:37 +08:00
chunmao.guo
0dd3589a21
ENH: re-register BambuSource with bat script
...
Change-Id: I67f014bc8de55597134a9974557e622082daaf97
2022-10-20 19:34:37 +08:00
chunmao.guo
70de37d1ae
ENH: help video play failure
...
Change-Id: I5f847547877a82d626bffb78488e5f3d20cc56d0
2022-09-29 11:16:43 +08:00
chunmao.guo
b2b2bc2a9c
FIX: not keep restarting video on local error
...
Change-Id: I2f79208326f92931bec108a4609088788ceca998
2022-09-08 21:49:36 +08:00
chunmao.guo
d4ddd8f470
ENH: check BambuSource registered
...
Change-Id: Ia98e1630115811e061bc320fbb25b74b8f933dfb
2022-08-26 09:25:59 +08:00
chunmao.guo
efd20d0a84
FIX: direct jump to enable 'Windows Media Player'
...
Change-Id: If5eeb82162293cd20583f65aae1fa75f70aac25d
2022-08-26 09:25:59 +08:00
chunmao.guo
f908ccd7b3
FIX: modify NvOptimusEnablement earlier in contructor of wxMediaCtrl2
...
Change-Id: I0562c393245726887c2d507f41269d09cf7a8800
2022-08-05 15:28:01 +08:00
lane.wei
e9e4d75877
Update the codes to 01.01.00.10 for the formal release
...
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
2022-07-22 20:35:34 +08:00
lane.wei
1555904bef
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00