3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CLI:

Browse source 
Removed the --help-options parameter, left the --help-fff and --help-sla
Added check for empty print.
This commit is contained in:
bubnikv 2019-03-13 19:49:14 +01:00
parent 1224491cd4
commit 0b4dbc87c7
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/PrintConfig.cpp
View file

@ -2955,11 +2955,6 @@ CLIActionsConfigDef::CLIActionsConfigDef()
def->cli = "help|h"; def->cli = "help|h";
def->default_value = new ConfigOptionBool(false); def->default_value = new ConfigOptionBool(false);
def = this->add("help_options", coBool);
def->label = L("Help (options)");
def->tooltip = L("Show the full list of print/G-code configuration options.");
def->default_value = new ConfigOptionBool(false);
def = this->add("help_fff", coBool); def = this->add("help_fff", coBool);
def->label = L("Help (FFF options)"); def->label = L("Help (FFF options)");
def->tooltip = L("Show the full list of print/G-code configuration options."); def->tooltip = L("Show the full list of print/G-code configuration options.");

22
src/slic3r.cpp
View file

@ -133,8 +133,8 @@ int CLI::run(int argc, char **argv)
// Initialize full print configs for both the FFF and SLA technologies. // Initialize full print configs for both the FFF and SLA technologies.
FullPrintConfig fff_print_config; FullPrintConfig fff_print_config;
SLAFullPrintConfig sla_print_config; SLAFullPrintConfig sla_print_config;
fff_print_config.apply(m_print_config); fff_print_config.apply(m_print_config, true);
sla_print_config.apply(m_print_config); sla_print_config.apply(m_print_config, true);
// Loop through transform options. // Loop through transform options.
for (auto const &opt_key : m_transforms) { for (auto const &opt_key : m_transforms) {
@ -308,8 +308,6 @@ int CLI::run(int argc, char **argv)
for (auto const &opt_key : m_actions) { for (auto const &opt_key : m_actions) {
if (opt_key == "help") { if (opt_key == "help") {
this->print_help(); this->print_help();
} else if (opt_key == "help_options") {
this->print_help(true, ptAny);
} else if (opt_key == "help_fff") { } else if (opt_key == "help_fff") {
this->print_help(true, ptFFF); this->print_help(true, ptFFF);
} else if (opt_key == "help_sla") { } else if (opt_key == "help_sla") {
@ -375,7 +373,13 @@ int CLI::run(int argc, char **argv)
} }
print->apply(model, m_print_config); print->apply(model, m_print_config);
std::string err = print->validate(); std::string err = print->validate();
if (err.empty()) { if (! err.empty()) {
boost::nowide::cerr << err << std::endl;
return 1;
}
if (print->empty())
boost::nowide::cout << "Nothing to print for " << outfile << " . Either the print is empty or no object is fully inside the print volume." << std::endl;
else
try { try {
std::string outfile_final; std::string outfile_final;
print->process(); print->process();
@ -393,15 +397,11 @@ int CLI::run(int argc, char **argv)
boost::nowide::cerr << "Renaming file " << outfile << " to " << outfile_final << " failed" << std::endl; boost::nowide::cerr << "Renaming file " << outfile << " to " << outfile_final << " failed" << std::endl;
return 1; return 1;
} }
boost::nowide::cout << "Slicing result exported to " << outfile << std::endl;
} catch (const std::exception &ex) { } catch (const std::exception &ex) {
boost::nowide::cerr << ex.what() << std::endl; boost::nowide::cerr << ex.what() << std::endl;
return 1; return 1;
} }
} else {
boost::nowide::cerr << err << std::endl;
return 1;
}
/* /*
print.center = ! m_config.has("center") print.center = ! m_config.has("center")
&& ! m_config.has("align_xy") && ! m_config.has("align_xy")
@ -577,7 +577,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
} else { } else {
boost::nowide::cout boost::nowide::cout
<< std::endl << std::endl
<< "Run --help-options / --help-fff / --help-sla to see the full listing of print options." << std::endl; << "Run --help-fff / --help-sla to see the full listing of print options." << std::endl;
} }
} }