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

Fix conflict in recent merges

Browse Source
This commit is contained in:
Alessandro Ranellucci 2016-11-24 16:20:04 +01:00
parent cc01e6565d
commit 9c7e4871db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/libslic3r/Config.hpp
View File

@ -226,7 +226,7 @@ class ConfigOptionString : public ConfigOptionSingle<std::string>
return escape_string_cstyle(this->value); return escape_string_cstyle(this->value);
} }
bool deserialize(std::string str) { bool deserialize(std::string str, bool append = false) {
return unescape_string_cstyle(str, this->value); return unescape_string_cstyle(str, this->value);
}; };
}; };
@ -247,7 +247,7 @@ class ConfigOptionStrings : public ConfigOptionVector<std::string>
return this->values; return this->values;
}; };
bool deserialize(std::string str) { bool deserialize(std::string str, bool append = false) {
return unescape_strings_cstyle(str, this->values); return unescape_strings_cstyle(str, this->values);
}; };
}; };
@ -668,7 +668,7 @@ class ConfigBase
bool equals(ConfigBase &other); bool equals(ConfigBase &other);
t_config_option_keys diff(ConfigBase &other); t_config_option_keys diff(ConfigBase &other);
std::string serialize(const t_config_option_key &opt_key) const; std::string serialize(const t_config_option_key &opt_key) const;
bool set_deserialize(const t_config_option_key &opt_key, std::string str); bool set_deserialize(const t_config_option_key &opt_key, std::string str, bool append = false);
double get_abs_value(const t_config_option_key &opt_key) const; double get_abs_value(const t_config_option_key &opt_key) const;
double get_abs_value(const t_config_option_key &opt_key, double ratio_over) const; double get_abs_value(const t_config_option_key &opt_key, double ratio_over) const;
void setenv_(); void setenv_();