refactoring

This commit is contained in:
iperov 2019-03-26 11:09:44 +04:00
commit b03b147bae
18 changed files with 452 additions and 447 deletions

View file

@ -7,7 +7,6 @@ import cv2
from utils.DFLPNG import DFLPNG
from utils.DFLJPG import DFLJPG
from utils.cv2_utils import *
from utils import image_utils
import shutil
import numpy as np
import time

View file

@ -7,11 +7,11 @@ import shutil
from pathlib import Path
import numpy as np
import mathlib
import imagelib
import cv2
from utils import Path_utils
from utils.DFLJPG import DFLJPG
from utils.cv2_utils import *
from utils import image_utils
import facelib
from facelib import FaceType
from facelib import LandmarksProcessor
@ -378,7 +378,7 @@ class ExtractSubprocessor(Subprocessor):
if self.cache_text_lines_img[0] == sh:
self.text_lines_img = self.cache_text_lines_img[1]
else:
self.text_lines_img = (image_utils.get_draw_text_lines ( self.image, sh,
self.text_lines_img = (imagelib.get_draw_text_lines ( self.image, sh,
[ '[Mouse click] - lock/unlock selection',
'[Mouse wheel] - change rect',
'[Enter] / [Space] - confirm / skip frame',

View file

@ -6,7 +6,6 @@ import cv2
from shutil import copyfile
from pathlib import Path
from utils import Path_utils
from utils import image_utils
from utils.DFLPNG import DFLPNG
from utils.DFLJPG import DFLJPG
from utils.cv2_utils import *

View file

@ -7,7 +7,7 @@ import numpy as np
import itertools
from pathlib import Path
from utils import Path_utils
from utils import image_utils
import imagelib
import cv2
import models
from interact import interact as io
@ -235,7 +235,7 @@ def main(args, device_args):
for i in range(0, len(head_lines)):
t = i*head_line_height
b = (i+1)*head_line_height
head[t:b, 0:w] += image_utils.get_text_image ( (w,head_line_height,c) , head_lines[i], color=[0.8]*c )
head[t:b, 0:w] += imagelib.get_text_image ( (w,head_line_height,c) , head_lines[i], color=[0.8]*c )
final = head