Skip to content

Fix copy paste bytes for wxpython #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbillinge merged 1 commit into from
May 21, 2021
Merged

Fix copy paste bytes for wxpython #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions src/diffpy/pdfgui/gui/fittree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import wx
import re
import base64

from diffpy.pdfgui.gui.pdfguiglobals import iconpath
from diffpy.pdfgui.control.fitting import Fitting
Expand Down Expand Up @@ -556,8 +557,10 @@ def CopyBranch(self, startnode):
if isinstance(cdata, Fitting):
cdata = cdata.stripped()
cdata.type = nodetype
cdatastring = safeCPickleDumps(cdata)
cdatastring = "pdfgui_cliboard=" + cdatastring
cdatabytes = safeCPickleDumps(cdata)
cdatabytes = "pdfgui_cliboard=" + cdatabytes
#wxpython only accepts str, use base64 to convert bytes to str
cdatastring = base64.b64encode(cdatabytes)
textdata = wx.TextDataObject(cdatastring)
if not wx.TheClipboard.IsOpened():
opened = wx.TheClipboard.Open()
Expand Down Expand Up @@ -586,12 +589,15 @@ def GetClipboard(self):
cdatastring = textdata.GetText()

cdata = None
if cdatastring[:16] == "pdfgui_cliboard=":
cdatastring = cdatastring[16:]
try:
# use base64 to convert str back to bytes
try:
cdatabytes = base64.b64decode(cdatastring.encode())

if cdatabytes[:16] == b'pdfgui_cliboard=':
cdatabytes = cdatabytes[16:]
cdata = pickle_loads(cdatastring)
except:
pass
except:
pass
return cdata

def PasteBranch(self, entrypoint = None):
Expand Down