forked from viewit/OrcaSlicer-KX
* FIX: linux: fix the building issue on Linux Mint 21.3 Virginia github: https://github.com/bambulab/BambuStudio/issues/3874 author: https://github.com/lucianoloder Change-Id: Ia3db6923d5dd68dba532d7bdba6f93f73cc51d59 * FIX: auto-arranging incorrect with rotation enabled auto-arranging incorrect with rotation enabled and the objects already have been rotated. jira: STUDIO-6022 Change-Id: I349d663efb1fc71367c8a77aa8ed5047a0bf2017 (cherry picked from commit 75fe40257a274ed83886e1ee20ce8dedd0de48f6) * ENH: update X1C & X1E start gcode 1.Fix fan problem jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I68ee5be78e142e8a2a210a1a70f5663893390610 * ENH: update A series gcode 1. Update A1 series start gcode and change filament gcode 2. Add G2814 command 3. Add multi-filament extrusion compensation and vibration suppression jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I57d2bc8e98d3e547881dc1369c1fb31413c6205d * FIX: fix some cali problem of P series jira: none Change-Id: Id57ea8d65da22ab653cca49509cb923ff065e43f * FIX: fix can't enter ',' in multiplicator github: #3805 Change-Id: I6dd70822d1c2e79d66c70514d6dd580ab029c7ea * calib wizard * NEW: FlipLines infill jira:6701 New infill pattern that combine block lines infill and switching layers for smooth transition. Change-Id: I2608a2d39b14efcdfe9d39a9437280da350b94c0 (cherry picked from commit 8d0a09c8b763dfc924cbba9913c241e6afadbc7f) * ENH: add nozzle blob detection and air printing detection jira: new Change-Id: Ie4a19a7ad7d0b10a021c516cbc3a84b4ae734302 * FIX: Top surface bridging fail on 3DHC & FL infill Add 45 degree angle offset when processing the bridge. Need to raise infill_direction to invalidate posPrepareInfill jira: 6774 Change-Id: I5e6bef3aa814b01c5f30398ac745937a67e3ef4c (cherry picked from commit 7b12cab10b88f432a11414f8caa1c6427777a1ba) * FIX: the error display when reset virtual slot jira: none Change-Id: I5ae5899baf1bfc2aaadb832083b277855a669fd5 * FIX: Error "Voronoi cell doesn't contain a sourcepoint" github: 3859 Change-Id: Idca84992bcba5380bfe05e63ac9a5e40419dcfdf * fix build error * FIX: CLI: fix the crash issue caused by get_min_flush_volumes JIRA: no jira Change-Id: I0d5bfd605e51ebddac8fddc4d83dab5055b0fbf2 * FIX: can't use support filament in gcode.3mf 1. Add total_filament_volumes, directly access it to get used filaments github:#3865 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I4fae4f1947b4ebd16e394e0f3cf5fb0e9f979717 * ENH: p series support long retraction 1. P series support long retraction in filament 2. Add long retraction params in common.json jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib94184fa1f0b5ab151360f1f053d8c8ff92e7e18 * ENH::modify some logs level jira:[for log] Change-Id: I6a46b8fcd3a030b4b630e800fe9a9ac5c387f117 * NEW: support multi device JIRA: STUDIO-6072 Change-Id: Ic514c4097767b0a728368c9ea48ee103c031fbb0 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH: update A1 series gcode 1.Update filament change gcode and machine start gcode for A1 and A1 mini jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I2f3be3fd89fef21e717a32f2b89985fc046f7f6e * FIX: always have 0th filament in ams mapping 1. Only set the filament id in map when flush length is not 0 jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I6e0aeaf010f6e6dcbdc3bca5c0034aa60750bb67 * ENH: add filament id in slice info jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ic5fe4632bca8acacc9ffd072ee2ed207c1da37aa * ENH: refine ui for multi machine JIRA: STUDIO-6819 STUDIO-6824 1. Shrink the Send Print dialog box 2. add input box for flipping panel Change-Id: I4174c79ecd239c374ee11478951e12be399c57ce * FIX: fix Issues with sending multiple devices JIRA: STUDIO-6876 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I33c6a932863fc715c3f0eb5dfd4b299f980a4918 * NEW: support hms error code Change-Id: Ic256a83cf501fb05bb9d3203f3d24cb1d1290fa4 * FIX:fixed some multi job issue Change-Id: I338078ad8fcf809888db9d8daeb470a9bf4eab46 * NEW:support pin code binding Change-Id: Ida5d47881fbd83f3ffedc80369cfe377114d7f13 * ENH:add printable check for devices Change-Id: I672988fa9cfa986d924bfc64331752f4aef68067 (cherry picked from commit 69de9e5b8334ec94eec7fcee31038b8ff42d1d3b) * FIX: add more fonts jira: none Change-Id: I6bafed3563083858f29e92a3d84906a2e53dcb5c (cherry picked from commit afbea693e807dcc1c406a59aa5376b9ea2a5d606) * ENH: load more fonts this feature is according to Prusa by Filip Sykala<filip.sykala@prusa3d.cz>, thanks to Filip Sykala jira: none Change-Id: I55e92f184f750c0b93b679d4382aaa5b164ec5c3 (cherry picked from commit d05522c4cc5d7ee4cac42de398b88d347a55f74b) * ENH: add ProfileDescription for translate 1.Add ProfileDescription.hpp simply for translating jira:NEW Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: Iaa3ced1edccf67eaeebde35c1e8b36442d2e9a6f * ENH: Improve CrossHatch transation layers jira: 6701 Change name from Flippingline to CrossHatch. Reduce noise, improve speed by 6.5%. Improve transation layers by gradually increasing rotation angle and overshoot the transation layer while direction changed. Change-Id: I17fcc45b409074d121bf5bb5702e15553d925b51 * UP * ENH: modify the default config for multi-device JIRA: STUDIO-6072 Change-Id: If6e7582a8274eb5e685b8b8545f6eab5d17de3f5 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH: add long retraction for P series jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I6890695b67e674fc5cdc2a208e89bd9e41404213 * FIX: all plates stats data missing issue jira: new Change-Id: I137a2b6d69ad08791f5a9a9788653621960dc63f * ENH:update pre print options jira:[for multi] Change-Id: I2e9bb8a09436a71749af98a0bad94e9922f95c81 * FIX:fixed can't popup pinbind win on macos jira:[STUDIO-6895] Change-Id: I664bba78cf27420d736b586df19e3c09c6f8ed21 * FIX:fixed the task of padding cannot be cancelled Change-Id: I401a22118c14ca7601be7a925cfd8e4796dfc1e9 * ENH:Play video after redirecting to device page jira:[STUDIO-6884] Change-Id: Ia5e2ac84e3d71baacfcf941b782dab2325f35d54 * FIX: fix ui bug in send multi machine page for mac JIRA: STUDIO-6882 Incorrect background color when renaming during multi machine printing Change-Id: I6c551f5023ffe747e7a7e2f5703b0707c9505922 * FIX: Fix some bugs in maintaining the selected status of local tasks JIRA: STUDIO-6824 Change-Id: I12c4da3fc56ac5077b3ccd7e89a4b57c3675eaf5 * ENH: local task sort by send time by default JIRA: STUDIO-6885 Change-Id: I03b5881a39ab2e90c5b9cf46052ba465ee707ccc * FIX: Clicking to continue printing does not take effect in error code JIRA: STUDIO-6830 Detected an incomplete printing task error pop-up when power outage occurred. Clicking to continue printing did not take effect Change-Id: Ie85a1602093dabac861cd1f41ea21e1c312c83e9 * ENH: use designTitle when designId > 0 JIRA: STUDIO-6072 Change-Id: I8342df053edeab16f930522e099e2eef91e5c5a4 Signed-off-by: Stone Li <stone.li@bambulab.com> * NEW:import vertex and mtl color from obj file Jira: STUDIO-6805 Change-Id: Iaacb13ee2451effdb83e5aba4b7fe1637b7fc95f * FIX:change the strategy of merge_ka_kd Upgrade ui, users can directly ok to proceed to the next step jira: STUDIO-6805 Change-Id: Ia81019c2eacb503666680c0b8583d026baa0134c (cherry picked from commit 38a2434753c8e3b422267283b16c75f6ad195b14) * FIX:use default_strategy after modifed cluster number jira: STUDIO-6915 Change-Id: I4e0c3d62f5a766f73d48d1e06c4364fc6babe1ac * FIX: the bug of incorrect button without restarting JIRA: STUDIO-6824 The bug can cause the user to not restart when opening the multi-device option, but the button of send multi-devices appears Change-Id: I0837fa79ecc1d8ab5ce98273ad134fa2f830421e * FIX: wrong default value for long retraction jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ifc2ec57a320fdb14e7ca746e5795501ed146ff32 * FIX: error code pop-up window without retry button in some code JIRA: STUDIO-6922 Change-Id: I67464bebaba4558618301592c455db8824bbfe30 * FIX: air printing and nozzle blob detection issue jira: STUDIO-6897 Change-Id: I008ddb24b74119d7e4124ae26310b4b86c42a799 * FIX:fix bugs of algo and read quad in obj file Jira: STUDIO-6805 Change-Id: I6c33e8197225f27dccdfa0681e64d76d1df14f61 * dd * ENH:Set the default nozzle diameter to 0.4 jira:[for nozzle] Change-Id: I74a5c9b0460046496b897eae3d9f917ac1b99052 * FIX:fixed backspace error on macos Change-Id: I76066391783c04857c1a60a6f8438111501b6d7c * ENH:Subscription list deduplication jira:[for mulit] Change-Id: I10e9d849986c9661b587c7b1a509180c2451816e * ENH:update wiki url for Pin Code jira:[pin code] Change-Id: I95faaa396a839b5b159119ef235b650c76706a84 * NEW:add OpenCV.cmake in deps jira: none Change-Id: I1ae4a2bd5618e9e620b08a937904d6af5d00bc41 * FIX:cancel obj import restrictions jira: none Change-Id: Iaf3e799ca982ad6aeb3ec76e9a416c4c8e4d100c * NEW:add multiple printer restrictions jira:[for multiple] Change-Id: I0bb5a0c1062a543c42f8d67a9347efa358b0864a * ENH:Added two entrances for adding devices jira:[multi device] Change-Id: Ieb6197e067d422979606f93b22b337a2399aec74 * slic3r: Fix wxFont being undefined [427/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o /usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -c /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp In file included from /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp:1: /run/build/BambuStudio/src/slic3r/Utils/FontUtils.hpp:51:21: error: ‘wxFont’ does not name a type 51 | bool can_load(const wxFont &font); | ^~~~~~ * slic3r: Fix missing BOOST_LOG_TRIVIAL declaration [427/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o /usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -c /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp: In function ‘std::unique_ptr<Slic3r::FontFile> Slic3r::create_font_file(const char*)’: /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp:127:27: error: ‘error’ was not declared in this scope; did you mean ‘perror’? 127 | BOOST_LOG_TRIVIAL(error) << "Couldn't open " << file_path << " for reading."; | ^~~~~ | perror [447/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o /usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o -c /run/build/BambuStudio/src/slic3r/GUI/TaskManager.cpp In file included from /run/build/BambuStudio/src/slic3r/GUI/TaskManager.cpp:1: /run/build/BambuStudio/src/slic3r/GUI/TaskManager.hpp: In member function ‘void Slic3r::TaskStateInfo::set_state(Slic3r::TaskState)’: /run/build/BambuStudio/src/slic3r/GUI/TaskManager.hpp:40:9: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope 40 | BOOST_LOG_TRIVIAL(trace) << "TaskStateInfo set state = " << get_task_state_enum_str(ts); | ^~~~~~~~~~~~~~~~~ * fix OpenCV * wip - build break * fix build error wip * ENH: support preset description(tooltip) Change-Id: Iff005baac4974c538d1109fb0ba1df20b04a8f69 Jira: STUDIO-5754 * fix more build errors * Revert "ENH: load more fonts" This reverts commit 32b6fd199ac50e21db1f72089e5b3287a1776e04. * change colors * misc fixes * restore export gcode btn --------- Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Signed-off-by: Stone Li <stone.li@bambulab.com> Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: jianjia.ma <jianjia.ma@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: Bastien Nocera <hadess@hadess.net> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com>
820 lines
32 KiB
C++
820 lines
32 KiB
C++
#include "MediaPlayCtrl.h"
|
|
#include "Widgets/Button.hpp"
|
|
#include "Widgets/CheckBox.hpp"
|
|
#include "Widgets/Label.hpp"
|
|
#include "GUI_App.hpp"
|
|
#include "libslic3r/AppConfig.hpp"
|
|
#include "I18N.hpp"
|
|
#include "MsgDialog.hpp"
|
|
#include "DownloadProgressDialog.hpp"
|
|
|
|
#include <boost/lexical_cast.hpp>
|
|
#include <boost/log/trivial.hpp>
|
|
#include <boost/nowide/cstdio.hpp>
|
|
#include <boost/nowide/utf8_codecvt.hpp>
|
|
#undef pid_t
|
|
#include <boost/process.hpp>
|
|
#ifdef __WIN32__
|
|
#include <boost/process/windows.hpp>
|
|
#else
|
|
#include <sys/ipc.h>
|
|
#include <sys/shm.h>
|
|
#endif
|
|
|
|
#include <wx/clipbrd.h>
|
|
#include "wx/evtloop.h"
|
|
|
|
static std::map<int, std::string> error_messages = {
|
|
{1, L("The device cannot handle more conversations. Please retry later.")},
|
|
{2, L("Player is malfunctioning. Please reinstall the system player.")},
|
|
{100, L("The player is not loaded, please click \"play\" button to retry.")},
|
|
{101, L("The player is not loaded, please click \"play\" button to retry.")},
|
|
{102, L("The player is not loaded, please click \"play\" button to retry.")},
|
|
{103, L("The player is not loaded, please click \"play\" button to retry.")}
|
|
};
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl2 *media_ctrl, const wxPoint &pos, const wxSize &size)
|
|
: wxPanel(parent, wxID_ANY, pos, size)
|
|
, m_media_ctrl(media_ctrl)
|
|
{
|
|
SetLabel("MediaPlayCtrl");
|
|
SetBackgroundColour(*wxWHITE);
|
|
m_media_ctrl->Bind(wxEVT_MEDIA_STATECHANGED, &MediaPlayCtrl::onStateChanged, this);
|
|
|
|
m_button_play = new Button(this, "", "media_play", wxBORDER_NONE);
|
|
m_button_play->SetCanFocus(false);
|
|
|
|
m_label_status = new Label(this, "");
|
|
m_label_status->SetForegroundColour(wxColour("#323A3C"));
|
|
|
|
m_label_stat = new Label(this, "");
|
|
m_label_stat->SetForegroundColour(wxColour("#323A3C"));
|
|
m_media_ctrl->Bind(EVT_MEDIA_CTRL_STAT, [this](auto & e) {
|
|
#if !BBL_RELEASE_TO_PUBLIC
|
|
wxSize size = m_media_ctrl->GetVideoSize();
|
|
m_label_stat->SetLabel(e.GetString() + wxString::Format(" VS:%ix%i", size.x, size.y));
|
|
#endif
|
|
wxString str = e.GetString();
|
|
m_stat.clear();
|
|
for (auto k : {"FPS:", "BPS:", "T:", "B:"}) {
|
|
auto ik = str.Find(k);
|
|
double value = 0;
|
|
if (ik != wxString::npos) {
|
|
ik += strlen(k);
|
|
auto ip = str.find(' ', ik);
|
|
if (ip == wxString::npos) ip = str.Length();
|
|
auto v = str.Mid(ik, ip - ik);
|
|
if (k == "T:" && v.Length() == 8) {
|
|
long h = 0,m = 0,s = 0;
|
|
v.Left(2).ToLong(&h);
|
|
v.Mid(3, 2).ToLong(&m);
|
|
v.Mid(6, 2).ToLong(&s);
|
|
value = h * 3600. + m * 60 + s;
|
|
} else {
|
|
v.ToDouble(&value);
|
|
if (v.Right(1) == "K") value *= 1024;
|
|
else if (v.Right(1) == "%") value *= 0.01;
|
|
}
|
|
}
|
|
m_stat.push_back(value);
|
|
}
|
|
});
|
|
|
|
m_button_play->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](auto &e) { TogglePlay(); });
|
|
m_button_play->Bind(wxEVT_RIGHT_UP, [this](auto & e) { m_media_ctrl->Play(); });
|
|
// m_label_status->Bind(wxEVT_LEFT_UP, [this](auto &e) {
|
|
// auto url = wxString::Format(L"https://wiki.bambulab.com/%s/software/bambu-studio/faq/live-view", L"en");
|
|
// wxLaunchDefaultBrowser(url);
|
|
// });
|
|
|
|
Bind(wxEVT_RIGHT_UP, [this](auto & e) {
|
|
wxClipboard & c = *wxTheClipboard;
|
|
if (c.Open()) {
|
|
if (wxGetKeyState(WXK_SHIFT)) {
|
|
if (c.IsSupported(wxDF_TEXT)) {
|
|
wxTextDataObject data;
|
|
c.GetData(data);
|
|
Stop();
|
|
m_url = data.GetText();
|
|
load();
|
|
}
|
|
} else {
|
|
c.SetData(new wxTextDataObject(m_url));
|
|
}
|
|
c.Close();
|
|
}
|
|
});
|
|
|
|
wxBoxSizer * sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
sizer->Add(m_button_play, 0, wxEXPAND | wxALL, 0);
|
|
sizer->Add(m_label_stat, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(25));
|
|
sizer->AddStretchSpacer(1);
|
|
sizer->Add(m_label_status, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(25));
|
|
SetSizer(sizer);
|
|
|
|
m_thread = boost::thread([this] {
|
|
media_proc();
|
|
});
|
|
|
|
//#if BBL_RELEASE_TO_PUBLIC
|
|
// m_next_retry = wxDateTime::Now();
|
|
//#endif
|
|
|
|
parent->Bind(wxEVT_SHOW, &MediaPlayCtrl::on_show_hide, this);
|
|
parent->GetParent()->GetParent()->Bind(wxEVT_SHOW, &MediaPlayCtrl::on_show_hide, this);
|
|
|
|
m_lan_user = "bblp";
|
|
m_lan_passwd = "bblp";
|
|
}
|
|
|
|
MediaPlayCtrl::~MediaPlayCtrl()
|
|
{
|
|
{
|
|
boost::unique_lock lock(m_mutex);
|
|
m_tasks.push_back("<exit>");
|
|
m_cond.notify_all();
|
|
}
|
|
while (!m_thread.try_join_for(boost::chrono::milliseconds(10))) {
|
|
wxEventLoopBase::GetActive()->Yield();
|
|
}
|
|
}
|
|
|
|
void MediaPlayCtrl::SetMachineObject(MachineObject* obj)
|
|
{
|
|
std::string machine = obj ? obj->dev_id : "";
|
|
if (obj) {
|
|
m_camera_exists = obj->has_ipcam;
|
|
m_dev_ver = obj->get_ota_version();
|
|
m_lan_mode = obj->is_lan_mode_printer();
|
|
m_lan_proto = obj->liveview_local;
|
|
m_remote_support = obj->liveview_remote;
|
|
m_lan_ip = obj->dev_ip;
|
|
m_lan_passwd = obj->get_access_code();
|
|
m_device_busy = obj->is_camera_busy_off();
|
|
m_tutk_state = obj->tutk_state;
|
|
} else {
|
|
m_camera_exists = false;
|
|
m_lan_mode = false;
|
|
m_lan_proto = MachineObject::LVL_None;
|
|
m_lan_ip.clear();
|
|
m_lan_passwd.clear();
|
|
m_dev_ver.clear();
|
|
m_tutk_state.clear();
|
|
m_remote_support = true;
|
|
m_device_busy = false;
|
|
}
|
|
Enable(obj && obj->is_connected() && obj->m_push_count > 0);
|
|
if (machine == m_machine) {
|
|
if (m_last_state == MEDIASTATE_IDLE && IsEnabled())
|
|
Play();
|
|
else if (m_last_state == MEDIASTATE_LOADING && m_tutk_state == "disable"
|
|
&& m_last_user_play + wxTimeSpan::Seconds(3) < wxDateTime::Now()) {
|
|
// resend ttcode to printer
|
|
if (auto agent = wxGetApp().getAgent())
|
|
agent->get_camera_url(machine, [](auto) {});
|
|
m_last_user_play = wxDateTime::Now();
|
|
}
|
|
return;
|
|
}
|
|
m_machine = machine;
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl switch machine: " << m_machine;
|
|
m_disable_lan = false;
|
|
m_failed_retry = 0;
|
|
m_last_failed_codes.clear();
|
|
m_last_user_play = wxDateTime::Now();
|
|
std::string stream_url;
|
|
if (get_stream_url(&stream_url)) {
|
|
m_streaming = boost::algorithm::contains(stream_url, "device=" + m_machine);
|
|
} else {
|
|
m_streaming = false;
|
|
}
|
|
if (m_last_state != MEDIASTATE_IDLE)
|
|
Stop(" ");
|
|
if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid state conflict
|
|
m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
|
|
else
|
|
SetStatus("", false);
|
|
}
|
|
|
|
wxString hide_id_middle_string(wxString const &str, size_t offset = 0, size_t length = -1)
|
|
{
|
|
#if BBL_RELEASE_TO_PUBLIC
|
|
if (length == size_t(-1)) length = str.Length() - offset;
|
|
if (length <= 8) return str;
|
|
return str.Left(offset + 4) + wxString(length - 8, '*') + str.Mid(offset + length - 4);
|
|
#else
|
|
return str;
|
|
#endif
|
|
}
|
|
|
|
wxString hide_passwd(wxString url, std::vector<wxString> const &passwords)
|
|
{
|
|
for (auto &p : passwords) {
|
|
auto i = url.find(p);
|
|
if (i == wxString::npos)
|
|
continue;
|
|
auto j = i + p.length();
|
|
if (p[p.length() - 1] == '=') {
|
|
i = j;
|
|
j = url.find('&', i);
|
|
if (j == wxString::npos) j = url.length();
|
|
}
|
|
auto l = size_t(j - i);
|
|
if (p[0] == '?' || p[0] == '&')
|
|
url = hide_id_middle_string(url, i, l);
|
|
else if (j == url.length() || url[j] == '@' || url[j] == '&')
|
|
url.replace(i, l, l, wxUniChar('*'));
|
|
}
|
|
return url;
|
|
}
|
|
|
|
void MediaPlayCtrl::Play()
|
|
{
|
|
if (!m_next_retry.IsValid() || wxDateTime::Now() < m_next_retry)
|
|
return;
|
|
if (!IsShownOnScreen())
|
|
return;
|
|
if (m_last_state != MEDIASTATE_IDLE) {
|
|
return;
|
|
}
|
|
m_failed_code = 0;
|
|
if (m_machine.empty()) {
|
|
Stop(_L("Please confirm if the printer is connected."));
|
|
return;
|
|
}
|
|
if (!IsEnabled()) {
|
|
Stop(_L("Please confirm if the printer is connected."));
|
|
return;
|
|
}
|
|
if (m_device_busy) {
|
|
Stop(_L("The printer is currently busy downloading. Please try again after it finishes."));
|
|
m_failed_retry = 0;
|
|
return;
|
|
}
|
|
if (!m_camera_exists) {
|
|
Stop(_L("Printer camera is malfunctioning."));
|
|
return;
|
|
}
|
|
|
|
m_button_play->SetIcon("media_stop");
|
|
NetworkAgent *agent = wxGetApp().getAgent();
|
|
std::string agent_version = agent ? agent->get_version() : "";
|
|
if (m_lan_proto > MachineObject::LVL_Disable && (m_lan_mode || !m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) {
|
|
m_disable_lan = m_remote_support && !m_lan_mode; // try remote next time
|
|
std::string url;
|
|
if (m_lan_proto == MachineObject::LVL_Local)
|
|
url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd;
|
|
else if (m_lan_proto == MachineObject::LVL_Rtsps)
|
|
url = "bambu:///rtsps___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsps";
|
|
else if (m_lan_proto == MachineObject::LVL_Rtsp)
|
|
url = "bambu:///rtsp___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsp";
|
|
url += "&device=" + m_machine;
|
|
url += "&net_ver=" + agent_version;
|
|
url += "&dev_ver=" + m_dev_ver;
|
|
url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
|
|
url += "&cli_ver=" + std::string(SLIC3R_VERSION);
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_passwd(hide_id_middle_string(url, url.find(m_lan_ip), m_lan_ip.length()), {m_lan_passwd});
|
|
m_url = url;
|
|
load();
|
|
return;
|
|
}
|
|
|
|
// m_lan_mode && m_lan_proto > LVL_Disable (use local tunnel)
|
|
// m_lan_mode && m_lan_proto == LVL_Disable (*)
|
|
// m_lan_mode && m_lan_proto == LVL_None (x)
|
|
// !m_lan_mode && m_remote_support (go on)
|
|
// !m_lan_mode && !m_remote_support && m_lan_proto > LVL_None (use local tunnel)
|
|
// !m_lan_mode && !m_remote_support && m_lan_proto == LVL_Disable (*)
|
|
// !m_lan_mode && !m_remote_support && m_lan_proto == LVL_None (x)
|
|
|
|
if (m_lan_proto <= MachineObject::LVL_Disable && (m_lan_mode || !m_remote_support)) {
|
|
Stop(m_lan_proto == MachineObject::LVL_None
|
|
? _L("Problem occured. Please update the printer firmware and try again.")
|
|
: _L("LAN Only Liveview is off. Please turn on the liveview on printer screen."));
|
|
return;
|
|
}
|
|
|
|
m_disable_lan = false;
|
|
m_failed_code = 0;
|
|
m_last_state = MEDIASTATE_INITIALIZING;
|
|
|
|
if (!m_remote_support) { // not support tutk
|
|
m_failed_code = -1;
|
|
m_url = "bambu:///local/";
|
|
Stop(_L("Please enter the IP of printer to connect."));
|
|
return;
|
|
}
|
|
|
|
m_label_stat->SetLabel({});
|
|
SetStatus(_L("Initializing..."));
|
|
|
|
if (agent) {
|
|
agent->get_camera_url(m_machine,
|
|
[this, m = m_machine, v = agent_version, dv = m_dev_ver](std::string url) {
|
|
if (boost::algorithm::starts_with(url, "bambu:///")) {
|
|
url += "&device=" + into_u8(m);
|
|
url += "&net_ver=" + v;
|
|
url += "&dev_ver=" + dv;
|
|
url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
|
|
url += "&cli_ver=" + std::string(SLIC3R_VERSION);
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_passwd(url,
|
|
{"?uid=", "authkey=", "passwd=", "license=", "token="});
|
|
CallAfter([this, m, url] {
|
|
if (m != m_machine) {
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl drop late ttcode for machine: " << m;
|
|
return;
|
|
}
|
|
if (m_last_state == MEDIASTATE_INITIALIZING) {
|
|
if (url.empty() || !boost::algorithm::starts_with(url, "bambu:///")) {
|
|
m_failed_code = 3;
|
|
Stop(_L("Connection Failed. Please check the network and try again"));
|
|
} else {
|
|
m_url = url;
|
|
load();
|
|
}
|
|
} else {
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl drop late ttcode for state: " << m_last_state;
|
|
}
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
void start_ping_test();
|
|
|
|
void MediaPlayCtrl::Stop(wxString const &msg)
|
|
{
|
|
int last_state = m_last_state;
|
|
|
|
if (m_last_state != MEDIASTATE_IDLE) {
|
|
m_media_ctrl->InvalidateBestSize();
|
|
m_button_play->SetIcon("media_play");
|
|
boost::unique_lock lock(m_mutex);
|
|
m_tasks.push_back("<stop>");
|
|
m_cond.notify_all();
|
|
if (!msg.IsEmpty())
|
|
SetStatus(msg);
|
|
else if (m_failed_code) {
|
|
auto iter = error_messages.find(m_failed_code);
|
|
auto msg2 = iter == error_messages.end()
|
|
? _L("Please check the network and try again, You can restart or update the printer if the issue persists.")
|
|
: _L(iter->second.c_str());
|
|
if (m_failed_code == 1) {
|
|
if (m_last_state == wxMEDIASTATE_PLAYING)
|
|
msg2 = _L("The printer has been logged out and cannot connect.");
|
|
}
|
|
#if !BBL_RELEASE_TO_PUBLIC && defined(__WINDOWS__)
|
|
if (m_failed_code < 0)
|
|
boost::thread ping_thread = Slic3r::create_thread([] {
|
|
start_ping_test();
|
|
});
|
|
#endif
|
|
SetStatus(msg2);
|
|
} else
|
|
SetStatus(_L("Stopped."), false);
|
|
m_last_state = MEDIASTATE_IDLE;
|
|
bool auto_retry = wxGetApp().app_config->get("liveview", "auto_retry") != "false";
|
|
if (!auto_retry || m_failed_code >= 100 || m_failed_code == 1) // not keep retry on local error or EOS
|
|
m_next_retry = wxDateTime();
|
|
} else if (!msg.IsEmpty()) {
|
|
SetStatus(msg, false);
|
|
return;
|
|
} else {
|
|
m_failed_code = 0;
|
|
return;
|
|
}
|
|
|
|
auto tunnel = m_url.empty() ? "" : into_u8(wxURI(m_url).GetPath()).substr(1);
|
|
if (auto n = tunnel.find_first_of('/_'); n != std::string::npos)
|
|
tunnel = tunnel.substr(0, n);
|
|
if (last_state != wxMEDIASTATE_PLAYING && m_failed_code != 0
|
|
&& m_last_failed_codes.find(m_failed_code) == m_last_failed_codes.end()
|
|
&& (m_user_triggered || m_failed_retry > 3)) {
|
|
m_last_failed_codes.insert(m_failed_code);
|
|
}
|
|
|
|
m_url.clear();
|
|
++m_failed_retry;
|
|
bool local = tunnel == "local" || tunnel == "rtsp" ||
|
|
tunnel == "rtsps";
|
|
if (m_failed_code < 0 && last_state != wxMEDIASTATE_PLAYING && local && (m_failed_retry > 1 || m_user_triggered)) {
|
|
m_next_retry = wxDateTime(); // stop retry
|
|
if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) {
|
|
m_failed_retry = 0;
|
|
m_user_triggered = true;
|
|
if (m_last_user_play + wxTimeSpan::Minutes(5) < wxDateTime::Now()) {
|
|
m_last_failed_codes.clear();
|
|
m_last_user_play = wxDateTime::Now();
|
|
}
|
|
m_next_retry = wxDateTime::Now();
|
|
return;
|
|
}
|
|
}
|
|
m_user_triggered = false;
|
|
if (m_next_retry.IsValid())
|
|
m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(5 * m_failed_retry);
|
|
}
|
|
|
|
void MediaPlayCtrl::TogglePlay()
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::TogglePlay";
|
|
if (m_last_state != MEDIASTATE_IDLE) {
|
|
m_next_retry = wxDateTime();
|
|
Stop();
|
|
} else {
|
|
m_failed_retry = 0;
|
|
m_user_triggered = true;
|
|
if (m_last_user_play + wxTimeSpan::Minutes(5) < wxDateTime::Now()) {
|
|
m_last_failed_codes.clear();
|
|
m_last_user_play = wxDateTime::Now();
|
|
}
|
|
m_next_retry = wxDateTime::Now();
|
|
Play();
|
|
}
|
|
}
|
|
|
|
void MediaPlayCtrl::ToggleStream()
|
|
{
|
|
std::string file_url = data_dir() + "/cameratools/url.txt";
|
|
if (m_streaming) {
|
|
boost::nowide::ofstream file(file_url);
|
|
file.close();
|
|
m_streaming = false;
|
|
return;
|
|
} else if (!boost::filesystem::exists(file_url)) {
|
|
boost::nowide::ofstream file(file_url);
|
|
file.close();
|
|
}
|
|
std::string url;
|
|
if (!get_stream_url(&url)) {
|
|
// create stream pipeline
|
|
bool need_install = false;
|
|
if (!start_stream_service(&need_install)) {
|
|
if (!need_install) return;
|
|
auto res = MessageDialog(this->GetParent(), _L("Virtual Camera Tools is required for this task!\nDo you want to install them?"), _L("Info"),
|
|
wxOK | wxCANCEL).ShowModal();
|
|
if (res == wxID_OK) {
|
|
// download tools
|
|
struct DownloadProgressDialog2 : DownloadProgressDialog
|
|
{
|
|
MediaPlayCtrl *ctrl;
|
|
DownloadProgressDialog2(MediaPlayCtrl *ctrl) : DownloadProgressDialog(_L("Downloading Virtual Camera Tools")), ctrl(ctrl) {}
|
|
struct UpgradeNetworkJob2 : UpgradeNetworkJob
|
|
{
|
|
UpgradeNetworkJob2(std::shared_ptr<ProgressIndicator> pri) : UpgradeNetworkJob() {
|
|
name = "cameratools";
|
|
package_name = "camera_tools.zip";
|
|
}
|
|
};
|
|
std::shared_ptr<UpgradeNetworkJob> make_job(std::shared_ptr<ProgressIndicator> pri)
|
|
{ return std::make_shared<UpgradeNetworkJob2>(pri); }
|
|
void on_finish() override
|
|
{
|
|
ctrl->CallAfter([ctrl = this->ctrl] { ctrl->ToggleStream(); });
|
|
EndModal(wxID_CLOSE);
|
|
}
|
|
};
|
|
DownloadProgressDialog2 dlg(this);
|
|
dlg.ShowModal();
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
if (!url.empty() && wxGetApp().app_config->get("not_show_vcamera_stop_prev") != "1") {
|
|
MessageDialog dlg(this->GetParent(), _L("Another virtual camera is running.\nOrca Slicer supports only a single virtual camera.\nDo you want to stop this virtual camera?"), _L("Warning"),
|
|
wxYES | wxCANCEL | wxICON_INFORMATION);
|
|
dlg.show_dsa_button();
|
|
auto res = dlg.ShowModal();
|
|
if (dlg.get_checkbox_state())
|
|
wxGetApp().app_config->set("not_show_vcamera_stop_prev", "1");
|
|
if (res == wxID_CANCEL) return;
|
|
}
|
|
if (m_lan_proto > MachineObject::LVL_Disable && (m_lan_mode || !m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) {
|
|
std::string url;
|
|
if (m_lan_proto == MachineObject::LVL_Local)
|
|
url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd;
|
|
else if (m_lan_proto == MachineObject::LVL_Rtsps)
|
|
url = "bambu:///rtsps___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsps";
|
|
else if (m_lan_proto == MachineObject::LVL_Rtsp)
|
|
url = "bambu:///rtsp___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsp";
|
|
url += "&device=" + into_u8(m_machine);
|
|
url += "&dev_ver=" + m_dev_ver;
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::ToggleStream: " << hide_passwd(hide_id_middle_string(url, url.find(m_lan_ip), m_lan_ip.length()), {m_lan_passwd});
|
|
std::string file_url = data_dir() + "/cameratools/url.txt";
|
|
boost::nowide::ofstream file(file_url);
|
|
auto url2 = encode_path(url.c_str());
|
|
file.write(url2.c_str(), url2.size());
|
|
file.close();
|
|
m_streaming = true;
|
|
return;
|
|
}
|
|
NetworkAgent *agent = wxGetApp().getAgent();
|
|
if (!agent) return;
|
|
agent->get_camera_url(m_machine, [this, m = m_machine, v = agent->get_version(), dv = m_dev_ver](std::string url) {
|
|
if (boost::algorithm::starts_with(url, "bambu:///")) {
|
|
url += "&device=" + m;
|
|
url += "&net_ver=" + v;
|
|
url += "&dev_ver=" + dv;
|
|
url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
|
|
url += "&cli_ver=" + std::string(SLIC3R_VERSION);
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::ToggleStream: " << hide_passwd(url,
|
|
{"?uid=", "authkey=", "passwd=", "license=", "token="});
|
|
CallAfter([this, m, url] {
|
|
if (m != m_machine) return;
|
|
if (url.empty() || !boost::algorithm::starts_with(url, "bambu:///")) {
|
|
MessageDialog(this->GetParent(), wxString::Format(_L("Virtual camera initialize failed (%s)!"), url.empty() ? _L("Network unreachable") : from_u8(url)), _L("Information"),
|
|
wxICON_INFORMATION)
|
|
.ShowModal();
|
|
return;
|
|
}
|
|
std::string file_url = data_dir() + "/cameratools/url.txt";
|
|
boost::nowide::ofstream file(file_url);
|
|
auto url2 = encode_path(url.c_str());
|
|
file.write(url2.c_str(), url2.size());
|
|
file.close();
|
|
m_streaming = true;
|
|
});
|
|
});
|
|
}
|
|
|
|
void MediaPlayCtrl::msw_rescale() {
|
|
m_button_play->Rescale();
|
|
}
|
|
|
|
void MediaPlayCtrl::jump_to_play()
|
|
{
|
|
if (m_last_state != MEDIASTATE_IDLE)
|
|
return;
|
|
TogglePlay();
|
|
}
|
|
|
|
void MediaPlayCtrl::onStateChanged(wxMediaEvent &event)
|
|
{
|
|
auto last_state = m_last_state;
|
|
auto state = m_media_ctrl->GetState();
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::onStateChanged: " << state << ", last_state: " << last_state;
|
|
if ((int) state < 0) return;
|
|
{
|
|
boost::unique_lock lock(m_mutex);
|
|
if (!m_tasks.empty()) {
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::onStateChanged: skip when task not finished";
|
|
return;
|
|
}
|
|
}
|
|
if ((last_state == MEDIASTATE_IDLE || last_state == MEDIASTATE_INITIALIZING) && state == wxMEDIASTATE_STOPPED) { return; }
|
|
if ((last_state == wxMEDIASTATE_PAUSED || last_state == wxMEDIASTATE_PLAYING) && state == wxMEDIASTATE_STOPPED) {
|
|
m_failed_code = m_media_ctrl->GetLastError();
|
|
Stop();
|
|
return;
|
|
}
|
|
if (last_state == MEDIASTATE_LOADING && (state == wxMEDIASTATE_STOPPED || state == wxMEDIASTATE_PAUSED)) {
|
|
wxSize size = m_media_ctrl->GetVideoSize();
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::onStateChanged: size: " << size.x << "x" << size.y;
|
|
m_failed_code = m_media_ctrl->GetLastError();
|
|
if (size.GetWidth() >= 320) {
|
|
m_last_state = state;
|
|
SetStatus(_L("Playing..."), false);
|
|
|
|
|
|
m_failed_retry = 0;
|
|
m_failed_code = 0;
|
|
m_disable_lan = false;
|
|
boost::unique_lock lock(m_mutex);
|
|
m_tasks.push_back("<play>");
|
|
m_cond.notify_all();
|
|
} else if (event.GetId()) {
|
|
if (m_failed_code == 0)
|
|
m_failed_code = 2;
|
|
Stop();
|
|
}
|
|
} else {
|
|
m_last_state = state;
|
|
}
|
|
}
|
|
|
|
void MediaPlayCtrl::SetStatus(wxString const &msg2, bool hyperlink)
|
|
{
|
|
auto msg = msg2;
|
|
if (m_failed_code != 0) {
|
|
int state2 = m_last_state >= MEDIASTATE_IDLE ? m_last_state - MEDIASTATE_IDLE :
|
|
m_last_state + MEDIASTATE_BUFFERING - MEDIASTATE_IDLE;
|
|
msg += wxString::Format(" [%d:%d]", state2, m_failed_code);
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::SetStatus: " << msg.ToUTF8().data() << " tutk_state: " << m_tutk_state;
|
|
#ifdef __WXMSW__
|
|
OutputDebugStringA("MediaPlayCtrl::SetStatus: ");
|
|
OutputDebugStringA(msg.ToUTF8().data());
|
|
OutputDebugStringA("\n");
|
|
#endif // __WXMSW__
|
|
m_label_status->SetLabel(msg);
|
|
m_label_status->Wrap(GetSize().GetWidth() - 120 - m_label_stat->GetSize().GetWidth());
|
|
long style = m_label_status->GetWindowStyle() & ~LB_HYPERLINK;
|
|
if (hyperlink) {
|
|
style |= LB_HYPERLINK;
|
|
}
|
|
m_label_status->SetWindowStyle(style);
|
|
m_label_status->InvalidateBestSize();
|
|
Layout();
|
|
}
|
|
|
|
bool MediaPlayCtrl::IsStreaming() const { return m_streaming; }
|
|
|
|
void MediaPlayCtrl::load()
|
|
{
|
|
m_last_state = MEDIASTATE_LOADING;
|
|
SetStatus(_L("Loading..."));
|
|
if (wxGetApp().app_config->get("internal_developer_mode") == "true") {
|
|
std::string file_h264 = data_dir() + "/video.h264";
|
|
std::string file_info = data_dir() + "/video.info";
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl dump video to " << file_h264;
|
|
// closed by BambuSource
|
|
FILE *dump_h264_file = boost::nowide::fopen(file_h264.c_str(), "wb");
|
|
FILE *dump_info_file = boost::nowide::fopen(file_info.c_str(), "wb");
|
|
m_url = m_url + "&dump_h264=" + boost::lexical_cast<std::string>(dump_h264_file);
|
|
m_url = m_url + "&dump_info=" + boost::lexical_cast<std::string>(dump_info_file);
|
|
}
|
|
boost::unique_lock lock(m_mutex);
|
|
m_tasks.push_back(m_url);
|
|
m_cond.notify_all();
|
|
}
|
|
|
|
void MediaPlayCtrl::on_show_hide(wxShowEvent &evt)
|
|
{
|
|
evt.Skip();
|
|
if (m_isBeingDeleted) return;
|
|
m_failed_retry = 0;
|
|
if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid quick play/stop
|
|
m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
|
|
IsShownOnScreen() ? Play() : Stop();
|
|
}
|
|
|
|
void MediaPlayCtrl::media_proc()
|
|
{
|
|
boost::unique_lock lock(m_mutex);
|
|
while (true) {
|
|
while (m_tasks.empty()) {
|
|
m_cond.wait(lock);
|
|
}
|
|
wxString url = m_tasks.front();
|
|
if (m_tasks.size() >= 2 && !url.IsEmpty() && url[0] != '<' && m_tasks[1] == "<stop>") {
|
|
BOOST_LOG_TRIVIAL(trace) << "MediaPlayCtrl: busy skip url: " << url;
|
|
m_tasks.pop_front();
|
|
m_tasks.pop_front();
|
|
continue;
|
|
}
|
|
lock.unlock();
|
|
if (url.IsEmpty()) {
|
|
break;
|
|
}
|
|
else if (url == "<stop>") {
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: start stop";
|
|
m_media_ctrl->Stop();
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end stop";
|
|
}
|
|
else if (url == "<exit>") {
|
|
break;
|
|
}
|
|
else if (url == "<play>") {
|
|
m_media_ctrl->Play();
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: start load";
|
|
m_media_ctrl->Load(wxURI(url));
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end load";
|
|
}
|
|
lock.lock();
|
|
m_tasks.pop_front();
|
|
wxMediaEvent theEvent(wxEVT_MEDIA_STATECHANGED, m_media_ctrl->GetId());
|
|
theEvent.SetId(0);
|
|
m_media_ctrl->GetEventHandler()->AddPendingEvent(theEvent);
|
|
}
|
|
}
|
|
|
|
bool MediaPlayCtrl::start_stream_service(bool *need_install)
|
|
{
|
|
#ifdef __WIN32__
|
|
auto tools_dir = boost::nowide::widen(data_dir()) + L"\\cameratools\\";
|
|
auto file_source = tools_dir + L"bambu_source.exe";
|
|
auto file_ffmpeg = tools_dir + L"ffmpeg.exe";
|
|
auto file_ff_cfg = tools_dir + L"ffmpeg.cfg";
|
|
#else
|
|
auto tools_dir = data_dir() + "/cameratools/";
|
|
auto file_source = tools_dir + "bambu_source";
|
|
auto file_ffmpeg = tools_dir + "ffmpeg";
|
|
auto file_ff_cfg = tools_dir + "ffmpeg.cfg";
|
|
#endif
|
|
if (!boost::filesystem::exists(file_source) || !boost::filesystem::exists(file_ffmpeg) || !boost::filesystem::exists(file_ff_cfg)) {
|
|
if (need_install) *need_install = true;
|
|
return false;
|
|
}
|
|
std::string file_url = data_dir() + "/cameratools/url.txt";
|
|
if (!boost::filesystem::exists(file_url)) {
|
|
boost::nowide::ofstream file(file_url);
|
|
file.close();
|
|
}
|
|
wxString file_url2 = L"bambu:///camera/" + from_u8(file_url);
|
|
file_url2.Replace("\\", "/");
|
|
file_url2 = wxURI(file_url2).BuildURI();
|
|
try {
|
|
std::string configs;
|
|
load_string_file(file_ff_cfg, configs);
|
|
std::vector<std::string> configss;
|
|
boost::algorithm::split(configss, configs, boost::algorithm::is_any_of("\r\n"));
|
|
configss.erase(std::remove(configss.begin(), configss.end(), std::string()), configss.end());
|
|
boost::process::pipe intermediate;
|
|
boost::filesystem::path start_dir(boost::filesystem::path(data_dir()) / "plugins");
|
|
#ifdef __WXMSW__
|
|
auto plugins_dir = boost::nowide::widen(data_dir()) + L"\\plugins\\";
|
|
for (auto dll : {L"BambuSource.dll", L"live555.dll"}) {
|
|
auto file_dll = tools_dir + dll;
|
|
auto file_dll2 = plugins_dir + dll;
|
|
if (!boost::filesystem::exists(file_dll) || boost::filesystem::last_write_time(file_dll) != boost::filesystem::last_write_time(file_dll2))
|
|
boost::filesystem::copy_file(file_dll2, file_dll, boost::filesystem::copy_option::overwrite_if_exists);
|
|
}
|
|
boost::process::child process_source(file_source, file_url2.ToStdWstring(), boost::process::start_dir(tools_dir),
|
|
boost::process::windows::create_no_window,
|
|
boost::process::std_out > intermediate, boost::process::limit_handles);
|
|
boost::process::child process_ffmpeg(file_ffmpeg, configss, boost::process::windows::create_no_window,
|
|
boost::process::std_in < intermediate, boost::process::limit_handles);
|
|
#else
|
|
boost::filesystem::permissions(file_source, boost::filesystem::owner_exe | boost::filesystem::add_perms);
|
|
boost::filesystem::permissions(file_ffmpeg, boost::filesystem::owner_exe | boost::filesystem::add_perms);
|
|
boost::process::child process_source(file_source, file_url2.data().AsInternal(), boost::process::start_dir(start_dir),
|
|
boost::process::std_out > intermediate, boost::process::limit_handles);
|
|
boost::process::child process_ffmpeg(file_ffmpeg, configss, boost::process::std_in < intermediate, boost::process::limit_handles);
|
|
#endif
|
|
process_source.detach();
|
|
process_ffmpeg.detach();
|
|
} catch (std::exception &e) {
|
|
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl failed to start camera stream: " << decode_path(e.what());
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool MediaPlayCtrl::get_stream_url(std::string *url)
|
|
{
|
|
#ifdef __WIN32__
|
|
HANDLE shm = ::OpenFileMapping(FILE_MAP_READ, FALSE, L"bambu_stream_url");
|
|
if (shm == NULL) return false;
|
|
if (url) {
|
|
char *addr = (char *) MapViewOfFile(shm, FILE_MAP_READ, 0, 0, 0);
|
|
if (addr) {
|
|
*url = addr;
|
|
UnmapViewOfFile(addr);
|
|
url = nullptr;
|
|
}
|
|
}
|
|
CloseHandle(shm);
|
|
#else
|
|
std::string file_url = data_dir() + "/cameratools/url.txt";
|
|
key_t key = ::ftok(file_url.c_str(), 1000);
|
|
int shm = ::shmget(key, 1024, 0);
|
|
if (shm == -1) return false;
|
|
struct shmid_ds ds;
|
|
::shmctl(shm, IPC_STAT, &ds);
|
|
if (ds.shm_nattch == 0) {
|
|
return false;
|
|
}
|
|
if (url) {
|
|
char *addr = (char *) ::shmat(shm, nullptr, 0);
|
|
if (addr != (void*) -1) {
|
|
*url = addr;
|
|
::shmdt(addr);
|
|
url = nullptr;
|
|
}
|
|
}
|
|
#endif
|
|
return url == nullptr;
|
|
}
|
|
|
|
}}
|
|
|
|
void wxMediaCtrl2::DoSetSize(int x, int y, int width, int height, int sizeFlags)
|
|
{
|
|
#ifdef __WXMAC__
|
|
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
|
|
#else
|
|
wxMediaCtrl::DoSetSize(x, y, width, height, sizeFlags);
|
|
#endif
|
|
if (sizeFlags & wxSIZE_USE_EXISTING) return;
|
|
wxSize size = m_video_size;
|
|
int maxHeight = (width * size.GetHeight() + size.GetHeight() - 1) / size.GetWidth();
|
|
if (maxHeight != GetMaxHeight()) {
|
|
// BOOST_LOG_TRIVIAL(info) << "wxMediaCtrl2::DoSetSize: width: " << width << ", height: " << height << ", maxHeight: " << maxHeight;
|
|
SetMaxSize({-1, maxHeight});
|
|
CallAfter([this] {
|
|
if (auto p = GetParent()) {
|
|
p->Layout();
|
|
p->Refresh();
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|