diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index c8a5b274fe..7006de0d80 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -65,19 +65,19 @@ std::string AppConfig::get_hms_host() { std::string sel = get("iot_environment"); std::string host = ""; -#if !BBL_RELEASE_TO_PUBLIC - if (sel == ENV_DEV_HOST) - host = "e-dev.bambu-lab.com"; - else if (sel == ENV_QAT_HOST) - host = "e-qa.bambu-lab.com"; - else if (sel == ENV_PRE_HOST) - host = "e-pre.bambu-lab.com"; - else if (sel == ENV_PRODUCT_HOST) - host = "e.bambulab.com"; - return host; -#else +// #if !BBL_RELEASE_TO_PUBLIC +// if (sel == ENV_DEV_HOST) +// host = "e-dev.bambu-lab.com"; +// else if (sel == ENV_QAT_HOST) +// host = "e-qa.bambu-lab.com"; +// else if (sel == ENV_PRE_HOST) +// host = "e-pre.bambu-lab.com"; +// else if (sel == ENV_PRODUCT_HOST) +// host = "e.bambulab.com"; +// return host; +// #else return "e.bambulab.com"; -#endif +// #endif } void AppConfig::reset() @@ -291,15 +291,15 @@ void AppConfig::set_defaults() set("backup_interval", "10"); } -#if BBL_RELEASE_TO_PUBLIC +// #if BBL_RELEASE_TO_PUBLIC if (get("iot_environment").empty()) { set("iot_environment", "3"); } -#else - if (get("iot_environment").empty()) { - set("iot_environment", "1"); - } -#endif +// #else +// if (get("iot_environment").empty()) { +// set("iot_environment", "1"); +// } +// #endif // Remove legacy window positions/sizes erase("app", "main_frame_maximized"); @@ -1028,29 +1028,29 @@ void AppConfig::update_last_backup_dir(const std::string& dir) std::string AppConfig::get_region() { -#if BBL_RELEASE_TO_PUBLIC +// #if BBL_RELEASE_TO_PUBLIC return this->get("region"); -#else - std::string sel = get("iot_environment"); - std::string region; - if (sel == ENV_DEV_HOST) - region = "ENV_CN_DEV"; - else if (sel == ENV_QAT_HOST) - region = "ENV_CN_QA"; - else if (sel == ENV_PRE_HOST) - region = "ENV_CN_PRE"; - if (region.empty()) - return this->get("region"); - return region; -#endif +// #else +// std::string sel = get("iot_environment"); +// std::string region; +// if (sel == ENV_DEV_HOST) +// region = "ENV_CN_DEV"; +// else if (sel == ENV_QAT_HOST) +// region = "ENV_CN_QA"; +// else if (sel == ENV_PRE_HOST) +// region = "ENV_CN_PRE"; +// if (region.empty()) +// return this->get("region"); +// return region; +// #endif } std::string AppConfig::get_country_code() { std::string region = get_region(); -#if !BBL_RELEASE_TO_PUBLIC - if (is_engineering_region()) { return region; } -#endif +// #if !BBL_RELEASE_TO_PUBLIC +// if (is_engineering_region()) { return region; } +// #endif if (region == "CHN" || region == "China") return "CN"; else if (region == "USA") diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 641f407141..0011fd3fa2 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -38,9 +38,9 @@ static std::vector s_project_options { "wipe_tower_y", "wipe_tower_rotation_angle", "curr_bed_type", -#if !BBL_RELEASE_TO_PUBLIC +// #if !BBL_RELEASE_TO_PUBLIC "flush_multiplier", -#endif +// #endif }; //BBS: add BBL as default diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp index 801a5a6862..b7b02be750 100644 --- a/src/slic3r/GUI/BBLTopbar.cpp +++ b/src/slic3r/GUI/BBLTopbar.cpp @@ -250,13 +250,13 @@ void BBLTopbar::Init(wxFrame* parent) this->AddSpacer(FromDIP(10)); this->AddStretchSpacer(1); -#if !BBL_RELEASE_TO_PUBLIC +// #if !BBL_RELEASE_TO_PUBLIC /*wxBitmap m_publish_bitmap = create_scaled_bitmap("topbar_publish", nullptr, TOPBAR_ICON_SIZE); m_publish_item = this->AddTool(ID_PUBLISH, "", m_publish_bitmap); wxBitmap m_publish_disable_bitmap = create_scaled_bitmap("topbar_publish_disable", nullptr, TOPBAR_ICON_SIZE); m_publish_item->SetDisabledBitmap(m_publish_disable_bitmap); this->AddSpacer(FromDIP(12));*/ -#endif +// #endif /*wxBitmap model_store_bitmap = create_scaled_bitmap("topbar_store", nullptr, TOPBAR_ICON_SIZE); m_model_store_item = this->AddTool(ID_MODEL_STORE, "", model_store_bitmap); diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index 1232dee606..392d92014d 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -37,9 +37,9 @@ MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl2 *media_ctrl, const w media_proc(); }); -#if BBL_RELEASE_TO_PUBLIC +// #if BBL_RELEASE_TO_PUBLIC m_next_retry = wxDateTime::Now(); -#endif +// #endif auto onShowHide = [this](auto &e) { e.Skip();