lithop 0.3.0 → 0.4.0

data/lib/lithop/web/public/app.js

@@ -3,6 +3,7 @@ const form = document.querySelector("#conversion-form");
 const fileInput = document.querySelector("#image-input");
 const filePicker = document.querySelector("#file-picker");
 const fileName = document.querySelector("#file-name");
+const submitButton = document.querySelector("#submit-button");
 const previewIdInput = document.querySelector("#preview-id");
 const sourceImage = document.querySelector("#source-image");
 const compareSourceImage = document.querySelector("#compare-source-image");
@@ -29,9 +30,11 @@ const previewLabels = Object.fromEntries(previewKinds.map(({ name, label }) => [
 const settingLabels = {
   width: "幅", height: "高さ", pixel_size: "XYセル", color_pixel_size: "色セル",
   image_fit: "配置", crop_position_x: "横位置", crop_position_y: "縦位置", crop_scale: "クロップ倍率",
-  brightness: "明るさ", contrast: "コントラスト", saturation: "彩度", tile_count: "タイル数",
+  brightness: "明るさ", contrast: "コントラスト", saturation: "彩度", suppress_pale_colors: "淡色をWhite化",
+  yellow_mix_color: "Yellow混色", yellow_mix_percent: "Yellow混色率", pigment_order: "色の積層順",
+  tile_count: "タイル数",
   tile_layout: "タイル配置", tile_rows: "行数", tile_columns: "列数", separate_z_parts: "Z分割",
-  color_region_parts: "色領域数", minimum_thickness: "最小厚み", maximum_thickness: "最大厚み",
+  color_region_parts: "最大Zプレート数", minimum_thickness: "最小厚み", maximum_thickness: "最大厚み",
   nozzle_diameter: "ノズル", margin_top: "上余白", margin_right: "右余白",
   margin_bottom: "下余白", margin_left: "左余白"
 };
@@ -71,6 +74,15 @@ const appViewLabels = { create: "作成", jobs: "ジョブ", presets: "プリセ
 let currentView = requestedView();
 let currentJobDetailTab = requestedJobTab();
 
+function updateHeaderHeight() {
+  const height = document.querySelector(".site-header")?.getBoundingClientRect().height;
+  if (height) document.documentElement.style.setProperty("--site-header-height", `${Math.ceil(height)}px`);
+}
+
+updateHeaderHeight();
+if (window.ResizeObserver) new ResizeObserver(updateHeaderHeight).observe(document.querySelector(".site-header"));
+else window.addEventListener("resize", updateHeaderHeight);
+
 function requestedView() {
   const parameters = new URL(window.location.href).searchParams;
   const view = parameters.get("view");
@@ -91,11 +103,6 @@ function viewUrl(view) {
   return `/?${parameters}`;
 }
 
-function closeNavigation() {
-  document.body.classList.remove("navigation-open");
-  document.querySelector("#menu-toggle")?.setAttribute("aria-expanded", "false");
-}
-
 function showAppView(view, { push = false, focus = false } = {}) {
   if (!Object.hasOwn(appViewLabels, view)) view = "create";
   currentView = view;
@@ -109,7 +116,6 @@ function showAppView(view, { push = false, focus = false } = {}) {
   });
   document.querySelector("#current-view-label").textContent = appViewLabels[view];
   document.title = `${appViewLabels[view]} · Lithop Local UI`;
-  closeNavigation();
   if (push) window.history.pushState({ jobId: currentJobId, view }, "", viewUrl(view));
   if (focus) document.querySelector(`[data-app-view="${view}"] .view-title`)?.focus({ preventScroll: true });
   window.requestAnimationFrame(() => viewerStates?.forEach?.((_state, id) => applyViewer(id)));
@@ -121,20 +127,31 @@ document.querySelectorAll("[data-view-target]").forEach((control) => {
     showAppView(control.dataset.viewTarget, { push: currentView !== control.dataset.viewTarget, focus: true });
   });
 });
-document.querySelector("#menu-toggle")?.addEventListener("click", () => {
-  const open = !document.body.classList.contains("navigation-open");
-  document.body.classList.toggle("navigation-open", open);
-  document.querySelector("#menu-toggle").setAttribute("aria-expanded", String(open));
-  if (open) document.querySelector("#primary-navigation [aria-current='page']")?.focus();
+
+function selectSettingsSection(id, { scroll = true, focus = true } = {}) {
+  const section = document.getElementById(id);
+  if (!section) return;
+  section.open = true;
+  document.querySelectorAll("[data-settings-target]").forEach((button) => {
+    if (button.dataset.settingsTarget === id) button.setAttribute("aria-current", "true");
+    else button.removeAttribute("aria-current");
+  });
+  if (scroll) section.scrollIntoView({ block: "start", behavior: "smooth" });
+  if (focus) window.setTimeout(() => section.querySelector("summary")?.focus({ preventScroll: true }), 0);
+}
+
+document.querySelectorAll("[data-settings-target]").forEach((button) => {
+  button.addEventListener("click", () => selectSettingsSection(button.dataset.settingsTarget));
 });
-document.querySelector("#navigation-scrim")?.addEventListener("click", closeNavigation);
-document.addEventListener("keydown", (event) => {
-  if (event.key === "Escape" && document.body.classList.contains("navigation-open")) {
-    closeNavigation();
-    document.querySelector("#menu-toggle")?.focus();
-  }
+document.querySelectorAll(".settings-section").forEach((section) => {
+  section.addEventListener("toggle", () => {
+    if (!section.open) return;
+    document.querySelectorAll("[data-settings-target]").forEach((button) => {
+      if (button.dataset.settingsTarget === section.id) button.setAttribute("aria-current", "true");
+      else button.removeAttribute("aria-current");
+    });
+  });
 });
-
 function selectJobDetailTab(name, { focus = false, push = false } = {}) {
   const button = document.querySelector(`[data-job-tab="${name}"]`);
   if (!button) return;
@@ -231,14 +248,16 @@ function updateDraftSummary() {
   const resolvedLayout = resolvedSummary
     ? `${resolvedSummary.tile_rows}行 × ${resolvedSummary.tile_columns}列`
     : layoutLabels[values.tile_layout] || values.tile_layout;
+  const zPartCount = resolvedSummary?.z_plate_count || resolvedStandardZPartCount(values.color_region_parts);
   const z = separateZParts?.checked
-    ? `色領域${values.color_region_parts} + Top White（${resolvedSummary?.z_plate_count || Number(values.color_region_parts) + 1}プレート）`
+    ? `連続Z分割（${zPartCount}プレート・CMYW 8層・${zPartBaseWhiteSummary(zPartCount)}・最小${minimumZPlateThickness(zPartCount)} mm）`
     : "一体出力";
   const entries = [
     ["入力", fileInput.files?.[0]?.name || "未選択"],
     ["完成寸法", `${formatSetting(values.width)} × ${formatSetting(values.height)} mm`],
     ["セル", `XY ${formatSetting(values.pixel_size, " mm")} / 色 ${formatSetting(values.color_pixel_size, " mm")}`],
-    ["画像", `${values.image_fit === "contain" ? "全体を収める" : "全面に配置"} / 明るさ ${values.brightness}% / コントラスト ${values.contrast}% / 彩度 ${values.saturation}%`],
+    ["画像", `${values.image_fit === "contain" ? "全体を収める" : "全面に配置"} / 明るさ ${values.brightness}% / コントラスト ${values.contrast}% / 彩度 ${values.saturation}% / 淡色White化 ${values.suppress_pale_colors ? "有効" : "無効"} / Yellow→${values.yellow_mix_color === "magenta" ? "Magenta" : "Cyan"} ${values.yellow_mix_percent}%`],
+    ["色積層", (values.pigment_order || "").split(",").map((pigment) => pigment[0]?.toUpperCase()).join("")],
     ["分割", `${values.tile_count}タイル・${resolvedLayout}（${layoutLabels[values.tile_layout] || values.tile_layout}） / ${z}`]
   ];
   summary.replaceChildren();
@@ -277,9 +296,24 @@ function updateDraftState(message) {
   else if (submittedSignature && submittedSignature !== settingsSignature()) state.textContent = "実行した設定から変更されています";
   else state.textContent = "入力プレビューに反映済み";
   updateDraftSummary();
+  updateStartAvailability();
   if (displayedJob) updateJobContext(displayedJob);
 }
 
+function updateStartAvailability() {
+  if (!submitButton) return;
+  const hasFile = Boolean(fileInput.files?.[0]);
+  const previewFailed = hasFile && !stagePromise && !previewId;
+  submitButton.disabled = submitting || Boolean(activeJobId) || !hasFile || previewFailed;
+  let label = "変換を開始";
+  if (submitting) label = "変換を準備しています…";
+  else if (activeJobId) label = "変換中";
+  else if (!hasFile) label = "画像を選択してください";
+  else if (previewFailed) label = "画像を確認してください";
+  else if (stagePromise) label = "準備完了後に開始";
+  if (submitButton.textContent !== label) submitButton.textContent = label;
+}
+
 function showFormError(message) {
   const error = document.querySelector("#form-error");
   error.textContent = message;
@@ -413,6 +447,7 @@ function stageFile(file, { render = true } = {}) {
       previewId = payload.id;
       previewIdInput.value = previewId;
       if (render) await renderPreview(previewId);
+      updateStartAvailability();
     })
     .catch((error) => {
       if (requestNumber === selectionSequence) {
@@ -422,8 +457,10 @@ function stageFile(file, { render = true } = {}) {
     })
     .finally(() => {
       if (stagePromise === promise) stagePromise = undefined;
+      updateStartAvailability();
     });
   stagePromise = promise;
+  updateStartAvailability();
   return promise;
 }
 
@@ -436,6 +473,7 @@ function selectFile(file) {
   window.clearTimeout(renderTimer);
   discardPreview(oldPreviewId);
   showFormError("");
+  updateStartAvailability();
   if (!file) {
     fileName.textContent = "ファイルをここへ選択";
     showSourceStatus("画像未選択");
@@ -504,24 +542,22 @@ function updateZFields() {
   field.hidden = !visible;
   input.disabled = !visible;
   input.required = visible;
+  const partCount = resolvedStandardZPartCount(input.value);
   document.querySelector("#z-parts-summary").textContent = visible
-    ? `Base White付き色領域 ${input.value}プレート + Top White 1プレート`
+    ? `CMYW 8層・${zPartBaseWhiteSummary(partCount)}付き・各プレート最小${minimumZPlateThickness(partCount)} mm（実出力 ${partCount}プレート）`
     : "Z方向は一体のCMYWモデルとして出力します";
   const diagram = document.querySelector("#z-parts-diagram");
   diagram.replaceChildren();
   if (visible) {
-    const partCount = Number(input.value);
-    const size = Math.floor(7 / partCount);
-    let remainder = 7 % partCount;
-    let layer = 0;
+    const sourceWidth = 0.96 / partCount;
     const labels = Array.from({ length: partCount }, (_value, index) => {
-      const count = size + (remainder-- > 0 ? 1 : 0);
-      const start = 0.2 + (layer * 0.1);
-      layer += count;
-      const finish = 0.2 + (layer * 0.1);
-      return `色領域 ${index + 1}\n${start.toFixed(1)}–${finish.toFixed(1)} mm`;
+      const start = 0.1 + (index * sourceWidth);
+      const finish = 0.1 + ((index + 1) * sourceWidth);
+      const endLabel = index === partCount - 1 ? `可変上面（最小 ${formatZMillimeters(finish)} mm）` : `${formatZMillimeters(finish)} mm`;
+      const baseWhite = zPartBaseWhiteThickness(partCount, index);
+      return `Zプレート ${index + 1}\nBase White ${formatZMillimeters(baseWhite)} mm + 元Z ${formatZMillimeters(start)} mm–${endLabel}`;
     });
-    labels.concat("Top White\n0.9 mm–可変上面").forEach((label) => {
+    labels.forEach((label) => {
       const part = document.createElement("span");
       part.textContent = label;
       diagram.append(part);
@@ -530,6 +566,31 @@ function updateZFields() {
   diagram.hidden = !visible;
 }
 
+function resolvedStandardZPartCount(requested) {
+  return Math.min(Math.max(Number(requested) || 1, 1), 3);
+}
+
+function minimumZPlateThickness(partCount) {
+  const lastSourceStart = 0.1 + ((partCount - 1) * (0.96 / partCount));
+  return formatZMillimeters((0.82 - lastSourceStart) + zPartBaseWhiteThickness(partCount, partCount - 1));
+}
+
+function zPartBaseWhiteLayers(partCount, index) {
+  return partCount === 3 && index === 2 ? 3 : 1;
+}
+
+function zPartBaseWhiteThickness(partCount, index) {
+  return 0.1 + ((zPartBaseWhiteLayers(partCount, index) - 1) * 0.08);
+}
+
+function zPartBaseWhiteSummary(partCount) {
+  return partCount === 3 ? "Base White 1層（Zプレート3は3層）" : "Base White 1層";
+}
+
+function formatZMillimeters(value) {
+  return value.toFixed(3).replace(/0+$/, "").replace(/\.$/, "");
+}
+
 function updateDimensions() {
   const width = Number(document.querySelector("#width").value);
   const height = Number(document.querySelector("#height").value);
@@ -546,6 +607,7 @@ updateGridFields();
 updateZFields();
 updateDimensions();
 updateDraftSummary();
+updateStartAvailability();
 refreshResolvedSummary();
 
 const widthInput = document.querySelector("#width");
@@ -599,23 +661,23 @@ form?.addEventListener("input", (event) => {
   }
 });
 form?.addEventListener("change", (event) => {
-  if (event.target !== fileInput) {
+  const alreadyHandledByInput = ["number", "range", "text"].includes(event.target.type);
+  if (event.target !== fileInput && !alreadyHandledByInput) {
     schedulePreview();
     scheduleTileOverlay();
     updateDraftState();
   }
 });
 form?.addEventListener("invalid", (event) => {
-  event.target.closest("details")?.setAttribute("open", "");
+  const section = event.target.closest("details.settings-section");
+  if (section) selectSettingsSection(section.id, { scroll: false, focus: false });
   const label = event.target.closest("label")?.childNodes?.[0]?.textContent?.trim();
   showFormError(`${label || "入力値"}を確認してください`);
 }, true);
 
 function setSubmitting(value) {
   submitting = value;
-  const button = document.querySelector("#submit-button");
-  button.disabled = value;
-  button.textContent = value ? "変換を準備しています…" : "変換を開始";
+  updateStartAvailability();
 }
 
 form?.addEventListener("submit", async (event) => {
@@ -625,6 +687,9 @@ form?.addEventListener("submit", async (event) => {
   showFormError("");
   try {
     if (stagePromise) await stagePromise;
+    if (!previewId) throw new Error("画像の準備に失敗しました。画像を選び直してください");
+    window.clearTimeout(renderTimer);
+    await renderPreview(previewId);
     const data = new FormData(form);
     if (previewId) {
       data.delete("image");
@@ -673,7 +738,7 @@ function applySettings(values, sourceLabel) {
   const detail = differences.length
     ? differences.map((difference) => `${difference.label}: ${difference.before} → ${difference.after}`).join("\n")
     : "現在の設定との差はありません。";
-  if (!window.confirm(`${sourceLabel}を編集へ読み込みます。\n\n${detail}`)) return false;
+  if (!window.confirm(`${sourceLabel}を作成に適用します。\n\n${detail}`)) return false;
   Object.entries(settingLabels).forEach(([key]) => {
     if (!(key in values)) return;
     const control = form.elements.namedItem(key);
@@ -694,7 +759,12 @@ function applySettings(values, sourceLabel) {
   document.querySelector("#settings-library-status").textContent = fileInput.files?.[0]
     ? `${sourceLabel}を反映しました。入力画像は変更していません。`
     : `${sourceLabel}を反映しました。画像は保存されないため、選択してください。`;
-  showAppView("create", { push: currentView !== "create", focus: true });
+  showAppView("create", { push: currentView !== "create" });
+  const state = document.querySelector("#draft-state");
+  window.setTimeout(() => {
+    state.scrollIntoView({ block: "center" });
+    state.focus({ preventScroll: true });
+  }, 0);
   return true;
 }
 
@@ -715,10 +785,16 @@ function renderSettingsLibrary() {
   select.replaceChildren(new Option("プリセットを選択", ""));
   Object.keys(settingsLibrary.presets || {}).forEach((name) => select.add(new Option(name, name)));
   if (settingsLibrary.presets?.[selected]) select.value = selected;
+  updatePresetSelectionControls();
   document.querySelector("#draft-restore").disabled = !settingsLibrary.draft;
   document.querySelector("#draft-delete").disabled = !settingsLibrary.draft;
 }
 
+function updatePresetSelectionControls() {
+  const selected = document.querySelector("#preset-select").value;
+  document.querySelector("#preset-load").disabled = !settingsLibrary.presets?.[selected];
+}
+
 async function loadSettingsLibrary() {
   try {
     const response = await fetch("/api/settings-library", { cache: "no-store" });
@@ -732,6 +808,7 @@ async function loadSettingsLibrary() {
 
 document.querySelector("#preset-select")?.addEventListener("change", (event) => {
   document.querySelector("#preset-name").value = event.target.value;
+  updatePresetSelectionControls();
 });
 document.querySelector("#preset-save")?.addEventListener("click", async () => {
   try {
@@ -740,6 +817,7 @@ document.querySelector("#preset-save")?.addEventListener("click", async () => {
     values.set("name", name);
     await settingsLibraryRequest("/api/settings-library/presets", values);
     document.querySelector("#preset-select").value = name;
+    updatePresetSelectionControls();
     document.querySelector("#settings-library-status").textContent = `「${name}」へ現在設定を保存しました。画像は保存していません。`;
   } catch (error) { showFormError(error.message); }
 });
@@ -829,6 +907,7 @@ function updateGlobalJob(job) {
   const representedId = representedJob?.job_id || activeJobId || currentJobId;
   if (!representedId) {
     control.hidden = true;
+    updateStartAvailability();
     return;
   }
   const state = representedJob?.state || "queued";
@@ -841,6 +920,7 @@ function updateGlobalJob(job) {
   cancel.hidden = !["queued", "running", "cancelling"].includes(state);
   cancel.disabled = state === "cancelling";
   cancel.textContent = state === "cancelling" ? "停止要求中" : "停止";
+  updateStartAvailability();
 }
 
 function showJobPanel(jobId) {
@@ -947,7 +1027,7 @@ function renderTileModels(job) {
   const previews = new Map(job.artifacts.map((artifact) => [artifact.name, artifact]));
   const metadata = new Map((job.tiles || []).map((tile) => [tile.file, tile]));
   const plateCount = job.z_part_separation?.enabled
-    ? (job.z_part_separation.color_regions?.length || 0) + 1
+    ? (job.z_part_separation.plates?.length || job.z_part_separation.resolved_parts || 0)
     : 1;
   list.replaceChildren();
   section.querySelector(".tile-map")?.remove();
@@ -1177,7 +1257,10 @@ function renderJob(job) {
   if (job.job_id === activeJobId) {
     activeJob = job;
     updateGlobalJob(job);
-    if (!active) activeJobId = undefined;
+    if (!active) {
+      activeJobId = undefined;
+      updateStartAvailability();
+    }
   } else if (!activeJobId) {
     updateGlobalJob(job);
   }
@@ -1249,7 +1332,10 @@ async function pollJob(jobId) {
     if (isActiveJob) {
       activeJob = job;
       updateGlobalJob(job);
-      if (!active) activeJobId = undefined;
+      if (!active) {
+        activeJobId = undefined;
+        updateStartAvailability();
+      }
     }
     if (jobId === currentJobId) renderJob(job);
     if (active && (isActiveJob || jobId === currentJobId)) pollTimer = window.setTimeout(() => pollJob(jobId), 900);
@@ -1318,9 +1404,15 @@ function updateHistorySelection() {
   const selected = [...selectedJobIds].map((id) => historyJobs.get(id)).filter(Boolean);
   const completed = selected.filter((job) => job.state === "completed");
   const final = selected.filter((job) => ["completed", "failed", "cancelled"].includes(job.state));
+  const selectable = [...historyJobs.values()].filter((job) => ["completed", "failed", "cancelled"].includes(job.state));
+  const allSelected = selectable.length > 0 && selectable.every((job) => selectedJobIds.has(job.job_id));
   const size = selected.reduce((sum, job) => sum + Number(job.size_bytes || 0), 0);
   document.querySelector("#history-selection-status").textContent = selected.length
     ? `${selected.length}件選択・${formatBytes(size)}` : (historyNotice || "未選択");
+  const selectAll = document.querySelector("#select-all-jobs");
+  selectAll.disabled = selectable.length === 0;
+  selectAll.setAttribute("aria-pressed", String(allSelected));
+  selectAll.textContent = allSelected ? "全ての選択を解除する" : "全てを選択する";
   document.querySelector("#compare-jobs").disabled = selected.length !== 2 || completed.length !== 2;
   document.querySelector("#delete-selected-jobs").disabled = selected.length === 0 || final.length !== selected.length;
 }
@@ -1446,6 +1538,19 @@ document.querySelector("#history-query")?.addEventListener("input", () => {
   historySearchTimer = window.setTimeout(() => refreshHistory(), 250);
 });
 document.querySelector("#load-more-jobs")?.addEventListener("click", () => refreshHistory({ append: true }));
+document.querySelector("#select-all-jobs")?.addEventListener("click", () => {
+  historyNotice = undefined;
+  const selectable = [...historyJobs.values()].filter((job) => ["completed", "failed", "cancelled"].includes(job.state));
+  const allSelected = selectable.length > 0 && selectable.every((job) => selectedJobIds.has(job.job_id));
+  selectable.forEach((job) => {
+    if (allSelected) selectedJobIds.delete(job.job_id);
+    else selectedJobIds.add(job.job_id);
+  });
+  document.querySelectorAll("#job-list .history-select").forEach((checkbox) => {
+    checkbox.checked = selectedJobIds.has(checkbox.dataset.jobId);
+  });
+  updateHistorySelection();
+});
 
 document.querySelector("#delete-selected-jobs")?.addEventListener("click", async () => {
   const jobs = [...selectedJobIds].map((id) => historyJobs.get(id)).filter(Boolean);
@@ -1571,7 +1676,6 @@ document.querySelector("#close-job-compare")?.addEventListener("click", () => do
     const job = comparedJobs[index];
     if (job && applySettings(job, `ジョブ ${job.job_id} の設定`)) {
       document.querySelector("#job-compare-dialog").close();
-      document.querySelector("#conversion-form").scrollIntoView({ block: "start" });
     }
   });
 });
@@ -1622,9 +1726,7 @@ document.querySelector("#choose-another-image")?.addEventListener("click", () =>
 });
 document.querySelector("#review-settings")?.addEventListener("click", () => {
   showAppView("create", { push: currentView !== "create" });
-  const settings = document.querySelector(".settings-section");
-  settings.open = true;
-  settings.scrollIntoView({ block: "start" });
+  selectSettingsSection("settings-basic", { focus: false });
   document.querySelector("#width")?.focus();
 });
 document.querySelector("#retry-status-button")?.addEventListener("click", () => {

data/lib/lithop/web/settings_form.rb

@@ -6,12 +6,13 @@ module Lithop
     class SettingsForm
       FLOAT_FIELDS = %i[
         width height margin_top margin_right margin_bottom margin_left crop_position_x crop_position_y
-        crop_scale brightness contrast saturation minimum_thickness maximum_thickness pixel_size
+        crop_scale brightness contrast saturation yellow_mix_percent minimum_thickness maximum_thickness pixel_size
         color_pixel_size nozzle_diameter
       ].freeze
       INTEGER_FIELDS = %i[tile_count tile_rows tile_columns color_region_parts].freeze
-      STRING_FIELDS = %i[image_fit tile_layout].freeze
-      FIELD_NAMES = (FLOAT_FIELDS + INTEGER_FIELDS + STRING_FIELDS + [:separate_z_parts]).map(&:to_s).freeze
+      STRING_FIELDS = %i[image_fit tile_layout yellow_mix_color pigment_order].freeze
+      BOOLEAN_FIELDS = %i[suppress_pale_colors separate_z_parts].freeze
+      FIELD_NAMES = (FLOAT_FIELDS + INTEGER_FIELDS + STRING_FIELDS + BOOLEAN_FIELDS).map(&:to_s).freeze
 
       attr_reader :defaults
 
@@ -27,7 +28,9 @@ module Lithop
       end
 
       def values(settings = defaults)
-        settings.to_h.slice(*Settings::DEFAULTS.keys).transform_keys(&:to_s)
+        result = settings.to_h.slice(*Settings::DEFAULTS.keys).transform_keys(&:to_s)
+        result["pigment_order"] = settings.pigment_order.join(",")
+        result
       end
 
       private
@@ -37,7 +40,7 @@ module Lithop
         FLOAT_FIELDS.each { |key| assign_number(values, params, key, Float) }
         INTEGER_FIELDS.each { |key| assign_number(values, params, key, Integer) }
         STRING_FIELDS.each { |key| values[key] = params[key.to_s] if present?(params[key.to_s]) }
-        values[:separate_z_parts] = params["separate_z_parts"] == "1"
+        BOOLEAN_FIELDS.each { |key| values[key] = params[key.to_s] == "1" }
         clear_unused_grid(values)
         values
       rescue ArgumentError