From a30961f59ae5a1bd85359f79f147cdcd9eac0472 Mon Sep 17 00:00:00 2001
From: David Kocik <kocikdav@gmail.com>
Date: Mon, 29 Jul 2024 17:08:26 +0200
Subject: [PATCH] Rename paramters in jsons and add FilamentConfig.

---
 src/slic3r/GUI/UserAccountUtils.cpp |  2 +-
 src/slic3r/GUI/WebViewDialog.cpp    | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/UserAccountUtils.cpp b/src/slic3r/GUI/UserAccountUtils.cpp
index 07c56065e8..84c6483ed5 100644
--- a/src/slic3r/GUI/UserAccountUtils.cpp
+++ b/src/slic3r/GUI/UserAccountUtils.cpp
@@ -105,7 +105,7 @@ void fill_supported_printer_models_from_json(boost::property_tree::ptree &ptree,
 void fill_config_options_from_json(boost::property_tree::ptree& ptree, std::map<std::string, std::string>& result) 
 {
     assert(!ptree.empty());
-    pt::ptree subtree = parse_tree_for_subtree(ptree, "config_options");
+    pt::ptree subtree = parse_tree_for_subtree(ptree, "printerConfig");
     for (const auto &item : subtree) {
         result[item.first] = item.second.data();
     }
diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp
index 0b33acdce5..cd2aa66bf9 100644
--- a/src/slic3r/GUI/WebViewDialog.cpp
+++ b/src/slic3r/GUI/WebViewDialog.cpp
@@ -1320,9 +1320,9 @@ void PrinterPickWebViewDialog::request_compatible_printers_FFF() {
         "\"nozzleDiameter\": %2%, "
         "\"material\": \"%1%\", "
         "\"filename\": \"%5%\", "
-        "\"filamentAbrasive\": \"%6%\", "
-        "\"config_options\": {"
-        , filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized, uuid, filename, filament_abrasive);
+        //"\"filamentAbrasive\": \"%6%\", "
+        "\"printerConfig\": {"
+        , filament_type_serialized, nozzle_diameter_serialized, printer_model_serialized, uuid, filename/*, filament_abrasive*/);
 
     // std::map<t_config_option_key, std::unique_ptr<ConfigOption>>::const_iterator
     for (auto it = selected_printer.config.cbegin(); it != selected_printer.config.cend(); ++it) {
@@ -1334,6 +1334,16 @@ void PrinterPickWebViewDialog::request_compatible_printers_FFF() {
         request += GUI::format("\"%1%\": \"%2%\"", it->first, value);
     }
 
+    request += "}, \"filamentConfig\": {";
+    for (auto it = selected_filament.config.cbegin(); it != selected_filament.config.cend(); ++it) {
+        std::string value = selected_filament.config.option(it->first)->serialize();
+        if (value.find('\"') != std::string::npos) {
+            continue;
+        }
+        request += it == selected_filament.config.cbegin() ? "" : ",";
+        request += GUI::format("\"%1%\": \"%2%\"", it->first, value);
+    }
+
     request += "}}";
 
     wxString script = GUI::format_wxstr("window._prusaConnect_v1.requestCompatiblePrinter(%1%)", request);