fix: dedupe compatible printer type check

src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp

@@ -1,5 +1,7 @@
 #include "DevConfigUtil.h"
 
+#include "slic3r/GUI/DeviceManager.hpp"
+
 #include <wx/dir.h>
 #include <boost/filesystem/operations.hpp>
 #include "../I18N.hpp"
@@ -41,6 +43,19 @@ static void _toolhead_translation_markers()
 
 std::string DevPrinterConfigUtil::m_resource_file_path = "";
 
+bool DevPrinterConfigUtil::is_printer_model_compatible(const std::string& source_model, MachineObject& machine)
+{
+    const std::string& target_model = machine.printer_type;
+    if (is_optional_printer_model_id(source_model) || is_optional_printer_model_id(target_model))
+        return true;
+
+    if (source_model == target_model)
+        return true;
+
+    const auto compatible_machine = machine.get_compatible_machine();
+    return std::find(compatible_machine.begin(), compatible_machine.end(), source_model) != compatible_machine.end();
+}
+
 
 std::map<std::string, std::string> DevPrinterConfigUtil::get_all_model_id_with_name()
 {
@@ -405,4 +420,4 @@ std::string DevPrinterConfigUtil::get_toolhead_display_name(
     return result;
 }
 
-};
+};

src/slic3r/GUI/DeviceCore/DevConfigUtil.h

@@ -25,6 +25,8 @@
 namespace Slic3r
 {
 
+class MachineObject;
+
 /// Toolhead component type (extruder / nozzle / hotend)
 enum class ToolHeadComponent {
     Extruder,
@@ -61,19 +63,8 @@ public:
     static std::map<std::string, std::string> get_all_model_id_with_name();
     // A printer agent may not know the physical model. Keep that case optional so
     // model compatibility checks do not turn missing identity into a hard error.
-    static bool is_optional_printer_model_id(const std::string& model_id)
-    {
-        if (model_id.empty())
-            return true;
-        if (model_id.size() != 9)
-            return false;
-
-        static constexpr char generic_model_id[] = "orcasonar";
-        return std::equal(model_id.begin(), model_id.end(), generic_model_id,
-                          [](char lhs, char rhs) {
-                              return static_cast<char>(std::tolower(static_cast<unsigned char>(lhs))) == rhs;
-                          });
-    }
+    static bool is_printer_model_compatible(const std::string& source_model, MachineObject& machine);
+    static bool is_optional_printer_model_id(const std::string& model_id) { return model_id.empty(); }
     static std::string get_printer_type(const std::string& type_str) { return get_value_from_config<std::string>(type_str, "printer_type"); }
     static std::string get_printer_display_name(const std::string& type_str) { return get_value_from_config<std::string>(type_str, "display_name"); }
     static std::string get_printer_series_str(std::string type_str) { return get_value_from_config<std::string>(type_str, "printer_series"); }