Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for SimplyPrint cloud integration #4385

Closed
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8ca2f1d
Support for SimplyPrint cloud integration (SoftFever/OrcaSlicer#4525)
Noisyfox Mar 23, 2024
3411a75
Various improvements to SimplyPrint integration (SoftFever/OrcaSlicer…
Noisyfox Jun 21, 2024
1903eff
UI Jobs Rework
tamasmeszaros Nov 30, 2021
93aaee8
Add WindowWorker.hpp
Ocraftyone Jul 21, 2024
a2d9e7b
Update ArrangeJob calls
Ocraftyone Jul 21, 2024
900b30e
Fix misnamed type
Ocraftyone Jul 21, 2024
e74bdc2
Fix include statement
Ocraftyone Jul 21, 2024
e4c2a7f
Try fixing build with gcc 13.3 (SoftFever/OrcaSlicer#5991) (SoftFever…
Noisyfox Jul 7, 2024
8b12a5a
Fix path parameters in json library
Ocraftyone Jul 21, 2024
77ca520
Port MIME logic from BBL/Orca
Ocraftyone Jul 21, 2024
63d0ace
Add QueuePrint to PrintHostPostUploadAction
Ocraftyone Jul 21, 2024
f26be69
Add HttpServer::port_type in place of boost::asio::ip::port_type
Ocraftyone Jul 21, 2024
31503ac
Convert OAuthDialog to WindowWorker from PlaterWorker
Ocraftyone Jul 21, 2024
756cc03
Revert "Fix issue caused by the fact that the backing widget of the `…
Ocraftyone Jul 21, 2024
0bf1782
Fix signature of upload function to match overridden function
Ocraftyone Jul 21, 2024
57dce8a
Remove device tab logic
Ocraftyone Jul 21, 2024
ba2a2c6
Remove "use_3mf" as it is only supported on BBL printers
Ocraftyone Jul 21, 2024
41de219
Fix includes
Ocraftyone Jul 21, 2024
1ceb20a
Port Http::url_decode from BBL/Orca
Ocraftyone Jul 21, 2024
1ce7877
Modify HttpServer
Ocraftyone Jul 21, 2024
b3ff363
Replace "orcaslicer" with "superslicer" in client ID and request header
Ocraftyone Jul 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix signature of upload function to match overridden function
Ocraftyone committed Jul 22, 2024
commit 0bf17823bb141ae9c3a06c5872424e209383208b
2 changes: 1 addition & 1 deletion src/slic3r/Utils/SimplyPrint.cpp
Original file line number Diff line number Diff line change
@@ -470,7 +470,7 @@ bool SimplyPrint::do_chunk_upload(const boost::filesystem::path& file_path, cons
}


bool SimplyPrint::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const
bool SimplyPrint::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const
{
if (cred.find("access_token") == cred.end()) {
error_fn(_L("SimplyPrint account not linked. Go to Connect options to set it up."));
2 changes: 1 addition & 1 deletion src/slic3r/Utils/SimplyPrint.hpp
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ class SimplyPrint : public PrintHost
wxString get_test_failed_msg(wxString& msg) const override;
bool test(wxString& curl_msg) const override;
PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::QueuePrint; }
bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const override;
bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override;
bool is_logged_in() const override { return !cred.empty(); }
void log_out() const override;
};