diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 54c7b1b2d..6515ab3ac 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2671,14 +2671,14 @@ std::vector Plater::priv::load_files(const std::vector& input_ if (en_3mf_file_type == En3mfType::From_Prusa) { // do not reset the model config load_config = false; - show_info(q, _L("the 3mf is not compatible, load geometry data only!"), _L("Incompatible 3mf")); + show_info(q, _L("The 3mf is not from Bambu lab, load geometry data only."), _L("Load 3mf")); } else if (load_config && (file_version.maj() != app_version.maj())) { // version mismatch, only load geometries load_config = false; if (!load_model) { // only load config case, return directly - show_info(q, _L("The Config is not compatible and can not be loaded."), _L("Incompatible 3mf")); + show_info(q, _L("The Config can not be loaded."), _L("Load 3mf")); return empty_result; } load_old_project = true; @@ -2686,7 +2686,10 @@ std::vector Plater::priv::load_files(const std::vector& input_ q->select_view_3D("3D"); // select plate 0 as default q->select_plate(0); - show_info(q, _L("the 3mf is not compatible, load geometry data only!"), _L("Incompatible 3mf")); + if (en_3mf_file_type == En3mfType::From_BBS) + show_info(q, _L("The 3mf is generated by old Bambu Studio, load geometry data only."), _L("Load 3mf")); + else + show_info(q, _L("The 3mf is not from Bambu lab, load geometry data only."), _L("Load 3mf")); for (ModelObject *model_object : model.objects) { model_object->config.reset(); // Is there any modifier or advanced config data? diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index 683785a4e..f62c7fc1c 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -478,7 +478,7 @@ void PresetUpdater::priv::sync_resources(std::string http_url, std::map resource_list; - BOOST_LOG_TRIVIAL(info) << format("[BBL Updater]: get preferred setting version for app version %1%, url: `%2%`", SLIC3R_APP_NAME, version_check_url); + BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_resources get preferred setting version for app version %1%, url: %2%")%SLIC3R_APP_NAME%http_url; std::string query_params = "?"; bool first = true; @@ -496,6 +496,7 @@ void PresetUpdater::priv::sync_resources(std::string http_url, std::map(); @@ -528,22 +529,22 @@ void PresetUpdater::priv::sync_resources(std::string http_url, std::map> vendor_list; std::map vendor_descriptions; - BOOST_LOG_TRIVIAL(info) << "[BBL Updater]: Syncing configuration cache"; + BOOST_LOG_TRIVIAL(info) << "[BBL Updater]: sync_config Syncing configuration cache"; if (!enabled_config_update) { return; } - BOOST_LOG_TRIVIAL(info) << format("[BBL Updater]: get preferred setting version for app version %1%, url: `%2%`", SLIC3R_APP_NAME, version_check_url); + BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config get preferred setting version for app version %1%, http_url: %2%")%SLIC3R_APP_NAME%http_url; std::string query_params = "?"; bool first = true; @@ -641,6 +642,7 @@ void PresetUpdater::priv::sync_config(std::string http_url, const VendorMap vend std::string url = http_url; url += query_params; Slic3r::Http http = Slic3r::Http::get(url); + BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config request_url: %1%")%url; http.on_progress([this](Slic3r::Http::Progress, bool &cancel_http) { if (cancel) { cancel_http = true; @@ -649,7 +651,7 @@ void PresetUpdater::priv::sync_config(std::string http_url, const VendorMap vend .on_complete( [this, &vendor_list, &vendor_descriptions, vendors](std::string body, unsigned) { try { - BOOST_LOG_TRIVIAL(trace) << "[BBL Updater]::body=" << body; + BOOST_LOG_TRIVIAL(info) << "[BBL Updater]::body=" << body; json j = json::parse(body); std::string message = j["message"].get(); @@ -678,7 +680,7 @@ void PresetUpdater::priv::sync_config(std::string http_url, const VendorMap vend url = sub_iter.value(); } } - BOOST_LOG_TRIVIAL(trace) << "[BBL Updater]: get type "<< type <<", version "<