mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-22 22:24:01 -06: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 32b6fd199a
.
* 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>
505 lines
No EOL
20 KiB
C++
505 lines
No EOL
20 KiB
C++
#include "CalibrationWizardCaliPage.hpp"
|
|
#include "MainFrame.hpp"
|
|
#include "I18N.hpp"
|
|
#include "Widgets/Label.hpp"
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
static const wxString NA_STR = _L("N/A");
|
|
|
|
|
|
CalibrationCaliPage::CalibrationCaliPage(wxWindow* parent, CalibMode cali_mode, CaliPageType cali_type,
|
|
wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
|
|
: CalibrationWizardPage(parent, id, pos, size, style)
|
|
{
|
|
m_cali_mode = cali_mode;
|
|
|
|
m_page_type = cali_type;
|
|
|
|
m_top_sizer = new wxBoxSizer(wxVERTICAL);
|
|
|
|
create_page(this);
|
|
|
|
this->SetSizer(m_top_sizer);
|
|
Layout();
|
|
m_top_sizer->Fit(this);
|
|
}
|
|
|
|
CalibrationCaliPage::~CalibrationCaliPage()
|
|
{
|
|
m_printing_panel->get_pause_resume_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_pause_resume), NULL, this);
|
|
m_printing_panel->get_abort_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_abort), NULL, this);
|
|
}
|
|
|
|
void CalibrationCaliPage::create_page(wxWindow* parent)
|
|
{
|
|
m_page_caption = new CaliPageCaption(parent, m_cali_mode);
|
|
m_page_caption->show_prev_btn(true);
|
|
m_top_sizer->Add(m_page_caption, 0, wxEXPAND, 0);
|
|
|
|
wxArrayString steps;
|
|
steps.Add(_L("Preset"));
|
|
steps.Add(_L("Calibration"));
|
|
steps.Add(_L("Record Factor"));
|
|
m_step_panel = new CaliPageStepGuide(parent, steps);
|
|
m_step_panel->set_steps(1);
|
|
m_top_sizer->Add(m_step_panel, 0, wxEXPAND, 0);
|
|
|
|
m_picture_panel = new CaliPagePicture(parent);
|
|
m_top_sizer->Add(m_picture_panel, 0, wxEXPAND, 0);
|
|
m_top_sizer->AddSpacer(FromDIP(20));
|
|
|
|
set_cali_img();
|
|
|
|
m_printing_panel = new PrintingTaskPanel(parent, PrintingTaskType::CALIBRATION);
|
|
m_printing_panel->SetDoubleBuffered(true);
|
|
m_printing_panel->SetSize({ CALIBRATION_PROGRESSBAR_LENGTH, -1 });
|
|
m_printing_panel->SetMinSize({ CALIBRATION_PROGRESSBAR_LENGTH, -1 });
|
|
m_printing_panel->enable_pause_resume_button(false, "resume_disable");
|
|
m_printing_panel->enable_abort_button(false);
|
|
|
|
m_top_sizer->Add(m_printing_panel, 0, wxALIGN_CENTER, 0);
|
|
m_action_panel = new CaliPageActionPanel(parent, m_cali_mode, CaliPageType::CALI_PAGE_CALI);
|
|
m_top_sizer->Add(m_action_panel, 0, wxEXPAND, 0);
|
|
|
|
m_printing_panel->get_pause_resume_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_pause_resume), NULL, this);
|
|
m_printing_panel->get_abort_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_abort), NULL, this);
|
|
}
|
|
|
|
void CalibrationCaliPage::on_subtask_pause_resume(wxCommandEvent& event)
|
|
{
|
|
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
|
if (!dev) return;
|
|
MachineObject* obj = dev->get_selected_machine();
|
|
if (!obj) return;
|
|
|
|
if (obj->can_resume())
|
|
obj->command_task_resume();
|
|
else
|
|
obj->command_task_pause();
|
|
}
|
|
|
|
void CalibrationCaliPage::on_subtask_abort(wxCommandEvent& event)
|
|
{
|
|
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
|
if (!dev) return;
|
|
MachineObject* obj = dev->get_selected_machine();
|
|
if (!obj) return;
|
|
|
|
if (abort_dlg == nullptr) {
|
|
abort_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Cancel print"));
|
|
abort_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this, obj](wxCommandEvent& e) {
|
|
if (obj) obj->command_task_abort();
|
|
});
|
|
}
|
|
abort_dlg->update_text(_L("Are you sure you want to cancel this print?"));
|
|
abort_dlg->on_show();
|
|
}
|
|
|
|
void CalibrationCaliPage::set_cali_img()
|
|
{
|
|
if (m_cali_mode == CalibMode::Calib_PA_Line) {
|
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_manual", 400));
|
|
}
|
|
else if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_auto", 400));
|
|
}
|
|
}
|
|
else if (m_cali_mode == CalibMode::Calib_Flow_Rate) {
|
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
|
if (m_page_type == CaliPageType::CALI_PAGE_CALI)
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "flow_rate_calibration_coarse", 400));
|
|
if (m_page_type == CaliPageType::CALI_PAGE_FINE_CALI)
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "flow_rate_calibration_fine", 400));
|
|
else
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "flow_rate_calibration_coarse", 400));
|
|
}
|
|
else if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "flow_rate_calibration_auto", 400));
|
|
}
|
|
}
|
|
else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) {
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "max_volumetric_speed_calibration", 400));
|
|
}
|
|
}
|
|
|
|
void CalibrationCaliPage::set_pa_cali_image(int stage)
|
|
{
|
|
if (m_cali_mode == CalibMode::Calib_PA_Line && m_cali_method == CALI_METHOD_MANUAL) {
|
|
if (stage == 0) {
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_calibration_manual", 400));
|
|
} else if (stage == 1) {
|
|
m_picture_panel->set_bmp(ScalableBitmap(this, "fd_pattern_manual", 400));
|
|
}
|
|
}
|
|
}
|
|
|
|
void CalibrationCaliPage::clear_last_job_status()
|
|
{
|
|
m_is_between_start_and_running = true;
|
|
}
|
|
|
|
void CalibrationCaliPage::update(MachineObject* obj)
|
|
{
|
|
if (this->IsShown()) {
|
|
if (obj) {
|
|
if (obj->print_status != "RUNNING") {
|
|
BOOST_LOG_TRIVIAL(info) << "on_show_cali_page - machine object status:"
|
|
<< " dev_id = " << obj->dev_id
|
|
<< ", print_type = " << obj->printer_type
|
|
<< ", printer_status = " << obj->print_status
|
|
<< ", is_connected = " << obj->is_connected()
|
|
<< ", m_is_between_start_and_running = " << m_is_between_start_and_running
|
|
<< ", cali_finished = " << obj->cali_finished
|
|
<< ", cali_version = " << obj->cali_version
|
|
<< ", cache_flow_ratio = " << obj->cache_flow_ratio
|
|
<< ", sub_task_name = " << obj->subtask_name
|
|
<< ", gcode_file_name = " << obj->m_gcode_file
|
|
<< ", get_pa_calib_result" << obj->get_pa_calib_result
|
|
<< ", get_flow_calib_result" << obj->get_flow_calib_result;
|
|
}
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(info) << "on_show_cali_page - machine object is nullptr";
|
|
}
|
|
}
|
|
|
|
static int get_result_count = 0;
|
|
// enable calibration when finished
|
|
bool enable_cali = false;
|
|
if (obj) {
|
|
if (obj->print_error > 0) {
|
|
StatusPanel* status_panel = Slic3r::GUI::wxGetApp().mainframe->m_monitor->get_status_panel();
|
|
status_panel->obj = obj;
|
|
status_panel->update_error_message();
|
|
}
|
|
|
|
if (obj->print_status == "RUNNING")
|
|
m_is_between_start_and_running = false;
|
|
if (obj->is_connecting() || !obj->is_connected() || m_is_between_start_and_running) {
|
|
reset_printing_values();
|
|
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, false);
|
|
return;
|
|
}
|
|
|
|
if (m_cali_mode == CalibMode::Calib_PA_Line) {
|
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
|
if (get_obj_calibration_mode(obj) == m_cali_mode) {
|
|
if (obj->is_printing_finished()) {
|
|
if (obj->print_status == "FINISH") {
|
|
if (obj->get_pa_calib_result) {
|
|
enable_cali = true;
|
|
}
|
|
else {
|
|
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
|
CalibUtils::emit_get_PA_calib_results(get_selected_calibration_nozzle_dia(obj));
|
|
BOOST_LOG_TRIVIAL(trace) << "CalibUtils::emit_get_PA_calib_results, auto count = " << get_result_count++;
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
else if (obj->print_status == "FAILED") {
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
else {
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
} else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
|
if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) {
|
|
enable_cali = true;
|
|
} else {
|
|
enable_cali = false;
|
|
}
|
|
} else {
|
|
assert(false);
|
|
}
|
|
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, enable_cali);
|
|
} else if (m_cali_mode == CalibMode::Calib_Flow_Rate) {
|
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
|
if (get_obj_calibration_mode(obj) == m_cali_mode) {
|
|
if (obj->is_printing_finished()) {
|
|
if (obj->print_status == "FINISH") {
|
|
if (obj->get_flow_calib_result) {
|
|
enable_cali = true;
|
|
}
|
|
else {
|
|
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
|
CalibUtils::emit_get_flow_ratio_calib_results(get_selected_calibration_nozzle_dia(obj));
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
else if (obj->print_status == "FAILED") {
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
else {
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
} else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
|
if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) {
|
|
// use selected diameter, add a counter to timeout, add a warning tips when get result failed
|
|
CalibUtils::emit_get_flow_ratio_calib_results(get_selected_calibration_nozzle_dia(obj));
|
|
enable_cali = true;
|
|
}
|
|
else {
|
|
enable_cali = false;
|
|
}
|
|
} else {
|
|
assert(false);
|
|
}
|
|
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, enable_cali);
|
|
}
|
|
else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) {
|
|
if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) {
|
|
enable_cali = true;
|
|
} else {
|
|
enable_cali = false;
|
|
}
|
|
}
|
|
else {
|
|
assert(false);
|
|
}
|
|
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_NEXT, enable_cali);
|
|
}
|
|
|
|
// only display calibration printing status
|
|
if (get_obj_calibration_mode(obj) == m_cali_mode) {
|
|
update_subtask(obj);
|
|
} else {
|
|
update_subtask(nullptr);
|
|
}
|
|
}
|
|
|
|
void CalibrationCaliPage::update_subtask(MachineObject* obj)
|
|
{
|
|
if (!obj) return;
|
|
|
|
if (obj->is_support_layer_num) {
|
|
m_printing_panel->update_layers_num(true);
|
|
}
|
|
else {
|
|
m_printing_panel->update_layers_num(false);
|
|
}
|
|
|
|
if (obj->is_system_printing()
|
|
|| obj->is_in_calibration()) {
|
|
reset_printing_values();
|
|
}
|
|
else if (obj->is_in_printing() || obj->print_status == "FINISH") {
|
|
if (obj->is_in_prepare() || obj->print_status == "SLICING") {
|
|
m_printing_panel->get_market_scoring_button()->Hide();
|
|
m_printing_panel->enable_abort_button(false);
|
|
m_printing_panel->enable_pause_resume_button(false, "pause_disable");
|
|
wxString prepare_text;
|
|
bool show_percent = true;
|
|
|
|
if (obj->is_in_prepare()) {
|
|
prepare_text = wxString::Format(_L("Downloading..."));
|
|
}
|
|
else if (obj->print_status == "SLICING") {
|
|
if (obj->queue_number <= 0) {
|
|
prepare_text = wxString::Format(_L("Cloud Slicing..."));
|
|
}
|
|
else {
|
|
prepare_text = wxString::Format(_L("In Cloud Slicing Queue, there are %s tasks ahead."), std::to_string(obj->queue_number));
|
|
show_percent = false;
|
|
}
|
|
}
|
|
else
|
|
prepare_text = wxString::Format(_L("Downloading..."));
|
|
|
|
if (obj->gcode_file_prepare_percent >= 0 && obj->gcode_file_prepare_percent <= 100 && show_percent)
|
|
prepare_text += wxString::Format("(%d%%)", obj->gcode_file_prepare_percent);
|
|
|
|
m_printing_panel->update_stage_value(prepare_text, 0);
|
|
m_printing_panel->update_progress_percent(NA_STR, wxEmptyString);
|
|
m_printing_panel->update_left_time(NA_STR);
|
|
m_printing_panel->update_layers_num(true, wxString::Format(_L("Layer: %s"), NA_STR));
|
|
m_printing_panel->update_subtask_name(wxString::Format("%s", GUI::from_u8(obj->subtask_name)));
|
|
|
|
|
|
if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
|
|
m_printing_panel->show_profile_info(true, wxString::FromUTF8(obj->get_modeltask()->profile_name));
|
|
}
|
|
else {
|
|
m_printing_panel->show_profile_info(false);
|
|
}
|
|
|
|
if (obj->slice_info)
|
|
update_basic_print_data(false, obj->slice_info->weight, obj->slice_info->prediction);
|
|
}
|
|
else {
|
|
if (obj->can_resume()) {
|
|
m_printing_panel->enable_pause_resume_button(true, "resume");
|
|
|
|
}
|
|
else {
|
|
m_printing_panel->enable_pause_resume_button(true, "pause");
|
|
}
|
|
if (obj->print_status == "FINISH") {
|
|
|
|
m_printing_panel->enable_abort_button(false);
|
|
m_printing_panel->enable_pause_resume_button(false, "resume_disable");
|
|
|
|
bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0;
|
|
if (is_market_task) {
|
|
m_printing_panel->get_market_scoring_button()->Show();
|
|
BOOST_LOG_TRIVIAL(info) << "SHOW_SCORE_BTU: design_id [" << obj->get_modeltask()->design_id << "] print_finish [" << m_print_finish << "]";
|
|
if (!m_print_finish && IsShownOnScreen()) {
|
|
m_print_finish = true;
|
|
}
|
|
}
|
|
else {
|
|
m_printing_panel->get_market_scoring_button()->Hide();
|
|
}
|
|
}
|
|
else {
|
|
m_printing_panel->enable_abort_button(true);
|
|
m_printing_panel->get_market_scoring_button()->Hide();
|
|
if (m_print_finish) {
|
|
m_print_finish = false;
|
|
}
|
|
}
|
|
// update printing stage
|
|
|
|
m_printing_panel->update_left_time(obj->mc_left_time);
|
|
if (obj->subtask_) {
|
|
m_printing_panel->update_stage_value(obj->get_curr_stage(), obj->subtask_->task_progress);
|
|
m_printing_panel->update_progress_percent(wxString::Format("%d", obj->subtask_->task_progress), "%");
|
|
m_printing_panel->update_layers_num(true, wxString::Format(_L("Layer: %d/%d"), obj->curr_layer, obj->total_layers));
|
|
|
|
}
|
|
else {
|
|
m_printing_panel->update_stage_value(obj->get_curr_stage(), 0);
|
|
m_printing_panel->update_progress_percent(NA_STR, wxEmptyString);
|
|
m_printing_panel->update_layers_num(true, wxString::Format(_L("Layer: %s"), NA_STR));
|
|
}
|
|
}
|
|
|
|
m_printing_panel->update_subtask_name(wxString::Format("%s", GUI::from_u8(obj->subtask_name)));
|
|
|
|
if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
|
|
m_printing_panel->show_profile_info(wxString::FromUTF8(obj->get_modeltask()->profile_name));
|
|
}
|
|
else {
|
|
m_printing_panel->show_profile_info(false);
|
|
}
|
|
|
|
}
|
|
else {
|
|
reset_printing_values();
|
|
}
|
|
|
|
this->Layout();
|
|
this->Fit();
|
|
}
|
|
|
|
void CalibrationCaliPage::update_basic_print_data(bool def, float weight, int prediction)
|
|
{
|
|
if (def) {
|
|
wxString str_prediction = wxString::Format("%s", get_bbl_time_dhms(prediction));
|
|
wxString str_weight = wxString::Format("%.2fg", weight);
|
|
|
|
m_printing_panel->show_priting_use_info(true, str_prediction, str_weight);
|
|
}
|
|
else {
|
|
m_printing_panel->show_priting_use_info(false, "0m", "0g");
|
|
}
|
|
}
|
|
|
|
void CalibrationCaliPage::reset_printing_values()
|
|
{
|
|
m_printing_panel->enable_pause_resume_button(false, "pause_disable");
|
|
m_printing_panel->enable_abort_button(false);
|
|
m_printing_panel->reset_printing_value();
|
|
m_printing_panel->update_subtask_name(NA_STR);
|
|
m_printing_panel->show_profile_info(false);
|
|
m_printing_panel->update_stage_value(wxEmptyString, 0);
|
|
m_printing_panel->update_progress_percent(NA_STR, wxEmptyString);
|
|
m_printing_panel->get_market_scoring_button()->Hide();
|
|
m_printing_panel->update_left_time(NA_STR);
|
|
m_printing_panel->update_layers_num(true, wxString::Format(_L("Layer: %s"), NA_STR));
|
|
update_basic_print_data(false);
|
|
this->Layout();
|
|
this->Fit();
|
|
}
|
|
|
|
void CalibrationCaliPage::on_device_connected(MachineObject* obj)
|
|
{
|
|
reset_printing_values();
|
|
}
|
|
|
|
void CalibrationCaliPage::set_cali_method(CalibrationMethod method)
|
|
{
|
|
m_cali_method = method;
|
|
|
|
set_cali_img();
|
|
|
|
wxArrayString auto_steps;
|
|
auto_steps.Add(_L("Preset"));
|
|
auto_steps.Add(_L("Calibration"));
|
|
auto_steps.Add(_L("Record Factor"));
|
|
|
|
wxArrayString manual_steps;
|
|
manual_steps.Add(_L("Preset"));
|
|
manual_steps.Add(_L("Calibration1"));
|
|
manual_steps.Add(_L("Calibration2"));
|
|
manual_steps.Add(_L("Record Factor"));
|
|
|
|
if (method == CalibrationMethod::CALI_METHOD_AUTO) {
|
|
m_step_panel->set_steps_string(auto_steps);
|
|
m_step_panel->set_steps(1);
|
|
}
|
|
else if (method == CalibrationMethod::CALI_METHOD_MANUAL) {
|
|
if (m_cali_mode == CalibMode::Calib_PA_Line) {
|
|
m_step_panel->set_steps_string(auto_steps);
|
|
m_step_panel->set_steps(1);
|
|
} else {
|
|
m_step_panel->set_steps_string(manual_steps);
|
|
if (m_page_type == CaliPageType::CALI_PAGE_CALI)
|
|
m_step_panel->set_steps(1);
|
|
else if (m_page_type == CaliPageType::CALI_PAGE_FINE_CALI) {
|
|
m_step_panel->set_steps(2);
|
|
}
|
|
else {
|
|
m_step_panel->set_steps(1);
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
assert(false);
|
|
}
|
|
}
|
|
|
|
bool CalibrationCaliPage::Show(bool show /*= true*/)
|
|
{
|
|
if (true) {
|
|
reset_printing_values();
|
|
}
|
|
return wxPanel::Show(show);
|
|
}
|
|
|
|
void CalibrationCaliPage::msw_rescale()
|
|
{
|
|
CalibrationWizardPage::msw_rescale();
|
|
m_picture_panel->msw_rescale();
|
|
}
|
|
|
|
float CalibrationCaliPage::get_selected_calibration_nozzle_dia(MachineObject* obj)
|
|
{
|
|
// return selected if this is set
|
|
if (obj->cali_selected_nozzle_dia > 1e-3 && obj->cali_selected_nozzle_dia < 10.0f)
|
|
return obj->cali_selected_nozzle_dia;
|
|
|
|
// return default nozzle if nozzle diameter is set
|
|
if (obj->nozzle_diameter > 1e-3 && obj->nozzle_diameter < 10.0f)
|
|
return obj->nozzle_diameter;
|
|
|
|
// return 0.4 by default
|
|
return 0.4;
|
|
}
|
|
|
|
}} |