Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions cls/appWidgets/main_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions cls/applications/pyStxm/stxmMain.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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()
Expand All @@ -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):
Expand Down
23 changes: 10 additions & 13 deletions cls/plotWidgets/curveWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ def __init__(
filtStr="*.hdf5",
options=None,
parent=None,
main_obj=None,
):
if options == None:
options = PlotOptions()
Expand All @@ -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()
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
Loading
Loading