From 0fc322be99bd145176915132030fb61c80741bae Mon Sep 17 00:00:00 2001 From: bergr Date: Fri, 6 Nov 2026 15:52:18 -0600 Subject: [PATCH 1/2] drag and drop converted from using serialized data to using main_obj as a common model or registry for drag and drop data --- cls/appWidgets/main_object.py | 17 ++++ cls/applications/pyStxm/stxmMain.py | 7 +- .../dict_based_contact_sheet/contact_sheet.py | 99 ++++++------------- cls/plotWidgets/curveWidget.py | 23 ++--- cls/plotWidgets/imageWidget.py | 28 +++--- cls/scanning/baseScanParamWidget.py | 38 ++++--- 6 files changed, 98 insertions(+), 114 deletions(-) diff --git a/cls/appWidgets/main_object.py b/cls/appWidgets/main_object.py index 32379e4..06b3d65 100644 --- a/cls/appWidgets/main_object.py +++ b/cls/appWidgets/main_object.py @@ -8,6 +8,7 @@ from datetime import datetime from copy import deepcopy import pathlib +import uuid from importlib import import_module from tinydb import TinyDB, Query import simplejson as json @@ -146,6 +147,8 @@ def __init__(self, name, endstation, beamline_cfg_dct=None, splash=None, main_cf self.nx_server_master_seq_dct = None self._progressive_stack_data = {} # this is a dict of detector names each containing a list of lists that # represent the progressive stack data being built + # Drag payloads stay in-process here; Qt MIME data carries only a short-lived lookup key. + self._drag_drop_data = {} self._progressive_stack_data_dir = None self._progressive_stack_data_file_prefix = None # Serialize file writes, not data: overlapping saves must not open the same HDF5 file. @@ -1209,6 +1212,20 @@ def set(self, name, obj): """get the object section by name""" dct_put(self.main_obj, name, obj) + def register_drag_drop_data(self, data): + """Store an in-process drag payload and return its MIME-safe lookup key.""" + key = uuid.uuid4().hex + self._drag_drop_data[key] = data + return key + + def get_drag_drop_data(self, key): + """Read a drag payload without consuming it, for drag-enter inspection.""" + return self._drag_drop_data.get(key) + + def take_drag_drop_data(self, key): + """Read and remove a drag payload so a later drop cannot reuse it.""" + return self._drag_drop_data.pop(key, None) + def get_main_obj(self): """return the entire main object dict""" return self.main_obj diff --git a/cls/applications/pyStxm/stxmMain.py b/cls/applications/pyStxm/stxmMain.py index 4c94e47..e5cab04 100644 --- a/cls/applications/pyStxm/stxmMain.py +++ b/cls/applications/pyStxm/stxmMain.py @@ -2182,6 +2182,7 @@ def setup_image_plot(self): self.lineByLineImageDataWidget = ImageWidgetPlot( parent=None, type="analyze", + main_obj=MAIN_OBJ, ) if hasattr(self, "lineByLineImageDataWidget"): # self.lineByLineImageDataWidget.plot.setTitle('lineByLineImageDataWidget') @@ -2253,7 +2254,7 @@ def setup_spectra_plot(self): """ vbox = QtWidgets.QVBoxLayout() # self.spectraWidget = CurveViewerWidget(parent = self, winTitleStr = "Spectra Data Viewer") - self.spectraWidget = CurveViewerWidget(parent=self) + self.spectraWidget = CurveViewerWidget(parent=self, main_obj=MAIN_OBJ) self.spectraWidget.set_dataIO(STXMDataIo) self.spectraWidget.add_legend("TL") self.spectraWidget.addTool("tools.clsSignalSelectTool") @@ -2315,7 +2316,9 @@ def setup_stack_rois_plot(self): vbox = QtWidgets.QVBoxLayout() hbox = QtWidgets.QHBoxLayout() # self.roiSpectraWidget = CurveViewerWidget(toolbar=False, type="minimal", parent=self) - self.roiSpectraWidget = CurveViewerWidget(toolbar=True, type="minimal", parent=self) + self.roiSpectraWidget = CurveViewerWidget( + toolbar=True, type="minimal", parent=self, main_obj=MAIN_OBJ + ) self.roiSpectraWidget.remove_all_tools() self.roiSpectraWidget.addTool("tools.clsSignalSelectTool") self.create_roi_btn = QtWidgets.QPushButton("Press to create ROI") diff --git a/cls/applications/pyStxm/widgets/dict_based_contact_sheet/contact_sheet.py b/cls/applications/pyStxm/widgets/dict_based_contact_sheet/contact_sheet.py index ef6697d..ffb18b5 100644 --- a/cls/applications/pyStxm/widgets/dict_based_contact_sheet/contact_sheet.py +++ b/cls/applications/pyStxm/widgets/dict_based_contact_sheet/contact_sheet.py @@ -31,17 +31,14 @@ """ from PyQt5 import QtCore, QtWidgets -import simplejson as json from cls.appWidgets.dialogs import setExistingDirectory from cls.types.stxmTypes import spectra_type_scans, scan_types from cls.utils.log import get_module_logger from cls.utils.fileUtils import get_file_path_as_parts from cls.utils.dict_utils import dct_get, dct_put -from cls.utils.json_threadsave import NumpyAwareJSONEncoder from cls.utils.roi_dict_defs import * from cls.stylesheets import master_colors -from cls.utils.arrays import convert_numpy_to_python from cls.utils.roi_utils import make_base_wdg_com, widget_com_cmnd_types from cls.plotWidgets.imageWidget import make_default_stand_alone_stxm_imagewidget from cls.data_io.stxm_data_io import STXMDataIo @@ -165,6 +162,7 @@ class ContactSheet(QtWidgets.QWidget): def __init__(self, main_obj=None, data_dir=None, data_io=None, base_data_dir='/tmp', parent=None): super(ContactSheet, self).__init__(parent) + self.main_obj = main_obj self.data_dir = data_dir self.base_data_dir = base_data_dir data_dir_display_name = self.get_directory_display_name(self.data_dir) @@ -342,7 +340,9 @@ def create_image_viewer(self): min_clr = master_colors["plot_gridmaj"]["rgb_str"] maj_clr = master_colors["plot_gridmin"]["rgb_str"] - image_win = make_default_stand_alone_stxm_imagewidget(data_io=STXMDataIo) + image_win = make_default_stand_alone_stxm_imagewidget( + data_io=STXMDataIo, main_obj=self.main_obj + ) image_win.setWindowTitle("Image Viewer") qssheet = get_style() image_win.setStyleSheet(qssheet) @@ -360,7 +360,9 @@ def create_spectra_viewer(self): min_clr = master_colors["plot_gridmaj"]["rgb_str"] maj_clr = master_colors["plot_gridmin"]["rgb_str"] - spectra_win = make_spectra_viewer_window(data_io=STXMDataIo) + spectra_win = make_spectra_viewer_window( + data_io=STXMDataIo, main_obj=self.main_obj + ) spectra_win.setWindowTitle("Spectra Viewer") qssheet = get_style() spectra_win.setStyleSheet(qssheet) @@ -627,13 +629,14 @@ def on_drag(self, obj: ThumbnailWidget, event: QtWidgets.QGraphicsSceneDragDropE :returns: None """ - import orjson - import timeit - # print("on_drag: Entered.") event.accept() if self.get_drag_enabled(): + if self.main_obj is None: + _logger.error("Cannot start an in-process data drag without main_obj") + return + if obj.scan_type is scan_types.GENERIC_SCAN: format = "application/dict-based-lineplot-stxmscan" dct = obj.get_generic_scan_launch_viewer_dct() @@ -643,71 +646,27 @@ def on_drag(self, obj: ThumbnailWidget, event: QtWidgets.QGraphicsSceneDragDropE else: format = "application/dict-based-imageplot-stxmscan" dct = obj.get_standard_image_launch_viewer_dct() - # print("\n") - start = timeit.default_timer() - #jstr = json.dumps(convert_numpy_to_python(dct), cls=NumpyAwareJSONEncoder) - py_dict = convert_numpy_to_python(dct) - end = timeit.default_timer() - # print(f"\tconvert_numpy_to_python: Elapsed: {end - start} seconds") - - start = timeit.default_timer() - jstr_bytes = orjson.dumps(py_dict) - end = timeit.default_timer() - # print(f"\torjson.dumps: Elapsed: {end - start} seconds") - - itemData = QtCore.QByteArray() - dataStream = QtCore.QDataStream(itemData, QtCore.QIODevice.WriteOnly) - - start = timeit.default_timer() - if obj.is_stack: - # if its a stack we only need 1 images worth of data - # print("\ton_drag: Stack detected, using first image data only.") - #data_bytes = obj.data[0].tobytes() - data_bytes = b'' - else: - # print("\ton_drag: Single image detected, using full data.") - data_bytes = obj.data.tobytes() - end = timeit.default_timer() - # print(f"\ttobytes(): Elapsed: {end - start} seconds") - - start = timeit.default_timer() - ( - dataStream - << QtCore.QByteArray(bytearray(jstr_bytes)) - << QtCore.QByteArray(data_bytes) - << (event.pos() - obj.rect().topLeft()) - ) - end = timeit.default_timer() - # print(f"\tdataStream << << << : Elapsed: {end - start} seconds") - - start = timeit.default_timer() - mimeData = QtCore.QMimeData() - mimeData.setData(format, itemData) - mimeData.setText(obj.info_jstr) - end = timeit.default_timer() - # print(f"\tmimeData : Elapsed: {end - start} seconds") - - start = timeit.default_timer() - drag = QtGui.QDrag(self) - drag.setMimeData(mimeData) - pos = event.pos() - obj.rect().topLeft() - drag.setHotSpot(QtCore.QPoint(int(pos.x()), int(pos.y()))) - - end = timeit.default_timer() - # print(f"\tdrag.setHotSpot : Elapsed: {end - start} seconds") - - if obj.pixmap is not None: - drag.setPixmap(obj.pixmap) - - if ( + # Keep arrays and nested dictionaries in main_obj; MIME data carries only a key. + drag_key = self.main_obj.register_drag_drop_data(dct) + try: + mimeData = QtCore.QMimeData() + mimeData.setData(format, QtCore.QByteArray(drag_key.encode("ascii"))) + + drag = QtGui.QDrag(self) + drag.setMimeData(mimeData) + pos = event.pos() - obj.rect().topLeft() + drag.setHotSpot(QtCore.QPoint(int(pos.x()), int(pos.y()))) + + if obj.pixmap is not None: + drag.setPixmap(obj.pixmap) + drag.exec_( QtCore.Qt.MoveAction | QtCore.Qt.CopyAction, QtCore.Qt.CopyAction ) - == QtCore.Qt.MoveAction - ): - pass - else: - pass + finally: + # The drop target consumes the entry; this also clears cancelled or + # unhandled drags so their payload cannot be mistaken for a later drop. + self.main_obj.take_drag_drop_data(drag_key) # print("on_drag: Leaving.") def resizeEvent(self, event): diff --git a/cls/plotWidgets/curveWidget.py b/cls/plotWidgets/curveWidget.py index 9e20bee..90a1ca0 100644 --- a/cls/plotWidgets/curveWidget.py +++ b/cls/plotWidgets/curveWidget.py @@ -392,6 +392,7 @@ def __init__( filtStr="*.hdf5", options=None, parent=None, + main_obj=None, ): if options == None: options = PlotOptions() @@ -416,6 +417,7 @@ def __init__( parent=parent ) self.setObjectName("CurveViewerWidget") + self.main_obj = main_obj self.fileFilterStr = filtStr self.addtoplot = False self.plot = self.get_plot() @@ -604,19 +606,14 @@ def on_drop(self, mimeData=None): break elif format == "application/dict-based-lineplot-stxmscan": - itemData = mimeData.data("application/dict-based-lineplot-stxmscan") - _stream = QtCore.QDataStream(itemData, QtCore.QIODevice.ReadOnly) - _info_jstr = QtCore.QByteArray() - _data_bytes = QtCore.QByteArray() - _pos = QtCore.QPointF() - _stream >> _info_jstr >> _data_bytes >> _pos - _info_str = bytes(_info_jstr).decode() - drop_dct = json.loads(_info_str) + if self.main_obj is None: + return + drag_key = bytes(mimeData.data(format)).decode("ascii") + drop_dct = self.main_obj.take_drag_drop_data(drag_key) + if drop_dct is None: + return # fname = drop_dct["path"] - # convert to array - data = np.array(drop_dct["data"]) - drop_dct["data"] = data sp_db = drop_dct["sp_db"] title = drop_dct["title"] xlabel = drop_dct.get("xlabel") or "X" @@ -1522,13 +1519,13 @@ def add_curve(self, det_nm, sp_ids, prefix="spid-", clr_set={}): # #print 'StxmImageWidget: wheel event' -def make_spectra_viewer_window(data_io=None): +def make_spectra_viewer_window(data_io=None, main_obj=None): if data_io is None: from cls.data_io.stxm_data_io import STXMDataIo data_io = STXMDataIo - win = CurveViewerWidget(toolbar=True, type="viewer") + win = CurveViewerWidget(toolbar=True, type="viewer", main_obj=main_obj) win.set_dataIO(data_io) return win diff --git a/cls/plotWidgets/imageWidget.py b/cls/plotWidgets/imageWidget.py index 3cec27b..49ac009 100644 --- a/cls/plotWidgets/imageWidget.py +++ b/cls/plotWidgets/imageWidget.py @@ -327,6 +327,7 @@ def __init__( type="basic", sample_pos_mode=None, options=None, + main_obj=None, #settings_fname="shape_settings.json", ): """ @@ -360,6 +361,7 @@ def __init__( self.fileFilterStr = filtStr self.type = type + self.main_obj = main_obj self._data_dir = "" self.data_io = None self._auto_contrast = True @@ -812,19 +814,15 @@ def dropEvent(self, event): formatItem.setTextAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignLeft) if format == "application/dict-based-imageplot-stxmscan": - itemData = mimeData.data(format) - # text = mimeData.text() - _stream = QtCore.QDataStream(itemData, QtCore.QIODevice.ReadOnly) - _info_jstr = QtCore.QByteArray() - _data_bytes = QtCore.QByteArray() - _pos = QtCore.QPointF() - _stream >> _info_jstr >> _data_bytes >> _pos - _info_str = bytes(_info_jstr).decode() - drop_dct = json.loads(_info_str) + if self.main_obj is None: + return + drag_key = bytes(mimeData.data(format)).decode("ascii") + drop_dct = self.main_obj.take_drag_drop_data(drag_key) + if drop_dct is None: + return # fname = drop_dct["path"] - # convert to array - data = np.array(drop_dct["data"]) + data = drop_dct["data"] sp_db = drop_dct["sp_db"] title = drop_dct['title'] xlabel = drop_dct.get("xlabel") or "X" @@ -6982,7 +6980,7 @@ def get_percentage_of_qrect(qrect, p): def make_default_stand_alone_stxm_imagewidget( - parent=None, data_io=None, _type=None, bndg_rect=None + parent=None, data_io=None, _type=None, bndg_rect=None, main_obj=None ): # from cls.applications.pyStxm.widgets.beam_spot_fbk import BeamSpotFeedbackObjStandAlone # from cls.applications.pyStxm.main_obj_init import MAIN_OBJ @@ -7022,6 +7020,7 @@ def make_default_stand_alone_stxm_imagewidget( parent=parent, filtStr=FILTER_STRING, type=_type, + main_obj=main_obj, options=PlotOptions( gridparam=gridparam, show_contrast=True, @@ -7692,6 +7691,5 @@ def set_cs_grid_parameters(self, forgrnd_color, bkgrnd_color, min_color, maj_col # profile_it('go', bias_val=7.40181638985e-07) # go() #astxm_lineplot_test() - #make_sig_selection() - make_style_test() - + make_sig_selection() + #make_style_test() diff --git a/cls/scanning/baseScanParamWidget.py b/cls/scanning/baseScanParamWidget.py index 192e79d..c99f4ed 100644 --- a/cls/scanning/baseScanParamWidget.py +++ b/cls/scanning/baseScanParamWidget.py @@ -1307,8 +1307,26 @@ def get_scan_panel_id_from_scan_name(self, scan_name): def dragEnterEvent(self, event): from cls.types.stxmTypes import scan_type_to_panel_dct - dct = mime_to_dct(event.mimeData()) - idx = self.get_scan_panel_id_from_scan_name(dct['stxm_scan_type']) + mime_data = event.mimeData() + if (mime_data.hasFormat("application/dict-based-lineplot-stxmscan") + or mime_data.hasFormat("application/dict-based-imageplot-stxmscan")): + # Inspect the shared payload without consuming it; dropEvent takes it. + drag_format = next( + fmt for fmt in mime_data.formats() + if fmt in ("application/dict-based-lineplot-stxmscan", + "application/dict-based-imageplot-stxmscan") + ) + drag_key = bytes(mime_data.data(drag_format)).decode("ascii") + dct = self.main_obj.get_drag_drop_data(drag_key) + if dct is None: + return + scan_name = dct_get(dct.get("sp_db", {}), SPDB_SCAN_PLUGIN_STXM_SCAN_TYPE) + else: + dct = mime_to_dct(mime_data) + scan_name = dct.get("stxm_scan_type") + if not scan_name: + return + idx = self.get_scan_panel_id_from_scan_name(scan_name) event.acceptProposedAction() self.selected.emit(idx) @@ -1326,20 +1344,12 @@ def dropEvent(self, event): formatItem.setTextAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignLeft) if (format == 'application/dict-based-lineplot-stxmscan') or (format == 'application/dict-based-imageplot-stxmscan'): - itemData = mimeData.data(format) - # text = mimeData.text() - _stream = QtCore.QDataStream(itemData, QtCore.QIODevice.ReadOnly) - _info_jstr = QtCore.QByteArray() - _data_bytes = QtCore.QByteArray() - _pos = QtCore.QPointF() - _stream >> _info_jstr >> _data_bytes >> _pos - _info_str = bytes(_info_jstr).decode() - drop_dct = json.loads(_info_str) + drag_key = bytes(mimeData.data(format)).decode("ascii") + drop_dct = self.main_obj.take_drag_drop_data(drag_key) + if drop_dct is None: + return # fname = drop_dct["path"] - #convert to array - data = np.array(drop_dct["data"]) - drop_dct["data"] = data sp_db = drop_dct["sp_db"] # title = drop_dct["title"] # xlabel = drop_dct.get("xlabel") or "X" From 68b05035cc5439b60fc41d9054c2a48b3fe294df Mon Sep 17 00:00:00 2001 From: bergr Date: Mon, 9 Nov 2026 10:44:14 -0600 Subject: [PATCH 2/2] remove dropped filenames from being displayed on plotter --- cls/plotWidgets/imageWidget.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cls/plotWidgets/imageWidget.py b/cls/plotWidgets/imageWidget.py index 49ac009..7494bcd 100644 --- a/cls/plotWidgets/imageWidget.py +++ b/cls/plotWidgets/imageWidget.py @@ -824,7 +824,6 @@ def dropEvent(self, event): # fname = drop_dct["path"] data = drop_dct["data"] sp_db = drop_dct["sp_db"] - title = drop_dct['title'] xlabel = drop_dct.get("xlabel") or "X" ylabel = drop_dct.get("ylabel") or "Y" @@ -832,7 +831,6 @@ def dropEvent(self, event): dct_put(wdg_com, WDGCOM_CMND, widget_com_cmnd_types.LOAD_SCAN) dct_put(wdg_com, SPDB_SPATIAL_ROIS, {sp_db[ID_VAL]: sp_db}) drop_dct['wdg_com'] = wdg_com - data_dir, fprefix, fsuffix = get_file_path_as_parts(drop_dct['path']) rect = dct_get(sp_db, SPDB_RECT) self.load_image_data( drop_dct['path'], @@ -840,7 +838,7 @@ def dropEvent(self, event): data, addimages=True, flipud=False, - name_lbl=True, + name_lbl=False, item_z=None, show=True, dropped=True, @@ -850,11 +848,7 @@ def dropEvent(self, event): self.setPlotAxisStrs(ylabel, xlabel) # self.show() self.set_autoscale(fill_plot_window=True) - # self.raise_() - if title is not None: - self.plot.set_title(title) - else: - self.plot.set_title(f"{fprefix}{fsuffix}") + # Dropped filenames should not accumulate as plot titles. else: self.setPlotAxisStrs(ylabel, xlabel) @@ -6359,6 +6353,9 @@ def load_image_data( _title = str(fname) self.setWindowTitle(_title) plot.set_title("%s%s" % (fprefix, fsuffix)) + elif dropped: + # Keep the internal data key separate from the visible plot-item title. + _title = "" else: _title = str(img_idx) @@ -6389,6 +6386,8 @@ def load_image_data( colormap="gist_gray", title=_title, ) + if dropped: + self.items[img_idx].setItemAttribute(Qwt.QwtPlotItem.Legend, False) plot = self.get_plot() plot.add_item(self.items[img_idx], z=0) @@ -6399,6 +6398,8 @@ def load_image_data( colormap="gist_gray", title=_title, ) + if dropped: + self.items[img_idx].setItemAttribute(Qwt.QwtPlotItem.Legend, False) items = self.plot.get_items(item_type=ICSImageItemType) plot.add_item(self.items[img_idx], z=len(items) + 1 if item_z is None else item_z)