Commit 1e03a003 authored by dmMaze's avatar dmMaze
Browse files

sort pages

parent f2b5eaa0

ui/imgtrans_proj.py

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class ProjImgTrans: 
            self.not_found_pages = {}

            page_dict = proj_dict['pages']

            not_found_pages = list(page_dict.keys())

            found_pages = find_all_imgs(img_dir=self.directory, abs_path=False)

            found_pages = find_all_imgs(img_dir=self.directory, abs_path=False, sort=True)

            for ii, imname in enumerate(found_pages):

                if imname in page_dict:

                    self.pages[imname] = [TextBlock(**blk_dict) for blk_dict in page_dict[imname]]
@@ -184,7 +184,7 @@ class ProjImgTrans: 
        if not osp.exists(self.directory):

            raise ProjectDirNotExistException

        self.set_current_img(None)

        imglist = find_all_imgs(self.directory, abs_path=False)

        imglist = find_all_imgs(self.directory, abs_path=False, sort=True)

        self.pages = {}

        self._pagename2idx = {}

        self._idx2pagename = {}

utils/io_utils.py

+5 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class NumpyEncoder(json.JSONEncoder): 
                return int(obj)

        return json.JSONEncoder.default(self, obj)



def find_all_imgs(img_dir, abs_path=False):

def find_all_imgs(img_dir, abs_path=False, sort=False):

    imglist = []

    for filename in os.listdir(img_dir):

        file_suffix = Path(filename).suffix
@@ -38,6 +38,10 @@ def find_all_imgs(img_dir, abs_path=False): 
            imglist.append(osp.join(img_dir, filename))

        else:

            imglist.append(filename)



    if sort:

        imglist.sort()

        

    return imglist



def imread(imgpath, read_type=cv2.IMREAD_COLOR):