juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-10 02:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix type name from preset to process in the preset bundle dialog (#14481)

Browse Source 
# Description

The type field for process presets is wrong. It should be process
instead of preset

<img width="2532" height="1576" alt="image"
src="https://github.com/user-attachments/assets/ef73f895-8ce9-4b04-957d-c12cdbaf8f9b"
/>

[How to Download Pull Requests Artifacts for
Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)
This commit is contained in:
Ian Chua
2026-07-01 11:13:27 +08:00
committed by SoftFever
parent 2f13fd82b1
commit 128068cb65
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/web/dialog/PresetBundleDialog/index.js
View File

@@ -2,7 +2,7 @@
const bundlesById = new Map(); // bundleId -> bundle object const bundlesById = new Map(); // bundleId -> bundle object
const printersByBundle = new Map(); // bundleId -> Map(index -> printerName) const printersByBundle = new Map(); // bundleId -> Map(index -> printerName)
const filamentsByBundle = new Map(); // bundleId -> Map(index -> filamentName) const filamentsByBundle = new Map(); // bundleId -> Map(index -> filamentName)
const presetsByBundle = new Map(); // bundleId -> Map(index -> presetName) const processesByBundle = new Map(); // bundleId -> Map(index -> presetName)
const UPDATE_TOOLTIP = "Update available"; const UPDATE_TOOLTIP = "Update available";
const UNAUTHORIZED_TOOLTIP = "Unauthorized bundle"; const UNAUTHORIZED_TOOLTIP = "Unauthorized bundle";
@@ -193,7 +193,7 @@ function unpackPayload(payload) {
bundlesById.clear(); bundlesById.clear();
printersByBundle.clear(); printersByBundle.clear();
filamentsByBundle.clear(); filamentsByBundle.clear();
presetsByBundle.clear(); processesByBundle.clear();
const list = payload?.data || []; const list = payload?.data || [];
for (const bundle of list) { for (const bundle of list) {
@@ -212,7 +212,7 @@ function unpackPayload(payload) {
printersByBundle.set(id, new Map((bundle.printers || []).map((name, i) => [i, name]))); printersByBundle.set(id, new Map((bundle.printers || []).map((name, i) => [i, name])));
filamentsByBundle.set(id, new Map((bundle.filaments || []).map((name, i) => [i, name]))); filamentsByBundle.set(id, new Map((bundle.filaments || []).map((name, i) => [i, name])));
presetsByBundle.set(id, new Map((bundle.presets || []).map((name, i) => [i, name]))); processesByBundle.set(id, new Map((bundle.processes || []).map((name, i) => [i, name])));
} }
} }
@@ -277,14 +277,14 @@ function renderBottomForBundle(bundleId) {
const key = String(bundleId || ""); const key = String(bundleId || "");
const printers = printersByBundle.get(key) || new Map(); const printers = printersByBundle.get(key) || new Map();
const filaments = filamentsByBundle.get(key) || new Map(); const filaments = filamentsByBundle.get(key) || new Map();
const presets = presetsByBundle.get(key) || new Map(); const processes = processesByBundle.get(key) || new Map();
// Convert to a flat list of rows { typeLabel, name } // Convert to a flat list of rows { typeLabel, name }
const rows = []; const rows = [];
for (const [, name] of printers) rows.push({ type: "Printer", name }); for (const [, name] of printers) rows.push({ type: "Printer", name });
for (const [, name] of filaments) rows.push({ type: "Filament", name }); for (const [, name] of filaments) rows.push({ type: "Filament", name });
for (const [, name] of presets) rows.push({ type: "Preset", name }); for (const [, name] of processes) rows.push({ type: "Process", name });
bottomList.innerHTML = rows.map((r, idx) => ` bottomList.innerHTML = rows.map((r, idx) => `
<div class="row" data-id="${escapeAttr(bundleId)}" data-idx="${idx}"> <div class="row" data-id="${escapeAttr(bundleId)}" data-idx="${idx}">

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

@@ -387,7 +387,7 @@ void PresetBundleDialog::ListBundles()
temp["printers"] = strip_prefix(metadata.printer_presets); temp["printers"] = strip_prefix(metadata.printer_presets);
temp["filaments"] = strip_prefix(metadata.filament_presets); temp["filaments"] = strip_prefix(metadata.filament_presets);
temp["presets"] = strip_prefix(metadata.print_presets); temp["processes"] = strip_prefix(metadata.print_presets);
temp["update_available"] = metadata.update_available; temp["update_available"] = metadata.update_available;
temp["unauthorized"] = metadata.unauthorized; temp["unauthorized"] = metadata.unauthorized;