diff --git a/.gitignore b/.gitignore index b6e4761..bfd99ba 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,6 @@ dmypy.json # Pyre type checker .pyre/ + +# Jetbrains +.idea diff --git a/pyproject.toml b/pyproject.toml index 6739535..e501d66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "tiffexplore" -version = "2024.10.0" +version = "2026.11.0" description = "Explore a tiff structure." authors = ["Wim Pomp, "] license = "GPL-3.0-or-later" @@ -19,6 +19,10 @@ PyQt5 = "*" [tool.pytest.ini_options] filterwarnings = ["ignore:::(?!tiffexplore)"] +[tool.ruff] +line-length = 119 +indent-width = 4 + [tool.isort] line_length = 119 diff --git a/tiffexplore/__init__.py b/tiffexplore/__init__.py index 4d035c5..4ac5d5a 100644 --- a/tiffexplore/__init__.py +++ b/tiffexplore/__init__.py @@ -1,8 +1,8 @@ -#!/usr/bin/env python3 +from os.path import basename, isfile +from sys import argv, exit +from traceback import format_exc -from PyQt5 import QtCore, QtWidgets, QtGui -from os.path import isfile, basename -from sys import argv +from PyQt5 import QtCore, QtGui, QtWidgets if __package__ is None: import tiffread @@ -10,7 +10,7 @@ else: from . import tiffread -class UiMainWindow(object): +class UiMainWindow: def setupUi(self, MainWindow): MainWindow.resize(800, 600) self.centralwidget = QtWidgets.QWidget(MainWindow) @@ -76,21 +76,30 @@ class UiMainWindow(object): class PaintBox(QtWidgets.QWidget): def drawText(self, qp, rect, text): - qp.setPen(QtGui.QColor('black')) - qp.setFont(QtGui.QFont('Decorative', 10 if rect[3] > 20 else rect[3] // 2)) + qp.setPen(QtGui.QColor("black")) + qp.setFont(QtGui.QFont("Decorative", 10 if rect[3] > 20 else rect[3] // 2)) qp.drawText(QtCore.QRect(*rect), QtCore.Qt.AlignCenter, text) def drawRectangle(self, qp, rect, color): color = QtGui.QColor(color) if isinstance(color, str) else QtGui.QColor(*color) - qp.setPen(QtGui.QColor('gray')) + qp.setPen(QtGui.QColor("gray")) qp.setBrush(color) qp.drawRect(*rect) + class Legend(PaintBox): def __init__(self, parent): self.parent = parent - self.color = {'header': 'red', '(sub)ifd': 'cyan', 'tagdata': 'lightgreen', 'image': 'yellow', 'empty': 'white', - 'shared tagdata': 'green', 'shared image': 'orange', 'unknown': 'gray'} + self.color = { + "header": "red", + "(sub)ifd": "cyan", + "tagdata": "lightgreen", + "image": "yellow", + "empty": "white", + "shared tagdata": "green", + "shared image": "orange", + "unknown": "gray", + } super().__init__() self.setFixedHeight(15 * len(self.color)) self.show() @@ -99,17 +108,28 @@ class Legend(PaintBox): qp = QtGui.QPainter() qp.begin(self) for i, (key, value) in enumerate(self.color.items()): - self.drawRectangle(qp, (0, 15*i, 125, 15), value) - self.drawText(qp, (0, 15*i, 125, 15), key) + self.drawRectangle(qp, (0, 15 * i, 125, 15), value) + self.drawText(qp, (0, 15 * i, 125, 15), key) qp.end() class Bar(PaintBox): def __init__(self, parent): self.parent = parent - self.color = {'header': 'red', 'ifd': 'cyan', 'subifd': 'cyan', 'tagdata': 'lightgreen', 'image': 'yellow', - 'empty': 'white', 'HEADER': 'red', 'IFD': 'blue', 'SUBIFD': 'blue', 'TAGDATA': 'green', - 'IMAGE': 'orange', 'EMPTY': 'white'} + self.color = { + "header": "red", + "ifd": "cyan", + "subifd": "cyan", + "tagdata": "lightgreen", + "image": "yellow", + "empty": "white", + "HEADER": "red", + "IFD": "blue", + "SUBIFD": "blue", + "TAGDATA": "green", + "IMAGE": "orange", + "EMPTY": "white", + } self.tiff = None self.bar = tiffread.assignments() super().__init__() @@ -129,8 +149,11 @@ class Bar(PaintBox): self.parent.verticalLayoutWidget.setFixedHeight(self.bar.max_addr) for key, value in self.bar.items(): self.drawRectangle(qp, (0, value[0], 125, value[1]), self.color.get(key[0], "gray")) - self.drawText(qp, (0, value[0], 125, value[1]), - key[0].lower() + ('\n' if value[1] > 20 else ' ') + ' '.join([f'{k}' for k in key[1]])) + self.drawText( + qp, + (0, value[0], 125, value[1]), + key[0].lower() + ("\n" if value[1] > 20 else " ") + " ".join([f"{k}" for k in key[1]]), + ) qp.end() def get_bar(self, scale=100, min_size=10, max_size=1000): @@ -141,9 +164,9 @@ class Bar(PaintBox): size = value[1] // scale if not (min_size <= size <= max_size): size = min_size if size < min_size else max_size - if not (key[0].lower() == 'empty' and value[1] == 1): - if key[0].lower() == 'empty': - bar[('empty', (value[0] + value[1] // 2,))] = (pos, size) + if not (key[0].lower() == "empty" and value[1] == 1): + if key[0].lower() == "empty": + bar[("empty", (value[0] + value[1] // 2,))] = (pos, size) else: if len(item) > 1: bar[(key[0].upper(),) + key[1:]] = (pos, size) @@ -155,46 +178,49 @@ class Bar(PaintBox): def mousePressEvent(self, event): ((code, key), *_), _ = zip(*self.bar.get_assignment(event.localPos().y())) - if code.lower() == 'empty': + if code.lower() == "empty": addr = key[0] else: addr = self.tiff.addresses[(code.lower(), key)] addr = addr[0] + addr[1] // 2 keys, (addr, *_) = zip(*self.parent.tiff.addresses.get_assignment(addr)) - text = [' '.join([f'{k}' for k in (c.lower(), *k)]) for c, *k in keys] - text.append('') - text.append(f'Adresses: {addr[0]} - {sum(addr)}') - text.append(f'Length: {addr[1]}') - if code.lower() == 'header': - text.append(f'\nFile size: {len(self.tiff)}') - text.append(f'Unused bytes in file: {self.tiff.get_empty()}') - text.append(f'Byte order: {self.tiff.byteorder}') - text.append(f'Big tiff: {self.tiff.bigtiff}') - text.append(f'Tag size: {self.tiff.tagsize}') - text.append(f'Tag number format: {self.tiff.tagnoformat}') - text.append(f'Offset size: {self.tiff.offsetsize}') - text.append(f'Offset format: {self.tiff.offsetformat}') - text.append(f'First ifd offset: {self.tiff.offsets[(0,)]}') - if code.lower() in ('ifd', 'subifd'): - text.append(f'Number of tags: {self.tiff.nTags[key]}') - text.append(f'Unused bytes in ifd: {self.tiff.get_empty(key)}\n') - text.extend([self.tiff.fmt_tag(k, v) + '\n' for k, v in self.tiff.tags[key].items()]) - text.append(f'Next ifd offset: {self.tiff.offsets.get(key[:-1] + (key[-1] + 1,))}') - if code.lower() == 'tagdata': - text.append('\n' + self.tiff.fmt_tag(key[-1], self.tiff.tags[key[:-1]][key[-1]])) - if code.lower() == 'image' and len(key) == 2: - im = self.tiff.asarray(key[0], key[1]) - if im is not None: - text.append(f'\nStrip size: {im.shape}') - text.append(f'Data type: {im.dtype}') - text.append(f'Min, max: {im.min()}, {im.max()}') - text.append(f'Mean, std: {im.mean()}, {im.std()}') - self.parent.setImage(im) - else: - self.parent.setImage() - self.parent.properties.setText('\n'.join(text)) - self.parent.binary.setText(''.join([chr(i) for i in self.tiff[addr[0]:addr[0]+addr[1]]])) + text = [" ".join([f"{k}" for k in (c.lower(), *k)]) for c, *k in keys] + text.append("") + text.append(f"Adresses: {addr[0]} - {sum(addr)}") + text.append(f"Length: {addr[1]}") + try: + if code.lower() == "header": + text.append(f"\nFile size: {len(self.tiff)}") + text.append(f"Unused bytes in file: {self.tiff.get_empty()}") + text.append(f"Byte order: {self.tiff.byteorder}") + text.append(f"Big tiff: {self.tiff.bigtiff}") + text.append(f"Tag size: {self.tiff.tagsize}") + text.append(f"Tag number format: {self.tiff.tagnoformat}") + text.append(f"Offset size: {self.tiff.offsetsize}") + text.append(f"Offset format: {self.tiff.offsetformat}") + text.append(f"First ifd offset: {self.tiff.offsets[(0,)]}") + if code.lower() in ("ifd", "subifd"): + text.append(f"Number of tags: {self.tiff.nTags[key]}") + text.append(f"Unused bytes in ifd: {self.tiff.get_empty(key)}\n") + text.extend([self.tiff.fmt_tag(k, v) + "\n" for k, v in self.tiff.tags[key].items()]) + text.append(f"Next ifd offset: {self.tiff.offsets.get(key[:-1] + (key[-1] + 1,))}") + if code.lower() == "tagdata": + text.append("\n" + self.tiff.fmt_tag(key[-1], self.tiff.tags[key[:-1]][key[-1]])) + if code.lower() == "image" and len(key) == 2: + im = self.tiff.asarray(key[0], key[1]) + if im is not None: + text.append(f"\nStrip size: {im.shape}") + text.append(f"Data type: {im.dtype}") + text.append(f"Min, max: {im.min()}, {im.max()}") + text.append(f"Mean, std: {im.mean()}, {im.std()}") + self.parent.setImage(im) + else: + self.parent.setImage() + except Exception: # noqa + text.append(format_exc()) + self.parent.properties.setText("\n".join(text)) + self.parent.binary.setText("".join([chr(i) for i in self.tiff[addr[0] : addr[0] + addr[1]]])) class App(QtWidgets.QMainWindow, UiMainWindow): @@ -214,9 +240,9 @@ class App(QtWidgets.QMainWindow, UiMainWindow): if len(args): im = args[0] if im.ndim == 3: - im = im.transpose(2, 0, 1).reshape((im.shape[0]*im.shape[2], im.shape[1])) + im = im.transpose(2, 0, 1).reshape((im.shape[0] * im.shape[2], im.shape[1])) if im.max() - im.min() > 0: - im = (255 * ((im - im.min()) / (im.max() - im.min()))).astype('uint8') + im = (255 * ((im - im.min()) / (im.max() - im.min()))).astype("uint8") shape = im.shape im = QtGui.QImage(im, im.shape[1], im.shape[0], QtGui.QImage.Format_Grayscale8) f = min([a / b for a, b in zip((self.image.height(), self.image.width()), shape)]) @@ -226,9 +252,13 @@ class App(QtWidgets.QMainWindow, UiMainWindow): self.image.setPixmap(pix) def openDialog(self): - file, _ = QtWidgets.QFileDialog.getOpenFileName(self, - "Open config file", "", "TIFF Files (*.tif *.tiff);;DNG files (*.dng);;All Files (*)", - options=(QtWidgets.QFileDialog.Options() | QtWidgets.QFileDialog.DontUseNativeDialog)) + file, _ = QtWidgets.QFileDialog.getOpenFileName( + self, + "Open config file", + "", + "TIFF Files (*.tif *.tiff);;DNG files (*.dng);;All Files (*)", + options=(QtWidgets.QFileDialog.Options() | QtWidgets.QFileDialog.DontUseNativeDialog), + ) self.open(file) def open(self, file): @@ -237,7 +267,7 @@ class App(QtWidgets.QMainWindow, UiMainWindow): self.tiff.close() self.tiff = tiffread.tiff(file) self.bar.new_file() - self.setWindowTitle(f'TiffExp: {basename(self.tiff.file)}') + self.setWindowTitle(f"TiffExp: {basename(self.tiff.file)}") def closeEvent(self, *args, **kwargs): if self.tiff is not None: @@ -246,9 +276,9 @@ class App(QtWidgets.QMainWindow, UiMainWindow): def main(): app = QtWidgets.QApplication([]) - w = App(argv[1]) if len(argv) > 1 else App() + App(argv[1]) if len(argv) > 1 else App() exit(app.exec()) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tiffexplore/tiffread.py b/tiffexplore/tiffread.py index c9177d5..5aaf8a4 100644 --- a/tiffexplore/tiffread.py +++ b/tiffexplore/tiffread.py @@ -1,15 +1,17 @@ import struct -import tifffile -import numpy as np from traceback import format_exc -class tiff(): +import numpy as np +import tifffile + + +class tiff: def __init__(self, file): self.file = file - self.fh = open(file, 'rb') + self.fh = open(file, "rb") # noqa try: self.tiff = tifffile.TiffFile(self.file) - except Exception: + except Exception: # noqa self.tiff = None self.tags = {} self.get_file_len() @@ -20,10 +22,10 @@ class tiff(): try: self.read_ifd_offsets(self.read_header()) self.read_tags() - except Exception: + except Exception: # noqa print(format_exc()) - def read_ifd_offsets(self, offset, ifdtype=tuple()): + def read_ifd_offsets(self, offset, ifdtype=()): idx = 0 self.offsets[ifdtype + (idx,)] = offset while 0 < self.offsets[ifdtype + (idx,)] < len(self): @@ -37,10 +39,10 @@ class tiff(): if idx not in self.tagsread: if 273 in tags and 279 in tags: for i, a in enumerate(zip(tags[273][-1], tags[279][-1])): - self.addresses[('image', (*idx, i))] = a + self.addresses[("image", (*idx, i))] = a elif 324 in tags and 325 in tags: for i, a in enumerate(zip(tags[324][-1], tags[325][-1])): - self.addresses[('image', (*idx, i))] = a + self.addresses[("image", (*idx, i))] = a for code in (330, 400, 34665, 34853, 40965): if code in tags: if len(tags[code][3]) == 1: @@ -52,21 +54,23 @@ class tiff(): @staticmethod def fmt_tag(code, value): - text = [f'Code: {code}'] + text = [f"Code: {code}"] if code in tifffile.TIFF.TAGS: - text[-1] += f'; {tifffile.TIFF.TAGS[code]}' - text.append(f'data format: {value[0]}') + text[-1] += f"; {tifffile.TIFF.TAGS[code]}" + text.append(f"data format: {value[0]}") try: - text[-1] += f'; {tifffile.TIFF.DATATYPES(value[0]).name.lower()}' + text[-1] += f"; {tifffile.DATATYPE(value[0]).name.lower()}" except ValueError: pass - text.append(f'address: {value[1]}') - text.append(f'count: {value[2]}') + text.append(f"address: {value[1]}") + text.append(f"count: {value[2]}") if value[0] in (5, 10): - text.append(f'value: [{", ".join(["-" * (sum([w<0 for w in v]) % 2) + "/".join([str(abs(w)) for w in v[::-1]]) for v in value[3]])}]') + text.append( + f"value: [{', '.join(['-' * (sum([w < 0 for w in v]) % 2) + '/'.join([str(abs(w)) for w in v[::-1]]) for v in value[3]])}]" + ) else: - text.append(f'value: {value[3]}') - return '\n'.join(text) + text.append(f"value: {value[3]}") + return "\n".join(text) def get_file_len(self): self.fh.seek(0, 2) @@ -81,34 +85,37 @@ class tiff(): def read_header(self): self.fh.seek(0) - self.byteorder = {b'II': '<', b'MM': '>'}[self.fh.read(2)] - self.bigtiff = {42: False, 43: True}[struct.unpack(self.byteorder + 'H', self.fh.read(2))[0]] + self.byteorder = {b"II": "<", b"MM": ">"}[self.fh.read(2)] + self.bigtiff = {42: False, 43: True}[struct.unpack(self.byteorder + "H", self.fh.read(2))[0]] if self.bigtiff: self.tagsize = 20 - self.tagnoformat = 'Q' - self.offsetsize = struct.unpack(self.byteorder + 'H', self.fh.read(2))[0] - self.offsetformat = {8: 'Q', 16: '2Q'}[self.offsetsize] - assert struct.unpack(self.byteorder + 'H', self.fh.read(2))[0] == 0, 'Not a TIFF-file' + self.tagnoformat = "Q" + self.offsetsize = struct.unpack(self.byteorder + "H", self.fh.read(2))[0] + self.offsetformat = {8: "Q", 16: "2Q"}[self.offsetsize] + assert struct.unpack(self.byteorder + "H", self.fh.read(2))[0] == 0, "Not a TIFF-file" self.offset = struct.unpack(self.byteorder + self.offsetformat, self.fh.read(self.offsetsize))[0] else: self.tagsize = 12 - self.tagnoformat = 'H' - self.offsetformat = 'I' + self.tagnoformat = "H" + self.offsetformat = "I" self.offsetsize = 4 self.offset = struct.unpack(self.byteorder + self.offsetformat, self.fh.read(self.offsetsize))[0] - self.addresses[('header', (0,))] = (0, 4 + self.bigtiff * 4 + self.offsetsize) + self.addresses[("header", (0,))] = (0, 4 + self.bigtiff * 4 + self.offsetsize) return self.offset def read_ifd(self, idx): - """ Reads an IFD of the tiff file - wp@tl20200214 + """Reads an IFD of the tiff file + wp@tl20200214 """ offset = self.offsets[idx] self.fh.seek(offset) - nTags = struct.unpack(self.byteorder + self.tagnoformat, self.fh.read(struct.calcsize(self.tagnoformat)))[0] + nTags = struct.unpack( + self.byteorder + self.tagnoformat, + self.fh.read(struct.calcsize(self.tagnoformat)), + )[0] self.nTags[idx] = nTags self.tags[idx] = {} - assert nTags < 4096, 'Too many tags' + assert nTags < 4096, "Too many tags" length = 8 if self.bigtiff else 2 length += nTags * self.tagsize + self.offsetsize @@ -118,15 +125,21 @@ class tiff(): try: self.fh.seek(offset + struct.calcsize(self.tagnoformat) + self.tagsize * i) - code, ttype = struct.unpack(self.byteorder + 'HH', self.fh.read(4)) + code, ttype = struct.unpack(self.byteorder + "HH", self.fh.read(4)) count = struct.unpack(self.byteorder + self.offsetformat, self.fh.read(self.offsetsize))[0] dtype = tifffile.TIFF.DATA_FORMATS[ttype] dtypelen = struct.calcsize(dtype) toolong = struct.calcsize(dtype) * count > self.offsetsize if toolong: - caddr = struct.unpack(self.byteorder + self.offsetformat, self.fh.read(self.offsetsize))[0] - self.addresses[('tagdata', (*idx, code))] = (caddr, dtypelen * count) + caddr = struct.unpack( + self.byteorder + self.offsetformat, + self.fh.read(self.offsetsize), + )[0] + self.addresses[("tagdata", (*idx, code))] = ( + caddr, + dtypelen * count, + ) cp = self.fh.tell() self.fh.seek(caddr) else: @@ -135,7 +148,7 @@ class tiff(): if ttype == 1: value = self.fh.read(count) elif ttype == 2: - value = self.fh.read(count).decode('ascii').rstrip('\x00') + value = self.fh.read(count).decode("ascii").rstrip("\x00") elif ttype in (5, 10): value = [struct.unpack(self.byteorder + dtype, self.fh.read(dtypelen)) for _ in range(count)] else: @@ -143,23 +156,25 @@ class tiff(): if toolong: self.fh.seek(cp) - except Exception: + except Exception: # noqa print(format_exc()) - self.tags[idx][code] = (ttype, caddr, dtypelen*count, value) + self.tags[idx][code] = (ttype, caddr, dtypelen * count, value) self.fh.seek(offset + struct.calcsize(self.tagnoformat) + self.tagsize * nTags) nifd = struct.unpack(self.byteorder + self.offsetformat, self.fh.read(self.offsetsize))[0] - self.addresses[('sub' * (len(idx) > 1) + 'ifd', idx)] = (offset, 2 * struct.calcsize(self.tagnoformat) - + nTags * self.tagsize) + self.addresses[("sub" * (len(idx) > 1) + "ifd", idx)] = ( + offset, + 2 * struct.calcsize(self.tagnoformat) + nTags * self.tagsize, + ) return nifd def get_empty(self, ifd=None): empty = 0 if ifd is None: for ((code, *key), value), *_ in self.addresses.get_assignments(): - if code == 'empty': + if code == "empty": empty += value[-1] - elif code in ('ifd', 'subifd'): + elif code in ("ifd", "subifd"): empty += self.get_empty(key[0]) else: empty = sum([self.offsetsize - v[2] if v[2] < self.offsetsize else 0 for v in self.tags[ifd].values()]) @@ -167,7 +182,7 @@ class tiff(): def __getitem__(self, item): if not isinstance(item, slice): - item = slice(item, item+1) + item = slice(item, item + 1) start = 0 if item.start is None or item.start < 0 else item.start step = item.step or 1 stop = len(self) if item.stop is None or item.stop > len(self) else item.stop @@ -208,7 +223,7 @@ class assignments(dict): previous_addr = np.max(offset_len[offset_len <= addr]) next_addr = offset_arr[offset_arr > addr] length = np.min(next_addr) - previous_addr if len(next_addr) else self.max_addr - previous_addr - return [(('empty',), (previous_addr, length))] + return [(("empty",), (previous_addr, length))] def get_assignments(self, start=0, end=-1): addr = start