--- document/commandinterface.py | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/document/commandinterface.py b/document/commandinterface.py index 8410f08..98419f4 100644 --- a/document/commandinterface.py +++ b/document/commandinterface.py @@ -297,8 +297,11 @@ class CommandInterface(qt4.QObject): """Return the data with the name. Returns a tuple containing: + (data, serr, nerr, perr) + if 'name' is a Dataset, and + data + if 'name' is a DatasetText, where data is a list. - (data, serr, nerr, perr) Values not defined are set to None Return copies, so that the original data can't be indirectly modified @@ -306,16 +309,20 @@ class CommandInterface(qt4.QObject): d = self.document.getData(name) data = serr = nerr = perr = None - if d.data is not None: - data = d.data.copy() - if d.serr is not None: - serr = d.serr.copy() - if d.nerr is not None: - nerr = d.nerr.copy() - if d.perr is not None: - perr = d.perr.copy() - - return (data, serr, nerr, perr) + if isinstance(d, datasets.DatasetText): + return d.data[:] + else: + + if d.data is not None: + data = d.data.copy() + if d.serr is not None: + serr = d.serr.copy() + if d.nerr is not None: + nerr = d.nerr.copy() + if d.perr is not None: + perr = d.perr.copy() + + return (data, serr, nerr, perr) def ImportString(self, descriptor, string, useblocks=False): """Read data from the string using a descriptor. -- 1.6.4.2 _______________________________________________ Veusz-discuss mailing list Veusz-discuss@gna.org https://mail.gna.org/listinfo/veusz-discuss