mirror of
https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-06 00:19:11 +08:00

* 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>
669 lines
26 KiB
C++
669 lines
26 KiB
C++
///|/ Copyright (c) Prusa Research 2018 - 2023 Oleksandra Iushchenko @YuSanka, Lukáš Matěna @lukasmatena, Vojtěch Bubník @bubnikv, Enrico Turri @enricoturri1966, David Kocík @kocikdav, Lukáš Hejl @hejllukas, Vojtěch Král @vojtechkral
|
|
///|/
|
|
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
|
|
///|/
|
|
#include "MsgDialog.hpp"
|
|
|
|
#include <wx/settings.h>
|
|
#include <wx/sizer.h>
|
|
#include <wx/stattext.h>
|
|
#include <wx/button.h>
|
|
#include <wx/statbmp.h>
|
|
#include <wx/scrolwin.h>
|
|
#include <wx/clipbrd.h>
|
|
#include <wx/checkbox.h>
|
|
#include <wx/html/htmlwin.h>
|
|
|
|
#include <boost/algorithm/string/replace.hpp>
|
|
|
|
#include "libslic3r/libslic3r.h"
|
|
#include "libslic3r/Utils.hpp"
|
|
#include "libslic3r/Color.hpp"
|
|
#include "GUI.hpp"
|
|
#include "I18N.hpp"
|
|
//#include "ConfigWizard.hpp"
|
|
#include "wxExtensions.hpp"
|
|
#include "slic3r/GUI/MainFrame.hpp"
|
|
#include "GUI_App.hpp"
|
|
|
|
#define DESIGN_INPUT_SIZE wxSize(FromDIP(100), -1)
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, long style, wxBitmap bitmap)
|
|
: DPIDialog(parent ? parent : dynamic_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, title, wxDefaultPosition, wxSize(360, -1),wxDEFAULT_DIALOG_STYLE)
|
|
, boldfont(wxGetApp().normal_font())
|
|
, content_sizer(new wxBoxSizer(wxVERTICAL))
|
|
, btn_sizer(new wxBoxSizer(wxHORIZONTAL))
|
|
{
|
|
boldfont.SetWeight(wxFONTWEIGHT_BOLD);
|
|
SetBackgroundColour(0xFFFFFF);
|
|
SetFont(wxGetApp().normal_font());
|
|
CenterOnParent();
|
|
|
|
auto *main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
auto *topsizer = new wxBoxSizer(wxHORIZONTAL);
|
|
auto *rightsizer = new wxBoxSizer(wxVERTICAL);
|
|
|
|
//auto *headtext = new wxStaticText(this, wxID_ANY, headline);
|
|
//headtext->SetFont(boldfont);
|
|
// headtext->Wrap(CONTENT_WIDTH*wxGetApp().em_unit());
|
|
//rightsizer->Add(headtext);
|
|
//rightsizer->AddSpacer(VERT_SPACING);
|
|
|
|
rightsizer->Add(content_sizer, 1, wxEXPAND);
|
|
|
|
logo = new wxStaticBitmap(this, wxID_ANY, bitmap.IsOk() ? bitmap : wxNullBitmap);
|
|
topsizer->Add(LOGO_SPACING, 0, 0, wxEXPAND, 0);
|
|
topsizer->Add(logo, 0, wxTOP, BORDER);
|
|
topsizer->Add(LOGO_GAP, 0, 0, wxEXPAND, 0);
|
|
topsizer->Add(rightsizer, 1, wxTOP | wxEXPAND, BORDER);
|
|
|
|
main_sizer->Add(topsizer, 1, wxEXPAND);
|
|
|
|
m_dsa_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
btn_sizer->Add(0, 0, 0, wxLEFT, FromDIP(120));
|
|
btn_sizer->Add(m_dsa_sizer, 0, wxEXPAND,0);
|
|
btn_sizer->Add(0, 0, 1, wxEXPAND, 5);
|
|
main_sizer->Add(btn_sizer, 0, wxBOTTOM | wxRIGHT | wxEXPAND, BORDER);
|
|
|
|
apply_style(style);
|
|
SetSizerAndFit(main_sizer);
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
}
|
|
|
|
MsgDialog::~MsgDialog()
|
|
{
|
|
for (auto mb : m_buttons) { delete mb.second->buttondata ; delete mb.second; }
|
|
}
|
|
|
|
void MsgDialog::show_dsa_button(wxString const &title)
|
|
{
|
|
m_checkbox_dsa = new CheckBox(this);
|
|
m_dsa_sizer->Add(m_checkbox_dsa, 0, wxALL | wxALIGN_CENTER, FromDIP(2));
|
|
m_checkbox_dsa->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& e) {
|
|
auto event = wxCommandEvent(EVT_CHECKBOX_CHANGE);
|
|
event.SetInt(m_checkbox_dsa->GetValue()?1:0);
|
|
event.SetEventObject(this);
|
|
wxPostEvent(this, event);
|
|
e.Skip();
|
|
});
|
|
|
|
auto m_text_dsa = new wxStaticText(this, wxID_ANY, title.IsEmpty() ? _L("Don't show again") : title, wxDefaultPosition, wxDefaultSize, 0);
|
|
m_dsa_sizer->Add(m_text_dsa, 0, wxALL | wxALIGN_CENTER, FromDIP(2));
|
|
m_text_dsa->SetFont(::Label::Body_13);
|
|
m_text_dsa->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#323A3D")));
|
|
btn_sizer->Layout();
|
|
Fit();
|
|
}
|
|
|
|
bool MsgDialog::get_checkbox_state()
|
|
{
|
|
if (m_checkbox_dsa) {
|
|
return m_checkbox_dsa->GetValue();
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void MsgDialog::on_dpi_changed(const wxRect &suggested_rect)
|
|
{
|
|
if (m_buttons.size() > 0) {
|
|
MsgButtonsHash::iterator i = m_buttons.begin();
|
|
|
|
while (i != m_buttons.end()) {
|
|
MsgButton *bd = i->second;
|
|
wxSize bsize;
|
|
|
|
|
|
switch (bd->buttondata->type) {
|
|
case ButtonSizeNormal:bsize = MSG_DIALOG_BUTTON_SIZE;break;
|
|
case ButtonSizeMiddle: bsize = MSG_DIALOG_MIDDLE_BUTTON_SIZE; break;
|
|
case ButtonSizeLong: bsize = MSG_DIALOG_LONG_BUTTON_SIZE; break;
|
|
default: break;
|
|
}
|
|
|
|
bd->buttondata->button->SetMinSize(bsize);
|
|
i++;
|
|
}
|
|
}
|
|
}
|
|
|
|
void MsgDialog::SetButtonLabel(wxWindowID btn_id, const wxString& label, bool set_focus/* = false*/)
|
|
{
|
|
if (Button* btn = get_button(btn_id)) {
|
|
btn->SetLabel(label);
|
|
if (set_focus)
|
|
btn->SetFocus();
|
|
}
|
|
}
|
|
|
|
Button* MsgDialog::add_button(wxWindowID btn_id, bool set_focus /*= false*/, const wxString& label/* = wxString()*/)
|
|
{
|
|
Button* btn = new Button(this, label, "", 0, 0, btn_id);
|
|
ButtonSizeType type;
|
|
|
|
if (label.length() < 5) {
|
|
type = ButtonSizeNormal;
|
|
btn->SetMinSize(MSG_DIALOG_BUTTON_SIZE); }
|
|
else if (label.length() >= 5 && label.length() < 8) {
|
|
type = ButtonSizeMiddle;
|
|
btn->SetMinSize(MSG_DIALOG_MIDDLE_BUTTON_SIZE);
|
|
}
|
|
else if (label.length() >= 8 && label.length() < 12) {
|
|
type = ButtonSizeMiddle;
|
|
btn->SetMinSize(MSG_DIALOG_LONG_BUTTON_SIZE);
|
|
} else {
|
|
type = ButtonSizeLong;
|
|
btn->SetMinSize(MSG_DIALOG_LONGER_BUTTON_SIZE);
|
|
}
|
|
|
|
btn->SetCornerRadius(FromDIP(12));
|
|
StateColor btn_bg_green(
|
|
std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
|
|
std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
|
|
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
|
|
);
|
|
|
|
StateColor btn_bd_green(
|
|
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
|
|
);
|
|
|
|
StateColor btn_text_green(
|
|
std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)
|
|
);
|
|
|
|
StateColor btn_bg_white(
|
|
std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
|
|
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
|
|
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal)
|
|
);
|
|
|
|
StateColor btn_bd_white(
|
|
std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
|
|
);
|
|
|
|
StateColor btn_text_white(
|
|
std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
|
|
);
|
|
|
|
if (btn_id == wxID_OK || btn_id == wxID_YES) {
|
|
btn->SetBackgroundColor(btn_bg_green);
|
|
btn->SetBorderColor(btn_bd_green);
|
|
btn->SetTextColor(btn_text_green);
|
|
}
|
|
|
|
if (btn_id == wxID_CANCEL || btn_id == wxID_NO) {
|
|
btn->SetBackgroundColor(btn_bg_white);
|
|
btn->SetBorderColor(btn_bd_white);
|
|
btn->SetTextColor(btn_text_white);
|
|
}
|
|
|
|
if (set_focus)
|
|
btn->SetFocus();
|
|
btn_sizer->Add(btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, BTN_SPACING);
|
|
btn->Bind(wxEVT_BUTTON, [this, btn_id](wxCommandEvent&) { EndModal(btn_id); });
|
|
|
|
MsgButton *mb = new MsgButton;
|
|
ButtonData *bd = new ButtonData;
|
|
|
|
bd->button = btn;
|
|
bd->type = type;
|
|
|
|
mb->id = wxString::Format("%d", m_buttons.size());
|
|
mb->buttondata = bd;
|
|
m_buttons[ wxString::Format("%d", m_buttons.size())] = mb;
|
|
return btn;
|
|
};
|
|
|
|
Button* MsgDialog::get_button(wxWindowID btn_id){
|
|
return static_cast<Button*>(FindWindowById(btn_id, this));
|
|
}
|
|
|
|
void MsgDialog::apply_style(long style)
|
|
{
|
|
if (style & wxOK) add_button(wxID_OK, true, _L("OK"));
|
|
if (style & wxYES) add_button(wxID_YES, true, _L("Yes"));
|
|
if (style & wxNO) add_button(wxID_NO, false,_L("No"));
|
|
if (style & wxCANCEL) add_button(wxID_CANCEL, false, _L("Cancel"));
|
|
|
|
logo->SetBitmap( create_scaled_bitmap(style & wxAPPLY ? "completed" :
|
|
style & wxICON_WARNING ? "obj_warning" :
|
|
style & wxICON_INFORMATION ? "info" :
|
|
style & wxICON_QUESTION ? "question" : "OrcaSlicer", this, 64, style & wxICON_ERROR));
|
|
}
|
|
|
|
void MsgDialog::finalize()
|
|
{
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
Fit();
|
|
CenterOnParent();
|
|
}
|
|
|
|
|
|
// Text shown as HTML, so that mouse selection and Ctrl-V to copy will work.
|
|
static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxString msg, bool monospaced_font = false, bool is_marked_msg = false)
|
|
{
|
|
wxHtmlWindow* html = new wxHtmlWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
|
|
html->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
|
|
|
|
// count lines in the message
|
|
int msg_lines = 0;
|
|
if (!monospaced_font) {
|
|
int line_len = 55;// count of symbols in one line
|
|
int start_line = 0;
|
|
for (auto i = msg.begin(); i != msg.end(); ++i) {
|
|
if (*i == '\n') {
|
|
int cur_line_len = i - msg.begin() - start_line;
|
|
start_line = i - msg.begin();
|
|
if (cur_line_len == 0 || line_len > cur_line_len)
|
|
msg_lines++;
|
|
else
|
|
msg_lines += std::lround((double)(cur_line_len) / line_len);
|
|
}
|
|
}
|
|
msg_lines++;
|
|
}
|
|
|
|
wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
|
wxFont monospace = wxGetApp().code_font();
|
|
wxColour text_clr = wxGetApp().get_label_clr_default();
|
|
wxColour bgr_clr = parent->GetBackgroundColour();
|
|
auto text_clr_str = encode_color(ColorRGB(text_clr.Red(), text_clr.Green(), text_clr.Blue()));
|
|
auto bgr_clr_str = encode_color(ColorRGB(bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue()));
|
|
const int font_size = font.GetPointSize();
|
|
int size[] = { font_size, font_size, font_size, font_size, font_size, font_size, font_size };
|
|
html->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size);
|
|
html->SetBorders(2);
|
|
|
|
// calculate html page size from text
|
|
wxSize page_size;
|
|
int em = wxGetApp().em_unit();
|
|
if (!wxGetApp().mainframe) {
|
|
// If mainframe is nullptr, it means that GUI_App::on_init_inner() isn't completed
|
|
// (We just show information dialog about configuration version now)
|
|
// And as a result the em_unit value wasn't created yet
|
|
// So, calculate it from the scale factor of Dialog
|
|
#if defined(__WXGTK__)
|
|
// Linux specific issue : get_dpi_for_window(this) still doesn't responce to the Display's scale in new wxWidgets(3.1.3).
|
|
// So, initialize default width_unit according to the width of the one symbol ("m") of the currently active font of this window.
|
|
em = std::max<size_t>(10, parent->GetTextExtent("m").x - 1);
|
|
#else
|
|
double scale_factor = (double)get_dpi_for_window(parent) / (double)DPI_DEFAULT;
|
|
em = std::max<size_t>(10, 10.0f * scale_factor);
|
|
#endif // __WXGTK__
|
|
}
|
|
|
|
// if message containes the table
|
|
if (msg.Contains("<tr>")) {
|
|
int lines = msg.Freq('\n') + 1;
|
|
int pos = 0;
|
|
while (pos < (int)msg.Len() && pos != wxNOT_FOUND) {
|
|
pos = msg.find("<tr>", pos + 1);
|
|
lines += 2;
|
|
}
|
|
int page_height = std::min(int(font.GetPixelSize().y+2) * lines, 68 * em);
|
|
page_size = wxSize(68 * em, page_height);
|
|
}
|
|
else {
|
|
Label* wrapped_text = new Label(html, msg);
|
|
wrapped_text->Wrap(68 * em);
|
|
msg = wrapped_text->GetLabel();
|
|
wrapped_text->Destroy();
|
|
wxClientDC dc(parent);
|
|
wxSize msg_sz = dc.GetMultiLineTextExtent(msg);
|
|
|
|
page_size = wxSize(std::min(msg_sz.GetX(), 68 * em),
|
|
std::min(msg_sz.GetY(), 68 * em));
|
|
}
|
|
html->SetMinSize(page_size);
|
|
|
|
std::string msg_escaped = xml_escape(msg.ToUTF8().data(), is_marked_msg);
|
|
boost::replace_all(msg_escaped, "\r\n", "<br>");
|
|
boost::replace_all(msg_escaped, "\n", "<br>");
|
|
if (monospaced_font)
|
|
// Code formatting will be preserved. This is useful for reporting errors from the placeholder parser.
|
|
msg_escaped = std::string("<pre><code>") + msg_escaped + "</code></pre>";
|
|
html->SetPage("<html><body bgcolor=\"" + bgr_clr_str + "\"><font color=\"" + text_clr_str + "\">" + wxString::FromUTF8(msg_escaped.data()) + "</font></body></html>");
|
|
content_sizer->Add(html, 1, wxEXPAND|wxRIGHT, 8);
|
|
wxGetApp().UpdateDarkUIWin(html);
|
|
}
|
|
|
|
// ErrorDialog
|
|
|
|
ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg, bool monospaced_font)
|
|
: MsgDialog(parent, wxString::Format(_(L("%s error")), SLIC3R_APP_FULL_NAME),
|
|
wxString::Format(_(L("%s has encountered an error")), SLIC3R_APP_FULL_NAME), wxOK)
|
|
, msg(msg)
|
|
{
|
|
add_msg_content(this, content_sizer, msg, monospaced_font);
|
|
|
|
// Use a small bitmap with monospaced font, as the error text will not be wrapped.
|
|
logo->SetBitmap(create_scaled_bitmap("OrcaSlicer_192px_grayscale.png", this, monospaced_font ? 48 : /*1*/84));
|
|
|
|
SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
|
|
|
|
finalize();
|
|
}
|
|
|
|
// WarningDialog
|
|
|
|
WarningDialog::WarningDialog(wxWindow *parent,
|
|
const wxString& message,
|
|
const wxString& caption/* = wxEmptyString*/,
|
|
long style/* = wxOK*/)
|
|
: MsgDialog(parent, caption.IsEmpty() ? wxString::Format(_L("%s warning"), SLIC3R_APP_FULL_NAME) : caption,
|
|
wxString::Format(_L("%s has a warning")+":", SLIC3R_APP_FULL_NAME), style)
|
|
{
|
|
add_msg_content(this, content_sizer, message);
|
|
finalize();
|
|
}
|
|
|
|
#if 1
|
|
// MessageDialog
|
|
|
|
MessageDialog::MessageDialog(wxWindow* parent,
|
|
const wxString& message,
|
|
const wxString& caption/* = wxEmptyString*/,
|
|
long style/* = wxOK*/)
|
|
: MsgDialog(parent, caption.IsEmpty() ? wxString::Format(_L("%s info"), SLIC3R_APP_FULL_NAME) : caption, wxEmptyString, style)
|
|
{
|
|
add_msg_content(this, content_sizer, message);
|
|
finalize();
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
}
|
|
|
|
|
|
// RichMessageDialog
|
|
|
|
RichMessageDialog::RichMessageDialog(wxWindow* parent,
|
|
const wxString& message,
|
|
const wxString& caption/* = wxEmptyString*/,
|
|
long style/* = wxOK*/)
|
|
: MsgDialog(parent, caption.IsEmpty() ? wxString::Format(_L("%s info"), SLIC3R_APP_FULL_NAME) : caption, wxEmptyString, style)
|
|
{
|
|
add_msg_content(this, content_sizer, message);
|
|
|
|
m_checkBox = new wxCheckBox(this, wxID_ANY, m_checkBoxText);
|
|
wxGetApp().UpdateDarkUI(m_checkBox);
|
|
m_checkBox->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent&) { m_checkBoxValue = m_checkBox->GetValue(); });
|
|
|
|
btn_sizer->Insert(0, m_checkBox, wxALIGN_CENTER_VERTICAL);
|
|
|
|
finalize();
|
|
}
|
|
|
|
int RichMessageDialog::ShowModal()
|
|
{
|
|
if (m_checkBoxText.IsEmpty())
|
|
m_checkBox->Hide();
|
|
else
|
|
m_checkBox->SetLabelText(m_checkBoxText);
|
|
Layout();
|
|
|
|
return wxDialog::ShowModal();
|
|
}
|
|
#endif
|
|
|
|
// InfoDialog
|
|
InfoDialog::InfoDialog(wxWindow* parent, const wxString &title, const wxString& msg, bool is_marked_msg/* = false*/, long style/* = wxOK | wxICON_INFORMATION*/)
|
|
: MsgDialog(parent, wxString::Format(_L("%s information"), SLIC3R_APP_FULL_NAME), title, style)
|
|
, msg(msg)
|
|
{
|
|
add_msg_content(this, content_sizer, msg, false, is_marked_msg);
|
|
finalize();
|
|
}
|
|
|
|
wxString get_wraped_wxString(const wxString& in, size_t line_len /*=80*/)
|
|
{
|
|
wxString out;
|
|
|
|
for (size_t i = 0; i < in.size();) {
|
|
// Overwrite the character (space or newline) starting at ibreak?
|
|
bool overwrite = false;
|
|
// UTF8 representation of wxString.
|
|
// Where to break the line, index of character at the start of a UTF-8 sequence.
|
|
size_t ibreak = size_t(-1);
|
|
// Overwrite the character at ibreak (it is a whitespace) or not?
|
|
size_t j = i;
|
|
for (size_t cnt = 0; j < in.size();) {
|
|
if (bool newline = in[j] == '\n'; in[j] == ' ' || in[j] == '\t' || newline) {
|
|
// Overwrite the whitespace.
|
|
ibreak = j ++;
|
|
overwrite = true;
|
|
if (newline)
|
|
break;
|
|
} else if (in[j] == '/'
|
|
#ifdef _WIN32
|
|
|| in[j] == '\\'
|
|
#endif // _WIN32
|
|
) {
|
|
// Insert after the slash.
|
|
ibreak = ++ j;
|
|
overwrite = false;
|
|
} else
|
|
j += get_utf8_sequence_length(in.c_str() + j, in.size() - j);
|
|
if (++ cnt == line_len) {
|
|
if (ibreak == size_t(-1)) {
|
|
ibreak = j;
|
|
overwrite = false;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
if (j == in.size()) {
|
|
out.append(in.begin() + i, in.end());
|
|
break;
|
|
}
|
|
assert(ibreak != size_t(-1));
|
|
out.append(in.begin() + i, in.begin() + ibreak);
|
|
out.append('\n');
|
|
i = ibreak;
|
|
if (overwrite)
|
|
++ i;
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
// InfoDialog
|
|
DownloadDialog::DownloadDialog(wxWindow *parent, const wxString &msg, const wxString &title, bool is_marked_msg /* = false*/, long style /* = wxOK | wxICON_INFORMATION*/)
|
|
: MsgDialog(parent, title, msg, style), msg(msg)
|
|
{
|
|
add_button(wxID_YES, true, _L("Download"));
|
|
add_button(wxID_CANCEL, true, _L("Skip"));
|
|
|
|
finalize();
|
|
}
|
|
|
|
|
|
void DownloadDialog::SetExtendedMessage(const wxString &extendedMessage)
|
|
{
|
|
add_msg_content(this, content_sizer, msg + "\n" + extendedMessage, false, false);
|
|
Layout();
|
|
Fit();
|
|
}
|
|
|
|
DeleteConfirmDialog::DeleteConfirmDialog(wxWindow *parent, const wxString &title, const wxString &msg)
|
|
: DPIDialog(parent ? parent : nullptr, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
|
|
{
|
|
this->SetBackgroundColour(*wxWHITE);
|
|
this->SetSize(wxSize(FromDIP(450), FromDIP(200)));
|
|
std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str();
|
|
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
|
|
|
|
wxBoxSizer *m_main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
// top line
|
|
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
|
|
m_line_top->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA));
|
|
m_main_sizer->Add(m_line_top, 0, wxEXPAND, 0);
|
|
m_main_sizer->Add(0, 0, 0, wxTOP, FromDIP(5));
|
|
|
|
m_msg_text = new wxStaticText(this, wxID_ANY, msg);
|
|
m_main_sizer->Add(m_msg_text, 0, wxEXPAND | wxALL, FromDIP(10));
|
|
|
|
wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL);
|
|
bSizer_button->Add(0, 0, 1, wxEXPAND, 0);
|
|
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
|
|
std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
|
|
m_cancel_btn = new Button(this, _L("Cancel"));
|
|
m_cancel_btn->SetBackgroundColor(btn_bg_white);
|
|
m_cancel_btn->SetBorderColor(*wxBLACK);
|
|
m_cancel_btn->SetTextColor(wxColour(*wxBLACK));
|
|
m_cancel_btn->SetFont(Label::Body_12);
|
|
m_cancel_btn->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_cancel_btn->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_cancel_btn->SetCornerRadius(FromDIP(12));
|
|
bSizer_button->Add(m_cancel_btn, 0, wxRIGHT | wxBOTTOM, FromDIP(10));
|
|
|
|
|
|
m_del_btn = new Button(this, _L("Delete"));
|
|
m_del_btn->SetBackgroundColor(*wxRED);
|
|
m_del_btn->SetBorderColor(*wxWHITE);
|
|
m_del_btn->SetTextColor(wxColour(0xFFFFFE));
|
|
m_del_btn->SetFont(Label::Body_12);
|
|
m_del_btn->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_del_btn->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_del_btn->SetCornerRadius(FromDIP(12));
|
|
bSizer_button->Add(m_del_btn, 0, wxRIGHT | wxBOTTOM, FromDIP(10));
|
|
|
|
m_main_sizer->Add(bSizer_button, 0, wxEXPAND, 0);
|
|
m_del_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) { EndModal(wxID_OK); });
|
|
m_cancel_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) { EndModal(wxID_CANCEL); });
|
|
|
|
SetSizer(m_main_sizer);
|
|
Layout();
|
|
Fit();
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
}
|
|
|
|
DeleteConfirmDialog::~DeleteConfirmDialog() {}
|
|
|
|
|
|
void DeleteConfirmDialog::on_dpi_changed(const wxRect &suggested_rect) {}
|
|
|
|
|
|
Newer3mfVersionDialog::Newer3mfVersionDialog(wxWindow *parent, const Semver *file_version, const Semver *cloud_version, wxString new_keys)
|
|
: DPIDialog(parent ? parent : nullptr, wxID_ANY, wxString(SLIC3R_APP_FULL_NAME " - ") + _L("Newer 3mf version"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
|
|
, m_file_version(file_version)
|
|
, m_cloud_version(cloud_version)
|
|
, m_new_keys(new_keys)
|
|
{
|
|
this->SetBackgroundColour(*wxWHITE);
|
|
std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str();
|
|
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
|
|
|
|
wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
// top line
|
|
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
|
|
m_line_top->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA));
|
|
main_sizer->Add(m_line_top, 0, wxEXPAND, 0);
|
|
main_sizer->Add(0, 0, 0, wxTOP, FromDIP(5));
|
|
|
|
wxBoxSizer * content_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
wxStaticBitmap *info_bitmap = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("info", nullptr, 60), wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70)), 0);
|
|
wxBoxSizer * msg_sizer = get_msg_sizer();
|
|
content_sizer->Add(info_bitmap, 0, wxEXPAND | wxALL, FromDIP(5));
|
|
content_sizer->Add(msg_sizer, 0, wxEXPAND | wxALL, FromDIP(5));
|
|
main_sizer->Add(content_sizer, 0, wxEXPAND | wxALL, FromDIP(5));
|
|
main_sizer->Add(get_btn_sizer(), 0, wxEXPAND | wxALL, FromDIP(5));
|
|
|
|
this->SetSizer(main_sizer);
|
|
Layout();
|
|
Fit();
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
}
|
|
|
|
wxBoxSizer *Newer3mfVersionDialog::get_msg_sizer()
|
|
{
|
|
wxBoxSizer *vertical_sizer = new wxBoxSizer(wxVERTICAL);
|
|
bool file_version_newer = (*m_file_version) > (*m_cloud_version);
|
|
wxStaticText *text1;
|
|
wxBoxSizer * horizontal_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
wxString msg_str;
|
|
if (file_version_newer) {
|
|
text1 = new wxStaticText(this, wxID_ANY, _L("The 3mf file version is in Beta and it is newer than the current OrcaSlicer version."));
|
|
wxStaticText * text2 = new wxStaticText(this, wxID_ANY, _L("If you would like to try Orca Slicer Beta, you may click to"));
|
|
wxHyperlinkCtrl *github_link = new wxHyperlinkCtrl(this, wxID_ANY, _L("Download Beta Version"), "https://github.com/bambulab/BambuStudio/releases");
|
|
horizontal_sizer->Add(text2, 0, wxEXPAND, 0);
|
|
horizontal_sizer->Add(github_link, 0, wxEXPAND | wxLEFT, 5);
|
|
|
|
} else {
|
|
text1 = new wxStaticText(this, wxID_ANY, _L("The 3mf file version is newer than the current Orca Slicer version."));
|
|
wxStaticText *text2 = new wxStaticText(this, wxID_ANY, _L("Update your Orca Slicer could enable all functionality in the 3mf file."));
|
|
horizontal_sizer->Add(text2, 0, wxEXPAND, 0);
|
|
}
|
|
Semver app_version = *(Semver::parse(SLIC3R_VERSION));
|
|
wxStaticText *cur_version = new wxStaticText(this, wxID_ANY, _L("Current Version: ") + app_version.to_string());
|
|
|
|
vertical_sizer->Add(text1, 0, wxEXPAND | wxTOP, FromDIP(5));
|
|
vertical_sizer->Add(horizontal_sizer, 0, wxEXPAND | wxTOP, FromDIP(5));
|
|
vertical_sizer->Add(cur_version, 0, wxEXPAND | wxTOP, FromDIP(5));
|
|
if (!file_version_newer) {
|
|
wxStaticText *latest_version = new wxStaticText(this, wxID_ANY, _L("Latest Version: ") + m_cloud_version->to_string());
|
|
vertical_sizer->Add(latest_version, 0, wxEXPAND | wxTOP, FromDIP(5));
|
|
}
|
|
|
|
wxStaticText *unrecognized_keys = new wxStaticText(this, wxID_ANY, m_new_keys);
|
|
vertical_sizer->Add(unrecognized_keys, 0, wxEXPAND | wxTOP, FromDIP(10));
|
|
|
|
return vertical_sizer;
|
|
}
|
|
|
|
wxBoxSizer *Newer3mfVersionDialog::get_btn_sizer()
|
|
{
|
|
wxBoxSizer *horizontal_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
horizontal_sizer->Add(0, 0, 1, wxEXPAND, 0);
|
|
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
|
|
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
|
|
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
|
|
std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
|
|
bool file_version_newer = (*m_file_version) > (*m_cloud_version);
|
|
if (!file_version_newer) {
|
|
m_update_btn = new Button(this, _L("Update"));
|
|
m_update_btn->SetBackgroundColor(btn_bg_green);
|
|
m_update_btn->SetBorderColor(*wxWHITE);
|
|
m_update_btn->SetTextColor(wxColour(0xFFFFFE));
|
|
m_update_btn->SetFont(Label::Body_12);
|
|
m_update_btn->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_update_btn->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_update_btn->SetCornerRadius(FromDIP(12));
|
|
horizontal_sizer->Add(m_update_btn, 0, wxRIGHT, FromDIP(10));
|
|
|
|
m_update_btn->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
|
|
EndModal(wxID_OK);
|
|
if (wxGetApp().app_config->has("app", "cloud_software_url")) {
|
|
std::string download_url = wxGetApp().app_config->get("app", "cloud_software_url");
|
|
wxLaunchDefaultBrowser(download_url);
|
|
} else {
|
|
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "Bambu Studio conf has no cloud_software_url and file_version: " << m_file_version->to_string()
|
|
<< " and cloud_version: " << m_cloud_version->to_string();
|
|
}
|
|
});
|
|
}
|
|
|
|
if (!file_version_newer) {
|
|
m_later_btn = new Button(this, _L("Not for now"));
|
|
m_later_btn->SetBackgroundColor(btn_bg_white);
|
|
m_later_btn->SetBorderColor(wxColour(38, 46, 48));
|
|
} else {
|
|
m_later_btn = new Button(this, _L("OK"));
|
|
m_later_btn->SetBackgroundColor(btn_bg_green);
|
|
m_later_btn->SetBorderColor(*wxWHITE);
|
|
m_later_btn->SetTextColor(wxColour(0xFFFFFE));
|
|
}
|
|
m_later_btn->SetFont(Label::Body_12);
|
|
m_later_btn->SetSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_later_btn->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
|
|
m_later_btn->SetCornerRadius(FromDIP(12));
|
|
horizontal_sizer->Add(m_later_btn, 0, wxRIGHT, FromDIP(10));
|
|
m_later_btn->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
|
|
EndModal(wxID_OK);
|
|
});
|
|
return horizontal_sizer;
|
|
}
|
|
|
|
} // namespace GUI
|
|
|
|
} // namespace Slic3r
|