fix hatching

Author: kevinjohncutler

src/cellpose_omni/gui/MainWindowModules/buttons.py

@@ -893,6 +893,10 @@ def make_buttons(self):
     # ---- drawing area ---- #
     self.win = pg.GraphicsLayoutWidget()
     self.win.viewport().setAttribute(QtCore.Qt.WidgetAttribute.WA_AcceptTouchEvents, False)
+    # self.win.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+    # self.win.setAutoFillBackground(False)
+                
+    
     self.l0.addWidget(self.win, 0, TOOLBAR_WIDTH+1, b, 3*b)
     self.win.scene().sigMouseClicked.connect(lambda event: self.plot_clicked(event))
     self.win.scene().sigMouseMoved.connect(lambda pos: self.mouse_moved(pos))

src/cellpose_omni/gui/MainWindowModules/image.py

@@ -68,6 +68,7 @@ def make_viewbox(self):
     self.img.autoDownsample = False
 
     self.hist = guiparts.HistLUT(image=self.img,orientation='horizontal',gradientPosition='bottom')
+    self.gradient = self.hist.gradient
     self.opacity_effect = QtWidgets.QGraphicsOpacityEffect()
     self.hist.setGraphicsEffect(self.opacity_effect)
     self.win.addItem(self.hist,col=0,row=1)

src/cellpose_omni/gui/MainWindowModules/theme.py

@@ -8,6 +8,7 @@
 
 
 import pyqtgraph as pg
+import numpy as np
 
 
 
@@ -92,7 +93,8 @@ def set_hist_colors(self):
     self.hist.axis.style['showValues'] = 0
     self.hist.axis.style['tickAlpha'] = 0
     self.hist.axis.logMode = 1
-    # self.hist.plot.opts['antialias'] = 1
+    self.hist.plot.opts['antialias'] = 1
+    # self.hist.plot.opts['stepMode'] = True
     # self.hist.setLevels(min=0, max=255)
 
     # policy = QtWidgets.QSizePolicy()
@@ -109,7 +111,3 @@ def set_tick_hover_color(self):
 def set_button_color(self):
     color = '#eeeeee' if self.darkmode else '#888888'
     self.ModelButton.setStyleSheet('border: 2px solid {};'.format(color))
-        
-
-
-

src/cellpose_omni/gui/gui.py

@@ -16,12 +16,12 @@
 
 import pyqtgraph as pg
 pg.setConfigOptions(useOpenGL=True)
+# pg.setConfigOptions(enableExperimental=True)
 
 # handle the "Painter path exceeds +/-32767 pixels." warning
 from PyQt6.QtGui import QSurfaceFormat
 fmt = QSurfaceFormat()
 fmt.setStencilBufferSize(8)  # 8-bit stencil
-fmt.setSamples(0)              # Disable multisampling to avoid stipple artifacts - doesn't help
 QSurfaceFormat.setDefaultFormat(fmt)
 
 os.environ['QT_AUTO_SCREEN_SCALE_FACTOR'] = '1'
@@ -116,9 +116,12 @@ def __init__(self, size, dpi, pxr, clipboard, image=None):
         self.class_sources = {}   # maps (module_name, class_name) to the class's source code
         # Discover & load all submodules
         self.modules = self.load_all_submodules()
+        print('modules',self.modules)
         self.patch_all_submodules()
 
 
+        
+        
         # --- New: Register external modules ---
         self.register_external_modules()
 
@@ -222,9 +225,7 @@ def __init__(self, size, dpi, pxr, clipboard, image=None):
         self.linksEditorAction.setChecked(False)
         self.linksEditorAction.triggered.connect(self.toggleLinksDock)
 
-        self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
-        self.setAutoFillBackground(False)
-                
+
         self.setAcceptDrops(True)
         self.win.show()
         self.show()

src/cellpose_omni/gui/guiparts.py

@@ -5,7 +5,7 @@
 from PyQt6.QtGui import QPainter
 from PyQt6.QtWidgets import QApplication, QRadioButton, QWidget, QDialog, QButtonGroup, QSlider, QStyle, QStyleOptionSlider, QGridLayout, QPushButton, QLabel, QLineEdit, QDialogButtonBox, QComboBox
 import pyqtgraph as pg
-from pyqtgraph import Point
+from pyqtgraph.Point import Point
 import numpy as np
 import os
 from omnipose.core import affinity_to_boundary
@@ -1214,7 +1214,6 @@ def __pixelPosToRangeValue(self, pos):
                                              opt.upsideDown)
 
 
-    
 class HistLUT(pg.HistogramLUTItem):
     # sigLookupTableChanged = QtCore.pyqtSignal(object)
     # sigLevelsChanged = QtCore.pyqtSignal(object)
@@ -1232,12 +1231,15 @@ def __init__(self, image=None, fillHistogram=True, levelMode='mono',
         self._orig_mousePressEvent = super().mousePressEvent
         self._orig_mouseMoveEvent = super().mouseMoveEvent
         self._orig_mouseReleaseEvent = super().mouseReleaseEvent
+        self._orig_paint = super().paint
+        
 
         self.imageitem = image
         self._view = 0
         # Make sure there's a place to store full item states for each view.
         if not hasattr(self, 'view_states'):
             self.view_states = {}
+            
 
         # Connect signals for color stops...
         if hasattr(self.gradient, 'sigGradientChanged'):
@@ -1248,12 +1250,22 @@ def __init__(self, image=None, fillHistogram=True, levelMode='mono',
         # ...and region/levels so we capture user changes to min/max handles.
         self.region.sigRegionChanged.connect(self._on_region_changed)
         self.region.sigRegionChangeFinished.connect(self._on_region_changed)
-
+    
+    # def paint(self, painter, option, widget=None):
+    #     old_brush = self.gradient.gradRect.brush()      
+    #     if getattr(self, 'discrete_mode', False):
+    #         # In discrete mode, skip the default overlay drawing.
+    #         # return
+    #         self.gradient.gradRect.setBrush(QtGui.QBrush(QtCore.Qt.BrushStyle.NoBrush))
+    #     # Otherwise, call the original painting.
+    #     self._orig_paint(painter, option, widget)
+    #     self.gradient.gradRect.setBrush(old_brush)
+    #     self.gradient.backgroundRect.hide() # the cause of the hatching pattern 
+        
+    
     def set_view(self, v, preset=None, default_cmaps=None):
         self._view = v
         state = self.view_states.get(v)  # This is the *full item* state, not just gradient.
-
-
 
         if state is not None:
             self.restoreState(state)  # calls HistogramLUTItem.restoreState(state)
@@ -1293,7 +1305,7 @@ def setDiscreteMode(self, discrete: bool, n_bands: int = 5):
             if st.get('mode', '').lower() == 'hsv':
                 st['mode'] = 'rgb'
                 self.gradient.restoreState(st)
-            # Save original paint method if not already saved.
+            # Save original paint method if not already saved.  
             if not hasattr(self.gradient, '_original_paint'):
                 self.gradient._original_paint = self.gradient.paint
             # Store the number of discrete bands.
@@ -1304,18 +1316,13 @@ def setDiscreteMode(self, discrete: bool, n_bands: int = 5):
             self.gradient.paint = self._discrete_gradient_paint.__get__(self.gradient, type(self.gradient))
             # Hide the continuous gradient: disable gradRect painting and caching.
             self.gradient.gradRect.hide()
-            self.gradient.setCacheMode(QGraphicsItem.CacheMode.NoCache)
-            self.gradient.gradRect.setCacheMode(QGraphicsItem.CacheMode.NoCache)
-            self.gradient.gradRect.setFlag(QGraphicsItem.GraphicsItemFlag.ItemHasNoContents, True)
 
-            self.gradient.update()
         else:
             if hasattr(self.gradient, '_original_paint'):
                 self.gradient.paint = self.gradient._original_paint
             self.gradient.gradRect.show()
-            self.gradient.gradRect.setFlag(QGraphicsItem.GraphicsItemFlag.ItemHasNoContents, False)
 
-            self.gradient.update()
+        self.gradient.update()
 
 
     def _discrete_gradient_paint(self, painter, opt, widget=None):
@@ -1326,10 +1333,9 @@ def _discrete_gradient_paint(self, painter, opt, widget=None):
         between adjacent bands to cover any rounding gaps.
         """
         painter.save()
-        painter.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing, False)
-        painter.setRenderHint(QtGui.QPainter.RenderHint.SmoothPixmapTransform, False)
-        painter.setCompositionMode(QtGui.QPainter.CompositionMode_Source)
-        # painter.setPen(Qt.NoPen)
+        painter.setPen(Qt.NoPen)
+        # painter.setPen(self.tickPen)
+        
 
         # Get the drawing rectangle from gradRect as an integer QRect.
         rect = self.gradRect.rect().toRect()
@@ -1349,7 +1355,9 @@ def _discrete_gradient_paint(self, painter, opt, widget=None):
                     bandRect = QtCore.QRect(x, rect.top(), w + 1, rect.height())
                 else:
                     bandRect = QtCore.QRect(x, rect.top(), w, rect.height())
-                frac = (i + 0.5) / nBands
+                # frac = (i + 0.5) / nBands
+                frac = (i ) / (nBands-1)                
+                
                 qcol = self._parent_histlut._sample_colormap(frac)
                 painter.setBrush(QtGui.QBrush(qcol, Qt.BrushStyle.SolidPattern))
                 painter.drawRect(bandRect)
@@ -1373,8 +1381,15 @@ def _discrete_gradient_paint(self, painter, opt, widget=None):
                 painter.drawRect(bandRect)
                 y += h
 
+        # drow the border 
+        pen = self.tickPen
+        painter.setPen(pen)
+        painter.setBrush(QtCore.Qt.BrushStyle.NoBrush)
+        painter.drawRect(rect)
+
         painter.restore()
-            
+
+                
     def _sample_colormap(self, fraction: float) -> QtGui.QColor:
         """
         Sample the current colormap at the given fraction (0 to 1) and return a fully opaque QColor.
@@ -1395,7 +1410,7 @@ def _sample_colormap(self, fraction: float) -> QtGui.QColor:
             a = 255
         else:
             r, g, b, a = entry
-        return QtGui.QColor(r, g, b, 255)
+        return QtGui.QColor(r, g, b, a)
 
     def _on_gradient_changed(self):
         # Called when the user moves color stops in the gradient
@@ -1459,54 +1474,65 @@ def autoRange(self):
             self.region.setRegion((min_val, max_val)) # sets the slider region
 
 
-    # def paint(self, p, *args):
-    #     # paint the bounding edges of the region item and gradient item with lines
-    #     # connecting them
-    #     if self.levelMode != 'mono' or not self.region.isVisible():
-    #         return
-    #     print('ddd')
-    #     pen = self.region.lines[0].pen
-
-    #     mn, mx = self.getLevels()
-    #     vbc = self.vb.viewRect().center()
-    #     gradRect = self.gradient.mapRectToParent(self.gradient.gradRect.rect())
-    #     if self.orientation == 'vertical':
-    #         p1mn = self.vb.mapFromViewToItem(self, Point(vbc.x(), mn)) + Point(0, 5)
-    #         p1mx = self.vb.mapFromViewToItem(self, Point(vbc.x(), mx)) - Point(0, 5)
-    #         if self.gradientPosition == 'right':
-    #             p2mn = gradRect.bottomLeft()
-    #             p2mx = gradRect.topLeft()
-    #         else:
-    #             p2mn = gradRect.bottomRight()
-    #             p2mx = gradRect.topRight()
-    #     else:
-    #         p1mn = self.vb.mapFromViewToItem(self, Point(mn, vbc.y())) - Point(5, 0)
-    #         p1mx = self.vb.mapFromViewToItem(self, Point(mx, vbc.y())) + Point(5, 0)
-    #         if self.gradientPosition == 'bottom':
-    #             p2mn = gradRect.topLeft()
-    #             p2mx = gradRect.topRight()
-    #         else:
-    #             p2mn = gradRect.bottomLeft()
-    #             p2mx = gradRect.bottomRight()
-
-    #     p.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing)
-        
-    #     for pen in [pen]: #get rid of first entry, shadow of some sort
-    #         p.setPen(pen)
-
-    #         # lines from the linear region item bounds to the gradient item bounds
-    #         p.drawLine(p1mn, p2mn)
-    #         p.drawLine(p1mx, p2mx)
-
-    #         # lines bounding the edges of the gradient item
-    #         if self.orientation == 'vertical':
-    #             p.drawLine(gradRect.topLeft(), gradRect.topRight())
-    #             p.drawLine(gradRect.bottomLeft(), gradRect.bottomRight())
-    #         else:
-    #             p.drawLine(gradRect.topLeft(), gradRect.bottomLeft())
-    #             p.drawLine(gradRect.topRight(), gradRect.bottomRight())
-            
+    def paint(self, p, *args):
+        # paint the bounding edges of the region item and gradient item with lines
+        # connecting them
+        if self.levelMode != 'mono' or not self.region.isVisible():
+            return
 
+        pen = self.region.lines[0].pen
+
+        mn, mx = self.getLevels()
+        vbc = self.vb.viewRect().center()
+        gradRect = self.gradient.mapRectToParent(self.gradient.gradRect.rect())
+        if self.orientation == 'vertical':
+            p1mn = self.vb.mapFromViewToItem(self, Point(vbc.x(), mn)) + Point(0, 5)
+            p1mx = self.vb.mapFromViewToItem(self, Point(vbc.x(), mx)) - Point(0, 5)
+            if self.gradientPosition == 'right':
+                p2mn = gradRect.bottomLeft()
+                p2mx = gradRect.topLeft()
+            else:
+                p2mn = gradRect.bottomRight()
+                p2mx = gradRect.topRight()
+        else:
+            p1mn = self.vb.mapFromViewToItem(self, Point(mn, vbc.y())) - Point(5, 0)
+            p1mx = self.vb.mapFromViewToItem(self, Point(mx, vbc.y())) + Point(5, 0)
+            if self.gradientPosition == 'bottom':
+                p2mn = gradRect.topLeft()
+                p2mx = gradRect.topRight()
+            else:
+                p2mn = gradRect.bottomLeft()
+                p2mx = gradRect.bottomRight()
+
+        p.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing, True)
+        p.setRenderHint(QtGui.QPainter.RenderHint.SmoothPixmapTransform, True)
+        
+        for pen in [pen]: #get rid of first entry, shadow of some sort
+            p.setPen(pen)
+
+            # lines from the linear region item bounds to the gradient item bounds
+            p.drawLine(p1mn, p2mn)
+            p.drawLine(p1mx, p2mx)
+
+            # lines bounding the edges of the gradient item
+            if self.orientation == 'vertical':
+                p.drawLine(gradRect.topLeft(), gradRect.topRight())
+                p.drawLine(gradRect.bottomLeft(), gradRect.bottomRight())
+            else:
+                p.drawLine(gradRect.topLeft(), gradRect.bottomLeft())
+                p.drawLine(gradRect.topRight(), gradRect.bottomRight())
+            
+    # def paint(self, painter, option, widget=None):
+        old_brush = self.gradient.gradRect.brush()      
+        if getattr(self, 'discrete_mode', False):
+            # In discrete mode, skip the default overlay drawing.
+            # return
+            self.gradient.gradRect.setBrush(QtGui.QBrush(QtCore.Qt.BrushStyle.NoBrush))
+        # Otherwise, call the original painting.
+        self._orig_paint(p, *args) # painter, option, widget)
+        self.gradient.gradRect.setBrush(old_brush)
+        self.gradient.backgroundRect.hide() # the cause of the hatching pattern 
+        
 
 
 
@@ -1557,17 +1583,15 @@ def update_icons(self):
     def _emit_toggled(self):
         """Emit the toggled signal when the button is clicked."""
         self.toggled.emit(self.isChecked())
-    
-import numpy as np
-import pyqtgraph as pg
+
+
 from pyqtgraph import GraphicsObject
 from PyQt6.QtWidgets import QGraphicsItem
 from PyQt6.QtGui import QPainter
 from PyQt6.QtCore import QRectF, Qt
 
 import OpenGL.GL as gl
 
-
 class GLPixelGridOverlay(GraphicsObject):
     """
     A QGraphicsItem that draws lines between centers of adjacent pixels