Skip to content

Replace ImageList with QListWidget implementation #1670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace ImageList with QListWidget implementation #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
*.py[cdo]

.DS_Store
.idea/
.idea/
57 changes: 38 additions & 19 deletions labelme/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt


from labelme import __appname__
from labelme._automation import bbox_from_text
from labelme._label_file import LabelFile
Expand Down Expand Up @@ -1266,9 +1267,10 @@ def fileSelectionChanged(self):
if not self.mayContinue():
return

currIndex = self.imageList.index(str(item.text()))
if currIndex < len(self.imageList):
filename = self.imageList[currIndex]
currIndex = self.fileListWidget.row(item)

if currIndex < self.fileListWidget.count():
filename = item.text()
if filename:
self.loadFile(filename)

Expand Down Expand Up @@ -1651,10 +1653,11 @@ def togglePolygons(self, value):
def loadFile(self, filename=None):
"""Load the specified file, or the last opened file if None."""
# changing fileListWidget loads file
if filename in self.imageList and (
self.fileListWidget.currentRow() != self.imageList.index(filename)
filenames = self.fileListWidget.findItems(filename, Qt.MatchExactly)
if filenames and (
self.fileListWidget.currentRow() != self.fileListWidget.row(filenames[0])
):
self.fileListWidget.setCurrentRow(self.imageList.index(filename))
self.fileListWidget.setCurrentRow(self.fileListWidget.row(filenames[0]))
self.fileListWidget.repaint()
return

Expand Down Expand Up @@ -1844,15 +1847,16 @@ def openPrevImg(self, _value=False):
if not self.mayContinue():
return

if len(self.imageList) <= 0:
if self.fileListWidget.count() <= 0:
return

if self.filename is None:
return

currIndex = self.imageList.index(self.filename)
currIndex = self.findListRow(self.filename)

if currIndex - 1 >= 0:
filename = self.imageList[currIndex - 1]
filename = self.fileListWidget.item(currIndex - 1).text()
if filename:
self.loadFile(filename)

Expand All @@ -1868,18 +1872,19 @@ def openNextImg(self, _value=False, load=True):
if not self.mayContinue():
return

if len(self.imageList) <= 0:
if self.fileListWidget.count() <= 0:
return

filename = None
if self.filename is None:
filename = self.imageList[0]
filename = self.fileListWidget.item(0).text()
else:
currIndex = self.imageList.index(self.filename)
if currIndex + 1 < len(self.imageList):
filename = self.imageList[currIndex + 1]
currIndex = self.findListRow(self.filename)
count = self.fileListWidget.count()
if currIndex + 1 < count:
filename = self.fileListWidget.item(currIndex + 1).text()
else:
filename = self.imageList[-1]
filename = self.fileListWidget.item(count - 1).text()
self.filename = filename

if self.filename and load:
Expand Down Expand Up @@ -1941,9 +1946,9 @@ def changeOutputDirDialog(self, _value=False):
current_filename = self.filename
self.importDirImages(self.lastOpenDir, load=False)

if current_filename in self.imageList:
if self.fileListWidget.findItems(current_filename, Qt.MatchExactly):
# retain currently selected file
self.fileListWidget.setCurrentRow(self.imageList.index(current_filename))
self.fileListWidget.setCurrentRow(self.findListRow(current_filename))
self.fileListWidget.repaint()

def saveFile(self, _value=False):
Expand Down Expand Up @@ -2147,15 +2152,29 @@ def imageList(self) -> list[str]:
lst.append(item.text())
return lst

def findListRow(self, text: str) -> int:
for i in range(self.fileListWidget.count()):
item = self.fileListWidget.item(i)
if item and item.text() == text:
return i

def findListRow(self, text: str) -> int:
for i in range(self.fileListWidget.count()):
item = self.fileListWidget.item(i)
if item and item.text() == text:
return i

def importDroppedImageFiles(self, imageFiles):
extensions = [
f".{fmt.data().decode().lower()}"
for fmt in QtGui.QImageReader.supportedImageFormats()
]

self.filename = None

for file in imageFiles:
if file in self.imageList or not file.lower().endswith(tuple(extensions)):
fileItems = self.fileListWidget.findItems(file, Qt.MatchExactly)
if fileItems or not file.lower().endswith(tuple(extensions)):
continue
label_file = f"{osp.splitext(file)[0]}.json"
if self.output_dir:
Expand All @@ -2169,7 +2188,7 @@ def importDroppedImageFiles(self, imageFiles):
item.setCheckState(Qt.Unchecked)
self.fileListWidget.addItem(item)

if len(self.imageList) > 1:
if self.fileListWidget.count() > 1:
self.actions.openNextImg.setEnabled(True)
self.actions.openPrevImg.setEnabled(True)

Expand Down