apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement image counter. (#734)

Browse Source 
* Introduced two new attributes of MainWindow:
  cur_img_idx - Index of current image in m_img_list.
  img_count   - Length of m_img_list.

* Implement counter_str method to get string representation of counter.

* Appended counter to window title.

* Based image switching logic on counter instead of local variables.

* Removed useless condition.
  current_index = self.m_img_list.index(ustr(item.text()))
  if current_index < len(self.m_img_list):
  list.index will raise ValueError if item doesn't exist.
This commit is contained in:
Denis 2021-04-27 08:18:56 +03:00 committed by GitHub
parent 0c09c7c5d1
commit 6b5c3c634b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
labelImg.py
View File

@ -96,6 +96,8 @@ class MainWindow(QMainWindow, WindowMixin):
self.dir_name = None self.dir_name = None
self.label_hist = [] self.label_hist = []
self.last_open_dir = None self.last_open_dir = None
self.cur_img_idx = 0
self.img_count = 1
# Whether we need to save or not. # Whether we need to save or not.
self.dirty = False self.dirty = False
@ -714,11 +716,10 @@ class MainWindow(QMainWindow, WindowMixin):
# Tzutalin 20160906 : Add file list and dock to move faster # Tzutalin 20160906 : Add file list and dock to move faster
def file_item_double_clicked(self, item=None): def file_item_double_clicked(self, item=None):
current_index = self.m_img_list.index(ustr(item.text())) self.cur_img_idx = self.m_img_list.index(ustr(item.text()))
if current_index < len(self.m_img_list): filename = self.m_img_list[self.cur_img_idx]
filename = self.m_img_list[current_index] if filename:
if filename: self.load_file(filename)
self.load_file(filename)
# Add chris # Add chris
def button_state(self, item=None): def button_state(self, item=None):
@ -1093,7 +1094,8 @@ class MainWindow(QMainWindow, WindowMixin):
self.toggle_actions(True) self.toggle_actions(True)
self.show_bounding_box_from_annotation_file(file_path) self.show_bounding_box_from_annotation_file(file_path)
self.setWindowTitle(__appname__ + ' ' + file_path) counter = self.counter_str()
self.setWindowTitle(__appname__ + ' ' + file_path + ' ' + counter)
# Default : select last item if there is at least one item # Default : select last item if there is at least one item
if self.label_list.count(): if self.label_list.count():
@ -1104,6 +1106,12 @@ class MainWindow(QMainWindow, WindowMixin):
return True return True
return False return False
def counter_str(self):
"""
Converts image counter to string representation.
"""
return '[{} / {}]'.format(self.cur_img_idx + 1, self.img_count)
def show_bounding_box_from_annotation_file(self, file_path): def show_bounding_box_from_annotation_file(self, file_path):
if self.default_save_dir is not None: if self.default_save_dir is not None:
basename = os.path.basename(os.path.splitext(file_path)[0]) basename = os.path.basename(os.path.splitext(file_path)[0])
@ -1274,6 +1282,7 @@ class MainWindow(QMainWindow, WindowMixin):
self.file_path = None self.file_path = None
self.file_list_widget.clear() self.file_list_widget.clear()
self.m_img_list = self.scan_all_images(dir_path) self.m_img_list = self.scan_all_images(dir_path)
self.img_count = len(self.m_img_list)
self.open_next_image() self.open_next_image()
for imgPath in self.m_img_list: for imgPath in self.m_img_list:
item = QListWidgetItem(imgPath) item = QListWidgetItem(imgPath)
@ -1310,15 +1319,15 @@ class MainWindow(QMainWindow, WindowMixin):
if not self.may_continue(): if not self.may_continue():
return return
if len(self.m_img_list) <= 0: if self.img_count <= 0:
return return
if self.file_path is None: if self.file_path is None:
return return
current_index = self.m_img_list.index(self.file_path) if self.cur_img_idx - 1 >= 0:
if current_index - 1 >= 0: self.cur_img_idx -= 1
filename = self.m_img_list[current_index - 1] filename = self.m_img_list[self.cur_img_idx]
if filename: if filename:
self.load_file(filename) self.load_file(filename)
@ -1335,16 +1344,17 @@ class MainWindow(QMainWindow, WindowMixin):
if not self.may_continue(): if not self.may_continue():
return return
if len(self.m_img_list) <= 0: if self.img_count <= 0:
return return
filename = None filename = None
if self.file_path is None: if self.file_path is None:
filename = self.m_img_list[0] filename = self.m_img_list[0]
self.cur_img_idx = 0
else: else:
current_index = self.m_img_list.index(self.file_path) if self.cur_img_idx + 1 < self.img_count:
if current_index + 1 < len(self.m_img_list): self.cur_img_idx += 1
filename = self.m_img_list[current_index + 1] filename = self.m_img_list[self.cur_img_idx]
if filename: if filename:
self.load_file(filename) self.load_file(filename)
@ -1359,6 +1369,8 @@ class MainWindow(QMainWindow, WindowMixin):
if filename: if filename:
if isinstance(filename, (tuple, list)): if isinstance(filename, (tuple, list)):
filename = filename[0] filename = filename[0]
self.cur_img_idx = 0
self.img_count = 1
self.load_file(filename) self.load_file(filename)
def save_file(self, _value=False): def save_file(self, _value=False):
@ -1417,6 +1429,8 @@ class MainWindow(QMainWindow, WindowMixin):
delete_path = self.file_path delete_path = self.file_path
if delete_path is not None: if delete_path is not None:
self.open_next_image() self.open_next_image()
self.cur_img_idx -= 1
self.img_count -= 1
if os.path.exists(delete_path): if os.path.exists(delete_path):
os.remove(delete_path) os.remove(delete_path)
self.import_dir_images(self.last_open_dir) self.import_dir_images(self.last_open_dir)