From 9581ed159235fa69d7413f42937feabb87811f40 Mon Sep 17 00:00:00 2001
From: David Kocik <kocikdav@gmail.com>
Date: Wed, 2 Feb 2022 18:51:53 +0100
Subject: [PATCH] Show common generic only for <custom> printer

---
 resources/profiles/CommonFilaments.ini  | 10 +++++-----
 src/slic3r/GUI/ConfigWizard_private.hpp |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/profiles/CommonFilaments.ini b/resources/profiles/CommonFilaments.ini
index 44302b0e87..11fc788e30 100644
--- a/resources/profiles/CommonFilaments.ini
+++ b/resources/profiles/CommonFilaments.ini
@@ -60,7 +60,7 @@ filament_retract_length = 1
 filament_retract_lift = 0.2
 #compatible_printers_condition = printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
-[filament:Generic Common PETG]
+[filament:Generic PETG @Generic]
 inherits = *PET*
 filament_vendor = Generic
 filament_cost = 27.82
@@ -89,7 +89,7 @@ temperature = 255
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
 #compatible_printers_condition = printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
-[filament:Generic Common ABS]
+[filament:Generic ABS @Generic]
 inherits = *ABSC*
 filament_vendor = Generic
 filament_cost = 27.82
@@ -114,7 +114,7 @@ min_fan_speed = 100
 temperature = 210
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
 
-[filament:Generic Common PLA]
+[filament:Generic PLA @Generic]
 inherits = *PLA*
 filament_vendor = Generic
 filament_cost = 25.4
@@ -146,7 +146,7 @@ filament_deretract_speed = 25
 filament_retract_lift = 0
 filament_wipe = 0
 
-[filament:Generic Common FLEX]
+[filament:Generic FLEX @Generic]
 inherits = *FLEX*
 filament_vendor = Generic
 filament_cost = 82
@@ -177,7 +177,7 @@ temperature = 255
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
 #compatible_printers_condition = printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
-[filament:Generic Common HIPS]
+[filament:Generic HIPS @Generic]
 inherits = *ABS*
 filament_vendor = Generic
 filament_cost = 27.3
diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp
index 9243ae61d9..5bbaa87ec7 100644
--- a/src/slic3r/GUI/ConfigWizard_private.hpp
+++ b/src/slic3r/GUI/ConfigWizard_private.hpp
@@ -138,10 +138,11 @@ struct Materials
 			const Preset& prntr = *printer;
 		    if (((printer == nullptr && printer_name == PageMaterials::EMPTY) || (printer != nullptr && is_compatible_with_printer(PresetWithVendorProfile(prst, prst.vendor), PresetWithVendorProfile(prntr, prntr.vendor)))) &&
 			    (type.empty() || get_type(preset) == type) &&
-				(vendor.empty() || get_vendor(preset) == vendor)) {
+				(vendor.empty() || get_vendor(preset) == vendor) &&
+                !prst.vendor->common_profile) {
 
 				cb(preset);
-			} else if (prst.vendor->common_profile &&
+			} else if ((printer == nullptr && printer_name == PageMaterials::CUSTOM) && prst.vendor->common_profile &&
                 (type.empty() || get_type(preset) == type) &&
                 (vendor.empty() || get_vendor(preset) == vendor)) {
                 cb(preset);