Various improvements to SimplyPrint integration #4831

Noisyfox · 2024-04-01T09:49:59Z

For BBL printers, an new option has been added under the printer settings to allow using BBL's original device monitor instead of the SimplyPrint panel for device tab
Allow opening SimplyPrint panel from device tab after uploading
Add back options to export 3mf files for BBL printers
For BBL printers, now you can upload 3mf file with multiple plates at once:
Fix issue that one cannot login to SimplyPrint in device tab if API key is set
Fix issue that the default PrusaConnect host url is not properly set
Allow uploading files larger than 100MB

src/libslic3r/Preset.cpp

# Conflicts: # src/slic3r/GUI/BackgroundSlicingProcess.cpp

… make it a derived option of `print_host_webui` instead.

# Conflicts: # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/Plater.cpp

SoftFever · 2024-05-28T14:54:11Z

@Noisyfox
What's the status of this PR?

# Conflicts: # src/slic3r/GUI/Plater.cpp

Noisyfox · 2024-06-18T13:09:55Z

SoftFever

LGTM
Thanks

oddlama · 2024-07-02T14:27:17Z

Unfortunately this commit breaks building from source for me, reverting it (and "Fix-PrusaLink-upload-when-PUT-is-used-5843") fixes the issue:

[ 92%] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FixModelByWin10.cpp.o
In file included from /build/source/src/slic3r/GUI/Monitor.hpp:51:
/build/source/src/slic3r/GUI/SelectMachine.hpp: At global scope:
/build/source/src/slic3r/GUI/SelectMachine.hpp:67: warning: 'int Slic3r::GUI::get_brightness_value(wxImage)' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-function-Wunused-function8;;]
   67 | static int get_brightness_value(wxImage image) {
      | 
In file included from /build/source/src/slic3r/GUI/AmsMappingPopup.hpp:26:
/build/source/src/slic3r/GUI/GUI_Utils.hpp:43: warning: 'Slic3r::ColorRGBA Slic3r::GUI::decode_color_to_float_array(std::string)' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-function-Wunused-function8;;]
   43 | static ColorRGBA decode_color_to_float_array(const std::string color)
      | 
In file included from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/shared_ptr_base.h:59,
                 from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/shared_ptr.h:53,
                 from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/condition_variable:45,
                 from /build/source/src/slic3r/pchheader.hpp:25,
                 from /build/source/build/src/slic3r/CMakeFiles/libslic3r_gui.dir/cmake_pch.hxx:5,
                 from <command-line>:
/nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/unique_ptr.h: In instantiation of 'std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = Slic3r::form_file; _Args = {Slic3r::form_file}; __detail::__unique_ptr_t<_Tp> = __detail::__unique_ptr_t<Slic3r::form_file>]':
/build/source/src/slic3r/Utils/Http.cpp:384:0:   required from here
/nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/unique_ptr.h:1070:30: error: use of deleted function 'Slic3r::form_file::form_file(Slic3r::form_file&&)'
 1070 |     { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); }
      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/build/source/src/slic3r/Utils/Http.cpp:89: note: 'Slic3r::form_file::form_file(Slic3r::form_file&&)' is implicitly deleted because the default definition would be ill-formed:
   89 | struct form_file
      | 
/build/source/src/slic3r/Utils/Http.cpp:89: error: use of deleted function 'boost::filesystem::basic_ifstream<charT, traits>::basic_ifstream(const boost::filesystem::basic_ifstream<charT, traits>&) [with charT = char; traits = std::char_traits<char>]'
In file included from include/boost/config.hpp:61,
                 from include/boost/algorithm/clamp.hpp:26,
                 from /build/source/src/slic3r/pchheader.hpp:59:
include/boost/filesystem/fstream.hpp:98:5: note: declared here
In file included from /build/source/src/slic3r/GUI/AmsMappingPopup.hpp:26:
/build/source/src/slic3r/GUI/GUI_Utils.hpp: At global scope:
/build/source/src/slic3r/GUI/GUI_Utils.hpp:43: warning: 'Slic3r::ColorRGBA Slic3r::GUI::decode_color_to_float_array(std::string)' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-function-Wunused-function8;;]
   43 | static ColorRGBA decode_color_to_float_array(const std::string color)
      | 
In file included from /build/source/src/libslic3r/GCode.hpp:26,
                 from /build/source/src/libslic3r/calib.hpp:5,
                 from /build/source/src/libslic3r/AppConfig.hpp:12,
                 from /build/source/src/libslic3r/PresetBundle.hpp:5,
                 from /build/source/src/slic3r/GUI/GUI_App.hpp:17,
                 from /build/source/src/slic3r/GUI/MultiTaskManagerPage.hpp:4,
                 from /build/source/src/slic3r/GUI/MultiTaskManagerPage.cpp:1:
/build/source/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp:12: warning: 'Slic3r::SmallAreaInfillFlowCompensator' has a field 'std::unique_ptr<{anonymous}::tk::spline> Slic3r::SmallAreaInfillFlowCompensator::flowModel' whose type has internal linkage [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wsubobject-linkage-Wsubobject-linkage8;;]
   12 | class SmallAreaInfillFlowCompensator
      | 
[ 92%] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/EmbossStyleManager.cpp.o
[ 93%] Building CXX object src/slic3r/CMakeFiles/libslic3r_gui.dir/Utils/FontConfigHelp.cpp.o
In file included from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/x86_64-unknown-linux-gnu/bits/c++allocator.h:33,
                 from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/allocator.h:46,
                 from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/alloc_traits.h:39,
                 from /nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/condition_variable:44:
/nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/new_allocator.h: In instantiation of 'void std::__new_allocator<_Tp>::construct(_Up*, _Args&& ...) [with _Up = Slic3r::form_file; _Args = {Slic3r::form_file}; _Tp = Slic3r::form_file]':
/nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/alloc_traits.h:538:17:   required from 'static void std::allocator_traits<std::allocator<_Tp1> >::construct(allocator_type&, _Up*, _Args&& ...) [with _Up = Slic3r::form_file; _Args = {Slic3r::form_file}; _Tp = Slic3r::form_file; allocator_type = std::allocator<Slic3r::form_file>]'
/nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/deque.tcc:170:30:   required from 'std::deque<_Tp, _Alloc>::reference std::deque<_Tp, _Alloc>::emplace_back(_Args&& ...) [with _Args = {Slic3r::form_file}; _Tp = Slic3r::form_file; _Alloc = std::allocator<Slic3r::form_file>; reference = Slic3r::form_file&]'
/build/source/src/slic3r/Utils/Http.cpp:317:0:   required from here
/nix/store/zc0nsv23pakbafngjy32kvhfzb16as43-gcc-13.3.0/include/c++/13.3.0/bits/new_allocator.h:191:11: error: use of deleted function 'Slic3r::form_file::form_file(Slic3r::form_file&&)'
  191 |         { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /build/source/src/libslic3r/GCode.hpp:26,
                 from /build/source/src/libslic3r/calib.hpp:5,
                 from /build/source/src/slic3r/GUI/DeviceManager.hpp:17,
                 from /build/source/src/slic3r/GUI/MultiMachine.hpp:5,
                 from /build/source/src/slic3r/GUI/SendMultiMachinePage.hpp:5,
                 from /build/source/src/slic3r/GUI/SendMultiMachinePage.cpp:1:
/build/source/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp:12: warning: 'Slic3r::SmallAreaInfillFlowCompensator' has a field 'std::unique_ptr<{anonymous}::tk::spline> Slic3r::SmallAreaInfillFlowCompensator::flowModel' whose type has internal linkage [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wsubobject-linkage-Wsubobject-linkage8;;]
   12 | class SmallAreaInfillFlowCompensator
      |

…#4831) Note: Does not compile. * Allow using BBL's device tab when 3rd party print host is used * Add option to open SimplyPrint panel in device tab after uploading * Fix default print host for prusa connect * Do not set api key in device view when SimplyPrint is used * Sending 3mf file to SimplyPrint when using BBL printers * Fix file extension when uploading 3mf * Prepare for large file uploading * Implement chunk upload * Fix file uploading exceeding content size * Fix wrong field type * Add `temp=true` to all chunk upload calls * Add macro to enable test api * Merge branch 'main' into dev/simplyprint-improve * Fix another missing `temp=true` * Add delete token * Try fixing build error on *nix systems * Merge branch 'main' into dev/simplyprint-improve * Merge branch 'main' into dev/simplyprint-improve * Merge remote-tracking branch 'remote/main' into dev/simplyprint-improve # Conflicts: # src/slic3r/GUI/BackgroundSlicingProcess.cpp * Move the `bbl_use_print_host_webui` option to print host dialog. Also make it a derived option of `print_host_webui` instead. * Merge branch 'main' into dev/simplyprint-improve # Conflicts: # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/Plater.cpp * Merge branch 'main' into dev/simplyprint-improve # Conflicts: # src/slic3r/GUI/Plater.cpp * Use a more generic option instead of SimplyPrint specific * Merge branch 'main' into dev/simplyprint-improve * Merge branch 'main' into dev/simplyprint-improve (cherry picked from commit cd6cd0786fc494d2f1e2fd2123e791f65fbcc97a) Co-authored-by: Ocraftyone <ocraftyone@users.noreply.github.com>

Noisyfox added 6 commits April 1, 2024 10:13

Allow using BBL's device tab when 3rd party print host is used

37ed6fc

Add option to open SimplyPrint panel in device tab after uploading

ca11e8d

Fix default print host for prusa connect

674b2b3

Do not set api key in device view when SimplyPrint is used

a7ed530

Sending 3mf file to SimplyPrint when using BBL printers

79e7c10

Fix file extension when uploading 3mf

7f4fda2

Noisyfox marked this pull request as ready for review April 1, 2024 10:38

Noisyfox and others added 11 commits April 5, 2024 19:26

Prepare for large file uploading

88a93f3

Implement chunk upload

1994118

Fix file uploading exceeding content size

612ed77

Fix wrong field type

995731e

Add temp=true to all chunk upload calls

3630ad7

Add macro to enable test api

d9e2973

Merge branch 'main' into dev/simplyprint-improve

8ff0ff8

Fix another missing temp=true

de1bc99

Add delete token

b9ffa5b

Try fixing build error on *nix systems

0ccbb48

Merge branch 'main' into dev/simplyprint-improve

026e606

SoftFever reviewed Apr 15, 2024

View reviewed changes

src/libslic3r/Preset.cpp Outdated Show resolved Hide resolved

Noisyfox force-pushed the dev/simplyprint-improve branch from bd71263 to 026e606 Compare April 15, 2024 13:00

Noisyfox added 4 commits April 19, 2024 09:10

Merge branch 'main' into dev/simplyprint-improve

aecff2c

Merge remote-tracking branch 'remote/main' into dev/simplyprint-improve

0307bfb

# Conflicts: # src/slic3r/GUI/BackgroundSlicingProcess.cpp

Move the bbl_use_print_host_webui option to print host dialog. Also…

168dad8

… make it a derived option of `print_host_webui` instead.

Merge branch 'main' into dev/simplyprint-improve

ea295d9

# Conflicts: # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/Plater.cpp

Noisyfox added 2 commits June 18, 2024 11:18

Merge branch 'main' into dev/simplyprint-improve

3b4ec68

# Conflicts: # src/slic3r/GUI/Plater.cpp

Use a more generic option instead of SimplyPrint specific

25a51b5

SoftFever added 2 commits June 21, 2024 18:05

Merge branch 'main' into dev/simplyprint-improve

4190b8f

Merge branch 'main' into dev/simplyprint-improve

3e5590c

SoftFever approved these changes Jun 21, 2024

View reviewed changes

SoftFever merged commit cd6cd07 into SoftFever:main Jun 21, 2024
12 checks passed

oddlama mentioned this pull request Jul 2, 2024

Cannot build 2.1.1 from source #5991

Closed

3 tasks

AlbertMN mentioned this pull request Jul 9, 2024

Cant authorize with SimplyPrint #4882

Open

3 tasks

Azio-Pantheon mentioned this pull request Aug 6, 2024

Easy: Do not go to Device Tab when print is sent to printer #6301

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various improvements to SimplyPrint integration #4831

Various improvements to SimplyPrint integration #4831

Noisyfox commented Apr 1, 2024 •

edited

Loading

SoftFever commented May 28, 2024

Noisyfox commented Jun 18, 2024

SoftFever left a comment

oddlama commented Jul 2, 2024

Various improvements to SimplyPrint integration #4831

Various improvements to SimplyPrint integration #4831

Conversation

Noisyfox commented Apr 1, 2024 • edited Loading

SoftFever commented May 28, 2024

Noisyfox commented Jun 18, 2024

SoftFever left a comment

Choose a reason for hiding this comment

oddlama commented Jul 2, 2024

Noisyfox commented Apr 1, 2024 •

edited

Loading