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

Printer_model when requesting printer filtering in PrinterPick.

Browse Source
This commit is contained in:
David Kocik 2024-04-22 14:12:53 +02:00
parent b7b97ee320
commit a474d36bfb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,14 +735,14 @@ void PrinterPickWebViewDialog::request_compatible_printers_FFF()
const std::string nozzle_diameter_serialized = dynamic_cast<const ConfigOptionFloats*>(selected_printer.config.option("nozzle_diameter"))->serialize(); const std::string nozzle_diameter_serialized = dynamic_cast<const ConfigOptionFloats*>(selected_printer.config.option("nozzle_diameter"))->serialize();
const std::string filament_type_serialized = selected_filament.config.option("filament_type")->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_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( const std::string request = GUI::format(
"{" "{"
"\"material\": \"%1%\", " "\"material\": \"%1%\", "
"\"nozzleDiameter\": %2%, " "\"nozzleDiameter\": %2%, "
"\"printerType\": \"%3%\" " "\"printerModel\": \"%3%\" "
"}", filament_type_serialized, nozzle_diameter_serialized, printer_type); "}", filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized);
wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request);
run_script(script); 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 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_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 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 material_type_serialized = selected_material.config.option("material_type")->serialize();
const std::string request = GUI::format( const std::string request = GUI::format(
"{" "{"
"\"material\": \"%1%\", " "\"material\": \"%1%\", "
"\"printerType\": \"%2%\" " "\"printerModel\": \"%2%\" "
"}", material_type_serialized, printer_type); "}", material_type_serialized, printer_model_serialized);
wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request); wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request);
run_script(script); run_script(script);