add show origin image button and fix some bugs

Author: ray1422

.gitignore

@@ -2,3 +2,5 @@
 pretrained/*.pb
 __pycache__
 .DS_Store/
+dist/
+build/

app.py

@@ -37,6 +37,8 @@ def __init__(self):
         self.frame_main_left = None
         self.frame_main_center = None
         self.frame_main_right = None
+        self.show_origin_btn = None
+        self.show_enhanced_btn = None
         self.canvas: ResizingCanvas = None
         self.enhance_pb = None
         self.start_enhance_btn = None
@@ -83,9 +85,26 @@ class ThemedStyle:
         self.model_dir = resource_path("pretrained/")
         self.vignette_handler()
 
-    def enhance_listener(self, *args):
-        if not (self._check_image() and self._check_model()):
+    def _show_origin_listener(self, *args):
+        if not (self._check_image()): return
+        image = Image.fromarray(np.asarray(self._main_image_origin))
+        self.canvas.set_main_image(image)
+        self.show_origin_btn.config(state="disabled")
+        self.show_enhanced_btn.config(state="normal")
+
+    def _show_enhanced_listener(self, *args):
+        if not (self._check_image()): return
+        if self._main_image_enhanced is None:
+            pop_msg.showinfo("Umm...", "請先增強圖片")
             return
+        image = Image.fromarray(np.asarray(self._main_image_enhanced))
+        self.canvas.set_main_image(image)
+        self.canvas.request_update()
+        self.show_enhanced_btn.config(state="disabled")
+        self.show_origin_btn.config(state="normal")
+
+    def enhance_listener(self, *args):
+        if not (self._check_image() and self._check_model()): return
         thread = td.Thread(target=self._enhance_task)
         self.status_text.set("增強圖片中..")
         self.enhance_pb.start()
@@ -114,8 +133,7 @@ def _resize_height_listener(self, *args):
     def _resize_width_listener(self, *args):
         if not self._check_image(): return
         with self.resize_lock:
-            if self.resizing:
-                return
+            if self.resizing: return
             self.resizing = True
         origin_height, origin_width, _ = np.shape(self._main_image_origin)
         resize_width = 0 if not self.resize_width.get() else int(self.resize_width.get())
@@ -133,9 +151,11 @@ def _enhance_task(self):
 
         resize_image = cv2.resize(self._main_image_origin, dsize=(new_width, new_height))
         resize_image = resize_image[new_height % 8:, new_width % 8:, :]
-        self._main_image_enhanced = self._model.sample(resize_image, denoise=False)
-        self._main_image_current_clean = self._main_image_enhanced
-        print(self._main_image_enhanced)
+        enhance_result = self._model.sample(resize_image, denoise=False)
+        if enhance_result is not None:
+            self._main_image_enhanced = enhance_result
+            self._main_image_current_clean = self._main_image_enhanced
+
 
     def _enhance_handler(self, thread: td.Thread):
         if thread.is_alive():
@@ -144,27 +164,42 @@ def _enhance_handler(self, thread: td.Thread):
             self.enhance_pb.stop()
             self.start_enhance_btn.config(state="normal")
             self.config(cursor='')
-            image = Image.fromarray(np.asarray(self._main_image_enhanced))
-            self.canvas.set_main_image(image)
-            self.canvas.request_update()
-            self.status_text.set("處理完成！")
-            try:
-                subprocess.check_output(["notify-send", "圖片處理完成！", "<b>幻想濾鏡™</b>處理好圖片囉！", "--icon=face-glasses"])
-            except FileNotFoundError:
-                print("can't send notification.")
-            self.after(3000, lambda: self.status_text.set("就緒"))
+            if self._model.success:
+                self.show_enhanced_btn.config(state="disabled")
+                self.show_origin_btn.config(state="normal")
+                image = Image.fromarray(np.asarray(self._main_image_enhanced))
+                self.canvas.set_main_image(image)
+                self.canvas.request_update()
+                self.status_text.set("處理完成！")
+                try:
+                    subprocess.check_output(["notify-send", "圖片處理完成！", "<b>幻想濾鏡™</b>處理好圖片囉！", "--icon=face-glasses"])
+                except:
+                    logging.warning("can't send notification.")
+                self.after(3000, lambda: self.status_text.set("就緒"))
+
+            else:
+                pop_msg.showerror("Something went wrong.. ", "圖片處理失敗！\n多數失敗是由於圖片太大張了，把圖片縮小點試試～")
+                pop_msg.showerror("Something went wrong.. ", self._model.error_log)
+
+                self.status_text.set("處理失敗！")
+                try:
+                    subprocess.check_output(["notify-send", "圖片處理失敗！", "<b>幻想濾鏡™</b>圖片處理失敗了QQ", "--icon=face-sad"])
+                except:
+                    logging.warning("can't send notification.")
+
+                self.after(3000, lambda: self.status_text.set("就緒"))
 
     def open_image_listener(self, *args):
 
         try:
+            # for Linux
             filename = subprocess.check_output(['zenity', '--file-selection']).decode("utf-8").strip()
         except FileNotFoundError:
             filename = filedialog.askopenfilename()
         except subprocess.CalledProcessError:
             filename = False
 
         if not filename:
-            logging.info("cancel opening image.")
             return False
         try:
             logging.info("open image:", filename)
@@ -178,8 +213,6 @@ def open_image_listener(self, *args):
             self.resize_height.set(image.height)
             self.resize_width.set(image.width)
 
-
-
         except IOError as e:
             logging.error("open image failed!")
             logging.error(str(e))
@@ -266,9 +299,14 @@ def save(self, *args):
             image.save(path)
 
     def run(self):
-
+        '''
+        try:
+            # self.call('wm', 'iconphoto', self._w, ImageTk.PhotoImage(Image.open(resource_path('appicon.png'))))
+            self.iconbitmap(resource_path('appicon.ico'))
+        except:
+            pass
+        '''
         self.title("Fantastic Filter")
-
         self.geometry("%dx%d+50+40" % (800, 500))
 
         """
@@ -307,6 +345,10 @@ def run(self):
             model_cbb.current(0)  # 選擇第一個
         model_cbb.bind("<<ComboboxSelected>>", self.select_model_listener)  # 绑定事件,(下拉列表框被选中时)
 
+        self.show_origin_btn = ttk.Button(frame_toolbar, text="檢視原圖", command=self._show_origin_listener)
+        self.show_enhanced_btn = ttk.Button(frame_toolbar, text="檢視增強後", command=self._show_enhanced_listener)
+        self.show_origin_btn.pack(side='left', padx=(10, 0))
+        self.show_enhanced_btn.pack(side='left', padx=(0, 10))
         ''' main area '''
 
         # split into 3 part, | load _model,image... | image preview | edit.. save.|
@@ -348,8 +390,8 @@ def run(self):
                                              validatecommand=(self.register(isnumeric_or_blank), "%P"), width=9)
         self.input_resize_width = ttk.Entry(frame_resize_inputs, textvariable=self.resize_width, validate='key',
                                             validatecommand=(self.register(isnumeric_or_blank), "%P"), width=9)
-        self.input_resize_width.pack(side='left')
-        self.input_resize_height.pack(side='right')
+        self.input_resize_width.pack(side='left', padx=(0, 4))
+        self.input_resize_height.pack(side='right', padx=(4, 0))
 
         ttk.Separator(self.frame_main_right, orient='horizontal').pack(fill='x', pady=10)
 
@@ -509,7 +551,6 @@ def set_main_image(self, image: Image):
 
 def resource_path(relative_path):
     if hasattr(sys, '_MEIPASS'):
-        print(sys._MEIPASS)
         return sys._MEIPASS + '/' + relative_path
     return os.path.join(os.path.dirname(os.path.abspath(__file__)), relative_path)
 

app.spec

@@ -4,9 +4,9 @@ block_cipher = None
 
 
 a = Analysis(['app.py'],
-             pathex=['/home/ray1422/workspace/Fantasic-Filter'],
+             pathex=['./Fantasic-Filter'],
              binaries=[],
-             datas=[('venv//Lib//site-packages//ttkthemes', 'ttkthemes')],
+             datas=[('venv//Lib//site-packages//ttkthemes', 'ttkthemes'), ('./appicon.png', 'appicon.png'), ('./appicon.ico', ''appicon.ico'')],
              hiddenimports=['ttkthemes'],
              hookspath=[],
              runtime_hooks=[],

appicon.ico

@@ -1,3 +1,4 @@
+import logging
 import os
 
 import cv2
@@ -15,6 +16,8 @@ def __init__(self, gpu=True):
         self._graph = _Graph()
         self._result = []
         self._available = True
+        self.success = False
+        self.error_log = ''
         self.model_available = lambda: self._sess is not None
         if not gpu:
             os.environ["CUDA_VISIBLE_DEVICES"] = "-1"
@@ -109,10 +112,12 @@ def batch_process(self):
 
                 result_img = cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR)
                 cv2.imwrite(save_path, result_img)
+                self.success = True
 
             except Exception as e:
                 print("Something went wrong!")
                 print(str(e))
+                self.success = False
 
         self._available = True
 
@@ -135,12 +140,16 @@ def sample(self, image, denoise=False, denoise_after=False):
 
             if denoise_after:
                 result_img = cv2.fastNlMeansDenoisingColored(result_img, None, 10, 10, 5, 5)
-
+            self.error_log = ''
+            self.success = True
             return result_img
         except Exception as e:
-            print("Something went wrong!")
-            print(str(e))
-            return np.zeros_like(image)
+            logging.error("Something went during enhancing task :(")
+            logging.error("It should caused by TensorFlow.")
+            logging.error(str(e))
+            self.success = False
+            self.error_log = str(e)
+            return None
 
         finally:
             self._available = True