bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 11:41:49 +02:00
Code Activity

WIP plot widgets data items inheritance order fixed

Browse Source
This commit is contained in:
wyzula_j
2025-04-06 13:44:16 +02:00
parent 210173b194
commit 11e5cf5abf
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bec_widgets/widgets/plots/image/image.py
View File

@ -125,13 +125,13 @@ class Image(PlotBase):
popups: bool = True, popups: bool = True,
**kwargs, **kwargs,
): ):
self._main_image = ImageItem(parent_image=self)
self._color_bar = None self._color_bar = None
if config is None: if config is None:
config = ImageConfig(widget_class=self.__class__.__name__) config = ImageConfig(widget_class=self.__class__.__name__)
super().__init__( super().__init__(
parent=parent, config=config, client=client, gui_id=gui_id, popups=popups, **kwargs parent=parent, config=config, client=client, gui_id=gui_id, popups=popups, **kwargs
) )
self._main_image = ImageItem(parent_image=self)
# For PropertyManager identification # For PropertyManager identification
self.setObjectName("Image") self.setObjectName("Image")

6
bec_widgets/widgets/plots/image/image_item.py
View File

@ -84,7 +84,6 @@ class ImageItem(BECConnector, pg.ImageItem):
else: else:
self.config = config self.config = config
pg.ImageItem.__init__(self, parent=parent) pg.ImageItem.__init__(self, parent=parent)
BECConnector.__init__(self, config=config, gui_id=gui_id)
self.parent_image = parent_image self.parent_image = parent_image
@ -95,6 +94,11 @@ class ImageItem(BECConnector, pg.ImageItem):
# Image processor will handle any setting of data # Image processor will handle any setting of data
self._image_processor = ImageProcessor(config=self.config.processing) self._image_processor = ImageProcessor(config=self.config.processing)
BECConnector.__init__(self, config=config, gui_id=gui_id)
def parent(self):
return self.parent_image
def set_data(self, data: np.ndarray): def set_data(self, data: np.ndarray):
self.raw_data = data self.raw_data = data
self._process_image() self._process_image()

6
bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py
View File

@ -78,11 +78,13 @@ class ScatterCurve(BECConnector, pg.PlotDataItem):
self.config = config self.config = config
name = config.label name = config.label
pg.PlotDataItem.__init__(self, **kwargs, name=name) pg.PlotDataItem.__init__(self, **kwargs, name=name)
BECConnector.__init__(self, config=config, gui_id=gui_id)
self.parent_item = parent_item self.parent_item = parent_item
self.parent = parent_item
self.data_z = None # color scaling needs to be cashed for changing colormap self.data_z = None # color scaling needs to be cashed for changing colormap
self.apply_config() self.apply_config()
BECConnector.__init__(self, config=config, gui_id=gui_id)
def parent(self):
return self.parent_item
def apply_config(self, config: dict | ScatterCurveConfig | None = None, **kwargs) -> None: def apply_config(self, config: dict | ScatterCurveConfig | None = None, **kwargs) -> None:
""" """

2
bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py
View File

@ -111,8 +111,6 @@ class ScatterWaveform(PlotBase):
parent=parent, config=config, client=client, gui_id=gui_id, popups=popups, **kwargs parent=parent, config=config, client=client, gui_id=gui_id, popups=popups, **kwargs
) )
self._main_curve = ScatterCurve(parent=self, parent_item=self) self._main_curve = ScatterCurve(parent=self, parent_item=self)
# self._main_curve = ScatterCurve(parent_item=self)
# For PropertyManager identification
# Specific GUI elements # Specific GUI elements
self.scatter_dialog = None self.scatter_dialog = None