* 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>
344 lines
13 KiB
C++
344 lines
13 KiB
C++
///|/ Copyright (c) Prusa Research 2017 - 2023 Vojtěch Bubník @bubnikv, David Kocík @kocikdav, Lukáš Matěna @lukasmatena, Filip Sykala @Jony01, Enrico Turri @enricoturri1966, Oleksandra Iushchenko @YuSanka, Vojtěch Král @vojtechkral
|
|
///|/
|
|
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
|
|
///|/
|
|
#ifndef slic3r_AppConfig_hpp_
|
|
#define slic3r_AppConfig_hpp_
|
|
|
|
#include <set>
|
|
#include <map>
|
|
#include <string>
|
|
#include "nlohmann/json.hpp"
|
|
#include <boost/algorithm/string/trim_all.hpp>
|
|
|
|
#include "libslic3r/Config.hpp"
|
|
#include "libslic3r/Semver.hpp"
|
|
#include "calib.hpp"
|
|
|
|
using namespace nlohmann;
|
|
|
|
#define ENV_DEV_HOST "0"
|
|
#define ENV_QAT_HOST "1"
|
|
#define ENV_PRE_HOST "2"
|
|
#define ENV_PRODUCT_HOST "3"
|
|
|
|
#define SUPPORT_DARK_MODE
|
|
//#define _MSW_DARK_MODE
|
|
|
|
|
|
namespace Slic3r {
|
|
|
|
class AppConfig
|
|
{
|
|
public:
|
|
enum class EAppMode : unsigned char
|
|
{
|
|
Editor,
|
|
GCodeViewer
|
|
};
|
|
|
|
//BBS: remove GCodeViewer as seperate APP logic
|
|
explicit AppConfig() :
|
|
m_dirty(false),
|
|
m_orig_version(Semver::invalid()),
|
|
m_mode(EAppMode::Editor),
|
|
m_legacy_datadir(false)
|
|
{
|
|
this->reset();
|
|
}
|
|
|
|
std::string get_language_code();
|
|
std::string get_hms_host();
|
|
|
|
// Clear and reset to defaults.
|
|
void reset();
|
|
// Override missing or keys with their defaults.
|
|
void set_defaults();
|
|
|
|
// Load the slic3r.ini from a user profile directory (or a datadir, if configured).
|
|
// return error string or empty strinf
|
|
std::string load();
|
|
// Store the slic3r.ini into a user profile directory (or a datadir, if configured).
|
|
void save();
|
|
|
|
// Does this config need to be saved?
|
|
bool dirty() const { return m_dirty; }
|
|
|
|
|
|
void set_dirty() { m_dirty = true; }
|
|
|
|
// Const accessor, it will return false if a section or a key does not exist.
|
|
bool get(const std::string §ion, const std::string &key, std::string &value) const
|
|
{
|
|
value.clear();
|
|
auto it = m_storage.find(section);
|
|
if (it == m_storage.end())
|
|
return false;
|
|
auto it2 = it->second.find(key);
|
|
if (it2 == it->second.end())
|
|
return false;
|
|
value = it2->second;
|
|
return true;
|
|
}
|
|
std::string get(const std::string §ion, const std::string &key) const
|
|
{ std::string value; this->get(section, key, value); return value; }
|
|
std::string get(const std::string &key) const
|
|
{ std::string value; this->get("app", key, value); return value; }
|
|
bool get_bool(const std::string &key) const
|
|
{ return this->get(key) == "true" || this->get(key) == "1"; }
|
|
void set(const std::string §ion, const std::string &key, const std::string &value)
|
|
{
|
|
#ifndef NDEBUG
|
|
{
|
|
std::string key_trimmed = key;
|
|
boost::trim_all(key_trimmed);
|
|
assert(key_trimmed == key);
|
|
assert(! key_trimmed.empty());
|
|
}
|
|
#endif // NDEBUG
|
|
std::string &old = m_storage[section][key];
|
|
if (old != value) {
|
|
old = value;
|
|
m_dirty = true;
|
|
}
|
|
}
|
|
|
|
void set_str(const std::string& section, const std::string& key, const std::string& value)
|
|
{
|
|
#ifndef NDEBUG
|
|
{
|
|
std::string key_trimmed = key;
|
|
boost::trim_all(key_trimmed);
|
|
assert(key_trimmed == key);
|
|
assert(!key_trimmed.empty());
|
|
}
|
|
#endif // NDEBUG
|
|
std::string& old = m_storage[section][key];
|
|
if (old != value) {
|
|
old = value;
|
|
m_dirty = true;
|
|
}
|
|
}
|
|
|
|
void set(const std::string& section, const std::string &key, bool value)
|
|
{
|
|
if (value){
|
|
set(section, key, std::string("true"));
|
|
} else {
|
|
set(section, key, std::string("false"));
|
|
}
|
|
}
|
|
|
|
|
|
void set(const std::string &key, const std::string &value)
|
|
{ this->set("app", key, value); }
|
|
|
|
void set_bool(const std::string &key, const bool &value)
|
|
{
|
|
this->set("app", key, value);
|
|
}
|
|
|
|
bool has(const std::string §ion, const std::string &key) const
|
|
{
|
|
auto it = m_storage.find(section);
|
|
if (it == m_storage.end())
|
|
return false;
|
|
auto it2 = it->second.find(key);
|
|
return it2 != it->second.end() && ! it2->second.empty();
|
|
}
|
|
bool has(const std::string &key) const
|
|
{ return this->has("app", key); }
|
|
|
|
void erase(const std::string §ion, const std::string &key)
|
|
{
|
|
auto it = m_storage.find(section);
|
|
if (it != m_storage.end()) {
|
|
it->second.erase(key);
|
|
}
|
|
}
|
|
|
|
bool has_section(const std::string §ion) const
|
|
{ return m_storage.find(section) != m_storage.end(); }
|
|
const std::map<std::string, std::string>& get_section(const std::string §ion) const
|
|
{ return m_storage.find(section)->second; }
|
|
void set_section(const std::string §ion, const std::map<std::string, std::string>& data)
|
|
{ m_storage[section] = data; }
|
|
void clear_section(const std::string §ion)
|
|
{ m_storage[section].clear(); }
|
|
|
|
typedef std::map<std::string, std::map<std::string, std::set<std::string>>> VendorMap;
|
|
bool get_variant(const std::string &vendor, const std::string &model, const std::string &variant) const;
|
|
void set_variant(const std::string &vendor, const std::string &model, const std::string &variant, bool enable);
|
|
void set_vendors(const AppConfig &from);
|
|
void set_vendors(const VendorMap &vendors) { m_vendors = vendors; m_dirty = true; }
|
|
void set_vendors(VendorMap &&vendors) { m_vendors = std::move(vendors); m_dirty = true; }
|
|
const VendorMap& vendors() const { return m_vendors; }
|
|
|
|
// Orca printer settings
|
|
typedef std::map<std::string, nlohmann::json> MachineSettingMap;
|
|
bool has_printer_settings(std::string printer) const {
|
|
return m_printer_settings.find(printer) != m_printer_settings.end();
|
|
}
|
|
void clear_printer_settings(std::string printer) {
|
|
m_printer_settings.erase(printer);
|
|
m_dirty = true;
|
|
}
|
|
bool has_printer_setting(std::string printer, std::string name) {
|
|
if (!has_printer_settings(printer))
|
|
return false;
|
|
if (!m_printer_settings[printer].contains(name))
|
|
return false;
|
|
return true;
|
|
}
|
|
std::string get_printer_setting(std::string printer, std::string name) {
|
|
if (!has_printer_setting(printer, name))
|
|
return "";
|
|
return m_printer_settings[printer][name];
|
|
}
|
|
std::string set_printer_setting(std::string printer, std::string name, std::string value) {
|
|
return m_printer_settings[printer][name] = value;
|
|
m_dirty = true;
|
|
}
|
|
|
|
|
|
const std::vector<std::string> &get_filament_presets() const { return m_filament_presets; }
|
|
void set_filament_presets(const std::vector<std::string> &filament_presets){
|
|
m_filament_presets = filament_presets;
|
|
m_dirty = true;
|
|
}
|
|
const std::vector<std::string> &get_filament_colors() const { return m_filament_colors; }
|
|
void set_filament_colors(const std::vector<std::string> &filament_colors){
|
|
m_filament_colors = filament_colors;
|
|
m_dirty = true;
|
|
}
|
|
|
|
const std::vector<PrinterCaliInfo> &get_printer_cali_infos() const { return m_printer_cali_infos; }
|
|
void save_printer_cali_infos(const PrinterCaliInfo& cali_info, bool need_change_status = true);
|
|
|
|
// return recent/last_opened_folder or recent/settings_folder or empty string.
|
|
std::string get_last_dir() const;
|
|
void update_config_dir(const std::string &dir);
|
|
void update_skein_dir(const std::string &dir);
|
|
|
|
//std::string get_last_output_dir(const std::string &alt) const;
|
|
//void update_last_output_dir(const std::string &dir);
|
|
std::string get_last_output_dir(const std::string& alt, const bool removable = false) const;
|
|
void update_last_output_dir(const std::string &dir, const bool removable = false);
|
|
|
|
// BBS: backup & restore
|
|
std::string get_last_backup_dir() const;
|
|
void update_last_backup_dir(const std::string &dir);
|
|
|
|
std::string get_region();
|
|
std::string get_country_code();
|
|
bool is_engineering_region();
|
|
|
|
void save_custom_color_to_config(const std::vector<std::string> &colors);
|
|
std::vector<std::string> get_custom_color_from_config();
|
|
// reset the current print / filament / printer selections, so that
|
|
// the PresetBundle::load_selections(const AppConfig &config) call will select
|
|
// the first non-default preset when called.
|
|
void reset_selections();
|
|
|
|
// Get the default config path from Slic3r::data_dir().
|
|
std::string config_path();
|
|
|
|
// Returns true if the user's data directory comes from before Slic3r 1.40.0 (no updating)
|
|
bool legacy_datadir() const { return m_legacy_datadir; }
|
|
void set_legacy_datadir(bool value) { m_legacy_datadir = value; }
|
|
|
|
// Get the Slic3r version check url.
|
|
// This returns a hardcoded string unless it is overriden by "version_check_url" in the ini file.
|
|
std::string version_check_url(bool stable_only = false) const;
|
|
|
|
// Get the Orca profile update url.
|
|
std::string profile_update_url() const;
|
|
|
|
// Returns the original Slic3r version found in the ini file before it was overwritten
|
|
// by the current version
|
|
Semver orig_version() const { return m_orig_version; }
|
|
|
|
// Does the config file exist?
|
|
bool exists();
|
|
|
|
void set_loading_path(const std::string& path) { m_loading_path = path; }
|
|
std::string loading_path() { return (m_loading_path.empty() ? config_path() : m_loading_path); }
|
|
|
|
std::vector<std::string> get_recent_projects() const;
|
|
void set_recent_projects(const std::vector<std::string>& recent_projects);
|
|
|
|
void set_mouse_device(const std::string& name, double translation_speed, double translation_deadzone, float rotation_speed, float rotation_deadzone, double zoom_speed, bool swap_yz, bool invert_x, bool invert_y, bool invert_z, bool invert_yaw, bool invert_pitch, bool invert_roll);
|
|
std::vector<std::string> get_mouse_device_names() const;
|
|
bool get_mouse_device_translation_speed(const std::string& name, double& speed) const
|
|
{ return get_3dmouse_device_numeric_value(name, "translation_speed", speed); }
|
|
bool get_mouse_device_translation_deadzone(const std::string& name, double& deadzone) const
|
|
{ return get_3dmouse_device_numeric_value(name, "translation_deadzone", deadzone); }
|
|
bool get_mouse_device_rotation_speed(const std::string& name, float& speed) const
|
|
{ return get_3dmouse_device_numeric_value(name, "rotation_speed", speed); }
|
|
bool get_mouse_device_rotation_deadzone(const std::string& name, float& deadzone) const
|
|
{ return get_3dmouse_device_numeric_value(name, "rotation_deadzone", deadzone); }
|
|
bool get_mouse_device_zoom_speed(const std::string& name, double& speed) const
|
|
{ return get_3dmouse_device_numeric_value(name, "zoom_speed", speed); }
|
|
bool get_mouse_device_swap_yz(const std::string& name, bool& swap) const
|
|
{ return get_3dmouse_device_numeric_value(name, "swap_yz", swap); }
|
|
bool get_mouse_device_invert_x(const std::string& name, bool& invert) const
|
|
{ return get_3dmouse_device_numeric_value(name, "invert_x", invert); }
|
|
bool get_mouse_device_invert_y(const std::string& name, bool& invert) const
|
|
{ return get_3dmouse_device_numeric_value(name, "invert_y", invert); }
|
|
bool get_mouse_device_invert_z(const std::string& name, bool& invert) const
|
|
{ return get_3dmouse_device_numeric_value(name, "invert_z", invert); }
|
|
bool get_mouse_device_invert_yaw(const std::string& name, bool& invert) const
|
|
{ return get_3dmouse_device_numeric_value(name, "invert_yaw", invert); }
|
|
bool get_mouse_device_invert_pitch(const std::string& name, bool& invert) const
|
|
{ return get_3dmouse_device_numeric_value(name, "invert_pitch", invert); }
|
|
bool get_mouse_device_invert_roll(const std::string& name, bool& invert) const
|
|
{ return get_3dmouse_device_numeric_value(name, "invert_roll", invert); }
|
|
|
|
static const std::string SECTION_FILAMENTS;
|
|
static const std::string SECTION_MATERIALS;
|
|
static const std::string SECTION_EMBOSS_STYLE;
|
|
|
|
private:
|
|
template<typename T>
|
|
bool get_3dmouse_device_numeric_value(const std::string &device_name, const char *parameter_name, T &out) const
|
|
{
|
|
std::string key = std::string("mouse_device:") + device_name;
|
|
auto it = m_storage.find(key);
|
|
if (it == m_storage.end())
|
|
return false;
|
|
auto it_val = it->second.find(parameter_name);
|
|
if (it_val == it->second.end())
|
|
return false;
|
|
out = T(string_to_double_decimal_point(it_val->second));
|
|
return true;
|
|
}
|
|
|
|
// Type of application: Editor or GCodeViewer
|
|
EAppMode m_mode { EAppMode::Editor };
|
|
// Map of section, name -> value
|
|
std::map<std::string, std::map<std::string, std::string>> m_storage;
|
|
|
|
// Map of enabled vendors / models / variants
|
|
VendorMap m_vendors;
|
|
|
|
// Preset for each machine
|
|
MachineSettingMap m_printer_settings;
|
|
// Has any value been modified since the config.ini has been last saved or loaded?
|
|
bool m_dirty;
|
|
// Original version found in the ini file before it was overwritten
|
|
Semver m_orig_version;
|
|
// Whether the existing version is before system profiles & configuration updating
|
|
bool m_legacy_datadir;
|
|
|
|
std::string m_loading_path;
|
|
|
|
std::vector<std::string> m_filament_presets;
|
|
std::vector<std::string> m_filament_colors;
|
|
|
|
std::vector<PrinterCaliInfo> m_printer_cali_infos;
|
|
};
|
|
|
|
} // namespace Slic3r
|
|
|
|
#endif /* slic3r_AppConfig_hpp_ */
|