From cea92259670de4d4e37bd60baeb5451857eda9d6 Mon Sep 17 00:00:00 2001
From: saeranv <saeranv@gmail.com>
Date: Sun, 25 Apr 2021 19:39:17 -0400
Subject: [PATCH] feat(chore): add traintest dir

---
 .gitignore                                           |  4 ++++
 .../{preprocess_traintest.py => make_traintest.py}   | 11 ++++-------
 deeprad/utils.py                                     | 12 ++++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)
 rename deeprad/{preprocess_traintest.py => make_traintest.py} (83%)

diff --git a/.gitignore b/.gitignore
index 994eca02..d2006924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,6 +128,10 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# Git
+.git-credentials
+/.git-credentials
+
 # Honeybee/Ladybug data
 /run
 /models
diff --git a/deeprad/preprocess_traintest.py b/deeprad/make_traintest.py
similarity index 83%
rename from deeprad/preprocess_traintest.py
rename to deeprad/make_traintest.py
index 6c044710..66a213b5 100644
--- a/deeprad/preprocess_traintest.py
+++ b/deeprad/make_traintest.py
@@ -1,4 +1,4 @@
-"""Preprocess raw outputs from GH for train/test dataset."""
+"""Preprocess raw outputs from GHOUT_DIR for train/test dataset."""
 import os
 import numpy as np
 
@@ -11,12 +11,10 @@
 DEEPRAD_TRAINTEST_DIR = utils.DEEPRAD_TRAINTEST_DIR
 
 
-def load_img_gray(img_fpath):
-    return cv2.imread(img_fpath, cv2.)
+def preprocess_img(img_fpath: str) -> np.ndarray:
+    """Preprocess image for traintest."""
 
-
-def preprocess_img(img_fpath):
-    pass
+    print(img_fpath)
 
 
 def main():
@@ -42,7 +40,6 @@ def main():
     # add as channels
 
     # save new images
-    # delete all raw images
 
     pass
 
diff --git a/deeprad/utils.py b/deeprad/utils.py
index 45e9d1f3..d677a4a1 100644
--- a/deeprad/utils.py
+++ b/deeprad/utils.py
@@ -37,6 +37,14 @@ def to_poly_np(poly_sh):
     return np.array(poly_sh.exterior.xy)
 
 
+def load_img_gray(img_fpath: str) -> np.ndarray:
+    return cv2.imread(img_fpath, cv2.IMREAD_GRAYSCALE)
+
+
+def load_img_rgb(img_fpath: str) -> np.ndarray:
+    return cv2.imread(img_fpath, cv2.COLOR_BGR2RGB)
+
+
 def extract_floorplan_ids(data_num, target_data_dir=None, verbose=True):
     """Safely extract root model directories for polygon extraction."""
 
@@ -97,8 +105,8 @@ def load_floorplan_data(targ_id_dirs, data_num):
 
         idx += 1
         hdict_arr[idx] = hdict
-        src_img_arr[idx] = cv2.imread(targ_src_fpath, cv2.COLOR_BGR2RGB)
-        label_img_arr[idx] = cv2.imread(targ_label_fpath, cv2.IMREAD_GRAYSCALE)
+        src_img_arr[idx] = koad_img_rgb(targ_src_fpath)
+        label_img_arr[idx] = load_img_gray(targ_label_fpath)
         targ_id_dir_arr[idx] = targ_id_dir
         null_lst.append(targ_id_dirs[i] + '\n')