GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-02 02:21:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-2551: PrusaConnect_v2 api use

Browse Source
This commit is contained in:
David Kocik 2024-11-06 15:24:21 +01:00 committed by Lukas Matena
parent 85094c5c19
commit ce991e6632
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/ConnectRequestHandler.cpp
View File

@ -98,7 +98,7 @@ void ConnectRequestHandler::on_connect_action_request_config(const std::string&
wxString language = GUI::wxGetApp().current_language_code(); wxString language = GUI::wxGetApp().current_language_code();
language = language.SubString(0, 1); language = language.SubString(0, 1);
const std::string init_options = GUI::format("{\"accessToken\": \"%4%\",\"clientVersion\": \"%1%\", \"colorMode\": \"%2%\", \"language\": \"%3%\"}", SLIC3R_VERSION, dark_mode, language, token ); const std::string init_options = GUI::format("{\"accessToken\": \"%4%\",\"clientVersion\": \"%1%\", \"colorMode\": \"%2%\", \"language\": \"%3%\"}", SLIC3R_VERSION, dark_mode, language, token );
wxString script = GUI::format_wxstr("window._prusaConnect_v1.init(%1%)", init_options); wxString script = GUI::format_wxstr("window._prusaConnect_v2.init(%1%)", init_options);
run_script_bridge(script); run_script_bridge(script);
} }

6
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -586,9 +586,9 @@ void PrinterPickWebViewDialog::request_compatible_printers_FFF() {
"\"filament_abrasive\": %6%," "\"filament_abrasive\": %6%,"
"\"high_flow\": %7%" "\"high_flow\": %7%"
"}" "}"
, filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized, uuid, filename, nozzle_high_flow_serialized, filament_abrasive_serialized); , filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized, uuid, filename, filament_abrasive_serialized, nozzle_high_flow_serialized);
wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); wxString script = GUI::format_wxstr("window._prusaConnect_v2.requestCompatiblePrinter(%1%)", request);
run_script(script); run_script(script);
} }
void PrinterPickWebViewDialog::request_compatible_printers_SLA() void PrinterPickWebViewDialog::request_compatible_printers_SLA()
@ -621,7 +621,7 @@ void PrinterPickWebViewDialog::request_compatible_printers_SLA()
"\"filename\": \"%4%\" " "\"filename\": \"%4%\" "
"}", material_type_serialized, printer_model_serialized, uuid, filename); "}", material_type_serialized, printer_model_serialized, uuid, filename);
wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); wxString script = GUI::format_wxstr("window._prusaConnect_v2.requestCompatiblePrinter(%1%)", request);
run_script(script); run_script(script);
} }

2
src/slic3r/GUI/WebViewPanel.cpp
View File

@ -801,7 +801,7 @@ void ConnectWebViewPanel::logout()
if (!m_browser || m_do_late_webview_create) { if (!m_browser || m_do_late_webview_create) {
return; return;
} }
wxString script = L"window._prusaConnect_v1.logout()"; wxString script = L"window._prusaConnect_v2.logout()";
run_script(script); run_script(script);
Plater* plater = wxGetApp().plater(); Plater* plater = wxGetApp().plater();