3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Added various manifests,

Browse source 
added auto generation of includes and manifests from version and build
variables,
resurrected SLIC3R_LOGLEVEL env var.
This commit is contained in:
bubnikv 2018-09-24 11:53:05 +02:00
parent 9f2cd347e3
commit 96e035b2f8
11 changed files with 100 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r.cpp
View file

@ -27,6 +27,7 @@
#include <math.h>
#include <boost/filesystem.hpp>
#include <boost/nowide/args.hpp>
#include <boost/nowide/cenv.hpp>
#include <boost/nowide/iostream.hpp>
#ifdef USE_WX
@ -48,6 +49,16 @@ int main(int argc, char **argv)
//FIXME On Windows, we want to receive the arguments as 16bit characters!
boost::nowide::args a(argc, argv);
{
const char *loglevel = boost::nowide::getenv("SLIC3R_LOGLEVEL");
if (loglevel != nullptr) {
if (loglevel[0] >= '0' && loglevel[0] <= '9' && loglevel[1] == 0)
set_logging_level(loglevel[0] - '0');
else
boost::nowide::cerr << "Invalid SLIC3R_LOGLEVEL environment variable: " << loglevel << std::endl;
}
}
// parse all command line options into a DynamicConfig
DynamicPrintAndCLIConfig config;
t_config_option_keys input_files;
@ -89,7 +100,7 @@ int main(int argc, char **argv)
// apply command line options to a more handy CLIConfig
CLIConfig cli_config;
cli_config.apply(config, true);
set_local_dir(cli_config.datadir.value);
set_data_dir(cli_config.datadir.value);
DynamicPrintConfig print_config;