From fbf4b71d2e79cc972c1b24bdf13e3dabc7600c7b Mon Sep 17 00:00:00 2001 From: Alice Date: Wed, 14 Oct 2026 15:21:44 +0200 Subject: [PATCH] Revert "Histogram of activate image is updated" This reverts commit 292162738400514dc162bb93ef4b8e009b4c35d1. --- pyctbgui/pyctbgui/services/ADC.py | 5 +- pyctbgui/pyctbgui/services/Plot.py | 154 +++++++++++----------- pyctbgui/pyctbgui/services/Transceiver.py | 6 +- 3 files changed, 86 insertions(+), 79 deletions(-) diff --git a/pyctbgui/pyctbgui/services/ADC.py b/pyctbgui/pyctbgui/services/ADC.py index f69e87b7b..c18e5cf9b 100644 --- a/pyctbgui/pyctbgui/services/ADC.py +++ b/pyctbgui/pyctbgui/services/ADC.py @@ -180,7 +180,8 @@ class AdcTab(QtWidgets.QWidget): state = viewBox.getState() try: self.mainWindow.analog_frame = self._processImageData(data, aSamples, self.mainWindow.nADCEnabled) - self.plotTab.setImage(self.mainWindow.plotAnalogImage, self.mainWindow.analog_frame) + self.plotTab.ignoreHistogramSignal = True + self.mainWindow.plotAnalogImage.setImage(self.mainWindow.analog_frame) except Exception: self.logger.exception('Exception Caught') self.mainWindow.statusbar.setStyleSheet("color:red") @@ -192,6 +193,8 @@ class AdcTab(QtWidgets.QWidget): self.mainWindow.statusbar.showMessage(message) print(message) + self.plotTab.setFrameLimits(self.mainWindow.analog_frame) + # keep the zoomed in state (not 1st image) if self.mainWindow.firstAnalogImage: self.mainWindow.firstAnalogImage = False diff --git a/pyctbgui/pyctbgui/services/Plot.py b/pyctbgui/pyctbgui/services/Plot.py index 0802f3f9f..de455720a 100644 --- a/pyctbgui/pyctbgui/services/Plot.py +++ b/pyctbgui/pyctbgui/services/Plot.py @@ -21,6 +21,8 @@ class PlotTab(QtWidgets.QWidget): def __init__(self, parent): super().__init__(parent) pg.setConfigOptions(imageAxisOrder="row-major") + self.frame_min: float = 0.0 + self.frame_max: float = 0.0 uic.loadUi(Path(__file__).parent.parent / 'ui' / "plot.ui", parent) self.view = parent self.mainWindow = None @@ -29,9 +31,11 @@ class PlotTab(QtWidgets.QWidget): self.transceiverTab = None self.acquisitionTab = None self.adcTab = None + self.cmin: float = 0.0 + self.cmax: float = 0.0 self.colorRangeMode: Defines.colorRange = Defines.colorRange.all - # image view whose color levels are shown in (and edited by) cmin/cmax spinboxes - self.activeImageView: pg.ImageView | None = None + self.ignoreHistogramSignal: bool = False + self.imagePlots: list[PlotWidget] = [] # list of callback functions to notify tabs when we should hide their legend # follows the observer design pattern self.hideLegendObservers = [] @@ -55,6 +59,12 @@ class PlotTab(QtWidgets.QWidget): checkBox.setChecked(False) checkBox.setEnabled(False) + self.imagePlots = ( + self.mainWindow.plotAnalogImage, + self.mainWindow.plotDigitalImage, + self.transceiverTab.transceiverImageViews, + ) + def connect_ui(self): self.view.radioButtonNoPlot.clicked.connect(self.plotOptions) self.view.radioButtonWaveform.clicked.connect(self.plotOptions) @@ -221,37 +231,31 @@ class PlotTab(QtWidgets.QWidget): for notify_function in self.hideLegendObservers: notify_function() - def imageViews(self) -> list[pg.ImageView]: - return [ - self.mainWindow.plotAnalogImage, - self.mainWindow.plotDigitalImage, - *self.transceiverTab.transceiverImageViews, - ] + def setCmin(self, value=None): + """ + slot for setting cmin from cminSpinBox + also used as a normal function + """ + if value is None: + self.cmin = self.view.cminSpinBox.value() + else: + self.cmin = value + self.updateColorRangeUI() - def setCmin(self): + def setCmax(self, value=None): """ - slot for setting cmin from cminSpinBox, only changes the active image view + slot for setting cmax from cmaxSpinBox + also used as a normal function """ - self.setActiveLevels(self.view.cminSpinBox.value(), None) - - def setCmax(self): - """ - slot for setting cmax from cmaxSpinBox, only changes the active image view - """ - self.setActiveLevels(None, self.view.cmaxSpinBox.value()) - - def setActiveLevels(self, cmin, cmax): - if self.activeImageView is None: - return - curMin, curMax = self.activeImageView.getHistogramWidget().item.getLevels() - self.setLevels(self.activeImageView, - curMin if cmin is None else cmin, - curMax if cmax is None else cmax) + if value is None: + self.cmax = self.view.cmaxSpinBox.value() + else: + self.cmax = value + self.updateColorRangeUI() def setColorRangeMode(self, mode): """ slot for setting the color range mode (all,fixed,3-97%) - in fixed mode the current levels of every image view are kept as they are """ self.colorRangeMode = mode @@ -259,66 +263,62 @@ class PlotTab(QtWidgets.QWidget): enableSpinBoxes = mode == Defines.colorRange.fixed self.view.cminSpinBox.setEnabled(enableSpinBoxes) self.view.cmaxSpinBox.setEnabled(enableSpinBoxes) + self.updateColorRange() + self.updateColorRangeUI() - for imageView in self.imageViews(): - frame = imageView.getImageItem().image - levels = self.computeLevels(frame) if frame is not None else None - if levels is not None: - self.setLevels(imageView, *levels) + def handleHistogramChange(self, plot): + """ + slot called after changing the color bar + This is called even when pyqtgraph sets the image without any user intervention + the class attribute ignore_histogram_signal is set to False before setting the image + so that we can distinguish between the signal originates from pyqt or from the user + """ + if not self.ignoreHistogramSignal: + self.cmin, self.cmax = plot.getHistogramWidget().item.getLevels() + self.setCmin(self.cmin) + self.setCmax(self.cmax) - def handleHistogramChange(self, imageView): - """ - slot called after the user changes the color bar of an image view - programmatic level changes block the histogram signals, so this is only triggered by the user - """ - self.activeImageView = imageView - self.updateCminCmaxSpinBoxes() + self.ignoreHistogramSignal = False + # self.setColorRangeMode(Defines.colorRange.fixed) - def computeLevels(self, frame): + def setFrameLimits(self, frame): """ - returns the (cmin, cmax) levels for frame depending on the color range mode: - - all: minimum/maximum values of the frame - - 3-97%: ignores 3% from each end of the whole range - - fixed: None, the levels of the image view are kept + function called from AcquisitionTab::read_zmq to get the maximum and minimum + values of the decoded frame and save them in frame_min/frame_max """ - if self.colorRangeMode == Defines.colorRange.fixed or frame.size == 0: - return None - frameMin = float(np.min(frame)) - frameMax = float(np.max(frame)) - if self.colorRangeMode == Defines.colorRange.center: - frameRange = frameMax - frameMin - return frameMin + 0.03 * frameRange, frameMax - 0.03 * frameRange - return frameMin, frameMax + self.frame_min = np.min(frame) + self.frame_max = np.max(frame) + self.updateColorRange() - def setImage(self, imageView, frame): + def updateColorRange(self): """ - sets frame on imageView, each image view keeps its own color levels - levels are recomputed from frame unless the color range mode is fixed + for mode: + - all: sets cmin and cmax to the maximums/minimum values of the frame + - 3-97%: limits cmax and cmin so that we ignore 3% from each end of the whole range + - fixed: this function does not change cmin and cmax """ - histogram = imageView.getHistogramWidget().item - levels = self.computeLevels(frame) - # block histogram signals so that programmatic changes are not taken as user changes - with QtCore.QSignalBlocker(histogram): - if levels is None: - imageView.setImage(frame, autoLevels=False) + + if self.colorRangeMode == Defines.colorRange.all: + self.cmin = self.frame_min + self.cmax = self.frame_max + elif self.colorRangeMode == Defines.colorRange.center: + self.cmin = self.frame_min + 0.03 * (self.frame_max - self.frame_min) + self.cmax = self.frame_max - 0.03 * (self.frame_max - self.frame_min) + + self.updateColorRangeUI() + + def updateColorRangeUI(self): + """ + updates UI views should be called after every change to cmin or cmax + """ + for plot in self.imagePlots: + if isinstance(plot, list): # hacky for now only transceiver image is a PlotSplitter + for p in plot: + p.getHistogramWidget().item.setLevels(min=self.cmin, max=self.cmax) else: - imageView.setImage(frame, autoLevels=False, levels=levels) - - if self.activeImageView is None or not self.activeImageView.isVisible(): - self.activeImageView = imageView - if imageView is self.activeImageView: - self.updateCminCmaxSpinBoxes() - - def setLevels(self, imageView, cmin, cmax): - with QtCore.QSignalBlocker(imageView.getHistogramWidget().item): - imageView.setLevels(min=cmin, max=cmax) - if imageView is self.activeImageView: - self.updateCminCmaxSpinBoxes() - - def updateCminCmaxSpinBoxes(self): - cmin, cmax = self.activeImageView.getHistogramWidget().item.getLevels() - self.view.cminSpinBox.setValue(cmin) - self.view.cmaxSpinBox.setValue(cmax) + plot.getHistogramWidget().item.setLevels(min=self.cmin, max=self.cmax) + self.view.cminSpinBox.setValue(self.cmin) + self.view.cmaxSpinBox.setValue(self.cmax) def setColorMap(self): cm = pg.colormap.getFromMatplotlib(self.view.comboBoxColorMap.currentText()) diff --git a/pyctbgui/pyctbgui/services/Transceiver.py b/pyctbgui/pyctbgui/services/Transceiver.py index 7f23010d2..828decd26 100644 --- a/pyctbgui/pyctbgui/services/Transceiver.py +++ b/pyctbgui/pyctbgui/services/Transceiver.py @@ -156,14 +156,18 @@ class TransceiverTab(QtWidgets.QWidget): try: transceiver_frame = self._processImageData(data, dSamples, self.mainWindow.romode.value, self.mainWindow.nDBitEnabled) + self.plotTab.ignoreHistogramSignal = True + for i in range(transceiver_frame.shape[0]): - self.plotTab.setImage(self.transceiverImageViews[i], transceiver_frame[i]) + self.transceiverImageViews[i].setImage(transceiver_frame[i]) except Exception as e: self.mainWindow.statusbar.setStyleSheet("color:red") self.acquisitionTab.updateCurrentFrame('Invalid Image') self.mainWindow.statusbar.showMessage(str(e)) print("Error: ", str(e)) + self.plotTab.setFrameLimits(transceiver_frame) + # keep the zoomed in state (not 1st image) for idx, image_view in enumerate(self.transceiverImageViews): if(self.firstTransceiverImage[idx] and self.shownCounters[idx]):