Commit 0ff0d305 authored by Yan's avatar Yan
Browse files

Fix missed merging issues

parent 4d36df96
......@@ -215,7 +215,8 @@ def key_pressed(event, augCanvas, config):
update_spectrum(augCanvas, config)
if event.key() == QtCore.Qt.Key_C:
if event.modifiers().__int__() == QtCore.Qt.ControlModifier:
imgt.clip_spect_img(augCanvas.ms, augCanvas.spectplot, fn)
imgt.clip_spect_img(augCanvas.ms, augCanvas.spectplot,
augCanvas.filename)
if event.modifiers().__int__() == QtCore.Qt.ControlModifier+\
QtCore.Qt.ShiftModifier:
dt.clip_spectstr(augCanvas)
......
......@@ -117,8 +117,8 @@ def paint_zcegraph(ds, coff, coffgrad, filename):
def clip_spect_img(ds, coff, coffgrad, filename):
image = paint_zcegraph(ds, coff, coffgrad, filename)
QtWidgets.QApplication.clipboard().setImage(image)
QtWidgets.QApplication.clipboard().setPixmap(QtGui.QPixmap.fromImage(image))
[QtWidgets.QApplication.clipboard().setImage(image, i) for i in range(2)]
#QtWidgets.QApplication.clipboard().setPixmap(QtGui.QPixmap.fromImage(image))
def print_graph(ds, coff, coffgrad, filename):
......@@ -188,7 +188,7 @@ def dialog(parent, augCanvas, update_signal):
close_button.clicked.connect(dial_widget.close)
dial_widget.keyPressEvent = lambda event: key_pressed(
event, ds, coff, coffgrad, filename)
event, augCanvas.ds, coff, coffgrad, augCanvas.filename)
butt_layout = QtWidgets.QHBoxLayout()
butt_layout.addWidget(zce_help)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment