Minor fixes

src/napari_imagej/widgets/result_tree.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 from logging import getLogger
-from typing import Dict, List, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from qtpy.QtCore import QRectF, Qt, Signal, QSize
 from qtpy.QtGui import QStandardItem, QStandardItemModel, QTextDocument
@@ -28,9 +28,10 @@
 if TYPE_CHECKING:
     from qtpy.QtCore import QModelIndex
 
+    from typing import Dict, List
 
-# FIXME: Ideally we'd use something from the palette
-# but there's no good options
+
+# Color used for additional information in the QTreeView
 HIGHLIGHT = "#8C745E"
 
 
@@ -155,13 +156,13 @@ def paint(self, painter, option, index: QModelIndex):
         doc.setHtml(rich_text)
 
         painter.save()
-        painter.setClipRect(options.rect)
-
-        # NB: Unsure why we can't pass subElementRect output to drawContents...
+        # Translate the painter to the correct item
+        # NB offset is necessary to account for checkbox, icon
         text_offset = style.subElementRect(
             QStyle.SE_ItemViewItemText, options, options.widget
         ).x()
         painter.translate(text_offset, options.rect.top())
+        # Paint the rich text
         rect = QRectF(0, 0, options.rect.width(), options.rect.height())
         doc.drawContents(painter, rect)
 
@@ -171,6 +172,7 @@ def sizeHint(self, option, index):
         options = QStyleOptionViewItem(option)
         self.initStyleOption(options, index)
 
+        # size hint is the size of the rendered HTML
         doc = QTextDocument()
         doc.setHtml(options.text)
         doc.setTextWidth(options.rect.width())
@@ -251,6 +253,7 @@ def _update_searcher_title(self, parent_idx, first: int, last: int):
         if isinstance(item, SearcherItem):
             if item.hasChildren():
                 item.setData(
+                    # Write the number of results in "highlight text"
                     f'{item.searcher.title()} <span style="color:{HIGHLIGHT};">({item.rowCount()})</span>',
                     Qt.DisplayRole,
                 )

src/napari_imagej/widgets/widget_utils.py

@@ -3,6 +3,7 @@
 from typing import List
 
 from jpype import JArray, JByte
+from scyjava import jvm_started
 from magicgui import magicgui
 from napari import Viewer
 from napari.layers import Image, Labels, Layer, Points, Shapes
@@ -315,7 +316,8 @@ def _get_icon(path: str, cls: "jc.Class" = None):
         # TODO: Add icons from web
         return
     # Java Resources
-    elif isinstance(cls, jc.Class):
+    # NB: Use java only if JVM started
+    elif jvm_started() and isinstance(cls, jc.Class):
         stream = cls.getResourceAsStream(path)
         # Ignore falsy streams
         if not stream:

tests/widgets/test_result_tree.py

@@ -6,7 +6,7 @@
 from qtpy.QtCore import QRunnable, Qt, QThreadPool
 from qtpy.QtWidgets import QApplication, QMenu
 
-from napari_imagej.java import init_ij
+from napari_imagej import nij
 from napari_imagej.widgets.result_tree import (
     SearcherItem,
     SearcherTreeView,
@@ -23,7 +23,7 @@ def results_tree():
 
 
 @pytest.fixture
-def fixed_tree(ij, asserter):
+def fixed_tree(asserter):
     """Creates a "fake" ResultsTree with deterministic results"""
     # Create a default SearchResultTree
     tree = SearcherTreeView(None)
@@ -49,7 +49,12 @@ def test_searchers_persist(fixed_tree: SearcherTreeView, asserter):
     asserter(lambda: fixed_tree.model().invisibleRootItem().rowCount() == 2)
 
 
-def test_resultTreeItem_regression(ij):
+def test_regression():
+    """Tests SearchResultItems, SearcherItems display as expected."""
+    # SearchResultItems wrap SciJava SearchResults, so they expect a running JVM
+    nij.ij
+
+    # Phase 1: Search Results
     dummy = DummySearchResult()
     item = SearchResultItem(dummy)
     assert item.result == dummy
@@ -61,9 +66,7 @@ def test_resultTreeItem_regression(ij):
     data = f'{dummy.name()} <span style="color:#8C745E;">foo > bar > baz</span>'
     assert item.data(0) == data
 
-
-def test_searcherTreeItem_regression():
-    init_ij()
+    # Phase 2: Searchers
     dummy = DummySearcher("This is not a Searcher")
     item = SearcherItem(dummy)
     assert item.searcher == dummy
@@ -78,7 +81,7 @@ def test_searcherTreeItem_regression():
     assert item.data(0) == dummy.title()
 
 
-def test_key_return_expansion(fixed_tree: SearcherTreeView, qtbot, asserter):
+def test_key_return_expansion(fixed_tree: SearcherTreeView, qtbot):
     idx = fixed_tree.model().index(0, 0)
     fixed_tree.setCurrentIndex(idx)
     expanded = fixed_tree.isExpanded(idx)

tests/widgets/widget_utils.py

@@ -6,6 +6,7 @@
 
 from qtpy.QtCore import Qt
 
+from napari_imagej import nij
 from napari_imagej.widgets.result_tree import SearcherItem, SearcherTreeView
 from tests.utils import DummySearcher, DummySearchEvent, jc
 
@@ -19,6 +20,9 @@ def _searcher_tree_named(tree: SearcherTreeView, name: str) -> Optional[Searcher
 
 
 def _populate_tree(tree: SearcherTreeView, asserter):
+    # DummySearchers are SciJava Searchers - we need a JVM
+    nij.ij
+
     root = tree.model().invisibleRootItem()
     asserter(lambda: root.rowCount() == 0)
     # Add two searchers