From 561c39e05283e32aab60cef235bc084e835cbf9b Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Fri, 30 Sep 2022 06:27:06 +0200 Subject: [PATCH] Fix more bugs Now it does something. --- birdvisu/visualisation/annotators.py | 4 +++- poor_mans_visualisation.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/birdvisu/visualisation/annotators.py b/birdvisu/visualisation/annotators.py index b31637a..8ee6d34 100644 --- a/birdvisu/visualisation/annotators.py +++ b/birdvisu/visualisation/annotators.py @@ -12,7 +12,7 @@ from PySide6 import QtCore, QtGui, QtWidgets # Classification -class DifferenceStatus: +class DifferenceStatus(Enum): """Describes differences between two topologies""" NORMAL = auto() MISSING = auto() @@ -109,6 +109,7 @@ def assign_brushes(at): for tags in annot.values(): statuses = list(filter(lambda x: isinstance(x, DifferenceStatus), tags)) status = statuses[-1] if len(statuses) > 0 else DifferenceStatus.DISCREPANCY # should always have something. + print(repr(status)) color = { DifferenceStatus.NORMAL: 'black', DifferenceStatus.EXTRA: 'green', @@ -182,4 +183,5 @@ def create_qgritems(at): line = QtWidgets.QGraphicsLineItem(rpos.x, rpos.y, npos.x, npos.y) at.link_annotations[lk].append(line) + return at diff --git a/poor_mans_visualisation.py b/poor_mans_visualisation.py index bfa0a4a..0a7597a 100644 --- a/poor_mans_visualisation.py +++ b/poor_mans_visualisation.py @@ -29,6 +29,14 @@ final_topo = combiner.get_complete_topology() from birdvisu.visualisation import annotators +def dbg_ann(at): + print('hello') + return at + +# annotators.create_qgritems does not like being run without Qt initialization. +from PySide6 import QtCore, QtGui, QtWidgets +app = QtWidgets.QApplication([]) + annotated_topology = maps_new.annotate_topology(final_topo, # A semi-canonical set of annotators: [ @@ -40,11 +48,9 @@ annotated_topology = maps_new.annotate_topology(final_topo, ] ) -# Render the widget -from PySide6 import QtCore, QtGui, QtWidgets +# Render the widget -app = QtWidgets.QApplication([]) scene = QtWidgets.QGraphicsScene() for tagsrc in [