GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-04 17:30:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented Preset::compatible and improved doxygen comment.

Browse Source
This commit is contained in:
Joseph Lenox 2018-11-18 00:26:01 -06:00 committed by Joseph Lenox
parent 8059bff31e
commit 54d40bbc04
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GUI/Preset.cpp
View File

@ -121,4 +121,14 @@ t_config_option_keys Preset::_group_overrides() const {
} }
} }
bool Preset::compatible(const std::string& printer_name) const {
if (!this->_dirty_config->has("compatible_printers") || this->default_preset || this->group == preset_t::Printer) {
return true;
}
auto compatible_list {this->_dirty_config->get<ConfigOptionStrings>("compatible_printers").values};
if (compatible_list.size() == 0) return true;
return std::any_of(compatible_list.cbegin(), compatible_list.cend(), [printer_name] (const std::string& x) -> bool { return x.compare(printer_name) == 0; });
}
}} // namespace Slic3r::GUI }} // namespace Slic3r::GUI

7
src/GUI/Preset.hpp
View File

@ -48,9 +48,10 @@ public:
/// Search the compatible_printers config option list for this preset name. /// Search the compatible_printers config option list for this preset name.
/// Assume that Printer configs are compatible with other Printer configs /// Assume that Printer configs are compatible with other Printer configs
bool compatible(std::string printer_name) { return true; } /// @param [in] Printer preset name to use to compare.
bool compatible(const wxString& printer_name) { if (group == preset_t::Printer) return true; return true; } bool compatible(const std::string& printer_name) const;
bool compatible(const Preset& other) {return (this->group == preset_t::Printer || (compatible(other.name) && other.group == preset_t::Printer));} bool compatible(const wxString& printer_name) const { return this->compatible(printer_name.ToStdString()); }
bool compatible(const Preset& other) const {return (this->group == preset_t::Printer || (compatible(other.name) && other.group == preset_t::Printer));}
/// Format the name appropriately. /// Format the name appropriately.
wxString dropdown_name() { return (this->dirty() ? this->name << " " << _("(modified)") : this->name); } wxString dropdown_name() { return (this->dirty() ? this->name << " " << _("(modified)") : this->name); }