implement setting page

zmcx16 · Jun 6, 2020 · 191cb53 · 191cb53
1 parent 78ebbe3
commit 191cb53
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/core/src/core_def.py b/core/src/core_def.py
@@ -26,6 +26,7 @@ class CoreTaskKey:
     SOURCE = 'src'
     TYPE = 'type'
     EFFECTS = 'effects'
+    OUTPUT = 'output'
     TASK_ID = 'task_id'
     SHOW = 'show'
     TASK = 'task'
@@ -48,6 +49,19 @@ class CoreTaskCmdKey:
     STOP_TASK = 'stop_task'
 
 
+class OutputKey:
+    FORMAT = 'format'
+
+    # format
+    PNG = 'PNG'
+    JPEG = 'JPEG'
+    BMP = 'BMP'
+
+    COMPRESS_LEVEL = 'compress_level'
+    QUALITY = 'quality'
+    OPTIMIZE = 'optimize'
+
+
 class BlendKey:
     # config
     OPACITY = 'opacity'

diff --git a/core/src/mpcore.py b/core/src/mpcore.py
@@ -14,7 +14,7 @@
 from image_enhance import ImageEnhance
 from blend import Blend
 from levels import Levels
-from core_def import CoreReturn, CoreModeKey, CoreTaskKey, CoreTaskCmdKey
+from core_def import CoreReturn, CoreModeKey, CoreTaskKey, CoreTaskCmdKey, OutputKey
 
 
 class MangaPrettierCore(object):
@@ -86,6 +86,7 @@ def __run_task(self, param, task_id):
                 output_folder_name = datetime.now().strftime("%Y%m%d-%H%M%S")
                 images_path = param[CoreTaskKey.PARAMETER][CoreTaskKey.IMAGES_PATH]
                 effects = param[CoreTaskKey.PARAMETER][CoreTaskKey.EFFECTS]
+                output = param[CoreTaskKey.PARAMETER][CoreTaskKey.OUTPUT]
 
                 for image_i in range(len(images_path)):
 
@@ -113,9 +114,20 @@ def __run_task(self, param, task_id):
                         mode = MangaPrettierCore.ModeDict[config[CoreTaskKey.TYPE]]
                         image = mode.run(image, config, False).copy()
 
-                    image = Image.fromarray(image).convert('RGB')
-                    #image.save(os.path.splitext(output_path)[0]+'.png', format='png')
-                    image.save(os.path.splitext(output_path)[0] + '.jpg', format='jpeg', quality=95, optimize=True)
+                    if output[OutputKey.FORMAT] == OutputKey.PNG:
+                        image = Image.fromarray(image).convert('RGBA')
+                        image.save(os.path.splitext(output_path)[0]+'.png', format='png',
+                                   compress_level=output[OutputKey.COMPRESS_LEVEL], optimize=output[OutputKey.OPTIMIZE])
+                    elif output[OutputKey.FORMAT] == OutputKey.JPEG:
+                        image = Image.fromarray(image).convert('RGB')
+                        image.save(os.path.splitext(output_path)[0] + '.jpg', format='jpeg',
+                                   quality=output[OutputKey.QUALITY], optimize=output[OutputKey.OPTIMIZE])
+                    elif output[OutputKey.FORMAT] == OutputKey.BMP:
+                        image = Image.fromarray(image).convert('RGB')
+                        image.save(os.path.splitext(output_path)[0] + '.bmp', format='bmp')
+                    else:
+                        image = Image.fromarray(image).convert('RGB')
+                        image.save(os.path.splitext(output_path)[0] + '.jpg', format='jpeg')
 
                     # --------------------
 

diff --git a/gui/src/components/settingPanel.js b/gui/src/components/settingPanel.js
@@ -184,7 +184,7 @@ function SettingPanel({ settingPanelRef, appAPI, filesPanelAPI, previewImagePane
   // run task
   const task_heartbeat = useRef(0)
 
-  const runTask = (imgs_path, effects) => {
+  const runTask = (imgs_path, effects, output) => {
 
     setProgressBar(0)
 
@@ -196,6 +196,7 @@ function SettingPanel({ settingPanelRef, appAPI, filesPanelAPI, previewImagePane
           task: 'batch',
           param: {
             imgs_path: imgs_path,
+            output: output,
             effects: effects
           }
         }
@@ -351,7 +352,7 @@ function SettingPanel({ settingPanelRef, appAPI, filesPanelAPI, previewImagePane
                 taskRunningRef.current = !taskRunningRef.current
                 setTaskRunningUI()
                 if (taskRunningRef.current) {
-                  runTask(imgs_path, effects)
+                  runTask(imgs_path, effects, config['output'])
                 }
               }