externalize drawing, cleanup

2 files changed, 26 insertions, 9 deletions

diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index 55fed166..b13ff8ec 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -14,12 +14,16 @@ codecs.register(lambda name: codecs.lookup('utf8') if name == 'utf8mb4' else Non
 # Enun lists used for custom Click Params
 # -----------------------------------------------------------------------------
 
-FaceDetectNetVar = click_utils.ParamVar(types.FaceDetectNet)
-HaarCascadeVar = click_utils.ParamVar(types.HaarCascade)
 LogLevelVar = click_utils.ParamVar(types.LogLevel)
 MetadataVar = click_utils.ParamVar(types.Metadata)
 DatasetVar = click_utils.ParamVar(types.Dataset)
 DataStoreVar = click_utils.ParamVar(types.DataStore)
+# Face analysis
+HaarCascadeVar = click_utils.ParamVar(types.HaarCascade)
+FaceDetectNetVar = click_utils.ParamVar(types.FaceDetectNet)
+FaceLandmark2D_5Var = click_utils.ParamVar(types.FaceLandmark2D_5)
+FaceLandmark2D_68Var = click_utils.ParamVar(types.FaceLandmark2D_68)
+FaceLandmark3D_68Var = click_utils.ParamVar(types.FaceLandmark3D_68)
 
 # # data_store
 DATA_STORE = '/data_store_hdd/'
diff --git a/megapixels/app/settings/types.py b/megapixels/app/settings/types.py
index c2e2caf7..50e395e0 100644
--- a/megapixels/app/settings/types.py
+++ b/megapixels/app/settings/types.py
@@ -6,10 +6,7 @@ def find_type(name, enum_type):
       return enum_opt
   return None
 
-
-class FaceDetectNet(Enum):
-  """Scene text detector networks"""
-  HAAR, DLIB_CNN, DLIB_HOG, CVDNN, MTCNN = range(5)
+  
 
 class CVBackend(Enum):
   """OpenCV 3.4.2+ DNN target type"""
@@ -45,16 +42,32 @@ class LogLevel(Enum):
 # --------------------------------------------------------------------
 
 class Metadata(Enum):
-  IDENTITY, FILE_RECORD, FACE_VECTOR, FACE_POSE, FACE_ROI, FACE_LANDMARKS_2D_68, \
-    FACE_LANDMARKS_3D_68 = range(7)
+  IDENTITY, FILE_RECORD, FACE_VECTOR, FACE_POSE, \
+  FACE_ROI, FACE_LANDMARK_2D_68, FACE_LANDMARK_2D_5,FACE_LANDMARK_3D_68 = range(8)
 
 class Dataset(Enum):
-  LFW, VGG_FACE2, MSCELEB, UCCS, UMD_FACES = range(5)
+  LFW, VGG_FACE2, MSCELEB, UCCS, UMD_FACES, SCUT_FBP, SELFIE_DATASET = range(7)
 
 
 # ---------------------------------------------------------------------
 # Face analysis types
 # --------------------------------------------------------------------
+class FaceDetectNet(Enum):
+  """Scene text detector networks"""
+  HAAR, DLIB_CNN, DLIB_HOG, CVDNN, MTCNN = range(5)
+
+class FaceLandmark2D_5(Enum):
+  DLIB, MTCNN = range(2)
+
+class FaceLandmark2D_68(Enum):
+  DLIB, FACE_ALIGNMENT = range(2)
+
+class FaceLandmark3D_68(Enum):
+  FACE_ALIGNMENT = range(1)
+
+class FaceLandmark3D(Enum):
+  FACE_ALIGNMENT = range(1)
+  
 class FaceEmotion(Enum):
   # Map these to text strings for web display
   NEUTRAL, HAPPY, SAD, ANGRY, FRUSTURATED = range(5)