forked from viewit/OrcaSlicer-KX
* FIX: linux: fix the building issue on Linux Mint 21.3 Virginia github: https://github.com/bambulab/BambuStudio/issues/3874 author: https://github.com/lucianoloder Change-Id: Ia3db6923d5dd68dba532d7bdba6f93f73cc51d59 * FIX: auto-arranging incorrect with rotation enabled auto-arranging incorrect with rotation enabled and the objects already have been rotated. jira: STUDIO-6022 Change-Id: I349d663efb1fc71367c8a77aa8ed5047a0bf2017 (cherry picked from commit 75fe40257a274ed83886e1ee20ce8dedd0de48f6) * ENH: update X1C & X1E start gcode 1.Fix fan problem jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I68ee5be78e142e8a2a210a1a70f5663893390610 * ENH: update A series gcode 1. Update A1 series start gcode and change filament gcode 2. Add G2814 command 3. Add multi-filament extrusion compensation and vibration suppression jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I57d2bc8e98d3e547881dc1369c1fb31413c6205d * FIX: fix some cali problem of P series jira: none Change-Id: Id57ea8d65da22ab653cca49509cb923ff065e43f * FIX: fix can't enter ',' in multiplicator github: #3805 Change-Id: I6dd70822d1c2e79d66c70514d6dd580ab029c7ea * calib wizard * NEW: FlipLines infill jira:6701 New infill pattern that combine block lines infill and switching layers for smooth transition. Change-Id: I2608a2d39b14efcdfe9d39a9437280da350b94c0 (cherry picked from commit 8d0a09c8b763dfc924cbba9913c241e6afadbc7f) * ENH: add nozzle blob detection and air printing detection jira: new Change-Id: Ie4a19a7ad7d0b10a021c516cbc3a84b4ae734302 * FIX: Top surface bridging fail on 3DHC & FL infill Add 45 degree angle offset when processing the bridge. Need to raise infill_direction to invalidate posPrepareInfill jira: 6774 Change-Id: I5e6bef3aa814b01c5f30398ac745937a67e3ef4c (cherry picked from commit 7b12cab10b88f432a11414f8caa1c6427777a1ba) * FIX: the error display when reset virtual slot jira: none Change-Id: I5ae5899baf1bfc2aaadb832083b277855a669fd5 * FIX: Error "Voronoi cell doesn't contain a sourcepoint" github: 3859 Change-Id: Idca84992bcba5380bfe05e63ac9a5e40419dcfdf * fix build error * FIX: CLI: fix the crash issue caused by get_min_flush_volumes JIRA: no jira Change-Id: I0d5bfd605e51ebddac8fddc4d83dab5055b0fbf2 * FIX: can't use support filament in gcode.3mf 1. Add total_filament_volumes, directly access it to get used filaments github:#3865 Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I4fae4f1947b4ebd16e394e0f3cf5fb0e9f979717 * ENH: p series support long retraction 1. P series support long retraction in filament 2. Add long retraction params in common.json jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib94184fa1f0b5ab151360f1f053d8c8ff92e7e18 * ENH::modify some logs level jira:[for log] Change-Id: I6a46b8fcd3a030b4b630e800fe9a9ac5c387f117 * NEW: support multi device JIRA: STUDIO-6072 Change-Id: Ic514c4097767b0a728368c9ea48ee103c031fbb0 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH: update A1 series gcode 1.Update filament change gcode and machine start gcode for A1 and A1 mini jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I2f3be3fd89fef21e717a32f2b89985fc046f7f6e * FIX: always have 0th filament in ams mapping 1. Only set the filament id in map when flush length is not 0 jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I6e0aeaf010f6e6dcbdc3bca5c0034aa60750bb67 * ENH: add filament id in slice info jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ic5fe4632bca8acacc9ffd072ee2ed207c1da37aa * ENH: refine ui for multi machine JIRA: STUDIO-6819 STUDIO-6824 1. Shrink the Send Print dialog box 2. add input box for flipping panel Change-Id: I4174c79ecd239c374ee11478951e12be399c57ce * FIX: fix Issues with sending multiple devices JIRA: STUDIO-6876 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I33c6a932863fc715c3f0eb5dfd4b299f980a4918 * NEW: support hms error code Change-Id: Ic256a83cf501fb05bb9d3203f3d24cb1d1290fa4 * FIX:fixed some multi job issue Change-Id: I338078ad8fcf809888db9d8daeb470a9bf4eab46 * NEW:support pin code binding Change-Id: Ida5d47881fbd83f3ffedc80369cfe377114d7f13 * ENH:add printable check for devices Change-Id: I672988fa9cfa986d924bfc64331752f4aef68067 (cherry picked from commit 69de9e5b8334ec94eec7fcee31038b8ff42d1d3b) * FIX: add more fonts jira: none Change-Id: I6bafed3563083858f29e92a3d84906a2e53dcb5c (cherry picked from commit afbea693e807dcc1c406a59aa5376b9ea2a5d606) * ENH: load more fonts this feature is according to Prusa by Filip Sykala<filip.sykala@prusa3d.cz>, thanks to Filip Sykala jira: none Change-Id: I55e92f184f750c0b93b679d4382aaa5b164ec5c3 (cherry picked from commit d05522c4cc5d7ee4cac42de398b88d347a55f74b) * ENH: add ProfileDescription for translate 1.Add ProfileDescription.hpp simply for translating jira:NEW Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Change-Id: Iaa3ced1edccf67eaeebde35c1e8b36442d2e9a6f * ENH: Improve CrossHatch transation layers jira: 6701 Change name from Flippingline to CrossHatch. Reduce noise, improve speed by 6.5%. Improve transation layers by gradually increasing rotation angle and overshoot the transation layer while direction changed. Change-Id: I17fcc45b409074d121bf5bb5702e15553d925b51 * UP * ENH: modify the default config for multi-device JIRA: STUDIO-6072 Change-Id: If6e7582a8274eb5e685b8b8545f6eab5d17de3f5 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH: add long retraction for P series jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I6890695b67e674fc5cdc2a208e89bd9e41404213 * FIX: all plates stats data missing issue jira: new Change-Id: I137a2b6d69ad08791f5a9a9788653621960dc63f * ENH:update pre print options jira:[for multi] Change-Id: I2e9bb8a09436a71749af98a0bad94e9922f95c81 * FIX:fixed can't popup pinbind win on macos jira:[STUDIO-6895] Change-Id: I664bba78cf27420d736b586df19e3c09c6f8ed21 * FIX:fixed the task of padding cannot be cancelled Change-Id: I401a22118c14ca7601be7a925cfd8e4796dfc1e9 * ENH:Play video after redirecting to device page jira:[STUDIO-6884] Change-Id: Ia5e2ac84e3d71baacfcf941b782dab2325f35d54 * FIX: fix ui bug in send multi machine page for mac JIRA: STUDIO-6882 Incorrect background color when renaming during multi machine printing Change-Id: I6c551f5023ffe747e7a7e2f5703b0707c9505922 * FIX: Fix some bugs in maintaining the selected status of local tasks JIRA: STUDIO-6824 Change-Id: I12c4da3fc56ac5077b3ccd7e89a4b57c3675eaf5 * ENH: local task sort by send time by default JIRA: STUDIO-6885 Change-Id: I03b5881a39ab2e90c5b9cf46052ba465ee707ccc * FIX: Clicking to continue printing does not take effect in error code JIRA: STUDIO-6830 Detected an incomplete printing task error pop-up when power outage occurred. Clicking to continue printing did not take effect Change-Id: Ie85a1602093dabac861cd1f41ea21e1c312c83e9 * ENH: use designTitle when designId > 0 JIRA: STUDIO-6072 Change-Id: I8342df053edeab16f930522e099e2eef91e5c5a4 Signed-off-by: Stone Li <stone.li@bambulab.com> * NEW:import vertex and mtl color from obj file Jira: STUDIO-6805 Change-Id: Iaacb13ee2451effdb83e5aba4b7fe1637b7fc95f * FIX:change the strategy of merge_ka_kd Upgrade ui, users can directly ok to proceed to the next step jira: STUDIO-6805 Change-Id: Ia81019c2eacb503666680c0b8583d026baa0134c (cherry picked from commit 38a2434753c8e3b422267283b16c75f6ad195b14) * FIX:use default_strategy after modifed cluster number jira: STUDIO-6915 Change-Id: I4e0c3d62f5a766f73d48d1e06c4364fc6babe1ac * FIX: the bug of incorrect button without restarting JIRA: STUDIO-6824 The bug can cause the user to not restart when opening the multi-device option, but the button of send multi-devices appears Change-Id: I0837fa79ecc1d8ab5ce98273ad134fa2f830421e * FIX: wrong default value for long retraction jira:NEW Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ifc2ec57a320fdb14e7ca746e5795501ed146ff32 * FIX: error code pop-up window without retry button in some code JIRA: STUDIO-6922 Change-Id: I67464bebaba4558618301592c455db8824bbfe30 * FIX: air printing and nozzle blob detection issue jira: STUDIO-6897 Change-Id: I008ddb24b74119d7e4124ae26310b4b86c42a799 * FIX:fix bugs of algo and read quad in obj file Jira: STUDIO-6805 Change-Id: I6c33e8197225f27dccdfa0681e64d76d1df14f61 * dd * ENH:Set the default nozzle diameter to 0.4 jira:[for nozzle] Change-Id: I74a5c9b0460046496b897eae3d9f917ac1b99052 * FIX:fixed backspace error on macos Change-Id: I76066391783c04857c1a60a6f8438111501b6d7c * ENH:Subscription list deduplication jira:[for mulit] Change-Id: I10e9d849986c9661b587c7b1a509180c2451816e * ENH:update wiki url for Pin Code jira:[pin code] Change-Id: I95faaa396a839b5b159119ef235b650c76706a84 * NEW:add OpenCV.cmake in deps jira: none Change-Id: I1ae4a2bd5618e9e620b08a937904d6af5d00bc41 * FIX:cancel obj import restrictions jira: none Change-Id: Iaf3e799ca982ad6aeb3ec76e9a416c4c8e4d100c * NEW:add multiple printer restrictions jira:[for multiple] Change-Id: I0bb5a0c1062a543c42f8d67a9347efa358b0864a * ENH:Added two entrances for adding devices jira:[multi device] Change-Id: Ieb6197e067d422979606f93b22b337a2399aec74 * slic3r: Fix wxFont being undefined [427/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o /usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -c /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp In file included from /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp:1: /run/build/BambuStudio/src/slic3r/Utils/FontUtils.hpp:51:21: error: ‘wxFont’ does not name a type 51 | bool can_load(const wxFont &font); | ^~~~~~ * slic3r: Fix missing BOOST_LOG_TRIVIAL declaration [427/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o /usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontUtils.cpp.o -c /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp: In function ‘std::unique_ptr<Slic3r::FontFile> Slic3r::create_font_file(const char*)’: /run/build/BambuStudio/src/slic3r/Utils/FontUtils.cpp:127:27: error: ‘error’ was not declared in this scope; did you mean ‘perror’? 127 | BOOST_LOG_TRIVIAL(error) << "Couldn't open " << file_path << " for reading."; | ^~~~~ | perror [447/494] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o FAILED: src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o /usr/bin/c++ -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_DATE_TIME_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_IOSTREAMS_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_SYSTEM_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DGLEW_STATIC -DLIBNEST2D_GEOMETRIES_libslic3r -DLIBNEST2D_OPTIMIZER_nlopt -DLIBNEST2D_STATIC -DLIBNEST2D_THREADING_tbb -DOPENSSL_CERT_OVERRIDE -DOPENVDB_OPENEXR_STATICLIB -DOPENVDB_STATICLIB -DSLIC3R_CURRENTLY_COMPILING_GUI_MODULE -DSLIC3R_GUI -DTBB_USE_CAPTURED_EXCEPTION=0 -DUNICODE -DUSE_TBB -DWXINTL_NO_GETTEXT_MACRO -D_UNICODE -D__WXGTK3__ -D__WXGTK__ -DwxDEBUG_LEVEL=0 -DwxNO_UNSAFE_WXSTRING_CONV -DwxUSE_UNICODE -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/run/build/BambuStudio/src -I/run/build/BambuStudio/build/src/platform -I/run/build/BambuStudio/src/hidapi/include -I/run/build/BambuStudio/src/slic3r/Utils -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/webp -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/atk-1.0 -I/usr/include/fribidi -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -I/usr/include/gstreamer-1.0 -I/run/build/BambuStudio/build/src/libslic3r -I/run/build/BambuStudio/deps/build/destdir/usr/local/include/opencascade -I/run/build/BambuStudio/src/libnest2d/include -I/run/build/BambuStudio/src/miniz -I/run/build/BambuStudio/src/glu-libtess/include -I/run/build/BambuStudio/src/clipper2/Clipper2Lib/include -I/run/build/BambuStudio/src/minilzo -isystem /run/build/BambuStudio/src/eigen -isystem /run/build/BambuStudio/src/libigl -isystem /app/lib/wx/include/gtk3-unicode-static-3.1 -isystem /app/include/wx-3.1 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/opencv4 -isystem /run/build/BambuStudio/deps/build/destdir/usr/local/include/OpenEXR -std=gnu++20 -fext-numeric-literals -Wall -Wno-reorder -pthread -O3 -DNDEBUG -std=gnu++17 -fPIC -fsigned-char -Werror=return-type -Wno-ignored-attributes -Wno-unknown-pragmas -DOPENVDB_ABI_VERSION_NUMBER=8 -MD -MT src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o -MF src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o.d -o src/slic3r/CMakeFiles/libslic3r_gui.dir/GUI/TaskManager.cpp.o -c /run/build/BambuStudio/src/slic3r/GUI/TaskManager.cpp In file included from /run/build/BambuStudio/src/slic3r/GUI/TaskManager.cpp:1: /run/build/BambuStudio/src/slic3r/GUI/TaskManager.hpp: In member function ‘void Slic3r::TaskStateInfo::set_state(Slic3r::TaskState)’: /run/build/BambuStudio/src/slic3r/GUI/TaskManager.hpp:40:9: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope 40 | BOOST_LOG_TRIVIAL(trace) << "TaskStateInfo set state = " << get_task_state_enum_str(ts); | ^~~~~~~~~~~~~~~~~ * fix OpenCV * wip - build break * fix build error wip * ENH: support preset description(tooltip) Change-Id: Iff005baac4974c538d1109fb0ba1df20b04a8f69 Jira: STUDIO-5754 * fix more build errors * Revert "ENH: load more fonts" This reverts commit 32b6fd199ac50e21db1f72089e5b3287a1776e04. * change colors * misc fixes * restore export gcode btn --------- Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Signed-off-by: Stone Li <stone.li@bambulab.com> Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: jianjia.ma <jianjia.ma@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: Bastien Nocera <hadess@hadess.net> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com>
550 lines
20 KiB
C++
550 lines
20 KiB
C++
#include "BitmapCache.hpp"
|
|
|
|
#include "libslic3r/Utils.hpp"
|
|
#include "../Utils/MacDarkMode.hpp"
|
|
#include "GUI.hpp"
|
|
#include "GUI_Utils.hpp"
|
|
|
|
#include <boost/nowide/cstdio.hpp>
|
|
#include <boost/filesystem.hpp>
|
|
|
|
#ifdef __WXGTK2__
|
|
// Broken alpha workaround
|
|
#include <wx/mstream.h>
|
|
#include <wx/rawbmp.h>
|
|
#endif /* __WXGTK2__ */
|
|
|
|
#define NANOSVG_IMPLEMENTATION
|
|
#include "nanosvg/nanosvg.h"
|
|
#define NANOSVGRAST_IMPLEMENTATION
|
|
#include "nanosvg/nanosvgrast.h"
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
BitmapCache::BitmapCache()
|
|
{
|
|
#ifdef __APPLE__
|
|
// Note: win->GetContentScaleFactor() is not used anymore here because it tends to
|
|
// return bogus results quite often (such as 1.0 on Retina or even 0.0).
|
|
// We're using the max scaling factor across all screens because it's very likely to be good enough.
|
|
m_scale = mac_max_scaling_factor();
|
|
#endif
|
|
}
|
|
|
|
void BitmapCache::clear()
|
|
{
|
|
for (std::pair<const std::string, wxBitmap*> &bitmap : m_map)
|
|
delete bitmap.second;
|
|
|
|
m_map.clear();
|
|
}
|
|
|
|
static wxBitmap wxImage_to_wxBitmap_with_alpha(wxImage &&image, float scale = 1.0f)
|
|
{
|
|
#ifdef __WXGTK2__
|
|
// Broken alpha workaround
|
|
wxMemoryOutputStream stream;
|
|
image.SaveFile(stream, wxBITMAP_TYPE_PNG);
|
|
wxStreamBuffer *buf = stream.GetOutputStreamBuffer();
|
|
return wxBitmap::NewFromPNGData(buf->GetBufferStart(), buf->GetBufferSize());
|
|
#else
|
|
#ifdef __APPLE__
|
|
// This is a c-tor native to Mac OS. We need to let the Mac OS wxBitmap implementation
|
|
// know that the image may already be scaled appropriately for Retina,
|
|
// and thereby that it's not supposed to upscale it.
|
|
// Contrary to intuition, the `scale` argument isn't "please scale this to such and such"
|
|
// but rather "the wxImage is sized for backing scale such and such".
|
|
return wxBitmap(std::move(image), -1, scale);
|
|
#else
|
|
return wxBitmap(std::move(image));
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
wxBitmap* BitmapCache::insert(const std::string &bitmap_key, size_t width, size_t height)
|
|
{
|
|
wxBitmap *bitmap = nullptr;
|
|
auto it = m_map.find(bitmap_key);
|
|
if (it == m_map.end()) {
|
|
bitmap = new wxBitmap(width, height
|
|
#ifdef __WXGTK3__
|
|
, 32
|
|
#endif
|
|
);
|
|
#ifdef __APPLE__
|
|
// Contrary to intuition, the `scale` argument isn't "please scale this to such and such"
|
|
// but rather "the wxImage is sized for backing scale such and such".
|
|
// So, We need to let the Mac OS wxBitmap implementation
|
|
// know that the image may already be scaled appropriately for Retina,
|
|
// and thereby that it's not supposed to upscale it.
|
|
bitmap->CreateScaled(width, height, -1, m_scale);
|
|
#endif
|
|
m_map[bitmap_key] = bitmap;
|
|
} else {
|
|
bitmap = it->second;
|
|
if (size_t(bitmap->GetWidth()) != width || size_t(bitmap->GetHeight()) != height)
|
|
bitmap->Create(width, height);
|
|
}
|
|
#if defined(WIN32) || defined(__APPLE__)
|
|
// Not needed or harmful for GTK2 and GTK3.
|
|
bitmap->UseAlpha();
|
|
#endif
|
|
return bitmap;
|
|
}
|
|
|
|
wxBitmap* BitmapCache::insert(const std::string &bitmap_key, const wxBitmap &bmp)
|
|
{
|
|
wxBitmap *bitmap = nullptr;
|
|
auto it = m_map.find(bitmap_key);
|
|
if (it == m_map.end()) {
|
|
bitmap = new wxBitmap(bmp);
|
|
m_map[bitmap_key] = bitmap;
|
|
} else {
|
|
bitmap = it->second;
|
|
*bitmap = bmp;
|
|
}
|
|
return bitmap;
|
|
}
|
|
|
|
wxBitmap* BitmapCache::insert(const std::string &bitmap_key, const wxBitmap &bmp, const wxBitmap &bmp2)
|
|
{
|
|
// Copying the wxBitmaps is cheap as the bitmap's content is reference counted.
|
|
const wxBitmap bmps[2] = { bmp, bmp2 };
|
|
return this->insert(bitmap_key, bmps, bmps + 2);
|
|
}
|
|
|
|
wxBitmap* BitmapCache::insert(const std::string &bitmap_key, const wxBitmap &bmp, const wxBitmap &bmp2, const wxBitmap &bmp3)
|
|
{
|
|
// Copying the wxBitmaps is cheap as the bitmap's content is reference counted.
|
|
const wxBitmap bmps[3] = { bmp, bmp2, bmp3 };
|
|
return this->insert(bitmap_key, bmps, bmps + 3);
|
|
}
|
|
|
|
wxBitmap* BitmapCache::insert(const std::string &bitmap_key, const wxBitmap *begin, const wxBitmap *end)
|
|
{
|
|
size_t width = 0;
|
|
size_t height = 0;
|
|
for (const wxBitmap *bmp = begin; bmp != end; ++ bmp) {
|
|
#ifdef __APPLE__
|
|
width += bmp->GetScaledWidth();
|
|
height = std::max<size_t>(height, bmp->GetScaledHeight());
|
|
#else
|
|
width += bmp->GetWidth();
|
|
height = std::max<size_t>(height, bmp->GetHeight());
|
|
#endif
|
|
}
|
|
|
|
#ifdef __WXGTK2__
|
|
// Broken alpha workaround
|
|
wxImage image(width, height);
|
|
image.InitAlpha();
|
|
// Fill in with a white color.
|
|
memset(image.GetData(), 0x0ff, width * height * 3);
|
|
// Fill in with full transparency.
|
|
memset(image.GetAlpha(), 0, width * height);
|
|
size_t x = 0;
|
|
for (const wxBitmap *bmp = begin; bmp != end; ++ bmp) {
|
|
if (bmp->GetWidth() > 0) {
|
|
if (bmp->GetDepth() == 32) {
|
|
wxAlphaPixelData data(*const_cast<wxBitmap*>(bmp));
|
|
//FIXME The following method is missing from wxWidgets 3.1.1.
|
|
// It looks like the wxWidgets 3.0.3 called the wrapped bitmap's UseAlpha().
|
|
//data.UseAlpha();
|
|
if (data) {
|
|
for (int r = 0; r < bmp->GetHeight(); ++ r) {
|
|
wxAlphaPixelData::Iterator src(data);
|
|
src.Offset(data, 0, r);
|
|
unsigned char *dst_pixels = image.GetData() + (x + r * width) * 3;
|
|
unsigned char *dst_alpha = image.GetAlpha() + x + r * width;
|
|
for (int c = 0; c < bmp->GetWidth(); ++ c, ++ src) {
|
|
*dst_pixels ++ = src.Red();
|
|
*dst_pixels ++ = src.Green();
|
|
*dst_pixels ++ = src.Blue();
|
|
*dst_alpha ++ = src.Alpha();
|
|
}
|
|
}
|
|
}
|
|
} else if (bmp->GetDepth() == 24) {
|
|
wxNativePixelData data(*const_cast<wxBitmap*>(bmp));
|
|
if (data) {
|
|
for (int r = 0; r < bmp->GetHeight(); ++ r) {
|
|
wxNativePixelData::Iterator src(data);
|
|
src.Offset(data, 0, r);
|
|
unsigned char *dst_pixels = image.GetData() + (x + r * width) * 3;
|
|
unsigned char *dst_alpha = image.GetAlpha() + x + r * width;
|
|
for (int c = 0; c < bmp->GetWidth(); ++ c, ++ src) {
|
|
*dst_pixels ++ = src.Red();
|
|
*dst_pixels ++ = src.Green();
|
|
*dst_pixels ++ = src.Blue();
|
|
*dst_alpha ++ = wxALPHA_OPAQUE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
x += bmp->GetWidth();
|
|
}
|
|
return this->insert(bitmap_key, wxImage_to_wxBitmap_with_alpha(std::move(image)));
|
|
|
|
#else
|
|
|
|
wxBitmap *bitmap = this->insert(bitmap_key, width, height);
|
|
wxMemoryDC memDC;
|
|
memDC.SelectObject(*bitmap);
|
|
memDC.SetBackground(*wxTRANSPARENT_BRUSH);
|
|
memDC.Clear();
|
|
size_t x = 0;
|
|
for (const wxBitmap *bmp = begin; bmp != end; ++ bmp) {
|
|
if (bmp->GetWidth() > 0)
|
|
memDC.DrawBitmap(*bmp, x, 0, true);
|
|
#ifdef __APPLE__
|
|
// we should "move" with step equal to non-scaled width
|
|
x += bmp->GetScaledWidth();
|
|
#else
|
|
x += bmp->GetWidth();
|
|
#endif
|
|
}
|
|
memDC.SelectObject(wxNullBitmap);
|
|
return bitmap;
|
|
|
|
#endif
|
|
}
|
|
|
|
wxBitmap* BitmapCache::insert_raw_rgba(const std::string &bitmap_key, unsigned width, unsigned height, const unsigned char *raw_data, const bool grayscale/* = false*/)
|
|
{
|
|
wxImage image(width, height);
|
|
image.InitAlpha();
|
|
unsigned char *rgb = image.GetData();
|
|
unsigned char *alpha = image.GetAlpha();
|
|
unsigned int pixels = width * height;
|
|
for (unsigned int i = 0; i < pixels; ++ i) {
|
|
*rgb ++ = *raw_data ++;
|
|
*rgb ++ = *raw_data ++;
|
|
*rgb ++ = *raw_data ++;
|
|
*alpha ++ = *raw_data ++;
|
|
}
|
|
|
|
if (grayscale)
|
|
image = image.ConvertToGreyscale(m_gs, m_gs, m_gs);
|
|
|
|
return this->insert(bitmap_key, wxImage_to_wxBitmap_with_alpha(std::move(image), m_scale));
|
|
}
|
|
|
|
wxBitmap* BitmapCache::load_png(const std::string &bitmap_name, unsigned width, unsigned height,
|
|
const bool grayscale/* = false*/, const float scale_in_center/* = 0*/) // BBS: support resize by fill border
|
|
{
|
|
std::string bitmap_key = bitmap_name + ( height !=0 ?
|
|
"-h" + std::to_string(height) :
|
|
"-w" + std::to_string(width))
|
|
+ (grayscale ? "-gs" : "");
|
|
|
|
auto it = m_map.find(bitmap_key);
|
|
if (it != m_map.end())
|
|
return it->second;
|
|
|
|
wxImage image;
|
|
if (! image.LoadFile(Slic3r::GUI::from_u8(Slic3r::var(bitmap_name + ".png")), wxBITMAP_TYPE_PNG) ||
|
|
image.GetWidth() == 0 || image.GetHeight() == 0)
|
|
return nullptr;
|
|
|
|
if (height == 0 && width == 0)
|
|
height = image.GetHeight();
|
|
|
|
if (height != 0 && unsigned(image.GetHeight()) != height)
|
|
width = unsigned(0.5f + float(image.GetWidth()) * height / image.GetHeight());
|
|
else if (width != 0 && unsigned(image.GetWidth()) != width)
|
|
height = unsigned(0.5f + float(image.GetHeight()) * width / image.GetWidth());
|
|
|
|
if (height != 0 && width != 0) {
|
|
// BBS: support resize by fill border
|
|
if (scale_in_center > 0)
|
|
image.Resize({ (int)width, (int)height }, { (int)(width - image.GetWidth()) / 2, (int)(height - image.GetHeight()) / 2 });
|
|
else
|
|
image.Rescale(width, height, wxIMAGE_QUALITY_BILINEAR);
|
|
}
|
|
|
|
if (grayscale)
|
|
image = image.ConvertToGreyscale(m_gs, m_gs, m_gs);
|
|
|
|
return this->insert(bitmap_key, wxImage_to_wxBitmap_with_alpha(std::move(image)));
|
|
}
|
|
|
|
NSVGimage* BitmapCache::nsvgParseFromFileWithReplace(const char* filename, const char* units, float dpi, const std::map<std::string, std::string>& replaces)
|
|
{
|
|
std::string str;
|
|
FILE* fp = NULL;
|
|
size_t size;
|
|
char* data = NULL;
|
|
NSVGimage* image = NULL;
|
|
|
|
fp = boost::nowide::fopen(filename, "rb");
|
|
if (!fp) goto error;
|
|
fseek(fp, 0, SEEK_END);
|
|
size = ftell(fp);
|
|
fseek(fp, 0, SEEK_SET);
|
|
data = (char*)malloc(size + 1);
|
|
if (data == NULL) goto error;
|
|
if (fread(data, 1, size, fp) != size) goto error;
|
|
data[size] = '\0'; // Must be null terminated.
|
|
fclose(fp);
|
|
|
|
if (replaces.empty())
|
|
image = nsvgParse(data, units, dpi);
|
|
else {
|
|
str.assign(data);
|
|
for (auto val : replaces)
|
|
boost::replace_all(str, val.first, val.second);
|
|
image = nsvgParse(str.data(), units, dpi);
|
|
}
|
|
free(data);
|
|
return image;
|
|
|
|
error:
|
|
if (fp) fclose(fp);
|
|
if (data) free(data);
|
|
if (image) nsvgDelete(image);
|
|
return NULL;
|
|
}
|
|
|
|
wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_width, unsigned target_height,
|
|
const bool grayscale/* = false*/, const bool dark_mode/* = false*/, const std::string& new_color /*= ""*/, const float scale_in_center/* = 0*/)
|
|
{
|
|
std::string bitmap_key = bitmap_name + ( target_height !=0 ?
|
|
"-h" + std::to_string(target_height) :
|
|
"-w" + std::to_string(target_width))
|
|
+ (m_scale != 1.0f ? "-s" + float_to_string_decimal_point(m_scale) : "")
|
|
+ (dark_mode ? "-dm" : "")
|
|
+ (grayscale ? "-gs" : "")
|
|
+ new_color;
|
|
|
|
auto it = m_map.find(bitmap_key);
|
|
if (it != m_map.end())
|
|
return it->second;
|
|
|
|
// map of color replaces
|
|
std::map<std::string, std::string> replaces;
|
|
replaces["\"#0x00AE42\""] = "\"#009688\"";
|
|
replaces["\"#00FF00\""] = "\"#52c7b8\"";
|
|
if (dark_mode) {
|
|
replaces["\"#262E30\""] = "\"#EFEFF0\"";
|
|
replaces["\"#323A3D\""] = "\"#B3B3B5\"";
|
|
replaces["\"#808080\""] = "\"#818183\"";
|
|
//replaces["\"#ACACAC\""] = "\"#54545A\"";
|
|
replaces["\"#CECECE\""] = "\"#54545B\"";
|
|
replaces["\"#6B6B6B\""] = "\"#818182\"";
|
|
replaces["\"#909090\""] = "\"#FFFFFF\"";
|
|
replaces["\"#00FF00\""] = "\"#FF0000\"";
|
|
replaces["\"#009688\""] = "\"#00675b\"";
|
|
}
|
|
//if (!new_color.empty())
|
|
// replaces["\"#ED6B21\""] = "\"" + new_color + "\"";
|
|
|
|
NSVGimage *image = nullptr;
|
|
if (strstr(bitmap_name.c_str(), "printer_thumbnail") == NULL) {
|
|
image = nsvgParseFromFileWithReplace(Slic3r::var(bitmap_name + ".svg").c_str(), "px", 96.0f, replaces);
|
|
}
|
|
else {
|
|
std::map<std::string, std::string> temp_replaces;
|
|
image = nsvgParseFromFileWithReplace(Slic3r::var(bitmap_name + ".svg").c_str(), "px", 96.0f, temp_replaces);
|
|
}
|
|
|
|
if (image == nullptr)
|
|
return nullptr;
|
|
|
|
if (target_height == 0 && target_width == 0)
|
|
target_height = image->height;
|
|
|
|
target_height != 0 ? target_height *= m_scale : target_width *= m_scale;
|
|
|
|
float svg_scale = target_height != 0 ?
|
|
(float)target_height / image->height : target_width != 0 ?
|
|
(float)target_width / image->width : 1;
|
|
|
|
int width = (int)(svg_scale * image->width + 0.5f);
|
|
int height = (int)(svg_scale * image->height + 0.5f);
|
|
int n_pixels = width * height;
|
|
if (n_pixels <= 0) {
|
|
::nsvgDelete(image);
|
|
return nullptr;
|
|
}
|
|
|
|
NSVGrasterizer *rast = ::nsvgCreateRasterizer();
|
|
if (rast == nullptr) {
|
|
::nsvgDelete(image);
|
|
return nullptr;
|
|
}
|
|
|
|
std::vector<unsigned char> data(n_pixels * 4, 0);
|
|
// BBS: support resize by fill border
|
|
if (scale_in_center > 0 && scale_in_center < svg_scale) {
|
|
int w = (int)(image->width * scale_in_center);
|
|
int h = (int)(image->height * scale_in_center);
|
|
::nsvgRasterize(rast, image, 0, 0, scale_in_center, data.data() + int(height - h) / 2 * width * 4 + int(width - w) / 2 * 4, w, h, width * 4);
|
|
} else
|
|
::nsvgRasterize(rast, image, 0, 0, svg_scale, data.data(), width, height, width * 4);
|
|
::nsvgDeleteRasterizer(rast);
|
|
::nsvgDelete(image);
|
|
|
|
return this->insert_raw_rgba(bitmap_key, width, height, data.data(), grayscale);
|
|
}
|
|
|
|
wxBitmap* BitmapCache::load_svg2(const std::string& bitmap_name, unsigned target_width, unsigned target_height,
|
|
const bool grayscale/* = false*/, const bool dark_mode/* = false*/, const std::vector<std::string>& array_new_color /*= vector<std::string>()*/, const float scale_in_center/* = 0*/)
|
|
{
|
|
|
|
std::map<std::string, std::string> replaces;
|
|
if (array_new_color.size() == 2) {
|
|
replaces["#D9D9D9"] = array_new_color[0];
|
|
replaces["fill-opacity=\"1.0"] = array_new_color[1];
|
|
}
|
|
|
|
|
|
NSVGimage* image = nullptr;
|
|
image = nsvgParseFromFileWithReplace(Slic3r::var(bitmap_name + ".svg").c_str(), "px", 96.0f, replaces);
|
|
|
|
if (image == nullptr)
|
|
return nullptr;
|
|
|
|
if (target_height == 0 && target_width == 0)
|
|
target_height = image->height;
|
|
|
|
target_height != 0 ? target_height *= m_scale : target_width *= m_scale;
|
|
|
|
float svg_scale = target_height != 0 ?
|
|
(float)target_height / image->height : target_width != 0 ?
|
|
(float)target_width / image->width : 1;
|
|
|
|
int width = (int)(svg_scale * image->width + 0.5f);
|
|
int height = (int)(svg_scale * image->height + 0.5f);
|
|
int n_pixels = width * height;
|
|
if (n_pixels <= 0) {
|
|
::nsvgDelete(image);
|
|
return nullptr;
|
|
}
|
|
|
|
NSVGrasterizer* rast = ::nsvgCreateRasterizer();
|
|
if (rast == nullptr) {
|
|
::nsvgDelete(image);
|
|
return nullptr;
|
|
}
|
|
|
|
std::vector<unsigned char> data(n_pixels * 4, 0);
|
|
// BBS: support resize by fill border
|
|
if (scale_in_center > 0 && scale_in_center < svg_scale) {
|
|
int w = (int)(image->width * scale_in_center);
|
|
int h = (int)(image->height * scale_in_center);
|
|
::nsvgRasterize(rast, image, 0, 0, scale_in_center, data.data() + int(height - h) / 2 * width * 4 + int(width - w) / 2 * 4, w, h, width * 4);
|
|
}
|
|
else
|
|
::nsvgRasterize(rast, image, 0, 0, svg_scale, data.data(), width, height, width * 4);
|
|
::nsvgDeleteRasterizer(rast);
|
|
::nsvgDelete(image);
|
|
|
|
const unsigned char * raw_data = data.data();
|
|
wxImage wx_image(width, height);
|
|
wx_image.InitAlpha();
|
|
unsigned char* rgb = wx_image.GetData();
|
|
unsigned char* alpha = wx_image.GetAlpha();
|
|
unsigned int pixels = width * height;
|
|
for (unsigned int i = 0; i < pixels; ++i) {
|
|
*rgb++ = *raw_data++;
|
|
*rgb++ = *raw_data++;
|
|
*rgb++ = *raw_data++;
|
|
*alpha++ = *raw_data++;
|
|
}
|
|
|
|
if (grayscale)
|
|
wx_image = wx_image.ConvertToGreyscale(m_gs, m_gs, m_gs);
|
|
auto result = new wxBitmap(wxImage_to_wxBitmap_with_alpha(std::move(wx_image), m_scale));
|
|
return result;
|
|
|
|
}
|
|
|
|
//we make scaled solid bitmaps only for the cases, when its will be used with scaled SVG icon in one output bitmap
|
|
wxBitmap BitmapCache::mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency, bool suppress_scaling/* = false*/, size_t border_width /*= 0*/, bool dark_mode/* = false*/)
|
|
{
|
|
double scale = suppress_scaling ? 1.0f : m_scale;
|
|
width *= scale;
|
|
height *= scale;
|
|
|
|
wxImage image(width, height);
|
|
image.InitAlpha();
|
|
unsigned char* imgdata = image.GetData();
|
|
unsigned char* imgalpha = image.GetAlpha();
|
|
for (size_t i = 0; i < width * height; ++ i) {
|
|
*imgdata ++ = r;
|
|
*imgdata ++ = g;
|
|
*imgdata ++ = b;
|
|
*imgalpha ++ = transparency;
|
|
}
|
|
|
|
// Add border, make white/light spools easier to see
|
|
if (border_width > 0) {
|
|
|
|
// Restrict to width of image
|
|
if (border_width > height) border_width = height - 1;
|
|
if (border_width > width) border_width = width - 1;
|
|
|
|
auto px_data = (uint8_t*)image.GetData();
|
|
auto a_data = (uint8_t*)image.GetAlpha();
|
|
|
|
for (size_t x = 0; x < width; ++x) {
|
|
for (size_t y = 0; y < height; ++y) {
|
|
if (x < border_width || y < border_width ||
|
|
x >= (width - border_width) || y >= (height - border_width)) {
|
|
const size_t idx = (x + y * width);
|
|
const size_t idx_rgb = (x + y * width) * 3;
|
|
px_data[idx_rgb] = px_data[idx_rgb + 1] = px_data[idx_rgb + 2] = dark_mode ? 245u : 110u;
|
|
a_data[idx] = 255u;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return wxImage_to_wxBitmap_with_alpha(std::move(image), scale);
|
|
}
|
|
|
|
bool BitmapCache::parse_color(const std::string& scolor, unsigned char* rgb_out)
|
|
{
|
|
if (scolor.size() == 9) {
|
|
unsigned char rgba[4];
|
|
parse_color4(scolor, rgba);
|
|
rgb_out[0] = rgba[0];
|
|
rgb_out[1] = rgba[1];
|
|
rgb_out[2] = rgba[2];
|
|
return true;
|
|
}
|
|
rgb_out[0] = rgb_out[1] = rgb_out[2] = 0;
|
|
if (scolor.size() != 7 || scolor.front() != '#')
|
|
return false;
|
|
const char* c = scolor.data() + 1;
|
|
for (size_t i = 0; i < 3; ++i) {
|
|
int digit1 = hex_digit_to_int(*c++);
|
|
int digit2 = hex_digit_to_int(*c++);
|
|
if (digit1 == -1 || digit2 == -1)
|
|
return false;
|
|
rgb_out[i] = (unsigned char)(digit1 * 16 + digit2);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool BitmapCache::parse_color4(const std::string& scolor, unsigned char* rgba_out)
|
|
{
|
|
rgba_out[0] = rgba_out[1] = rgba_out[2] = 0; rgba_out[3] = 255;
|
|
if ((scolor.size() != 7 && scolor.size() != 9) || scolor.front() != '#')
|
|
return false;
|
|
const char* c = scolor.data() + 1;
|
|
for (size_t i = 0; i < scolor.size() / 2; ++i) {
|
|
int digit1 = hex_digit_to_int(*c++);
|
|
int digit2 = hex_digit_to_int(*c++);
|
|
if (digit1 == -1 || digit2 == -1)
|
|
return false;
|
|
rgba_out[i] = (unsigned char)(digit1 * 16 + digit2);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|