From 4544dad62c360ff94c29a7c845ce1a192ab83786 Mon Sep 17 00:00:00 2001 From: "lane.wei" Date: Sat, 16 Jul 2022 10:58:48 +0800 Subject: [PATCH] turnoff the debug mode on preferences also switch the environment to production and update version to 1.0.10.4 Change-Id: I396993ffa2bdfa5e60d69b61870d3710c6963489 --- src/libslic3r/AppConfig.cpp | 8 ++++---- src/slic3r/GUI/Preferences.cpp | 5 ++++- version.inc | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 3552c86f7..1ef53c164 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -118,7 +118,7 @@ void AppConfig::set_defaults() set("use_environment_map", false); #endif // ENABLE_ENVIRONMENT_MAP - if (get("use_inches").empty()) + if (get("use_inches").empty()) set("use_inches", "0"); } else { @@ -257,7 +257,7 @@ void AppConfig::set_defaults() } if (get("iot_environment").empty()) { - set("iot_environment", "1"); + set("iot_environment", "3"); } // Remove legacy window positions/sizes @@ -1004,11 +1004,11 @@ std::string AppConfig::get_country_code() { std::string region = get_region(); /* fix PRE environment when release to public */ -#if BBL_RELEASE_TO_PUBLIC +#if 0 this->set("iot_environment", "2"); return "ENV_CN_PRE"; #else - if (is_engineering_region()) { return region; } + //if (is_engineering_region()) { return region; } if (region == "CHN" || region == "China") return "CN"; else if (region == "USA") diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 08c3a271d..103756264 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -569,15 +569,18 @@ void PreferencesDialog::create() m_sizer_body->Add(m_top_line, 0, wxEXPAND, 0); auto general_page = create_general_page(); +#if !BBL_RELEASE_TO_PUBLIC auto debug_page = create_debug_page(); - +#endif /* create_gui_page(); create_sync_page(); create_shortcuts_page();*/ m_sizer_body->Add(0, 0, 0, wxTOP, FromDIP(28)); m_sizer_body->Add(general_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38)); +#if !BBL_RELEASE_TO_PUBLIC m_sizer_body->Add(debug_page, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(38)); +#endif m_sizer_body->Add(0, 0, 0, wxBOTTOM, FromDIP(28)); SetSizer(m_sizer_body); Layout(); diff --git a/version.inc b/version.inc index 3f74ea22e..23f2685ca 100644 --- a/version.inc +++ b/version.inc @@ -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.03") +set(SLIC3R_VERSION "01.00.10.04")