diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 4da664a175..ec8f9dac78 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -1059,8 +1059,8 @@ void AmsMapingPopup::show_reset_button() { m_reset_btn->Show(); } -// Orca: transitional shim (removed in resync cluster 8) — restored verbatim from the pre-resync Orca -// implementation so SelectMachine (cluster 7, not yet resynced) keeps compiling. +// Orca: kept surface for the reverse-direction SelectMachine — this helper (dropped by the reference) +// is still consumed by SelectMachine, so it stays as a permanent compatibility surface. std::vector AmsMapingPopup::parse_ams_mapping(const std::map& amsList) { std::vector m_tray_data; diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index 1c819e1a52..9fb41ad9de 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -352,12 +352,11 @@ public: void paintEvent(wxPaintEvent &evt); void set_parent_item(MaterialItem* item) {m_parent_item = item;}; void set_show_type(ShowType type) { m_show_type = type; }; - // Orca: transitional shim (removed in resync cluster 8) — keeps SelectMachine (cluster 7, not yet - // resynced) compiling. Its only caller passes false, which equals the copied update path's default - // (all slots shown), so a no-op preserves behavior. + // Orca: kept surface for the reverse-direction SelectMachine — its only caller passes false, which + // equals the update path's default (all slots shown), so this no-op preserves behavior. void set_only_show_ext_spool(bool /*flag*/) {} - // Orca: transitional shim (removed in resync cluster 8) — SelectMachine (cluster 7) still calls this - // dropped-from-REF helper; restored verbatim from the pre-resync Orca implementation. + // Orca: kept surface for the reverse-direction SelectMachine — this helper (dropped by the reference) + // is still consumed by SelectMachine, so it stays as a permanent compatibility surface. std::vector parse_ams_mapping(const std::map& amsList); #ifdef __APPLE__ diff --git a/src/slic3r/GUI/DeviceCore/DevDefs.h b/src/slic3r/GUI/DeviceCore/DevDefs.h index f5e3f1e380..e0eb7f854a 100644 --- a/src/slic3r/GUI/DeviceCore/DevDefs.h +++ b/src/slic3r/GUI/DeviceCore/DevDefs.h @@ -148,8 +148,8 @@ enum class DevFirmwareUpgradeState : int UpgradingFinished = 3 }; -// Orca: transitional shim (removed in resync cluster 8) — DeviceManager/UpgradePanel still use the -// pre-resync name; alias keeps them compiling until they are resynced to the reference name. +// Orca: permanent compatibility alias — the reverse-direction DeviceManager/UpgradePanel keep the +// Orca spelling of this enum, so the alias to the reference name is a kept surface, not transitional. using DevFirmwareUpgradingState = DevFirmwareUpgradeState; class devPrinterUtil diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp index 1d59b19729..77b069f3dc 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.cpp +++ b/src/slic3r/GUI/DeviceErrorDialog.cpp @@ -610,9 +610,7 @@ void DeviceErrorDialog::on_button_click(ActionButton btn_id) } case DeviceErrorDialog::OK_JUMP_RACK: { // Orca: ported REF error action Slic3r::GUI::wxGetApp().mainframe->jump_to_monitor(); - // Orca: transitional shim (removed in resync cluster 8) - if (auto* mon = Slic3r::GUI::wxGetApp().mainframe->m_monitor) - mon->get_status_panel()->jump_to_Rack(); + Slic3r::GUI::wxGetApp().mainframe->m_monitor->jump_to_Rack(); break; } case DeviceErrorDialog::ABORT: { // Orca: ported REF error action diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 759c7ba5b0..b84094027f 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3365,6 +3365,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_ is_support_filament_setting_inprinting = get_flag_bits(flag3, 3); is_enable_ams_np = get_flag_bits(flag3, 9); is_support_fila_change_abort = get_flag_bits(flag3, 13); // Orca: REF-additive, now ported (filament-change Stop button) + is_support_ext_change_assist_old = get_flag_bits(flag3, 16); // Orca: REF-additive, now ported (A/P-series multi-color external change assist) is_support_filament_32_colors = get_flag_bits(flag3, 17); // Orca: REF-additive, now ported (post-review) } } @@ -5810,7 +5811,9 @@ wxString MachineObject::get_nozzle_replace_url() const return link_map["en"].get(); }/*retry with en*/ - return "https://wiki.bambulab.com/en/h2/maintenance/replace-hotend"; + // Orca: no neutral wiki equivalent for this fallback — return empty so the caller hides the link + // (PrinterPartsDialog::OnWikiClicked reports "No wiki link available" instead of opening a browser) + return wxEmptyString; } std::string MachineObject::get_error_code_str(int error_code) diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 2408df501f..f190fe0aaf 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -130,9 +130,9 @@ private: DevBed * m_bed; DevStorage* m_storage; - /* Orca: adopt DeviceCore split — axis/calib/chamber/status/upgrade modules. - Provide the reference-shape surface for later resync clusters; MachineObject's inline - handling of these concerns stays authoritative during the transition (removed in cluster 8). */ + /* Orca: adopt DeviceCore split — axis/calib/chamber/status/upgrade modules alongside + MachineObject's inline handling of these concerns, which stays authoritative here (Orca keeps + the inline model permanently; the split modules coexist with it via accessors). */ std::shared_ptr m_axis; std::shared_ptr m_chamber; DevCalib* m_calib{ nullptr }; @@ -929,6 +929,7 @@ public: bool is_enable_ams_np{ false }; bool is_support_filament_32_colors{ false }; // Orca: REF-additive, now ported (post-review) bool is_support_fila_change_abort{ false }; // Orca: REF-additive, now ported (filament-change Stop button) + bool is_support_ext_change_assist_old{ false }; // Orca: REF-additive, now ported (A/P-series multi-color external change assist) // Orca: REF-additive, now ported (post-review). Max filament color count for the send // gate; returns 0 when there is no explicit upper bound. diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.h deleted file mode 100644 index df4e2ef707..0000000000 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.h +++ /dev/null @@ -1,13 +0,0 @@ -//**********************************************************/ -/* File: wgtDeviceNozzleRackNozzleItem.h -* Description: Compatibility header for the single-nozzle-cell widget. -//**********************************************************/ - -#pragma once - -// Orca: transitional shim (removed in resync cluster 8) -// The wgtDeviceNozzleRackNozzleItem class and its EVT_NOZZLE_RACK_NOZZLE_ITEM_SELECTED event now -// live inline in wgtDeviceNozzleRack.{h,cpp} (folded back to the reference shape). This header is -// kept only so the not-yet-resynced GUI/Widgets/MultiNozzleSync includer keeps resolving; it is -// deleted once that consumer is resynced to include wgtDeviceNozzleRack.h directly. -#include "wgtDeviceNozzleRack.h" diff --git a/src/slic3r/GUI/HMS.cpp b/src/slic3r/GUI/HMS.cpp index a8486f360a..4d67a398f7 100644 --- a/src/slic3r/GUI/HMS.cpp +++ b/src/slic3r/GUI/HMS.cpp @@ -267,7 +267,7 @@ std::string HMSQuery::hms_language_code() // set language code to en by default return "en"; std::string lang_code = wxGetApp().app_config->get_language_code(); - // The HMS host ships no catalog for these locales, so fall back to english to avoid empty texts + retries + // Orca: the HMS host ships no catalog for these locales, so fall back to english to avoid empty texts + retries if (lang_code.compare("uk") == 0 || lang_code.compare("cs") == 0 || lang_code.compare("ru") == 0 diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 682d37d7cc..cf66dc9f9b 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -4680,10 +4680,12 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_) } /* multi color external change assist*/ - if(obj_->is_support_ext_change_assist && !m_check_ext_change_assist->IsShown()){ + // Orca: REF-additive, now ported — A/P-series expose this via flag3 bit-16 (is_support_ext_change_assist_old) + bool is_support_mutile_color = obj_->is_support_ext_change_assist_old || obj_->is_support_ext_change_assist; + if (is_support_mutile_color && !m_check_ext_change_assist->IsShown()) { m_check_ext_change_assist->Show(true); m_label_ext_change_assist->Show(true); - }else if(!obj_->is_support_ext_change_assist &&m_check_ext_change_assist->IsShown()){ + } else if (!is_support_mutile_color && m_check_ext_change_assist->IsShown()) { m_check_ext_change_assist->Hide(); m_label_ext_change_assist->Hide(); } diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp index 18a5ecbd95..ab56663928 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp @@ -21,7 +21,7 @@ #include "libslic3r/PrintConfig.hpp" #include "libslic3r/MultiNozzleUtils.hpp" #include "slic3r/GUI/DeviceCore/DevNozzleRack.h" -#include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRackNozzleItem.h" +#include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h" #include #include