Merge pull request #78 from SRVFI-Raws/main

流水很清楚惜花這個責任
Tohrusky · Jul 19, 2023 · fd28d8e · fd28d8e
2 parents 928ae89 + 130e703
commit fd28d8e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/renderer/src/store/SRSettingsStore.ts b/src/renderer/src/store/SRSettingsStore.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue'
+import { ref, Ref } from 'vue'
 import { defineStore } from 'pinia'
 
 export const useSRSettingsStore = defineStore(
@@ -8,7 +8,7 @@ export const useSRSettingsStore = defineStore(
     const selectedScale = ref(2)
     const selectedNoise = ref(-1)
     const useTTA = ref(false)
-    const CustomScaleValue = ref(0)
+    const CustomScaleValue: Ref<number | null> = ref(null)
 
     return {
       selectedModel,

diff --git a/src/renderer/src/store/globalSettingsStore.ts b/src/renderer/src/store/globalSettingsStore.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue'
+import { ref, Ref } from 'vue'
 import { defineStore } from 'pinia'
 import { LogInst } from 'naive-ui'
 
@@ -12,7 +12,7 @@ export const useGlobalSettingsStore = defineStore(
     const langsNum = ref(0)
 
     const SRgpuid = ref(114514)
-    const deviceList = ref([])
+    const deviceList: Ref<any[]> = ref([])
 
     const ProgressPercentage = ref(0)
     const CommandLOG = ref('')

diff --git a/src/renderer/src/utils/getFinal2xconfig.ts b/src/renderer/src/utils/getFinal2xconfig.ts
@@ -37,16 +37,17 @@ export const getFinal2xconfig = (): string => {
   )
   const { SRgpuid } = storeToRefs(useGlobalSettingsStore())
   const gpuID = SRgpuid.value === 114514 ? 0 : SRgpuid.value
-  const outputPATH = ioPath.getoutputpath()
   const inputPATHList = ioPath.getList()
+  const outputPATH = ioPath.getoutputpath()
+  const targetScale = CustomScaleValue.value === null ? 0 : CustomScaleValue.value
   return JSON.stringify({
     gpuid: gpuID,
     inputpath: inputPATHList,
     model: selectedModel.value,
     modelscale: selectedScale.value,
     modelnoise: selectedNoise.value,
     outputpath: outputPATH,
-    targetscale: CustomScaleValue.value,
+    targetscale: targetScale,
     tta: useTTA.value
   })
 }
diff --git a/src/renderer/src/views/Final2xSettings.vue b/src/renderer/src/views/Final2xSettings.vue
@@ -331,6 +331,7 @@ class ClickButtomToConsoleLog {
           :max="99999999"
           :min="0"
           :step="0.2"
+          placeholder="Default"
           style="width: 110px"
         />
       </n-space>