viewit/OrcaSlicer-KX
5
3
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix(build): sub_brands in AmsTrayData; wxFileName::Normalize() wxPATH_NORM_ALL (wx 3.3)

Browse Source
This commit is contained in:
thysson2701
2026-06-22 20:24:14 +02:00
parent 7ebadadcd1
commit c7cb2aef53
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/Utils/MoonrakerPrinterAgent.hpp
View File

@@ -94,6 +94,7 @@ protected:
std::string tray_type; // Material type (e.g., "PLA", "ASA")
std::string tray_color; // Raw color (#RRGGBB, 0xRRGGBB, or RRGGBBAA)
std::string tray_info_idx; // Setting ID (optional)
std::string sub_brands; // Lane/filament name from Moonraker (KX)
int bed_temp = 0; // Optional
int nozzle_temp = 0; // Optional
};

6
src/slic3r/Utils/OrcaCloudServiceAgent.cpp
View File

@@ -479,7 +479,7 @@ int OrcaCloudServiceAgent::set_config_dir(std::string cfg_dir)
{
config_dir = cfg_dir;
wxFileName fallback(wxString::FromUTF8(cfg_dir.c_str()), "orca_refresh_token.sec");
fallback.Normalize();
fallback.Normalize(wxPATH_NORM_ALL);
secret_fallback_path = fallback.GetFullPath().ToStdString();
return BAMBU_NETWORK_SUCCESS;
}
@@ -1479,7 +1479,7 @@ void OrcaCloudServiceAgent::persist_user_secret(const std::string& secret)
return;
}
wxFileName path(wxString::FromUTF8(secret_fallback_path.c_str()));
path.Normalize();
path.Normalize(wxPATH_NORM_ALL);
if (!wxFileName::DirExists(path.GetPath())) {
wxFileName::Mkdir(path.GetPath(), wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
}
@@ -2305,7 +2305,7 @@ void OrcaCloudServiceAgent::compute_fallback_path()
if (wxTheApp == nullptr)
return;
wxFileName fallback(wxStandardPaths::Get().GetUserDataDir(), "orca_refresh_token.sec");
fallback.Normalize();
fallback.Normalize(wxPATH_NORM_ALL);
secret_fallback_path = fallback.GetFullPath().ToStdString();
}