Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitHub master #10

Merged
merged 2 commits into from
Jul 16, 2022
Merged

GitHub master #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694b88b
adjust the log level for released version
lanewei120 Jul 16, 2022
5eed578
Version: update to 1.0.10.5
lanewei120 Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/BambuStudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,6 @@ int CLI::run(int argc, char **argv)

bool CLI::setup(int argc, char **argv)
{
#if !BBL_RELEASE_TO_PUBLIC
{
Slic3r::set_logging_level(1);
const char *loglevel = boost::nowide::getenv("BBL_LOGLEVEL");
Expand All @@ -1459,10 +1458,6 @@ bool CLI::setup(int argc, char **argv)
boost::nowide::cerr << "Invalid BBL_LOGLEVEL environment variable: " << loglevel << std::endl;
}
}
#else
//set to fatal
Slic3r::set_logging_level(0);
#endif

// Detect the operating system flavor after SLIC3R_LOGLEVEL is set.
detect_platform();
Expand Down
2 changes: 1 addition & 1 deletion src/libslic3r/AppConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void AppConfig::set_defaults()
set_bool("developer_mode", false);

if (get("severity_level").empty())
set("severity_level", "trace");
set("severity_level", "info");

if (get("dump_video").empty())
set_bool("dump_video", false);
Expand Down
3 changes: 2 additions & 1 deletion src/slic3r/GUI/GUI_App.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,14 +1417,15 @@ bool GUI_App::OnInit()
bool GUI_App::on_init_inner()
{
//start log here
#if !BBL_RELEASE_TO_PUBLIC
std::time_t t = std::time(0);
std::tm* now_time = std::localtime(&t);
std::stringstream buf;
buf << std::put_time(now_time, "debug_%a_%b_%d_%H_%M_%S.log");
std::string log_filename = buf.str();
#if !BBL_RELEASE_TO_PUBLIC
set_log_path_and_level(log_filename, 5);
#else
set_log_path_and_level(log_filename, 3);
#endif

// Set initialization of image handlers before any UI actions - See GH issue #7469
Expand Down
2 changes: 1 addition & 1 deletion version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ set(SLIC3R_APP_KEY "BambuStudio")
if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
set(BBL_RELEASE_TO_PUBLIC "0")
endif()
set(SLIC3R_VERSION "01.00.10.04")
set(SLIC3R_VERSION "01.00.10.05")