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
This commit is contained in:
SoftFever 2023-12-24 11:37:38 +08:00
parent cc984b21fe
commit 68e1722e97
7 changed files with 156 additions and 45 deletions

View file

@ -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;

View file

@ -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;