juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-18 00:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove porting jargon and provenance notes from comments

Browse Source
This commit is contained in:
SoftFever
2026-07-18 01:46:23 +08:00
parent 4683c17f6f
commit 0b4cb89f7c
19 changed files with 97 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/AMSMaterialsSetting.hpp
View File

@@ -124,9 +124,8 @@ public:
std::string ams_setting_id;
bool m_is_third;
// Orca: view-only mode (dialog half of the laser/cut read-only feature). When set, the dialog is
// inspectable but every editing control is disabled and no command is sent. Set by the caller
// (StatusPanel, cluster 6); dormant (false) until then, so behavior is unchanged.
// Orca: view-only mode (laser/cut). When set, the dialog is inspectable but every
// editing control is disabled and no command is sent.
bool m_view_only = false;
wxString m_brand_filament;
wxString m_brand_sn;

13
src/slic3r/GUI/AmsMappingPopup.hpp
View File

@@ -96,8 +96,8 @@ protected:
wxString m_mapping_text;
public:
// Orca: filament_id defaults to empty so the pre-resync 3-arg callers (SelectMachine [cluster 7],
// SendMultiMachinePage, the calibration wizard) keep compiling; m_filament_id is otherwise unused here.
// Orca: filament_id defaults to empty so the existing 3-arg callers keep compiling;
// m_filament_id is otherwise unused here.
MaterialItem(wxWindow *parent, wxColour mcolour, wxString mname, std::string filament_id = std::string());
~MaterialItem();
@@ -172,7 +172,7 @@ public:
class MaterialSyncItem : public MaterialItem
{
public:
// Orca: filament_id defaults to empty for pre-resync 3-arg callers (see MaterialItem).
// Orca: filament_id defaults to empty for existing 3-arg callers (see MaterialItem).
MaterialSyncItem(wxWindow *parent, wxColour mcolour, wxString mname, std::string filament_id = std::string());
~MaterialSyncItem();
int get_real_offset();
@@ -352,11 +352,10 @@ 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: 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.
// Orca: kept as a no-op for SelectMachine — its only caller passes false, which
// equals the update path's default (all slots shown).
void set_only_show_ext_spool(bool /*flag*/) {}
// 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.
// Orca: dropped by the reference but still consumed by SelectMachine.
std::vector<TrayData> parse_ams_mapping(const std::map<std::string, DevAms*, NumericStrCompare>& amsList);
#ifdef __APPLE__

4
src/slic3r/GUI/DeviceCore/DevDefs.h
View File

@@ -148,8 +148,8 @@ enum class DevFirmwareUpgradeState : int
UpgradingFinished = 3
};
// 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.
// Orca: DeviceManager/UpgradePanel keep the Orca spelling of this enum; the alias to the
// reference name is a permanent compatibility surface.
using DevFirmwareUpgradingState = DevFirmwareUpgradeState;
class devPrinterUtil

4
src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h
View File

@@ -76,7 +76,7 @@ public:
DevAmsSystemIdx GetCurrentFirmwareIdxSel() const { return m_current_firmware_sel.m_firmare_idx; };
DevAmsSystemIdx GetCurrentFirmwareIdxRun() const { return m_current_firmware_run.m_firmare_idx; };
std::unordered_map<int, DevAmsSystemFirmware> GetSuppotedFirmwares() const { return m_firmwares;}; // Orca: unordered (AMSSetting.cpp, cluster 8)
std::unordered_map<int, DevAmsSystemFirmware> GetSuppotedFirmwares() const { return m_firmwares;}; // Orca: unordered (mirrored by AMSSetting.cpp)
bool IsSwitching() const { return m_status == "SWITCHING";};
bool IsIdle() const { return m_status == "IDLE";};
@@ -95,7 +95,7 @@ private:
DevAmsSystemFirmware m_current_firmware_run;
DevAmsSystemFirmware m_current_firmware_sel;
std::unordered_map<int, DevAmsSystemFirmware> m_firmwares; // Orca: unordered (AMSSetting.cpp, cluster 8)
std::unordered_map<int, DevAmsSystemFirmware> m_firmwares; // Orca: unordered (mirrored by AMSSetting.cpp)
DevCtrlInfo m_ctrl_switching;
};

3
src/slic3r/GUI/DeviceCore/DevInfo.h
View File

@@ -10,8 +10,7 @@ class MachineObject;
/* some static info of machine*/ /*TODO*/
// Orca: kept as a stub — connection_type/is_lan_mode_printer/is_cloud_mode_printer live inline on
// MachineObject (DeviceManager.hpp). Adopting the reference's full DevInfo would duplicate those
// definitions and require an m_dev_info member MachineObject does not have; that consolidation is
// deferred to the DeviceManager resync (cluster 2).
// definitions and require an m_dev_info member MachineObject does not have.
class DevInfo
{
public:

2
src/slic3r/GUI/DeviceCore/DevPrintOptions.h
View File

@@ -105,7 +105,7 @@ private:
// print option
DevPrintingSpeedLevel m_speed_level = SPEED_LEVEL_INVALID;
// detection options (7 existing + 6 newly parsed)
// detection options
PrintOptionData m_ai_monitoring_detection;
PrintOptionData m_first_layer_detection;
PrintOptionData m_buildplate_mark_detection;

32
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -96,9 +96,8 @@ class DevStorage;
class DevUpgrade; // Orca: adopt DeviceCore split
struct DevPrintTaskRatingInfo;
// Orca: REF-additive, now ported (post-review). Returns true when filament_id (e.g. "GFA11",
// "GFU00") is on the stringing-prone list for the given nozzle diameter (mm), bucketed per
// nozzle size to mirror the printer firmware.
// Returns true when filament_id (e.g. "GFA11", "GFU00") is on the stringing-prone list for the
// given nozzle diameter (mm), bucketed per nozzle size to mirror the printer firmware.
bool is_stringing_prone_filament(const std::string& filament_id, float nozzle_diameter);
@@ -163,13 +162,11 @@ public:
void set_agent(NetworkAgent* agent) { m_agent = agent; }
NetworkAgent* get_agent() const { return m_agent; } // Orca: needed by DeviceCore modules (DevAxisCtrl)
// Orca: these five DeviceCore module accessors are UNWIRED on the read side. The modules are
// constructed in the ctor and axis/chamber/status are fed every MQTT push (ParseAxis/ParseChamber/
// ParseStatus), but NO GUI consumer reads them yet. For calib/upgrade the module parse is NOT
// routed — the legacy inline parse in DeviceManager.cpp remains authoritative. Migration is parked
// (follow-up issue); do NOT wire DevUpgrade naively: its ParseUpgradeDisplayState would duplicate
// the inline block's dis_state==3 -> command_get_version CallAfter side effect.
// Orca: adopt DeviceCore split — reference-shape accessors for the new modules
// Orca: these DeviceCore module accessors are unwired on the read side — axis/chamber/status
// are fed every MQTT push but no GUI consumer reads them yet, and for calib/upgrade the inline
// parse in DeviceManager.cpp remains authoritative. Do not wire DevUpgrade naively: its
// ParseUpgradeDisplayState would duplicate the inline block's dis_state==3 ->
// command_get_version CallAfter side effect.
std::shared_ptr<DevAxis> GetAxis() const { return m_axis; }
std::shared_ptr<DevChamber> GetChamber() const { return m_chamber; }
DevCalib* GetCalib() const { return m_calib; }
@@ -409,7 +406,6 @@ public:
DevFirmwareVersionInfo laser_version_info;
DevFirmwareVersionInfo cutting_module_version_info;
DevFirmwareVersionInfo extinguish_version_info;
// Orca: REF-additive accessory firmware versions, now ported (post-review)
DevFirmwareVersionInfo rotary_version_info;
DevFirmwareVersionInfo exhaustfan_version_info;
DevFirmwareVersionInfo amshub_version_info;
@@ -710,9 +706,8 @@ public:
boost::thread* get_slice_info_thread { nullptr };
boost::thread* get_model_task_thread { nullptr };
// Orca: REF-additive, now ported (post-review). Per-filament-index AMS slot mapping
// reported by the printer in print.mapping. Up to 32 entries, each value packs
// (ams_id << 8) | slot_id; 0xFFFF means unused.
// Per-filament-index AMS slot mapping reported by the printer in print.mapping. Up to
// 32 entries, each value packs (ams_id << 8) | slot_id; 0xFFFF means unused.
std::vector<uint16_t> print_job_filament_mapping;
bool any_loaded_filament_is_stringing_prone() const;
@@ -933,12 +928,11 @@ public:
/*for more extruder*/
bool is_enable_np{ false };
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)
bool is_support_filament_32_colors{ false };
bool is_support_fila_change_abort{ false }; // filament-change Stop button
bool is_support_ext_change_assist_old{ false }; // 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.
// Max filament color count for the send gate; returns 0 when there is no explicit upper bound.
int get_max_filament_color_count() const;
/**

6
src/slic3r/GUI/Jobs/PrintJob.cpp
View File

@@ -523,7 +523,7 @@ void PrintJob::process(Ctl &ctl)
BOOST_LOG_TRIVIAL(info) << "print_job: printer has enter printing status, s = " << obj->print_status;
return true;
}
// Orca: break the wait-for-print-start loop on user cancel (resync).
// Break the wait-for-print-start loop on user cancel.
if (ctl.was_canceled()) {
BOOST_LOG_TRIVIAL(info) << "print_job: user cancel the job " << obj->job_id_;
return true;
@@ -644,8 +644,8 @@ void PrintJob::process(Ctl &ctl)
if (result < 0) {
curr_percent = -1;
// Orca: restore the ENC-flag-not-ready message (resync). The printer is still fetching its
// encryption flag (a transient state), so ask the user to retry rather than showing a generic error.
// The printer is still fetching its encryption flag (a transient state), so ask the
// user to retry rather than showing a generic error.
if (result == BAMBU_NETOWRK_ERR_PRINT_SP_ENC_FLAG_NOT_READY) {
msg_text = _u8L("Retrieving printer information, please try again later.");
} else if (result == BAMBU_NETWORK_ERR_PRINT_WR_FILE_NOT_EXIST || result == BAMBU_NETWORK_ERR_PRINT_SP_FILE_NOT_EXIST) {

8
src/slic3r/GUI/Jobs/SendJob.cpp
View File

@@ -118,11 +118,9 @@ void SendJob::process(Ctl &ctl)
ctl.call_on_main_thread([this] { prepare(); }).wait();
ctl.update_status(0, msg);
// Orca: IP/access-code verification pass (resync), adapted to the Worker/Job model. In check mode
// (InputIpAddressDialog / lan-mode send) verify the connection with a dummy "verify_job" upload and
// fire the caller's success/fail callback; when not continuing, stop here. Non-check-mode (cloud)
// sends skip this. Without it, set_check_mode()/check_and_continue() were dead and the IP-verify
// dialog's callbacks (ReleaseNote InputIpAddressDialog / SendToPrinter lan-mode) could never fire.
// In check mode (InputIpAddressDialog / lan-mode send) verify the connection with a dummy
// "verify_job" upload and fire the caller's success/fail callback; when not continuing, stop
// here. Cloud sends skip this.
if (m_is_check_mode) {
PrintParams verify_params;
verify_params.dev_ip = m_dev_ip;

6
src/slic3r/GUI/PrePrintChecker.cpp
View File

@@ -112,12 +112,12 @@ wxString PrePrintChecker::get_pre_state_msg(PrintDialogStatus status)
// (SelectMachine formats it via get_pre_state_msg before add()); default templates keep the wording.
case PrintStatusColorQuantityExceed: return _L("The current firmware supports a maximum of %s materials. You can either reduce the number of materials to %s or fewer on the Preparation Page, or try updating the firmware. If you are still restricted after the update, please wait for subsequent firmware support.");
case PrintStatusWarningExtFilamentNotMatch: return _L("The type of external filament is unknown or does not match with the filament type in the slicing file. Please make sure you have installed the correct filament in the external spool.");
// Orca: reuses REF's exact AutoCali/CaliOn text (same string for both). CaliOn is a non-blocking
// advisory (Send stays enabled); the "auto" case is the blocking one (PrintStatusTPUUnsupportAutoCali).
// Same text as the blocking "auto" case (PrintStatusTPUUnsupportAutoCali); CaliOn is a
// non-blocking advisory (Send stays enabled).
case PrintStatusTPUUnsupportCaliOn: return _L("TPU 90A/TPU 85A are too soft. It is recommended to perform manual flow calibration on the 'Calibration' page. If 'Dynamic Flow Calibration' is set to auto/on, the system will use the previous calibration value and skip the flow calibration process.");
case PrintStatusFilamentWarningRemainNotEnough: return _L("The filament in the AMS may be insufficient for this print. Please refill or replace it.");
// SmartNozzleBlobNeedAuto text is passed via add_with_link (clickable "Switch"), not here.
// PrintTimeEstimateWarning is dead in REF (no call site); enum kept for parity, no message string.
// PrintTimeEstimateWarning has no call site and no message string.
}
return wxEmptyString;
}

7
src/slic3r/GUI/PrePrintChecker.hpp
View File

@@ -119,10 +119,9 @@ enum PrintDialogStatus : unsigned int {
PrintStatusWarningExtFilamentNotMatch,
PrintStatusFilamentWarningNozzleHRC,
PrintStatusFilamentCrossExtruderWarning,
// Orca: resynced pre-send-check statuses (all non-blocking advisories). Wired: TPUUnsupportCaliOn,
// TPUUnsuggestCali, SmartNozzleBlobNeedAuto. FilamentWarningRemainNotEnough is declared for
// forward-compat (feature deferred — missing device-model surface). PrintTimeEstimateWarning is
// kept for table parity only (dead in REF; no call site, no message).
// Non-blocking advisories. FilamentWarningRemainNotEnough is declared but not wired (missing
// device-model surface); PrintTimeEstimateWarning has no call site or message and is kept only
// to match the reference enum table.
PrintStatusTPUUnsupportCaliOn,
PrintStatusTPUUnsuggestCali,
PrintStatusSmartNozzleBlobNeedAuto,

9
src/slic3r/GUI/PrintOptionsDialog.cpp
View File

@@ -223,9 +223,9 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent)
int mode_map[] = {2, 1, 0};
if (sel < 0 || sel > 2) { evt.Skip(); return; }
// Orca: Auto->On in-print confirmation (backing helper landed in cluster 2). If currently in
// Auto (current_detect_value == 2), a print is running, and a loaded filament is stringing-prone,
// confirm before enabling — turning blob detection on mid-print with such filament can degrade quality.
// If currently in Auto (current_detect_value == 2), a print is running, and a loaded
// filament is stringing-prone, confirm before enabling — turning blob detection on
// mid-print with such filament can degrade quality.
const auto* blob_opt = obj->GetPrintOptions()->GetDetectionOption(PrintOptionEnum::Smart_Nozzle_Blob_Detection);
const bool was_auto = blob_opt && blob_opt->current_detect_value == 2;
if (sel == 1 /*On*/ && was_auto && obj->is_in_printing()
@@ -527,8 +527,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
}
// Orca: firmware print-option toggles, each shown only when its fun2 capability bit is
// reported (Task 6 detection map). A printer reporting none of these bits renders
// the dialog exactly as before.
// reported. A printer reporting none of these bits renders the dialog as before.
auto* print_opts = obj_->GetPrintOptions();
auto show_row = [](bool support, std::initializer_list<wxWindow*> widgets, wxSizerItem* bottom_space) {
for (auto* w : widgets) { if (w) w->Show(support); }

73
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -31,9 +31,9 @@
#include "DeviceCore/DevMapping.h"
#include "DeviceCore/DevUtilBackend.h"
#include "DeviceCore/DevMappingNozzle.h"
#include "DeviceCore/DevPrintOptions.h" // Orca: smart-nozzle-blob detection option (resync)
#include "libslic3r/MultiNozzleUtils.hpp" // Orca: filament-change-gap model for the best-position popup (resync)
#include "BackgroundSlicingProcess.hpp" // Orca: complete type for background_process().get_current_gcode_result() (resync)
#include "DeviceCore/DevPrintOptions.h" // smart-nozzle-blob detection option
#include "libslic3r/MultiNozzleUtils.hpp" // filament-change-gap model for the best-position popup
#include "BackgroundSlicingProcess.hpp" // complete type for background_process().get_current_gcode_result()
#include "DeviceCore/DevStorage.h"
#include <wx/progdlg.h>
@@ -329,7 +329,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_text_printer_msg_tips->Hide();
m_text_printer_msg_tips->GetAlignment();
// Orca: best-position "recommended arrangement saves X" clickable tip (resync). Hidden unless the
// Orca: best-position "recommended arrangement saves X" clickable tip. Hidden unless the
// printer has a filament switcher and a better arrangement exists; click opens the best-position popup.
m_saveTimeText = new Label(m_basic_panel, wxEmptyString);
m_saveTimeText->SetForegroundColour(wxColour("#FF6F00"));
@@ -349,7 +349,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
sizer_basic_right_info->Add(m_text_printer_msg, 0, wxLEFT, 0);
sizer_basic_right_info->AddSpacer(FromDIP(10));
sizer_basic_right_info->Add(m_text_printer_msg_tips, 0, wxLEFT, 0);
sizer_basic_right_info->Add(m_saveTimeText, 0, wxTOP, 0); // Orca: best-position tip (resync)
sizer_basic_right_info->Add(m_saveTimeText, 0, wxTOP, 0);
m_basicl_sizer->Add(m_sizer_thumbnail_area, 0, wxLEFT, 0);
@@ -1926,7 +1926,7 @@ bool SelectMachineDialog::CheckWarningFilamentCrossExtruder(MachineObject* obj_)
return true;
}
// ===== Orca: resynced pre-send checks + AMS best-position popup (cluster 7) =====
// ===== Orca: pre-send checks + AMS best-position popup =====
bool SelectMachineDialog::CheckWarningSmartNozzleBlobAuto(MachineObject* obj_)
{
@@ -2277,7 +2277,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
} else if (status == PrintStatusColorQuantityExceed) {
Enable_Refresh_Button(true);
Enable_Send_Button(false);
// Orca: fill the real per-printer max color count into the %s template (resync).
// Fill the real per-printer max color count into the %s template.
if (!params.empty())
msg = wxString::Format(m_pre_print_checker.get_pre_state_msg(status), params[0], params[0]);
}
@@ -2393,13 +2393,13 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
} else if (status == PrintStatusTPUUnsupportAutoCali) {
Enable_Refresh_Button(true);
Enable_Send_Button(false);
} else if (status == PrintStatusTPUUnsupportCaliOn) { // Orca: TPU manual-cali-on ADVISORY (resync) — Send stays enabled
} else if (status == PrintStatusTPUUnsupportCaliOn) { // advisory — Send stays enabled
Enable_Refresh_Button(true);
Enable_Send_Button(true);
} else if (status == PrintStatusTPUUnsuggestCali) { // Orca: TPU flow-cali advisory (resync) — non-blocking
} else if (status == PrintStatusTPUUnsuggestCali) { // advisory — Send stays enabled
Enable_Refresh_Button(true);
Enable_Send_Button(true);
} else if (status == PrintStatusSmartNozzleBlobNeedAuto) { // Orca: blob switch-to-Auto advisory (resync) — non-blocking
} else if (status == PrintStatusSmartNozzleBlobNeedAuto) { // advisory — Send stays enabled
Enable_Refresh_Button(true);
Enable_Send_Button(true);
} else if (status == PrintStatusHasFilamentInBlackListError) {
@@ -2948,8 +2948,8 @@ void SelectMachineDialog::EnableEditing(bool enable)
iter.second->enable(enable);
}
// Orca: grey the best-position "saves X" tip when editing is disabled so an error transition
// doesn't leave a stale clickable tip (resync).
// Grey the best-position "saves X" tip when editing is disabled so an error transition
// doesn't leave a stale clickable tip.
if (m_saveTimeText) enable ? m_saveTimeText->Enable() : m_saveTimeText->Disable();
}
@@ -3627,9 +3627,9 @@ void SelectMachineDialog::on_send_print()
timelapse_option = m_checkbox_list["timelapse"]->getValue() == "on";
}
// Orca: PA-profile-sharing mode (extrude_cali_manual_mode): 0 = share (toggle on), 1 = per-nozzle.
// Only sent for pa_mode-capable printers; -1 keeps the field omitted for everyone else, matching
// Orca's prior behavior (this field was never populated before).
// PA-profile-sharing mode (extrude_cali_manual_mode): 0 = share (toggle on), 1 = per-nozzle.
// Shared PA (0) is the deliberate default for pa_mode printers even while the toggle is hidden;
// -1 keeps the field omitted for every other printer, which was the prior behavior.
int pa_manual_mode = -1;
if (obj_->is_support_pa_mode) {
pa_manual_mode = (m_checkbox_list["pa_value"]->getValue() == "on") ? 0 : 1;
@@ -4091,8 +4091,8 @@ void SelectMachineDialog::on_timer(wxTimerEvent &event)
update_print_status_msg();
//update_scroll_area_size();/*STUDIO-12867 the page maybe blank in some platform. FIXME*/
// Orca: refresh the best-position "saves X" tip after the status update (resync). Placed here (not
// inside update_show_status) so it still runs when update_show_status returns early on an error.
// Refresh the best-position "saves X" tip after the status update. Placed here (not inside
// update_show_status) so it still runs when update_show_status returns early on an error.
// No-op for printers without a filament switcher.
refresh_save_time(obj_);
}
@@ -4680,7 +4680,7 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
}
/* multi color external change assist*/
// Orca: REF-additive, now ported — A/P-series expose this via flag3 bit-16 (is_support_ext_change_assist_old)
// 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);
@@ -4741,10 +4741,9 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
show_status(PrintDialogStatus::PrintStatusNoSdcard);
return;
}
// Orca: gate against the printer's real max filament-color count instead of a hardcoded 16, so
// high-color firmware (is_support_filament_32_colors -> 32) isn't wrongly blocked. Floor at 16 so
// printers that report 0 (e.g. series X/O) keep their prior limit; every other class is unchanged.
// The real max is passed as a param so the %s message shows the actual count.
// Gate against the printer's real max filament-color count, floored at 16 so printers that
// report 0 (e.g. series X/O) keep that limit. The max is passed as a param so the %s message
// shows the actual count.
int max_color = obj_->get_max_filament_color_count();
if (max_color < 16) max_color = 16;
if (wxGetApp().preset_bundle->filament_presets.size() > (size_t)max_color && m_print_type != PrintFromType::FROM_SDCARD_VIEW) {
@@ -4770,10 +4769,9 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
}
}
// Orca: TPU/Aero flow-cali gate on printers that don't support PA auto-cali (REF parity). Only the
// "auto" case BLOCKS (AutoCali). The "on" case is a non-blocking ADVISORY (CaliOn): the printer uses
// the previous cali value and skips, so Send stays enabled and we do NOT return (matches REF, which
// puts CaliOn in the warning band and only returns on is_error).
// TPU/Aero flow-cali gate on printers that don't support PA auto-cali: "auto" blocks; "on" is a
// non-blocking advisory (the printer falls back to the previous cali value and skips flow
// calibration), so Send stays enabled and there is no return.
if (!can_support_pa_auto_cali() && m_checkbox_list["flow_cali"]->IsShown()) {
if (m_checkbox_list["flow_cali"]->getValue() == "auto") {
show_status(PrintDialogStatus::PrintStatusTPUUnsupportAutoCali);
@@ -4856,9 +4854,12 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
// H2-series firmware gate: block Send when TPU is mapped to the left (deputy) extruder on firmware
// that can't print it. Inert unless the printer JSON opts in via support_print_check_firmware_for_tpu_left.
// Fail-closed on purpose: a mapping entry missing from the tray list blocks as
// AmsMappingInvalid, and value_or(false) blocks TPU-left until the first fun2 push arrives;
// both self-clear on the next status refresh.
if (DevPrinterConfigUtil::support_print_check_firmware_for_tpu_left(obj_->printer_type)) {
// Orca: read the raw string members fila.ams_id/fila.slot_id (no int round-trip, which would throw on an
// unmapped filament); upstream's jump-to-upgrade button styling on the message is dropped for the plain message.
// Read the raw string members fila.ams_id/fila.slot_id — an int round-trip would throw on
// an unmapped filament. Orca: the jump-to-upgrade button styling is not ported.
bool has_tpu_left = false;
for (const auto& fila : m_ams_mapping_result) {
const auto& ams_id = fila.ams_id;
@@ -4994,11 +4995,9 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
show_status(PrintDialogStatus::PrintStatusFilamentCrossExtruderWarning, { warning_msg });
}
// Orca: smart-nozzle-blob pre-send suggestion (resync). When the file has stringing-prone filament
// and the printer's clumping detection isn't already Auto, offer a clickable "Switch" that sets the
// detection to Auto (mode 2). Rendered via the Orca callback-link path (add_with_link) with the
// message passed as a literal (no get_pre_state_msg entry) so the tail add() doesn't also push a
// second, linkless copy — mirrors the TimelapseStorageLow convention.
// Suggest switching nozzle clumping detection to Auto when the file has stringing-prone
// filament. The message is passed as a literal (no get_pre_state_msg entry) so the tail add()
// doesn't also push a second, linkless copy.
if (!CheckWarningSmartNozzleBlobAuto(obj_)) {
show_status(PrintDialogStatus::PrintStatusSmartNozzleBlobNeedAuto);
m_pre_print_checker.add_with_link(
@@ -5013,9 +5012,9 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
});
}
// Orca: TPU flow-cali advisory (resync, non-blocking). When Flow Dynamics Calibration is Auto/On and
// a mapped filament is in the printer's auto_on_cali_warning_tpu_filaments list, warn that the system
// will use the manual/default value and skip flow calibration. Send stays enabled.
// Non-blocking: when Flow Dynamics Calibration is Auto/On and a mapped filament is in the
// printer's auto_on_cali_warning_tpu_filaments list, warn that the system will use the
// manual/default value and skip flow calibration. Send stays enabled.
if (obj_ && m_checkbox_list.count("flow_cali") && m_checkbox_list["flow_cali"]->IsShown()
&& m_checkbox_list["flow_cali"]->getValue() != "off") {
const auto& warning_tpu_filaments =
@@ -6158,7 +6157,7 @@ void SelectMachineDialog::set_default_from_sdcard()
::sprintf(weight, "%.2f g", float_weight); // ORCA remove spacing before text
m_stext_time->SetLabel(time);
m_stext_weight->SetLabel(weight);
refresh_save_time(obj_); // Orca: mirrors REF; no-op for FROM_SDCARD_VIEW (refresh_save_time early-returns)
refresh_save_time(obj_); // no-op for FROM_SDCARD_VIEW (refresh_save_time early-returns)
}
catch (...) {}
}

12
src/slic3r/GUI/SelectMachine.hpp
View File

@@ -45,7 +45,7 @@
#include "Widgets/ScrolledWindow.hpp"
#include "Widgets/PopupWindow.hpp"
#include "Widgets/HyperLink.hpp" // ORCA
#include "DeviceTab/uiAMSBestPositionPopup.hpp" // Orca: AMS best-position popup (resync)
#include "DeviceTab/uiAMSBestPositionPopup.hpp" // AMS best-position popup
#include "DeviceCore/DevFilaSwitch.h" // Orca: DevFilaSwitch::SwitchPos for best-position helpers
#include <optional>
#include <wx/simplebook.h>
@@ -399,7 +399,7 @@ protected:
wxStaticText* m_rename_text{nullptr};
Label* m_stext_time{ nullptr };
Label* m_stext_weight{ nullptr };
Label* m_saveTimeText{ nullptr }; // Orca: best-position "saves X" clickable tip (resync)
Label* m_saveTimeText{ nullptr }; // best-position "saves X" clickable tip
PrinterMsgPanel * m_statictext_ams_msg{nullptr};
Label* m_txt_change_filament_times{ nullptr };
CheckBox* m_check_ext_change_assist{ nullptr };
@@ -446,7 +446,7 @@ protected:
wxGridSizer* m_sizer_ams_mapping_right{ nullptr };
PrePrintChecker m_pre_print_checker;
ReselectMachineDialog* m_best_pos_dialog{ nullptr }; // Orca: AMS best-position popup (resync)
ReselectMachineDialog* m_best_pos_dialog{ nullptr }; // AMS best-position popup
public:
static std::vector<wxString> MACHINE_BED_TYPE_STRING;
@@ -553,10 +553,10 @@ public:
// Warn (without blocking) when a mapped filament would be printed from both extruders on a
// dual-extruder printer, so per-nozzle manual K-value can't follow it across the whole print.
bool CheckWarningFilamentCrossExtruder(MachineObject* obj_);
// Orca: smart-nozzle-blob pre-send suggestion (resync). Recommends switching nozzle clumping
// detection to Auto when the file has stringing-prone filament and the printer isn't in Auto.
// Recommends switching nozzle clumping detection to Auto when the file has stringing-prone
// filament and the printer isn't in Auto.
bool CheckWarningSmartNozzleBlobAuto(MachineObject* obj_);
// Orca: AMS best-switch-position popup (resync). Suggests the filament arrangement that minimizes
// AMS best-switch-position popup: suggests the filament arrangement that minimizes
// filament-change time on filament-switcher printers; no-op for printers without a switcher.
void on_reselect_dialog_btn_clicked(wxMouseEvent&);
void update_best_pos_dialog(wxCommandEvent& evt);

4
src/slic3r/GUI/SendToPrinter.cpp
View File

@@ -1896,7 +1896,7 @@ void SendToPrinterDialog::CreateMediaAbilityJob()
}
});
});
// Orca: guard against a null transfer tunnel before dereferencing (resync).
// Guard against a null transfer tunnel before dereferencing.
if (m_filetransfer_tunnel) {
m_filetransfer_mediability_job->start_on(*m_filetransfer_tunnel);
} else {
@@ -1941,7 +1941,7 @@ void SendToPrinterDialog::CreateUploadFileJob(const std::string &path, const std
}
});
});
// Orca: guard against a null transfer tunnel before dereferencing (resync).
// Guard against a null transfer tunnel before dereferencing.
if (m_filetransfer_tunnel) {
m_filetransfer_uploadfile_job->start_on(*m_filetransfer_tunnel);
} else {

2
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -5432,7 +5432,7 @@ void StatusPanel::update_filament_loading_panel(MachineObject* obj)
bool ams_loading_state = false;
auto ams_status_sub = obj->ams_status_sub;
// Orca: skip busy-loading detection during a cold pull (backing enum/parse landed in cluster 2)
// Skip busy-loading detection during a cold pull.
if (obj->is_enable_np && obj->ams_status_main != AMS_STATUS_MAIN_COLD_PULL) {
ams_loading_state = obj->GetExtderSystem()->IsBusyLoading();
} else if (obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE) {

11
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@@ -372,9 +372,8 @@ void SyncAmsInfoDialog::update_map_when_change_map_mode()
m_cur_colors_in_thumbnail = m_back_cur_colors_in_thumbnail;
} else if (m_map_mode == MapModeEnum::Override) {
if (m_ams_combo_info.empty()) {
// Orca: the reference passes has_selector() here to skip ext-spool colors in Override mode;
// that overload lives in libslic3r/PresetBundle (out of this cluster's scope), so we keep the
// 1-arg form. Minor: with an FTS installed, ext-spool colors still appear in the Override combo.
// Orca: the reference's has_selector overload (skips ext-spool colors in Override mode) is
// not ported, so with an FTS installed, ext-spool colors still appear in the Override combo.
wxGetApp().preset_bundle->get_ams_cobox_infos(m_ams_combo_info);
}
for (size_t i = 0; i < m_ams_combo_info.ams_filament_colors.size(); i++) {
@@ -1225,8 +1224,8 @@ void SyncAmsInfoDialog::sync_ams_mapping_result(std::vector<FilamentInfo> &resul
}
}
// Orca: ported FTS "selector" check — a Filament Track Switch, once installed and ready, feeds both
// nozzles from one AMS set, so the mapping collapses to a single dynamic panel and skips ext spools.
// A Filament Track Switch, once installed and ready, feeds both nozzles from one AMS set,
// so the mapping collapses to a single dynamic panel and skips ext spools.
bool SyncAmsInfoDialog::has_selector(MachineObject *obj_) const
{
if (!obj_) {
@@ -2661,7 +2660,7 @@ void SyncAmsInfoDialog::reset_and_sync_ams_list()
MachineObject *obj_ = dev_manager->get_selected_machine();
bool is_selector = false;
if (get_is_double_extruder()) {
if (has_selector(obj_)) { // Orca: ported FTS combined view — one dynamic panel when a switch is installed+ready
if (has_selector(obj_)) { // FTS combined view — one dynamic panel when a switch is installed+ready
m_mapping_popup.set_show_type(ShowType::LEFT_AND_RIGHT_DYNAMIC);
is_selector = true;
} else {

5
src/slic3r/GUI/UpgradePanel.cpp
View File

@@ -1236,7 +1236,6 @@ void MachineInfoPanel::update_filatrack(MachineObject* obj)
}
}
// Orca: accessory firmware version display (backing parse landed in cluster 2)
void MachineInfoPanel::update_rotary(MachineObject* obj)
{
if (obj && obj->rotary_version_info.isValid())
@@ -1250,7 +1249,6 @@ void MachineInfoPanel::update_rotary(MachineObject* obj)
}
}
// Orca: accessory firmware version display (backing parse landed in cluster 2)
void MachineInfoPanel::update_exhaustfan(MachineObject* obj)
{
if (obj && obj->exhaustfan_version_info.isValid())
@@ -1264,8 +1262,7 @@ void MachineInfoPanel::update_exhaustfan(MachineObject* obj)
}
}
// Orca: AMS-hub / filament-buffer firmware version display (backing parse landed in cluster 2).
// Shown only when the kept m_ahb_panel path (module_vers["ahb"]) does NOT fire, so no printer gets a
// Shown only when the m_ahb_panel path (module_vers["ahb"]) does NOT fire, so no printer gets a
// double AMS-hub row. X2D/P2S report the buffer via amshub_version_info.product_name instead of module_vers.
void MachineInfoPanel::update_amshub(MachineObject* obj)
{

7
src/slic3r/Utils/BBLNetworkPlugin.cpp
View File

@@ -187,10 +187,9 @@ int BBLNetworkPlugin::initialize(bool using_backup, const std::string& version)
int BBLNetworkPlugin::unload()
{
// Orca: destroy the plugin agent while its creating DLL is still loaded, so the void* handle
// never dangles into freed memory. Skipping this makes a network-plugin hot reload (unload +
// reload) crash: the stale m_agent survives the unload, create_agent() then short-circuits on
// has_agent() and keeps the dangling old-DLL handle, and the next call into the freshly loaded
// DLL (e.g. install_device_cert from the device-refresh timer) dereferences it -> access violation.
// never dangles into freed memory. A stale m_agent surviving the unload makes create_agent()
// short-circuit on has_agent() after a hot reload, and the next call into the freshly loaded
// DLL dereferences the old-DLL handle -> access violation.
destroy_agent();
UnloadFTModule();