Skip to content

Commit

Permalink
GUIによる変換エラーの修正 (#698)
Browse files Browse the repository at this point in the history
<!-- Close or Related Issues -->
Close #697

### What I did(変更内容)
<!-- Please describe the motivation behind this PR and the changes it
introduces. -->
<!-- どのような変更をしますか? 目的は? -->

- GUI側で渡す変数名がrust側の受け取りの変数名と異なっていたのが原因でした。


### Notes(連絡事項)
<!-- If manual testing is required, please describe the procedure. -->
<!-- 手動での動作確認が必要なら手順を簡単に伝えてください。そのほか連絡事項など。 -->

None / なし
  • Loading branch information
satoshi7190 authored Jan 29, 2025
1 parent 90abeef commit 4c550c9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions app/src/lib/components/TransformerOptions.svelte
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script lang="ts">
import { isBooleanConfig, isSelectionConfig } from '$lib/transformer';
export let transformerRegistry;
export let transformerSettings;
</script>

{#if transformerRegistry && transformerRegistry.configs.length > 0}
{#each transformerRegistry.configs as config}
{#if transformerSettings && transformerSettings.configs.length > 0}
{#each transformerSettings.configs as config}
{#if isBooleanConfig(config.parameter)}
<div class="flex gap-2 w-80 items-center">
<label for={config.key} class="w-3/4 pointer-events-none">
Expand Down
7 changes: 4 additions & 3 deletions app/src/routes/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
let isConvertButtonDisabled = true;
$: isConvertButtonDisabled = !inputPaths.length || !outputPath || isRunning;
let transformerRegistry: TransformerSettings;
let transformerSettings: TransformerSettings;
async function convertAndSave() {
isRunning = true;
Expand All @@ -35,7 +36,7 @@
filetype,
epsg,
rulesPath,
transformerRegistry,
transformerSettings,
sinkParameters
});
Expand Down Expand Up @@ -75,7 +76,7 @@
bind:epsg
bind:rulesPath
bind:sinkParameters
bind:transformerRegistry
bind:transformerSettings
/>

<OutputSelector {filetype} bind:outputPath />
Expand Down
12 changes: 6 additions & 6 deletions app/src/routes/SettingSelector.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as dialog from "@tauri-apps/plugin-dialog"
export let epsg: number = 4979;
export let rulesPath: string;
export let sinkParameters: SinkParameters;
export let transformerRegistry: TransformerSettings;
export let transformerSettings: TransformerSettings;
$: epsgOptions = filetypeOptions[filetype]?.epsg || [];
$: disableEpsgOptions = epsgOptions.length < 2;
Expand Down Expand Up @@ -42,13 +42,13 @@ import * as dialog from "@tauri-apps/plugin-dialog"
rulesPath = Array.isArray(res) ? res[0] : res;
}
async function getTransformerRegistry(filetype: string) {
async function getTransformerSettings(filetype: string) {
const registry = (await invoke('get_transform', { filetype })) as any;
transformerRegistry = registry;
transformerSettings = registry;
}
$: getTransformerRegistry(filetype);
$: getTransformerSettings(filetype);
let sinkOptionKeys: string[] = [];
Expand Down Expand Up @@ -115,11 +115,11 @@ import * as dialog from "@tauri-apps/plugin-dialog"
</select>
</div>

{#if (transformerRegistry && transformerRegistry.configs.length > 0) || sinkOptionKeys.length > 0}
{#if (transformerSettings && transformerSettings.configs.length > 0) || sinkOptionKeys.length > 0}
<div class="flex flex-col">
<label for="transform-select" class="font-bold mb-1.5">出力の詳細設定</label>
<div class="flex flex-col gap-2">
<TransformerOptions bind:transformerRegistry />
<TransformerOptions bind:transformerSettings />
<SinkOptions bind:sinkOptionKeys bind:sinkParameters />
</div>
</div>
Expand Down

0 comments on commit 4c550c9

Please sign in to comment.