From a474d36bfb154bfec0a610d6ae6738d2e877d921 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Mon, 22 Apr 2024 14:12:53 +0200 Subject: [PATCH] Printer_model when requesting printer filtering in PrinterPick. --- src/slic3r/GUI/WebViewDialog.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 8bb1bd3ae4..603e78a78e 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -735,14 +735,14 @@ void PrinterPickWebViewDialog::request_compatible_printers_FFF() const std::string nozzle_diameter_serialized = dynamic_cast(selected_printer.config.option("nozzle_diameter"))->serialize(); const std::string filament_type_serialized = selected_filament.config.option("filament_type")->serialize(); const std::string printer_model_serialized = selected_printer.config.option("printer_model")->serialize(); - const std::string printer_type = wxGetApp().plater()->get_user_account()->get_printer_type_from_name(printer_model_serialized); + //const std::string printer_type = wxGetApp().plater()->get_user_account()->get_printer_type_from_name(printer_model_serialized); const std::string request = GUI::format( "{" "\"material\": \"%1%\", " "\"nozzleDiameter\": %2%, " - "\"printerType\": \"%3%\" " - "}", filament_type_serialized, nozzle_diameter_serialized, printer_type); + "\"printerModel\": \"%3%\" " + "}", filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized); wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); run_script(script); @@ -751,14 +751,14 @@ void PrinterPickWebViewDialog::request_compatible_printers_SLA() { const Preset& selected_printer = wxGetApp().preset_bundle->printers.get_selected_preset(); const std::string printer_model_serialized = selected_printer.config.option("printer_model")->serialize(); - const std::string printer_type = wxGetApp().plater()->get_user_account()->get_printer_type_from_name(printer_model_serialized); + //const std::string printer_type = wxGetApp().plater()->get_user_account()->get_printer_type_from_name(printer_model_serialized); const Preset& selected_material = wxGetApp().preset_bundle->sla_materials.get_selected_preset(); const std::string material_type_serialized = selected_material.config.option("material_type")->serialize(); const std::string request = GUI::format( "{" "\"material\": \"%1%\", " - "\"printerType\": \"%2%\" " - "}", material_type_serialized, printer_type); + "\"printerModel\": \"%2%\" " + "}", material_type_serialized, printer_model_serialized); wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); run_script(script);