GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 04:55:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes

Browse Source
This commit is contained in:
enricoturri1966 2020-03-24 12:26:48 +01:00
commit 7c72231fcd
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/PrusaSlicer.cpp
View File

@ -132,14 +132,18 @@ int CLI::run(int argc, char **argv)
Model model; Model model;
try { try {
// When loading an AMF or 3MF, config is imported as well, including the printer technology. // When loading an AMF or 3MF, config is imported as well, including the printer technology.
model = Model::read_from_file(file, &m_print_config, true); DynamicPrintConfig config;
PrinterTechnology other_printer_technology = get_printer_technology(m_print_config); model = Model::read_from_file(file, &config, true);
PrinterTechnology other_printer_technology = get_printer_technology(config);
if (printer_technology == ptUnknown) { if (printer_technology == ptUnknown) {
printer_technology = other_printer_technology; printer_technology = other_printer_technology;
} else if (printer_technology != other_printer_technology && other_printer_technology != ptUnknown) { } else if (printer_technology != other_printer_technology && other_printer_technology != ptUnknown) {
boost::nowide::cerr << "Mixing configurations for FFF and SLA technologies" << std::endl; boost::nowide::cerr << "Mixing configurations for FFF and SLA technologies" << std::endl;
return 1; return 1;
} }
// config is applied to m_print_config before the current m_config values.
config += std::move(m_print_config);
m_print_config = std::move(config);
} catch (std::exception &e) { } catch (std::exception &e) {
boost::nowide::cerr << file << ": " << e.what() << std::endl; boost::nowide::cerr << file << ": " << e.what() << std::endl;
return 1; return 1;
@ -640,6 +644,14 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
<< "Other options:" << std::endl; << "Other options:" << std::endl;
cli_misc_config_def.print_cli_help(boost::nowide::cout, false); cli_misc_config_def.print_cli_help(boost::nowide::cout, false);
boost::nowide::cout
<< std::endl
<< "Print options are processed in the following order:" << std::endl
<< "\t1) Config keys from the command line, for example --fill-pattern=stars" << std::endl
<< "\t (highest priority, overwrites everything below)" << std::endl
<< "\t2) Config files loaded with --load" << std::endl
<< "\t3) Config values loaded from amf or 3mf files" << std::endl;
if (include_print_options) { if (include_print_options) {
boost::nowide::cout << std::endl; boost::nowide::cout << std::endl;
print_config_def.print_cli_help(boost::nowide::cout, true, [printer_technology](const ConfigOptionDef &def) print_config_def.print_cli_help(boost::nowide::cout, true, [printer_technology](const ConfigOptionDef &def)

2
src/slic3r/Utils/FlashAir.cpp
View File

@ -70,7 +70,7 @@ wxString FlashAir::get_test_ok_msg () const
wxString FlashAir::get_test_failed_msg (wxString &msg) const wxString FlashAir::get_test_failed_msg (wxString &msg) const
{ {
return GUI::from_u8((boost::format("%s: %s") return GUI::from_u8((boost::format("%s: %s\n%s")
% _utf8(L("Could not connect to FlashAir")) % _utf8(L("Could not connect to FlashAir"))
% std::string(msg.ToUTF8()) % std::string(msg.ToUTF8())
% _utf8(L("Note: FlashAir with firmware 2.00.02 or newer and activated upload function is required."))).str()); % _utf8(L("Note: FlashAir with firmware 2.00.02 or newer and activated upload function is required."))).str());