* 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>
741 lines
29 KiB
C++
741 lines
29 KiB
C++
#include "CaliHistoryDialog.hpp"
|
|
#include "I18N.hpp"
|
|
|
|
#include "libslic3r/Utils.hpp"
|
|
#include "GUI.hpp"
|
|
#include "GUI_App.hpp"
|
|
#include "format.hpp"
|
|
#include "MsgDialog.hpp"
|
|
#include "slic3r/Utils/CalibUtils.hpp"
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
|
|
#define HISTORY_WINDOW_SIZE wxSize(FromDIP(700), FromDIP(600))
|
|
#define EDIT_HISTORY_DIALOG_INPUT_SIZE wxSize(FromDIP(160), FromDIP(24))
|
|
#define NEW_HISTORY_DIALOG_INPUT_SIZE wxSize(FromDIP(250), FromDIP(24))
|
|
#define HISTORY_WINDOW_ITEMS_COUNT 5
|
|
static const wxString k_tips = "Please input a valid value (K in 0~0.3)";
|
|
|
|
static wxString get_preset_name_by_filament_id(std::string filament_id)
|
|
{
|
|
auto preset_bundle = wxGetApp().preset_bundle;
|
|
auto collection = &preset_bundle->filaments;
|
|
wxString preset_name = "";
|
|
for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
|
|
if (filament_id.compare(it->filament_id) == 0) {
|
|
auto preset_parent = collection->get_preset_parent(*it);
|
|
if (preset_parent) {
|
|
if (preset_parent->is_system) {
|
|
if (!preset_parent->alias.empty())
|
|
preset_name = from_u8(preset_parent->alias);
|
|
else
|
|
preset_name = from_u8(preset_parent->name);
|
|
}
|
|
else { // is custom created filament
|
|
std::string name_str = preset_parent->name;
|
|
preset_name = from_u8(name_str.substr(0, name_str.find(" @")));
|
|
}
|
|
}
|
|
else {
|
|
if (it->is_system) {
|
|
if (!it->alias.empty())
|
|
preset_name = from_u8(it->alias);
|
|
else
|
|
preset_name = from_u8(it->name);
|
|
}
|
|
else { // is custom created filament
|
|
std::string name_str = it->name;
|
|
preset_name = from_u8(name_str.substr(0, name_str.find(" @")));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return preset_name;
|
|
}
|
|
|
|
HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector<PACalibResult>& calib_results_history, bool& show)
|
|
: DPIDialog(parent, wxID_ANY, _L("Flow Dynamics Calibration Result"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
|
|
, m_calib_results_history(calib_results_history)
|
|
, m_show_history_dialog(show)
|
|
{
|
|
this->SetBackgroundColour(*wxWHITE);
|
|
auto main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
|
|
auto scroll_window = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL | wxVSCROLL);
|
|
scroll_window->SetScrollRate(5, 5);
|
|
scroll_window->SetBackgroundColour(*wxWHITE);
|
|
scroll_window->SetMinSize(HISTORY_WINDOW_SIZE);
|
|
scroll_window->SetSize(HISTORY_WINDOW_SIZE);
|
|
scroll_window->SetMaxSize(HISTORY_WINDOW_SIZE);
|
|
|
|
auto scroll_sizer = new wxBoxSizer(wxVERTICAL);
|
|
scroll_window->SetSizer(scroll_sizer);
|
|
|
|
Button * mew_btn = new Button(scroll_window, _L("New"));
|
|
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));
|
|
mew_btn->SetBackgroundColour(*wxWHITE);
|
|
mew_btn->SetBackgroundColor(btn_bg_green);
|
|
mew_btn->SetBorderColor(wxColour(0, 150, 136));
|
|
mew_btn->SetTextColor(wxColour("#FFFFFE"));
|
|
mew_btn->SetMinSize(wxSize(FromDIP(100), FromDIP(24)));
|
|
mew_btn->SetMaxSize(wxSize(FromDIP(100), FromDIP(24)));
|
|
mew_btn->SetCornerRadius(FromDIP(12));
|
|
mew_btn->Bind(wxEVT_BUTTON, &HistoryWindow::on_click_new_button, this);
|
|
|
|
scroll_sizer->Add(mew_btn, 0, wxLEFT, FromDIP(20));
|
|
scroll_sizer->AddSpacer(FromDIP(15));
|
|
|
|
wxPanel* comboBox_panel = new wxPanel(scroll_window);
|
|
comboBox_panel->SetBackgroundColour(wxColour(238, 238, 238));
|
|
auto comboBox_sizer = new wxBoxSizer(wxVERTICAL);
|
|
comboBox_panel->SetSizer(comboBox_sizer);
|
|
comboBox_sizer->AddSpacer(10);
|
|
|
|
auto nozzle_dia_title = new Label(comboBox_panel, _L("Nozzle Diameter"));
|
|
nozzle_dia_title->SetFont(Label::Head_14);
|
|
comboBox_sizer->Add(nozzle_dia_title, 0, wxLEFT | wxRIGHT, FromDIP(15));
|
|
comboBox_sizer->AddSpacer(10);
|
|
|
|
m_comboBox_nozzle_dia = new ComboBox(comboBox_panel, wxID_ANY, "", wxDefaultPosition, wxSize(-1, FromDIP(24)), 0, nullptr, wxCB_READONLY);
|
|
comboBox_sizer->Add(m_comboBox_nozzle_dia, 0, wxLEFT | wxEXPAND | wxRIGHT, FromDIP(15));
|
|
comboBox_sizer->AddSpacer(10);
|
|
|
|
scroll_sizer->Add(comboBox_panel, 0, wxEXPAND | wxRIGHT, FromDIP(10));
|
|
|
|
scroll_sizer->AddSpacer(FromDIP(15));
|
|
|
|
wxPanel* tips_panel = new wxPanel(scroll_window, wxID_ANY);
|
|
tips_panel->SetBackgroundColour(*wxWHITE);
|
|
auto tips_sizer = new wxBoxSizer(wxVERTICAL);
|
|
tips_panel->SetSizer(tips_sizer);
|
|
m_tips = new Label(tips_panel, "");
|
|
m_tips->SetForegroundColour({ 145, 145, 145 });
|
|
tips_sizer->Add(m_tips, 0, wxEXPAND);
|
|
|
|
scroll_sizer->Add(tips_panel, 0, wxEXPAND);
|
|
|
|
scroll_sizer->AddSpacer(FromDIP(15));
|
|
|
|
m_history_data_panel = new wxPanel(scroll_window);
|
|
m_history_data_panel->SetBackgroundColour(*wxWHITE);
|
|
|
|
scroll_sizer->Add(m_history_data_panel, 1, wxEXPAND);
|
|
|
|
main_sizer->Add(scroll_window, 1, wxEXPAND | wxALL, FromDIP(10));
|
|
|
|
SetSizer(main_sizer);
|
|
Layout();
|
|
main_sizer->Fit(this);
|
|
CenterOnParent();
|
|
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
|
|
m_comboBox_nozzle_dia->Bind(wxEVT_COMBOBOX, &HistoryWindow::on_select_nozzle, this);
|
|
|
|
m_refresh_timer = new wxTimer();
|
|
m_refresh_timer->SetOwner(this);
|
|
m_refresh_timer->Start(200);
|
|
Bind(wxEVT_TIMER, &HistoryWindow::on_timer, this);
|
|
|
|
m_show_history_dialog = true;
|
|
}
|
|
|
|
HistoryWindow::~HistoryWindow()
|
|
{
|
|
m_refresh_timer->Stop();
|
|
m_show_history_dialog = false;
|
|
}
|
|
|
|
void HistoryWindow::sync_history_result(MachineObject* obj)
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << "sync_history_result";
|
|
|
|
m_calib_results_history.clear();
|
|
if (obj)
|
|
m_calib_results_history = obj->pa_calib_tab;
|
|
|
|
if (m_calib_results_history.empty()) {
|
|
m_tips->SetLabel(_L("No History Result"));
|
|
return;
|
|
}
|
|
else {
|
|
m_tips->SetLabel(_L("Success to get history result"));
|
|
}
|
|
m_tips->Refresh();
|
|
|
|
sync_history_data();
|
|
}
|
|
|
|
void HistoryWindow::on_device_connected(MachineObject* obj)
|
|
{
|
|
if (!obj) {
|
|
return;
|
|
}
|
|
|
|
curr_obj = obj;
|
|
// init nozzle value
|
|
static std::array<float, 4> nozzle_diameter_list = { 0.2f, 0.4f, 0.6f, 0.8f };
|
|
int selection = 1;
|
|
for (int i = 0; i < nozzle_diameter_list.size(); i++) {
|
|
m_comboBox_nozzle_dia->AppendString(wxString::Format("%1.1f mm", nozzle_diameter_list[i]));
|
|
if (abs(curr_obj->nozzle_diameter - nozzle_diameter_list[i]) < 1e-3) {
|
|
selection = i;
|
|
}
|
|
}
|
|
m_comboBox_nozzle_dia->SetSelection(selection);
|
|
|
|
// trigger on_select nozzle
|
|
wxCommandEvent evt(wxEVT_COMBOBOX);
|
|
evt.SetEventObject(m_comboBox_nozzle_dia);
|
|
wxPostEvent(m_comboBox_nozzle_dia, evt);
|
|
}
|
|
|
|
void HistoryWindow::on_timer(wxTimerEvent& event)
|
|
{
|
|
update(curr_obj);
|
|
}
|
|
|
|
void HistoryWindow::update(MachineObject* obj)
|
|
{
|
|
if (!obj) return;
|
|
|
|
if (obj->cali_version != history_version) {
|
|
if (obj->has_get_pa_calib_tab) {
|
|
history_version = obj->cali_version;
|
|
reqeust_history_result(obj);
|
|
}
|
|
}
|
|
|
|
// sync when history is not empty
|
|
if (obj->has_get_pa_calib_tab && m_calib_results_history.empty()) {
|
|
sync_history_result(curr_obj);
|
|
}
|
|
}
|
|
|
|
void HistoryWindow::on_select_nozzle(wxCommandEvent& evt)
|
|
{
|
|
reqeust_history_result(curr_obj);
|
|
|
|
}
|
|
|
|
void HistoryWindow::reqeust_history_result(MachineObject* obj)
|
|
{
|
|
if (curr_obj) {
|
|
// reset
|
|
curr_obj->reset_pa_cali_history_result();
|
|
m_calib_results_history.clear();
|
|
sync_history_data();
|
|
|
|
float nozzle_value = get_nozzle_value();
|
|
if (nozzle_value > 0) {
|
|
CalibUtils::emit_get_PA_calib_infos(nozzle_value);
|
|
m_tips->SetLabel(_L("Refreshing the historical Flow Dynamics Calibration records"));
|
|
BOOST_LOG_TRIVIAL(info) << "request calib history";
|
|
}
|
|
}
|
|
}
|
|
|
|
void HistoryWindow::enbale_action_buttons(bool enable) {
|
|
auto childern = m_history_data_panel->GetChildren();
|
|
for (auto child : childern) {
|
|
auto button = dynamic_cast<Button*>(child);
|
|
if (button) {
|
|
button->Enable(enable);
|
|
}
|
|
}
|
|
}
|
|
|
|
void HistoryWindow::sync_history_data() {
|
|
Freeze();
|
|
m_history_data_panel->DestroyChildren();
|
|
m_history_data_panel->Enable();
|
|
wxGridBagSizer* gbSizer;
|
|
gbSizer = new wxGridBagSizer(FromDIP(0), FromDIP(50));
|
|
gbSizer->SetFlexibleDirection(wxBOTH);
|
|
gbSizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
|
|
|
|
m_history_data_panel->SetSizer(gbSizer, true);
|
|
|
|
auto title_name = new Label(m_history_data_panel, _L("Name"));
|
|
title_name->SetFont(Label::Head_14);
|
|
gbSizer->Add(title_name, { 0, 0 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
|
|
auto title_preset_name = new Label(m_history_data_panel, _L("Filament"));
|
|
title_preset_name->SetFont(Label::Head_14);
|
|
gbSizer->Add(title_preset_name, { 0, 1 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
|
|
auto title_k = new Label(m_history_data_panel, _L("Factor K"));
|
|
title_k->SetFont(Label::Head_14);
|
|
gbSizer->Add(title_k, { 0, 2 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
|
|
// Hide
|
|
//auto title_n = new Label(m_history_data_panel, wxID_ANY, _L("N"));
|
|
//title_n->SetFont(Label::Head_14);
|
|
//gbSizer->Add(title_n, { 0, 3 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
|
|
auto title_action = new Label(m_history_data_panel, _L("Action"));
|
|
title_action->SetFont(Label::Head_14);
|
|
gbSizer->Add(title_action, { 0, 3 }, { 1, 1 });
|
|
|
|
int i = 1;
|
|
for (auto& result : m_calib_results_history) {
|
|
auto name_value = new Label(m_history_data_panel, from_u8(result.name));
|
|
|
|
wxString preset_name = get_preset_name_by_filament_id(result.filament_id);
|
|
auto preset_name_value = new Label(m_history_data_panel, preset_name);
|
|
|
|
auto k_str = wxString::Format("%.3f", result.k_value);
|
|
auto n_str = wxString::Format("%.3f", result.n_coef);
|
|
auto k_value = new Label(m_history_data_panel, k_str);
|
|
auto n_value = new Label(m_history_data_panel, n_str);
|
|
n_value->Hide();
|
|
auto delete_button = new Button(m_history_data_panel, _L("Delete"));
|
|
delete_button->SetBackgroundColour(*wxWHITE);
|
|
delete_button->SetMinSize(wxSize(-1, FromDIP(24)));
|
|
delete_button->SetCornerRadius(FromDIP(12));
|
|
delete_button->Bind(wxEVT_BUTTON, [this, gbSizer, i, &result](auto& e) {
|
|
for (int j = 0; j < HISTORY_WINDOW_ITEMS_COUNT; j++) {
|
|
auto item = gbSizer->FindItemAtPosition({ i, j });
|
|
item->GetWindow()->Hide();
|
|
}
|
|
gbSizer->SetEmptyCellSize({ 0,0 });
|
|
m_history_data_panel->Layout();
|
|
m_history_data_panel->Fit();
|
|
CalibUtils::delete_PA_calib_result({ result.tray_id, result.cali_idx, result.nozzle_diameter, result.filament_id });
|
|
});
|
|
|
|
auto edit_button = new Button(m_history_data_panel, _L("Edit"));
|
|
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));
|
|
edit_button->SetBackgroundColour(*wxWHITE);
|
|
edit_button->SetBackgroundColor(btn_bg_green);
|
|
edit_button->SetBorderColor(wxColour(0, 150, 136));
|
|
edit_button->SetTextColor(wxColour("#FFFFFE"));
|
|
edit_button->SetMinSize(wxSize(-1, FromDIP(24)));
|
|
edit_button->SetCornerRadius(FromDIP(12));
|
|
edit_button->Bind(wxEVT_BUTTON, [this, result, k_value, name_value, edit_button](auto& e) {
|
|
PACalibResult result_buffer = result;
|
|
result_buffer.k_value = stof(k_value->GetLabel().ToStdString());
|
|
result_buffer.name = name_value->GetLabel().ToUTF8().data();
|
|
EditCalibrationHistoryDialog dlg(this, result_buffer);
|
|
if (dlg.ShowModal() == wxID_OK) {
|
|
auto new_result = dlg.get_result();
|
|
|
|
wxString new_k_str = wxString::Format("%.3f", new_result.k_value);
|
|
k_value->SetLabel(new_k_str);
|
|
name_value->SetLabel(from_u8(new_result.name));
|
|
|
|
new_result.tray_id = -1;
|
|
CalibUtils::set_PA_calib_result({ new_result }, true);
|
|
|
|
enbale_action_buttons(false);
|
|
}
|
|
});
|
|
|
|
gbSizer->Add(name_value, { i, 0 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
gbSizer->Add(preset_name_value, { i, 1 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
gbSizer->Add(k_value, { i, 2 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
//gbSizer->Add(n_value, { i, 3 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
gbSizer->Add(delete_button, { i, 3 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
gbSizer->Add(edit_button, { i, 4 }, { 1, 1 }, wxBOTTOM, FromDIP(15));
|
|
i++;
|
|
}
|
|
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
|
|
Layout();
|
|
Fit();
|
|
Thaw();
|
|
}
|
|
|
|
float HistoryWindow::get_nozzle_value()
|
|
{
|
|
double nozzle_value = 0.0;
|
|
wxString nozzle_value_str = m_comboBox_nozzle_dia->GetValue();
|
|
try {
|
|
nozzle_value_str.ToDouble(&nozzle_value);
|
|
}
|
|
catch (...) {
|
|
;
|
|
}
|
|
|
|
return nozzle_value;
|
|
}
|
|
|
|
void HistoryWindow::on_click_new_button(wxCommandEvent& event)
|
|
{
|
|
if (curr_obj && curr_obj->get_printer_series() == PrinterSeries::SERIES_P1P && m_calib_results_history.size() >= 16) {
|
|
MessageDialog msg_dlg(nullptr, wxString::Format(_L("This machine type can only hold %d history results per nozzle."), 16), wxEmptyString, wxICON_WARNING | wxOK);
|
|
msg_dlg.ShowModal();
|
|
return;
|
|
}
|
|
|
|
NewCalibrationHistoryDialog dlg(this, m_calib_results_history);
|
|
dlg.ShowModal();
|
|
}
|
|
|
|
EditCalibrationHistoryDialog::EditCalibrationHistoryDialog(wxWindow* parent, const PACalibResult& result)
|
|
: DPIDialog(parent, wxID_ANY, _L("Edit Flow Dynamics Calibration"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
|
|
, m_new_result(result)
|
|
{
|
|
this->SetBackgroundColour(*wxWHITE);
|
|
auto main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
|
|
auto top_panel = new wxPanel(this);
|
|
top_panel->SetBackgroundColour(*wxWHITE);
|
|
auto panel_sizer = new wxBoxSizer(wxVERTICAL);
|
|
top_panel->SetSizer(panel_sizer);
|
|
|
|
auto flex_sizer = new wxFlexGridSizer(0, 2, FromDIP(15), FromDIP(30));
|
|
flex_sizer->SetFlexibleDirection(wxBOTH);
|
|
flex_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
|
|
|
|
Label* name_title = new Label(top_panel, _L("Name"));
|
|
m_name_value = new TextInput(top_panel, from_u8(m_new_result.name), "", "", wxDefaultPosition, EDIT_HISTORY_DIALOG_INPUT_SIZE, wxTE_PROCESS_ENTER);
|
|
|
|
flex_sizer->Add(name_title);
|
|
flex_sizer->Add(m_name_value);
|
|
|
|
Label* preset_name_title = new Label(top_panel, _L("Filament"));
|
|
wxString preset_name = get_preset_name_by_filament_id(result.filament_id);
|
|
Label* preset_name_value = new Label(top_panel, preset_name);
|
|
flex_sizer->Add(preset_name_title);
|
|
flex_sizer->Add(preset_name_value);
|
|
|
|
Label* k_title = new Label(top_panel, _L("Factor K"));
|
|
auto k_str = wxString::Format("%.3f", m_new_result.k_value);
|
|
m_k_value = new TextInput(top_panel, k_str, "", "", wxDefaultPosition, EDIT_HISTORY_DIALOG_INPUT_SIZE, wxTE_PROCESS_ENTER);
|
|
flex_sizer->Add(k_title);
|
|
flex_sizer->Add(m_k_value);
|
|
|
|
// Hide:
|
|
//Label* n_title = new Label(top_panel, _L("Factor N"));
|
|
//TextInput* n_value = new TextInput(top_panel, n, "", "", wxDefaultPosition, EDIT_HISTORY_DIALOG_INPUT_SIZE, wxTE_PROCESS_ENTER);
|
|
//flex_sizer->Add(n_title);
|
|
//flex_sizer->Add(n_value);
|
|
|
|
panel_sizer->Add(flex_sizer);
|
|
|
|
panel_sizer->AddSpacer(FromDIP(25));
|
|
|
|
auto btn_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
Button* save_btn = new Button(top_panel, _L("Save"));
|
|
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));
|
|
save_btn->SetBackgroundColour(*wxWHITE);
|
|
save_btn->SetBackgroundColor(btn_bg_green);
|
|
save_btn->SetBorderColor(wxColour(0, 150, 136));
|
|
save_btn->SetTextColor(wxColour("#FFFFFE"));
|
|
save_btn->SetMinSize(wxSize(-1, FromDIP(24)));
|
|
save_btn->SetCornerRadius(FromDIP(12));
|
|
Button* cancel_btn = new Button(top_panel, _L("Cancel"));
|
|
cancel_btn->SetBackgroundColour(*wxWHITE);
|
|
cancel_btn->SetMinSize(wxSize(-1, FromDIP(24)));
|
|
cancel_btn->SetCornerRadius(FromDIP(12));
|
|
save_btn->Bind(wxEVT_BUTTON, &EditCalibrationHistoryDialog::on_save, this);
|
|
cancel_btn->Bind(wxEVT_BUTTON, &EditCalibrationHistoryDialog::on_cancel, this);
|
|
btn_sizer->AddStretchSpacer();
|
|
btn_sizer->Add(save_btn);
|
|
btn_sizer->AddSpacer(FromDIP(20));
|
|
btn_sizer->Add(cancel_btn);
|
|
panel_sizer->Add(btn_sizer, 0, wxEXPAND, 0);
|
|
|
|
|
|
main_sizer->Add(top_panel, 1, wxEXPAND | wxALL, FromDIP(20));
|
|
|
|
SetSizer(main_sizer);
|
|
Layout();
|
|
Fit();
|
|
CenterOnParent();
|
|
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
}
|
|
|
|
EditCalibrationHistoryDialog::~EditCalibrationHistoryDialog() {
|
|
}
|
|
|
|
PACalibResult EditCalibrationHistoryDialog::get_result() {
|
|
return m_new_result;
|
|
}
|
|
|
|
void EditCalibrationHistoryDialog::on_save(wxCommandEvent& event) {
|
|
wxString name = m_name_value->GetTextCtrl()->GetValue();
|
|
if (!CalibUtils::validate_input_name(name))
|
|
return;
|
|
|
|
m_new_result.name = m_name_value->GetTextCtrl()->GetValue().ToUTF8().data();
|
|
|
|
float k = 0.0f;
|
|
if (!CalibUtils::validate_input_k_value(m_k_value->GetTextCtrl()->GetValue(), &k)) {
|
|
MessageDialog msg_dlg(nullptr, _L(k_tips), wxEmptyString, wxICON_WARNING | wxOK);
|
|
msg_dlg.ShowModal();
|
|
return;
|
|
}
|
|
wxString k_str = wxString::Format("%.3f", k);
|
|
m_k_value->GetTextCtrl()->SetValue(k_str);
|
|
m_new_result.k_value = k;
|
|
|
|
|
|
EndModal(wxID_OK);
|
|
}
|
|
|
|
void EditCalibrationHistoryDialog::on_cancel(wxCommandEvent& event) {
|
|
EndModal(wxID_CANCEL);
|
|
}
|
|
|
|
void EditCalibrationHistoryDialog::on_dpi_changed(const wxRect& suggested_rect)
|
|
{
|
|
}
|
|
|
|
wxArrayString NewCalibrationHistoryDialog::get_all_filaments(const MachineObject *obj)
|
|
{
|
|
PresetBundle *preset_bundle = wxGetApp().preset_bundle;
|
|
|
|
wxArrayString filament_items;
|
|
std::set<std::string> filament_id_set;
|
|
std::set<std::string> printer_names;
|
|
std::ostringstream stream;
|
|
stream << std::fixed << std::setprecision(1) << obj->nozzle_diameter;
|
|
std::string nozzle_diameter_str = stream.str();
|
|
|
|
for (auto printer_it = preset_bundle->printers.begin(); printer_it != preset_bundle->printers.end(); printer_it++) {
|
|
// filter by system preset
|
|
if (!printer_it->is_system)
|
|
continue;
|
|
// get printer_model
|
|
ConfigOption * printer_model_opt = printer_it->config.option("printer_model");
|
|
ConfigOptionString *printer_model_str = dynamic_cast<ConfigOptionString *>(printer_model_opt);
|
|
if (!printer_model_str)
|
|
continue;
|
|
|
|
// use printer_model as printer type
|
|
if (printer_model_str->value != MachineObject::get_preset_printer_model_name(obj->printer_type))
|
|
continue;
|
|
|
|
if (printer_it->name.find(nozzle_diameter_str) != std::string::npos)
|
|
printer_names.insert(printer_it->name);
|
|
}
|
|
|
|
if (preset_bundle) {
|
|
BOOST_LOG_TRIVIAL(trace) << "system_preset_bundle filament number=" << preset_bundle->filaments.size();
|
|
for (auto filament_it = preset_bundle->filaments.begin(); filament_it != preset_bundle->filaments.end(); filament_it++) {
|
|
// filter by system preset
|
|
Preset &preset = *filament_it;
|
|
/*The situation where the user preset is not displayed is as follows:
|
|
1. Not a root preset
|
|
2. Not system preset and the printer firmware does not support user preset */
|
|
if (preset_bundle->filaments.get_preset_base(*filament_it) != &preset || (!filament_it->is_system && ! obj->is_support_user_preset)) { continue; }
|
|
|
|
ConfigOption * printer_opt = filament_it->config.option("compatible_printers");
|
|
ConfigOptionStrings *printer_strs = dynamic_cast<ConfigOptionStrings *>(printer_opt);
|
|
for (auto printer_str : printer_strs->values) {
|
|
if (printer_names.find(printer_str) != printer_names.end()) {
|
|
if (filament_id_set.find(filament_it->filament_id) != filament_id_set.end()) {
|
|
continue;
|
|
} else {
|
|
filament_id_set.insert(filament_it->filament_id);
|
|
// name matched
|
|
if (filament_it->is_system) {
|
|
filament_items.push_back(filament_it->alias);
|
|
FilamentInfos filament_infos;
|
|
filament_infos.filament_id = filament_it->filament_id;
|
|
filament_infos.setting_id = filament_it->setting_id;
|
|
map_filament_items[filament_it->alias] = filament_infos;
|
|
} else {
|
|
char target = '@';
|
|
size_t pos = filament_it->name.find(target);
|
|
if (pos != std::string::npos) {
|
|
std::string user_preset_alias = filament_it->name.substr(0, pos - 1);
|
|
wxString wx_user_preset_alias = wxString(user_preset_alias.c_str(), wxConvUTF8);
|
|
user_preset_alias = wx_user_preset_alias.ToStdString();
|
|
|
|
filament_items.push_back(user_preset_alias);
|
|
FilamentInfos filament_infos;
|
|
filament_infos.filament_id = filament_it->filament_id;
|
|
filament_infos.setting_id = filament_it->setting_id;
|
|
map_filament_items[user_preset_alias] = filament_infos;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return filament_items;
|
|
}
|
|
|
|
NewCalibrationHistoryDialog::NewCalibrationHistoryDialog(wxWindow *parent, const std::vector<PACalibResult> history_results)
|
|
: DPIDialog(parent, wxID_ANY, _L("New Flow Dynamic Calibration"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
|
|
, m_history_results(history_results)
|
|
{
|
|
Slic3r::DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
|
if (!dev)
|
|
return;
|
|
MachineObject *obj = dev->get_selected_machine();
|
|
if (!obj)
|
|
return;
|
|
|
|
curr_obj = obj;
|
|
|
|
this->SetBackgroundColour(*wxWHITE);
|
|
auto main_sizer = new wxBoxSizer(wxVERTICAL);
|
|
|
|
auto top_panel = new wxPanel(this);
|
|
top_panel->SetBackgroundColour(*wxWHITE);
|
|
auto panel_sizer = new wxBoxSizer(wxVERTICAL);
|
|
top_panel->SetSizer(panel_sizer);
|
|
|
|
auto flex_sizer = new wxFlexGridSizer(0, 2, FromDIP(15), FromDIP(30));
|
|
flex_sizer->SetFlexibleDirection(wxBOTH);
|
|
flex_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
|
|
|
|
Label *name_title = new Label(top_panel, _L("Name"));
|
|
m_name_value = new TextInput(top_panel, "", "", "", wxDefaultPosition, NEW_HISTORY_DIALOG_INPUT_SIZE, wxTE_PROCESS_ENTER);
|
|
|
|
// Name
|
|
flex_sizer->Add(name_title);
|
|
flex_sizer->Add(m_name_value);
|
|
|
|
Label * preset_name_title = new Label(top_panel, _L("Filament"));
|
|
m_comboBox_filament = new ::ComboBox(top_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, NEW_HISTORY_DIALOG_INPUT_SIZE, 0, nullptr, wxCB_READONLY);
|
|
|
|
wxArrayString filament_items = get_all_filaments(obj);
|
|
m_comboBox_filament->Set(filament_items);
|
|
m_comboBox_filament->SetSelection(-1);
|
|
|
|
// Filament
|
|
flex_sizer->Add(preset_name_title);
|
|
flex_sizer->Add(m_comboBox_filament);
|
|
|
|
Label *nozzle_diameter_title = new Label(top_panel, _L("Nozzle Diameter"));
|
|
m_comboBox_nozzle_diameter = new ::ComboBox(top_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, NEW_HISTORY_DIALOG_INPUT_SIZE, 0, nullptr, wxCB_READONLY);
|
|
static std::array<float, 4> nozzle_diameter_list = {0.2f, 0.4f, 0.6f, 0.8f};
|
|
for (int i = 0; i < nozzle_diameter_list.size(); i++) {
|
|
m_comboBox_nozzle_diameter->AppendString(wxString::Format("%1.1f mm", nozzle_diameter_list[i]));
|
|
if (abs(obj->nozzle_diameter - nozzle_diameter_list[i]) < 1e-3) {
|
|
m_comboBox_nozzle_diameter->SetSelection(i);
|
|
}
|
|
}
|
|
|
|
// Nozzle Diameter
|
|
flex_sizer->Add(nozzle_diameter_title);
|
|
flex_sizer->Add(m_comboBox_nozzle_diameter);
|
|
|
|
Label *k_title = new Label(top_panel, _L("Factor K"));
|
|
auto k_str = wxString::Format("%.3f", m_new_result.k_value);
|
|
m_k_value = new TextInput(top_panel, k_str, "", "", wxDefaultPosition, NEW_HISTORY_DIALOG_INPUT_SIZE, wxTE_PROCESS_ENTER);
|
|
|
|
// Factor K
|
|
flex_sizer->Add(k_title);
|
|
flex_sizer->Add(m_k_value);
|
|
|
|
panel_sizer->Add(flex_sizer);
|
|
|
|
panel_sizer->AddSpacer(FromDIP(25));
|
|
|
|
auto btn_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
Button * ok_btn = new Button(top_panel, _L("Ok"));
|
|
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));
|
|
ok_btn->SetBackgroundColour(*wxWHITE);
|
|
ok_btn->SetBackgroundColor(btn_bg_green);
|
|
ok_btn->SetBorderColor(wxColour(0, 150, 136));
|
|
ok_btn->SetTextColor(wxColour("#FFFFFE"));
|
|
ok_btn->SetMinSize(wxSize(-1, FromDIP(24)));
|
|
ok_btn->SetCornerRadius(FromDIP(12));
|
|
Button *cancel_btn = new Button(top_panel, _L("Cancel"));
|
|
cancel_btn->SetBackgroundColour(*wxWHITE);
|
|
cancel_btn->SetMinSize(wxSize(-1, FromDIP(24)));
|
|
cancel_btn->SetCornerRadius(FromDIP(12));
|
|
ok_btn->Bind(wxEVT_BUTTON, &NewCalibrationHistoryDialog::on_ok, this);
|
|
cancel_btn->Bind(wxEVT_BUTTON, &NewCalibrationHistoryDialog::on_cancel, this);
|
|
btn_sizer->AddStretchSpacer();
|
|
btn_sizer->Add(ok_btn);
|
|
btn_sizer->AddSpacer(FromDIP(20));
|
|
btn_sizer->Add(cancel_btn);
|
|
panel_sizer->Add(btn_sizer, 0, wxEXPAND, 0);
|
|
|
|
main_sizer->Add(top_panel, 1, wxEXPAND | wxALL, FromDIP(20));
|
|
|
|
SetSizer(main_sizer);
|
|
Layout();
|
|
Fit();
|
|
CenterOnParent();
|
|
|
|
wxGetApp().UpdateDlgDarkUI(this);
|
|
}
|
|
|
|
void NewCalibrationHistoryDialog::on_ok(wxCommandEvent &event)
|
|
{
|
|
wxString name = m_name_value->GetTextCtrl()->GetValue();
|
|
if (!CalibUtils::validate_input_name(name))
|
|
return;
|
|
|
|
float k = 0.0f;
|
|
if (!CalibUtils::validate_input_k_value(m_k_value->GetTextCtrl()->GetValue(), &k)) {
|
|
MessageDialog msg_dlg(nullptr, _L(k_tips), wxEmptyString, wxICON_WARNING | wxOK);
|
|
msg_dlg.ShowModal();
|
|
return;
|
|
}
|
|
wxString k_str = wxString::Format("%.3f", k);
|
|
m_k_value->GetTextCtrl()->SetValue(k_str);
|
|
|
|
double nozzle_value = 0.0;
|
|
wxString nozzle_value_str = m_comboBox_nozzle_diameter->GetValue();
|
|
nozzle_value_str.ToDouble(&nozzle_value);
|
|
|
|
std::string filament_name = m_comboBox_filament->GetValue().ToStdString();
|
|
if (filament_name.empty()) {
|
|
MessageDialog msg_dlg(nullptr, _L("The filament must be selected."), wxEmptyString, wxICON_WARNING | wxOK);
|
|
msg_dlg.ShowModal();
|
|
return;
|
|
}
|
|
|
|
auto filament_item = map_filament_items[m_comboBox_filament->GetValue().ToStdString()];
|
|
std::string filament_id = filament_item.filament_id;
|
|
std::string setting_id = filament_item.setting_id;
|
|
|
|
m_new_result.name = name.ToUTF8().data();
|
|
m_new_result.k_value = k;
|
|
m_new_result.tray_id = -1;
|
|
m_new_result.cali_idx = -1;
|
|
|
|
m_new_result.nozzle_diameter = nozzle_value;
|
|
m_new_result.filament_id = filament_id;
|
|
m_new_result.setting_id = setting_id;
|
|
|
|
// Check for duplicate names from history
|
|
{
|
|
auto iter = std::find_if(m_history_results.begin(), m_history_results.end(), [this](const PACalibResult &item) {
|
|
return item.name == m_new_result.name && item.filament_id == m_new_result.filament_id;
|
|
});
|
|
|
|
if (iter != m_history_results.end()) {
|
|
MessageDialog msg_dlg(nullptr,
|
|
wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
|
|
"is saved. Are you sure you want to override the historical result?"),
|
|
m_new_result.name),
|
|
wxEmptyString, wxICON_WARNING | wxYES_NO);
|
|
if (msg_dlg.ShowModal() != wxID_YES)
|
|
return;
|
|
}
|
|
}
|
|
|
|
CalibUtils::set_PA_calib_result({m_new_result}, true);
|
|
|
|
EndModal(wxID_OK);
|
|
}
|
|
|
|
void NewCalibrationHistoryDialog::on_cancel(wxCommandEvent &event)
|
|
{
|
|
EndModal(wxID_CANCEL);
|
|
}
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|