Checkpoint

We were using a subclassed QTextEdit widget so that we could capture
clicks on anchors.

Moving to a delegate removed the widget per row issue.  Unfortunately,
there was no more click on anchor.

Adding a mouseEvent() to the TableView allowed us to translate raw
mouse presses to anchor triggers.

Fixes: #18

MainWindow.py

@@ -241,7 +241,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.loadButton.clicked.connect(self.loadCases)
         self.update_status.connect(self.statusBarUpdate)
         self.update_status.emit()
-        self.docketLabel.setText('')
+        self.docketLabel.setText("")
         return
 
     def closeEvent(self, event: QCloseEvent) -> None:

dockettableview.py

@@ -1,13 +1,13 @@
 from typing import cast
 
 from PySide6.QtCore import (
-    QAbstractItemModel,
     QDir,
     QFile,
     QModelIndex,
-    QObject,
     QPersistentModelIndex,
     QPoint,
+    QPointF,
+    QRect,
     QSize,
     Qt,
     QUrl,
@@ -16,7 +16,7 @@ from PySide6.QtCore import (
 )
 from PySide6.QtGui import (
     QMouseEvent,
-    QPalette,
+    QPainter,
     QTextDocument,
 )
 from PySide6.QtNetwork import (
@@ -26,7 +26,7 @@ from PySide6.QtNetwork import (
 )
 from PySide6.QtWidgets import (
     QAbstractItemView,
-    QSizePolicy,
+    QStyle,
     QStyledItemDelegate,
     QStyleOptionViewItem,
     QTableView,
@@ -34,7 +34,7 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
-from docketModel import docketModel
+from lib.utils import QStyleOptionViewItemInit
 from pdfView import PDFViewer
 
 
@@ -48,40 +48,39 @@ class docketEntryDelegate(QStyledItemDelegate):
 
     def sizeHint(
         self,
-        _: QStyleOptionViewItem,
+        option: QStyleOptionViewItem,
         index: QModelIndex | QPersistentModelIndex,
     ) -> QSize:
-        widget = self.view.indexWidget(index)
+        options = cast(QStyleOptionViewItemInit, option)
-        return widget.sizeHint()
+        self.initStyleOption(options, index)
-
-
-class docketEntry(QTextEdit):
-    def __init__(self, parent: QWidget | None = None) -> None:
-        super(docketEntry, self).__init__(parent)
-        self.setSizePolicy(
-            QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed
-        )
-        return
-
-    def mousePressEvent(self, e: QMouseEvent) -> None:
-        super().mousePressEvent(e)
-        anchor = self.anchorAt(e.pos())
-        if anchor:
-            obj = cast(QObject, self)
-            while not isinstance(obj, docketTableView) and obj is not None:
-                obj = obj.parent()
-            assert obj is not None
-            index = obj.indexAt(obj.mapFromGlobal(self.mapToGlobal(e.pos())))
-            obj.anchorSignal.emit(index, anchor)
-        return
-
-    def sizeHint(self) -> QSize:
-        size = self.size()
         doc = QTextDocument()
-        doc.setPlainText(self.document().toPlainText())
+        doc.setHtml(options.text)
-        doc.setTextWidth(size.width())
+        doc.setTextWidth(options.rect.width())
-        docSize = doc.size()
+        return QSize(int(doc.idealWidth()), int(doc.size().height()))
-        return QSize(size.width(), int(docSize.height()))
+
+    def paint(
+        self,
+        painter: QPainter,
+        option: QStyleOptionViewItem,
+        index: QModelIndex | QPersistentModelIndex,
+    ) -> None:
+        options = cast(QStyleOptionViewItemInit, option)
+        self.initStyleOption(options, index)
+        painter.save()
+
+        doc = QTextDocument()
+        doc.setHtml(options.text)
+        doc.setTextWidth(options.rect.width())
+
+        options.text = ""
+        options.widget.style().drawControl(
+            QStyle.ControlElement.CE_ItemViewItem, options, painter
+        )
+        painter.translate(options.rect.left(), options.rect.top())
+        clip = QRect(0, 0, options.rect.width(), options.rect.height())
+        doc.drawContents(painter, clip)
+        painter.restore()
+        return
 
 
 class docketTableView(QTableView):
@@ -99,12 +98,6 @@ class docketTableView(QTableView):
         self.manager.finished.connect(self.getDone)
         return
 
-    def setModel(self, model: QAbstractItemModel | None) -> None:
-        assert model is not None
-        super().setModel(model)
-        self.model().modelReset.connect(self.modelReset)
-        return
-
     @Slot(QNetworkReply)  # type: ignore
     def getDone(self, reply: QNetworkReply) -> None:
         dest = QFile("." + reply.url().path())
@@ -136,16 +129,36 @@ class docketTableView(QTableView):
             self.manager.get(QNetworkRequest(url))
         return
 
-    def modelReset(self) -> None:
+    def mousePressEvent(self, event: QMouseEvent) -> None:
-        model = self.model()
+        #
-        red = QPalette()
+        # The mouse has been pressed somewere in our rect.  We need to translate that to a click
-        red.setColor(QPalette.ColorRole.Base, Qt.GlobalColor.red)
+        # within the cell with the document.  This will allow the document to find anchors.
-        for row in range(0, model.rowCount()):
+        #
-            index = model.index(row, docketModel.ColumnNames.text)
+        index = self.indexAt(event.pos())
-            widget = docketEntry()
+        if not index.isValid():
-            widget.setHtml(model.data(index, Qt.ItemDataRole.DisplayRole))
+            return
-            widget.setAutoFillBackground(False)
+        if index.column() != 1:
-            widget.setReadOnly(True)
+            return
-            widget.setPalette(red)
+        doc = QTextDocument()
-            self.setIndexWidget(index, widget)
+        doc.setHtml(index.data(Qt.ItemDataRole.DisplayRole))
+        doc.setTextWidth(self.columnWidth(index.column()))
+        #
+        # We need to map our click position to a position within the cell.
+        #
+        pos = event.position()
+        new_pos = QPointF(
+            pos.x() - self.horizontalScrollBar().value(),
+            pos.y() - self.verticalScrollBar().value(),
+        )
+        rowHeight = 0
+        for row in range(0, index.row()):
+            rowHeight += self.rowHeight(row)
+        cell_pos = QPointF(
+            new_pos.x() - self.columnWidth(0), new_pos.y() - rowHeight
+        )
+        te = QTextEdit()
+        te.setDocument(doc)
+        anchor = te.anchorAt(cell_pos.toPoint())
+        if anchor:
+            self.anchorSignal.emit(index, anchor)
         return

scotus-pull.py

@@ -35,8 +35,9 @@ def main() -> int:
     updateDatabase(settings)
     db = QSqlDatabase.addDatabase("QMYSQL")
     db.setHostName(settings.value("hostname"))
-    portStr = cast(str, settings.value("port", "3306"))
+    port = settings.value("port", "3306")
-    db.setPort(int(portStr))
+    assert isinstance(port, str)
+    db.setPort(int(port))
     db.setDatabaseName(settings.value("databasename", "scotus"))  # type: ignore
     db.setUserName(settings.value("user", "scotus"))  # type: ignore
     db.setPassword(settings.value("password"))

scotusPdfView.py

@@ -0,0 +1,87 @@
+from PySide6.QtCore import QEvent, QObject, QPointF, QRect, QRectF, Qt
+from PySide6.QtGui import QColor, QMouseEvent, QPaintEvent, QPainter, QPen
+from PySide6.QtPdfWidgets import QPdfView
+from PySide6.QtWidgets import QApplication, QWidget
+
+def printParentHierarchy(obj: QObject, indent: int = 0):
+    if obj:
+        indentStr = '  ' * indent * 2
+        print(f"{indentStr}{obj.metaObject().className()}:{obj.objectName()}")
+        printParentHierarchy(obj.parent(), indent + 1)
+    return
+        
+class scotusPdfView(QPdfView):
+
+    drawing: bool
+    start_point: QPointF
+    end_point: QPointF
+    
+    def formatRect(self, rect: QRectF|QRect) -> str:
+        return f"({rect.left()},{rect.top()}):({rect.right()},{rect.bottom()})"
+    
+    def __init__(self, parent: QWidget) -> None:
+        self.drawing = False
+        super(scotusPdfView, self).__init__(parent)
+        print(self.viewport())
+        return
+
+    def paintEvent(self, event: QPaintEvent) -> None:
+        super(scotusPdfView,self).paintEvent(event)
+        if self.drawing:
+            page = self.pageNavigator().currentPage()
+            viewport = self.viewport()
+            painter = QPainter(viewport)
+            doc = self.document()
+            dpi = QApplication.primaryScreen().logicalDotsPerInch()
+            #
+            # XXX: Our mouse events are storing coordinates in the "self"
+            # coordinate system.  We need them in the viewport system
+            #
+
+            rect = QRectF(viewport.mapFrom(self, self.start_point),
+                          viewport.mapFrom(self, self.end_point))
+            redSolid = QPen(Qt.GlobalColor.red, 2, Qt.PenStyle.SolidLine)
+            blueDash = QPen(Qt.GlobalColor.blue, 2, Qt.PenStyle.DashLine)
+            greenDash = QPen(Qt.GlobalColor.green, 2, Qt.PenStyle.DashLine)
+            painter.setPen(redSolid)
+            painter.drawRect(rect) # Mouse drag box
+
+            selectRect = QRectF(rect.left()/dpi*72,
+                                rect.top()/dpi*72,
+                                rect.right()/dpi*72,
+                                rect.bottom()/dpi*72)
+            painter.setPen(blueDash)
+            selection = doc.getSelectionAtIndex(page, 10, 50)
+            selection = doc.getSelection(page, selectRect.topLeft(), selectRect.bottomRight())
+            bb = selection.boundingRectangle()
+            painter.drawRect(bb) # Selection bounding box
+            print(selection.text())
+            print()
+
+            painter.setPen(greenDash)
+            bb.setLeft(bb.left()/72*dpi)
+            bb.setTop(bb.top()/72*dpi)
+            bb.setRight(bb.right()/72*dpi)
+            bb.setBottom(bb.bottom()/72*dpi)
+            painter.drawRect(bb) # Selection translated into viewport coordinates?
+        return
+
+    def mousePressEvent(self, event: QMouseEvent) -> None:
+        if event.button() == Qt.MouseButton.LeftButton:
+            self.start_point = event.pos()
+            self.drawing = True
+        return
+    
+    def mouseMoveEvent(self, event: QMouseEvent) -> None:
+        if self.drawing:
+            pos = event.pos()
+            self.end_point = pos
+            viewport = self.viewport()
+            viewport.update()
+        return
+
+    def mouseReleaseEvent(self, event: QMouseEvent) -> None:
+        if event.button() == Qt.MouseButton.LeftButton:
+            self.drawing = False
+            self.viewport().update()
+        return

ui/pdfViewer.py

@@ -16,11 +16,12 @@ from PySide6.QtGui import (QAction, QBrush, QColor, QConicalGradient,
     QIcon, QImage, QKeySequence, QLinearGradient,
     QPainter, QPalette, QPixmap, QRadialGradient,
     QTransform)
-from PySide6.QtPdfWidgets import QPdfView
 from PySide6.QtWidgets import (QApplication, QDialog, QHeaderView, QSizePolicy,
     QSplitter, QTabWidget, QToolBar, QTreeView,
     QVBoxLayout, QWidget)
-import ui.resources_rc
+
+from scotusPdfView import scotusPdfView
+import resources_rc
 
 class Ui_pdfViewer(object):
     def setupUi(self, pdfViewer):
@@ -107,7 +108,7 @@ class Ui_pdfViewer(object):
         self.pagesTab.setObjectName(u"pagesTab")
         self.tabWidget.addTab(self.pagesTab, "")
         self.splitter.addWidget(self.tabWidget)
-        self.pdfView = QPdfView(self.splitter)
+        self.pdfView = scotusPdfView(self.splitter)
         self.pdfView.setObjectName(u"pdfView")
         sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         sizePolicy1.setHorizontalStretch(10)

ui/pdfViewer.ui

@@ -99,7 +99,7 @@
           </attribute>
          </widget>
         </widget>
-        <widget class="QPdfView" name="pdfView" native="true">
+        <widget class="scotusPdfView" name="pdfView" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>10</horstretch>
@@ -215,9 +215,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QPdfView</class>
+   <class>scotusPdfView</class>
    <extends>QWidget</extends>
-   <header>qpdfview.h</header>
+   <header>scotusPdfView.h</header>
   </customwidget>
  </customwidgets>
  <resources>

workers.py

@@ -106,7 +106,6 @@ def update_db(case_id: str, db: QSqlDatabase) -> int:
     #
     # We assume that case_id == docket_id at this point.  If it does not,
     # then we will build out from the request we get
-    print(f"Updating {case_id}")
     matches = re.match(r"(\d\d)[-A](\d+)(.*)$", case_id)
     if matches is None:
         raise Exception(f"Not a match {case_id}")
@@ -301,7 +300,7 @@ class updateThread(QThread):
             print(db.lastError())
             raise Exception("db.open()")
 
-        case_id = update_db(str(self.docket_id), db)
+        update_db(str(self.docket_id), db)
         db.close()
         del db
         QSqlDatabase.removeDatabase("update")
@@ -312,6 +311,7 @@ class loadCases(QThread):
     caseLoaded = Signal(int)
     year = QDateTime.currentDateTime().toString("yy")
     number = 0
+    edocket = 0
 
     def run(self) -> None:
         db = QSqlDatabase.cloneDatabase("qt_sql_default_connection", "load")
@@ -348,15 +348,31 @@ class loadCases(QThread):
                 docket_id = f"{self.year}A{self.number}"
             else:
                 docket_id = f"{self.year}-{self.number}"
+            print(f"Updating: {docket_id} ", end='')
             query.bindValue(":did", docket_id)
             if not query.exec():
                 query_error(query)
             if query.next():
                 if query.value("active") == 0:
                     self.number += 1
+                    print("INACTIVE")
                     continue
+            print()
             result = update_db(docket_id, db)
             if result < 0:
+                if edocket == 0:
+                    edocket = 1
+                    self.number = 1
+                    query.prepare("UPDATE history SET number = :number, "
+                                  "edocket=:edocket "
+                                  "WHERE history_id=:hid")
+                    query.bindValue(':number', 1)
+                    query.bindValue(':edocket', 1)
+                    query.bindValue(':hid', history_id)
+                    if not query.exec():
+                        query_error(query)
+                    continue
+                edocket = 0
                 self.year = f"{int(self.year) - 1:02d}"
                 if self.number > 1:
                     query.prepare(
@@ -391,6 +407,7 @@ class loadCases(QThread):
 
             self.number += 1
             count += 1
+        self.number -= 1
         if self.number > 1:
             query.prepare(
                 "UPDATE history SET number= :number WHERE year = :year"