* 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>
461 lines
16 KiB
C++
461 lines
16 KiB
C++
///|/ Copyright (c) Prusa Research 2018 - 2022 Enrico Turri @enricoturri1966, David Kocík @kocikdav, Oleksandra Iushchenko @YuSanka, Vojtěch Král @vojtechkral, Vojtěch Bubník @bubnikv
|
|
///|/
|
|
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
|
|
///|/
|
|
#ifndef slic3r_GLToolbar_hpp_
|
|
#define slic3r_GLToolbar_hpp_
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "GLTexture.hpp"
|
|
#include "Event.hpp"
|
|
#include "libslic3r/Point.hpp"
|
|
|
|
class wxEvtHandler;
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
class GLCanvas3D;
|
|
|
|
|
|
//BBS: GUI refactor: GLToolbar
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_OPEN_PROJECT, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SLICE_ALL, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SLICE_PLATE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_PRINT_ALL, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_PRINT_PLATE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_EXPORT_GCODE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SEND_GCODE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_UPLOAD_GCODE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_EXPORT_SLICED_FILE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_EXPORT_ALL_SLICED_FILE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_PRINT_SELECT, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SEND_TO_PRINTER, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SEND_TO_PRINTER_ALL, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_PRINT_MULTI_MACHINE, SimpleEvent);
|
|
|
|
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE_ALL, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_ADD_PLATE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_DEL_PLATE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_ORIENT, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_ARRANGE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_CUT, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_COPY, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_PASTE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_LAYERSEDITING, SimpleEvent);
|
|
//BBS: add clone event
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_CLONE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_MORE, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_FEWER, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SPLIT_OBJECTS, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SPLIT_VOLUMES, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_FILLCOLOR, IntEvent);
|
|
wxDECLARE_EVENT(EVT_GLTOOLBAR_SELECT_SLICED_PLATE, wxCommandEvent);
|
|
|
|
wxDECLARE_EVENT(EVT_GLVIEWTOOLBAR_3D, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLVIEWTOOLBAR_PREVIEW, SimpleEvent);
|
|
wxDECLARE_EVENT(EVT_GLVIEWTOOLBAR_ASSEMBLE, SimpleEvent);
|
|
|
|
|
|
|
|
class GLToolbarItem
|
|
{
|
|
public:
|
|
typedef std::function<void()> ActionCallback;
|
|
typedef std::function<bool()> VisibilityCallback;
|
|
typedef std::function<bool()> EnablingCallback;
|
|
typedef std::function<void(float, float, float, float)> RenderCallback;
|
|
|
|
enum EType : unsigned char
|
|
{
|
|
Action,
|
|
Separator,
|
|
//BBS: GUI refactor: GLToolbar
|
|
ActionWithText,
|
|
ActionWithTextImage,
|
|
SeparatorLine,
|
|
Num_Types
|
|
};
|
|
|
|
enum EActionType : unsigned char
|
|
{
|
|
Undefined,
|
|
Left,
|
|
Right,
|
|
Num_Action_Types
|
|
};
|
|
|
|
enum EState : unsigned char
|
|
{
|
|
Normal,
|
|
Pressed,
|
|
Disabled,
|
|
Hover,
|
|
HoverPressed,
|
|
HoverDisabled,
|
|
Num_States
|
|
};
|
|
|
|
enum EHighlightState : unsigned char
|
|
{
|
|
HighlightedShown,
|
|
HighlightedHidden,
|
|
Num_Rendered_Highlight_States,
|
|
NotHighlighted
|
|
};
|
|
|
|
struct Data
|
|
{
|
|
struct Option
|
|
{
|
|
bool toggable;
|
|
ActionCallback action_callback;
|
|
RenderCallback render_callback;
|
|
|
|
Option();
|
|
|
|
bool can_render() const { return toggable && (render_callback != nullptr); }
|
|
};
|
|
|
|
std::string name;
|
|
std::string icon_filename;
|
|
std::string tooltip;
|
|
std::string additional_tooltip;
|
|
//BBS: GUI refactor: GLToolbar
|
|
std::string button_text;
|
|
float extra_size_ratio;
|
|
GLTexture text_texture;
|
|
GLTexture image_texture;
|
|
std::vector<unsigned char> image_data;
|
|
unsigned int image_width;
|
|
unsigned int image_height;
|
|
|
|
unsigned int sprite_id;
|
|
// mouse left click
|
|
Option left;
|
|
// mouse right click
|
|
Option right;
|
|
bool visible;
|
|
VisibilityCallback visibility_callback;
|
|
EnablingCallback enabling_callback;
|
|
|
|
Data();
|
|
//BBS: GUI refactor: GLToolbar
|
|
Data(const GLToolbarItem::Data& data)
|
|
{
|
|
name = data.name;
|
|
icon_filename = data.icon_filename;
|
|
tooltip = data.tooltip;
|
|
additional_tooltip = data.additional_tooltip;
|
|
button_text = data.button_text;
|
|
extra_size_ratio = data.extra_size_ratio;
|
|
sprite_id = data.sprite_id;
|
|
left = data.left;
|
|
right = data.right;
|
|
visible = data.visible;
|
|
visibility_callback = data.visibility_callback;
|
|
enabling_callback = data.enabling_callback;
|
|
image_data = data.image_data;
|
|
image_width = data.image_width;
|
|
image_height = data.image_height;
|
|
}
|
|
};
|
|
|
|
static const ActionCallback Default_Action_Callback;
|
|
static const VisibilityCallback Default_Visibility_Callback;
|
|
static const EnablingCallback Default_Enabling_Callback;
|
|
static const RenderCallback Default_Render_Callback;
|
|
|
|
private:
|
|
EType m_type;
|
|
EState m_state;
|
|
Data m_data;
|
|
EActionType m_last_action_type;
|
|
EHighlightState m_highlight_state;
|
|
public:
|
|
// remember left position for rendering menu
|
|
mutable float render_left_pos;
|
|
|
|
GLToolbarItem(EType type, const Data& data);
|
|
|
|
EState get_state() const { return m_state; }
|
|
void set_state(EState state) { m_state = state; }
|
|
|
|
EHighlightState get_highlight() const { return m_highlight_state; }
|
|
void set_highlight(EHighlightState state) { m_highlight_state = state; }
|
|
|
|
const std::string& get_name() const { return m_data.name; }
|
|
const std::string& get_icon_filename() const { return m_data.icon_filename; }
|
|
void set_icon_filename(const std::string& filename) { m_data.icon_filename = filename; }
|
|
const std::string& get_tooltip() const { return m_data.tooltip; }
|
|
const std::string& get_additional_tooltip() const { return m_data.additional_tooltip; }
|
|
void set_additional_tooltip(const std::string& text) { m_data.additional_tooltip = text; }
|
|
void set_tooltip(const std::string& text) { m_data.tooltip = text; }
|
|
|
|
void do_left_action() { m_last_action_type = Left; m_data.left.action_callback(); }
|
|
void do_right_action() { m_last_action_type = Right; m_data.right.action_callback(); }
|
|
|
|
bool is_enabled() const { return (m_state != Disabled) && (m_state != HoverDisabled); }
|
|
bool is_disabled() const { return (m_state == Disabled) || (m_state == HoverDisabled); }
|
|
bool is_hovered() const { return (m_state == Hover) || (m_state == HoverPressed) || (m_state == HoverDisabled); }
|
|
bool is_pressed() const { return (m_state == Pressed) || (m_state == HoverPressed); }
|
|
bool is_visible() const { return m_data.visible; }
|
|
bool is_separator() const { return m_type == Separator; }
|
|
|
|
bool is_left_toggable() const { return m_data.left.toggable; }
|
|
bool is_right_toggable() const { return m_data.right.toggable; }
|
|
|
|
bool has_left_render_callback() const { return m_data.left.render_callback != nullptr; }
|
|
bool has_right_render_callback() const { return m_data.right.render_callback != nullptr; }
|
|
|
|
EActionType get_last_action_type() const { return m_last_action_type; }
|
|
void reset_last_action_type() { m_last_action_type = Undefined; }
|
|
|
|
// returns true if the state changes
|
|
bool update_visibility();
|
|
// returns true if the state changes
|
|
bool update_enabled_state();
|
|
|
|
//BBS: GUI refactor: GLToolbar
|
|
bool is_action() const { return m_type == Action; }
|
|
bool is_action_with_text() const { return m_type == ActionWithText; }
|
|
bool is_action_with_text_image() const { return m_type == ActionWithTextImage; }
|
|
const std::string& get_button_text() const { return m_data.button_text; }
|
|
void set_button_text(const std::string& text) { m_data.button_text = text; }
|
|
float get_extra_size_ratio() const { return m_data.extra_size_ratio; }
|
|
void set_extra_size_ratio(const float ratio) { m_data.extra_size_ratio = ratio; }
|
|
void render_text(float left, float right, float bottom, float top) const;
|
|
int generate_texture(wxFont& font);
|
|
int generate_image_texture();
|
|
|
|
void render(unsigned int tex_id, float left, float right, float bottom, float top, unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) const;
|
|
void render_image(unsigned int tex_id, float left, float right, float bottom, float top, unsigned int tex_width, unsigned int tex_height, unsigned int icon_size) const;
|
|
private:
|
|
void set_visible(bool visible) { m_data.visible = visible; }
|
|
|
|
friend class GLToolbar;
|
|
};
|
|
|
|
struct BackgroundTexture
|
|
{
|
|
struct Metadata
|
|
{
|
|
// path of the file containing the background texture
|
|
std::string filename;
|
|
// size of the left edge, in pixels
|
|
unsigned int left;
|
|
// size of the right edge, in pixels
|
|
unsigned int right;
|
|
// size of the top edge, in pixels
|
|
unsigned int top;
|
|
// size of the bottom edge, in pixels
|
|
unsigned int bottom;
|
|
|
|
Metadata();
|
|
};
|
|
|
|
GLTexture texture;
|
|
Metadata metadata;
|
|
};
|
|
|
|
class GLToolbar
|
|
{
|
|
public:
|
|
static const float Default_Icons_Size;
|
|
|
|
enum EType : unsigned char
|
|
{
|
|
Normal,
|
|
Radio,
|
|
Num_Types
|
|
};
|
|
|
|
struct Layout
|
|
{
|
|
enum EType : unsigned char
|
|
{
|
|
Horizontal,
|
|
Vertical,
|
|
Num_Types
|
|
};
|
|
|
|
enum EHorizontalOrientation : unsigned char
|
|
{
|
|
HO_Left,
|
|
HO_Center,
|
|
HO_Right,
|
|
Num_Horizontal_Orientations
|
|
};
|
|
|
|
enum EVerticalOrientation : unsigned char
|
|
{
|
|
VO_Top,
|
|
VO_Center,
|
|
VO_Bottom,
|
|
Num_Vertical_Orientations
|
|
};
|
|
|
|
EType type;
|
|
EHorizontalOrientation horizontal_orientation;
|
|
EVerticalOrientation vertical_orientation;
|
|
float top;
|
|
float left;
|
|
float border;
|
|
float separator_size;
|
|
float gap_size;
|
|
float icons_size;
|
|
float text_size;
|
|
float image_width;
|
|
float image_height;
|
|
float scale;
|
|
|
|
float width;
|
|
float height;
|
|
bool dirty;
|
|
|
|
Layout();
|
|
};
|
|
|
|
private:
|
|
typedef std::vector<GLToolbarItem*> ItemsList;
|
|
|
|
EType m_type;
|
|
std::string m_name;
|
|
bool m_enabled;
|
|
GLTexture m_icons_texture;
|
|
bool m_icons_texture_dirty;
|
|
mutable GLTexture m_images_texture;
|
|
mutable bool m_images_texture_dirty;
|
|
BackgroundTexture m_background_texture;
|
|
GLTexture m_arrow_texture;
|
|
Layout m_layout;
|
|
|
|
ItemsList m_items;
|
|
|
|
struct MouseCapture
|
|
{
|
|
bool left;
|
|
bool middle;
|
|
bool right;
|
|
GLCanvas3D* parent;
|
|
|
|
MouseCapture() { reset(); }
|
|
|
|
bool any() const { return left || middle || right; }
|
|
void reset() { left = middle = right = false; parent = nullptr; }
|
|
};
|
|
|
|
MouseCapture m_mouse_capture;
|
|
int m_pressed_toggable_id;
|
|
|
|
public:
|
|
GLToolbar(EType type, const std::string& name);
|
|
~GLToolbar();
|
|
|
|
bool init(const BackgroundTexture::Metadata& background_texture);
|
|
|
|
bool init_arrow(const std::string& filename);
|
|
|
|
Layout::EType get_layout_type() const;
|
|
void set_layout_type(Layout::EType type);
|
|
void set_icon_dirty() { m_icons_texture_dirty = true; }
|
|
Layout::EHorizontalOrientation get_horizontal_orientation() const { return m_layout.horizontal_orientation; }
|
|
void set_horizontal_orientation(Layout::EHorizontalOrientation orientation) { m_layout.horizontal_orientation = orientation; }
|
|
Layout::EVerticalOrientation get_vertical_orientation() const { return m_layout.vertical_orientation; }
|
|
void set_vertical_orientation(Layout::EVerticalOrientation orientation) { m_layout.vertical_orientation = orientation; }
|
|
|
|
void set_position(float top, float left);
|
|
void set_border(float border);
|
|
void set_separator_size(float size);
|
|
void set_gap_size(float size);
|
|
void set_icons_size(float size);
|
|
void set_text_size(float size);
|
|
void set_scale(float scale);
|
|
|
|
bool is_enabled() const { return m_enabled; }
|
|
void set_enabled(bool enable) { m_enabled = enable; }
|
|
|
|
//BBS: GUI refactor: GLToolbar
|
|
bool add_item(const GLToolbarItem::Data& data, GLToolbarItem::EType type = GLToolbarItem::Action);
|
|
bool add_separator();
|
|
bool del_all_item();
|
|
|
|
float get_icons_size() { return m_layout.icons_size; }
|
|
float get_width();
|
|
float get_height();
|
|
|
|
void select_item(const std::string& name);
|
|
|
|
bool is_item_pressed(const std::string& name) const;
|
|
bool is_item_disabled(const std::string& name) const;
|
|
bool is_item_visible(const std::string& name) const;
|
|
|
|
bool is_any_item_pressed() const;
|
|
|
|
unsigned int get_items_count() const { return (unsigned int)m_items.size(); }
|
|
int get_item_id(const std::string& name) const;
|
|
|
|
void force_left_action(int item_id, GLCanvas3D& parent) { do_action(GLToolbarItem::Left, item_id, parent, false); }
|
|
void force_right_action(int item_id, GLCanvas3D& parent) { do_action(GLToolbarItem::Right, item_id, parent, false); }
|
|
|
|
std::string get_tooltip() const;
|
|
|
|
void get_additional_tooltip(int item_id, std::string& text);
|
|
void set_additional_tooltip(int item_id, const std::string& text);
|
|
void set_tooltip(int item_id, const std::string& text);
|
|
int get_visible_items_cnt() const;
|
|
|
|
// returns true if any item changed its state
|
|
bool update_items_state();
|
|
|
|
void render(const GLCanvas3D& parent,GLToolbarItem::EType type = GLToolbarItem::Action);
|
|
void render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighted_item);
|
|
|
|
bool on_mouse(wxMouseEvent& evt, GLCanvas3D& parent);
|
|
// get item pointer for highlighter timer
|
|
GLToolbarItem* get_item(const std::string& item_name);
|
|
|
|
//BBS: GUI refactor: GLToolbar
|
|
int generate_button_text_textures(wxFont& font);
|
|
int generate_image_textures();
|
|
float get_scaled_icon_size();
|
|
|
|
private:
|
|
void calc_layout();
|
|
float get_width_horizontal() const;
|
|
float get_width_vertical() const;
|
|
float get_height_horizontal() const;
|
|
float get_height_vertical() const;
|
|
float get_main_size() const;
|
|
void do_action(GLToolbarItem::EActionType type, int item_id, GLCanvas3D& parent, bool check_hover);
|
|
void update_hover_state(const Vec2d& mouse_pos, GLCanvas3D& parent);
|
|
void update_hover_state_horizontal(const Vec2d& mouse_pos, GLCanvas3D& parent);
|
|
void update_hover_state_vertical(const Vec2d& mouse_pos, GLCanvas3D& parent);
|
|
// returns the id of the item under the given mouse position or -1 if none
|
|
int contains_mouse(const Vec2d& mouse_pos, const GLCanvas3D& parent) const;
|
|
int contains_mouse_horizontal(const Vec2d& mouse_pos, const GLCanvas3D& parent) const;
|
|
int contains_mouse_vertical(const Vec2d& mouse_pos, const GLCanvas3D& parent) const;
|
|
|
|
void render_background(float left, float top, float right, float bottom, float border_w, float border_h) const;
|
|
void render_horizontal(const GLCanvas3D &parent, GLToolbarItem::EType type);
|
|
void render_vertical(const GLCanvas3D& parent);
|
|
|
|
bool generate_icons_texture();
|
|
|
|
// returns true if any item changed its state
|
|
bool update_items_visibility();
|
|
// returns true if any item changed its state
|
|
bool update_items_enabled_state();
|
|
};
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|
|
|
|
#endif // slic3r_GLToolbar_hpp_
|