diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 6371608a5e..56ff4513a8 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -2756,14 +2756,6 @@ Vec2d Print::translate_to_print_space(const Point &point) const { FilamentTempType Print::get_filament_temp_type(const std::string& filament_type) { - // FilamentTempType Temperature-based logic - int min_temp, max_temp; - if (MaterialType::get_temperature_range(filament_type, min_temp, max_temp)) { - if (max_temp <= 250) return FilamentTempType::LowTemp; - else if (max_temp < 280) return FilamentTempType::HighLowCompatible; - else return FilamentTempType::HighTemp; - } - const static std::string HighTempFilamentStr = "high_temp_filament"; const static std::string LowTempFilamentStr = "low_temp_filament"; const static std::string HighLowCompatibleFilamentStr = "high_low_compatible_filament"; @@ -2798,6 +2790,19 @@ FilamentTempType Print::get_filament_temp_type(const std::string& filament_type) return HighTemp; if (filament_temp_type_map[LowTempFilamentStr].find(filament_type) != filament_temp_type_map[LowTempFilamentStr].end()) return LowTemp; + + // Orca: prefer explicit definition from JSON, if the filament type is not defined in json, fallback to temperature-based logic to determine the filament temp type. + // FilamentTempType Temperature-based logic + int min_temp, max_temp; + if (MaterialType::get_temperature_range(filament_type, min_temp, max_temp)) { + if (max_temp <= 250) + return FilamentTempType::LowTemp; + else if (max_temp < 280) + return FilamentTempType::HighLowCompatible; + else + return FilamentTempType::HighTemp; + } + return Undefine; } diff --git a/src/slic3r/GUI/DeviceTab/CMakeLists.txt b/src/slic3r/GUI/DeviceTab/CMakeLists.txt index 2d62d59a0d..40f192ef4e 100644 --- a/src/slic3r/GUI/DeviceTab/CMakeLists.txt +++ b/src/slic3r/GUI/DeviceTab/CMakeLists.txt @@ -1,7 +1,3 @@ -# GUI/DeviceTab -# usage -- GUI about device tab for BambuStudio -# date -- 2025.01.01 -# status -- Building list(APPEND SLIC3R_GUI_SOURCES GUI/DeviceTab/uiAmsHumidityPopup.h diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp index cc1e76ba2d..ced23a8d37 100644 --- a/src/slic3r/GUI/ObjColorDialog.cpp +++ b/src/slic3r/GUI/ObjColorDialog.cpp @@ -48,14 +48,7 @@ wxBoxSizer* ObjColorDialog::create_btn_sizer(long flags,bool exist_error) if (!exist_error) { btn_sizer->AddSpacer(FromDIP(25)); auto *tips = new HyperLink(this, _L("Wiki Guide")); // ORCA - tips->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { - bool is_zh = wxGetApp().app_config->get("language") == "zh_CN"; - if (is_zh) { - wxLaunchDefaultBrowser("https://wiki.bambulab.com/zh/software/bambu-studio/import_obj"); - } else { - wxLaunchDefaultBrowser("https://wiki.bambulab.com/en/software/bambu-studio/import_obj"); - } - }); + tips->SetURL("https://www.orcaslicer.com/wiki/general-settings/import_export.html#obj"); btn_sizer->Add(tips, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL); } btn_sizer->AddStretchSpacer(); diff --git a/src/slic3r/GUI/wxMediaCtrl2.cpp b/src/slic3r/GUI/wxMediaCtrl2.cpp index dfedae5677..bae815ae0f 100644 --- a/src/slic3r/GUI/wxMediaCtrl2.cpp +++ b/src/slic3r/GUI/wxMediaCtrl2.cpp @@ -123,7 +123,7 @@ void wxMediaCtrl2::Load(wxURI url) }); } else { CallAfter([] { - wxMessageBox(_L("Missing BambuSource component registered for media playing! Please re-install BambuStudio or seek after-sales help."), _L("Error"), wxOK); + wxMessageBox(_L("Missing BambuSource component registered for media playing! Please re-install OrcaSlicer or seek community help."), _L("Error"), wxOK); }); } m_error = clsid != CLSID_BAMBU_SOURCE ? 101 : path.empty() ? 102 : 103;