From 68e1722e970108010a18037fb9c08ebc9f1379ca Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 24 Dec 2023 11:37:38 +0800 Subject: [PATCH] Fixed an issue that bed texture was not reset when switching to a new printer model that don't have a valid bed texture. also fix/tweak some printer's bed texture --- .../elegoo_neptune3max_buildplate_texture.png | Bin 9965 -> 0 bytes .../elegoo_neptune_max_buildplate_texture.png | Bin 0 -> 12046 bytes .../Elegoo/machine/Elegoo Neptune 3 Max.json | 2 +- .../Elegoo/machine/Elegoo Neptune 4 Max.json | 2 +- resources/profiles/Prusa/mk4is.svg | 194 ++++++++++++++---- src/libslic3r/PresetBundle.cpp | 2 +- src/slic3r/GUI/PartPlate.cpp | 1 + 7 files changed, 156 insertions(+), 45 deletions(-) delete mode 100644 resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.png create mode 100644 resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png diff --git a/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.png deleted file mode 100644 index 9c18cff6e1d4ac1e1be8ad624ac4ee3e8e4923f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9965 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 Ta;-8ADgd6oo34Gm_pkp0LGMS# diff --git a/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..87965e7c4089b832fd1d5afc72992b92db65b06b GIT binary patch literal 12046 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 F`cKdhFysIL literal 0 HcmV?d00001 diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json index a7c765272d..1a4e152f31 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune3max_buildplate_model.stl", - "bed_texture": "elegoo_neptune3max_buildplate_texture.png", + "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "hotend_model": "", "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json index 5b4bb74450..0fa4bdef74 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune4max_buildplate_model.stl", - "bed_texture": "elegoo_neptune4max_buildplate_texture.png", + "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "bed_exclude_area": ["0x0"], "hotend_model": "", "default_materials": "Elegoo Generic PLA @0.2 nozzle;Elegoo Generic PETG @0.2 nozzle;Elegoo Generic ABS @0.2 nozzle;Elegoo Generic PLA @0.4 nozzle;Elegoo Generic PETG @0.4 nozzle;Elegoo Generic ABS @0.4 nozzle;Elegoo Generic PLA @0.6 nozzle;Elegoo Generic PETG @0.6 nozzle;Elegoo Generic ABS @0.6 nozzle;Elegoo Generic PLA @0.8 nozzle;Elegoo Generic PETG @0.8 nozzle;Elegoo Generic ABS @0.8 nozzle" diff --git a/resources/profiles/Prusa/mk4is.svg b/resources/profiles/Prusa/mk4is.svg index 2c99da4f8a..1e1a192ee3 100644 --- a/resources/profiles/Prusa/mk4is.svg +++ b/resources/profiles/Prusa/mk4is.svg @@ -1,45 +1,155 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index f242419bb0..bf9938bd85 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -462,7 +462,7 @@ std::string PresetBundle::get_texture_for_printer_model(std::string model_name) { for (auto vendor_model: vendor_profile.second.models) { - if (vendor_model.name == model_name) + if (vendor_model.name == model_name || vendor_model.id == model_name) { texture_name = vendor_model.bed_texture; vendor_name = vendor_profile.first; diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 306939bba8..b2e393f528 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -4604,6 +4604,7 @@ void PartPlateList::update_logo_texture_filename(const std::string &texture_file return !texture.empty() && (boost::algorithm::iends_with(texture, ".png") || boost::algorithm::iends_with(texture, ".svg")) && boost::filesystem::exists(texture, ec); }; if (!texture_filename.empty() && !check_texture(texture_filename)) { + m_logo_texture_filename = ""; BOOST_LOG_TRIVIAL(error) << "Unable to load bed texture: " << texture_filename; } else m_logo_texture_filename = texture_filename;