dominik/nmreval
1
0
Fork 0
forked from IPKM/nmreval
Code Pull Requests Activity

agr files with skipped set/graph numbers were not read nor written; fixes T252

Browse Source
This commit is contained in:
Dominik Demuth
2023-01-14 17:05:29 +01:00
parent 0e62f01103
commit ccbdf72416
4 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui_qt/graphs/graphwindow.py
View File

@ -530,6 +530,7 @@ class QGraphWindow(QtWidgets.QGraphicsView, Ui_GraphWindow):
path = ''
outfile = None
f = FileDialog(caption='Export graphic', directory=str(path), filter=filters, mode='save')
f.setOption(FileDialog.DontConfirmOverwrite)
mode = f.exec()
if mode == QtWidgets.QDialog.Accepted:
outfile = f.save_file()

2
src/gui_qt/io/filereaders.py
View File

@ -58,7 +58,7 @@ class QFileReader(QtCore.QObject):
try:
# If QAsciiReader.skip = True it accepts automatically and returns None
r(f).exec()
except AttributeError:
except ImportError:
pass
self.data_read.emit(self.data)

9
src/gui_qt/io/gracereader.py
View File

@ -20,6 +20,8 @@ class QGraceReader(QtWidgets.QDialog, Ui_Dialog):
self.treeWidget.installEventFilter(self)
def __call__(self, fname, *args, **kwargs):
self.treeWidget.clear()
self.show_property(self.treeWidget.invisibleRootItem(), 0)
self.read(fname)
return self
@ -43,12 +45,17 @@ class QGraceReader(QtWidgets.QDialog, Ui_Dialog):
def read(self, fname):
self._reader.parse(fname)
print('halio', len(self._reader.graphs))
for graphs in self._reader.graphs:
item = QtWidgets.QTreeWidgetItem([f'Graph {graphs.idx} (Title "{graphs.get_property("title")}")'])
for gset in graphs.set:
ds = self._reader.dataset(graphs.idx, gset.idx)
if ds is None:
continue
item_2 = QtWidgets.QTreeWidgetItem([f'Set {gset.idx} (Label: {gset.get_property("legend")}, '
f'shape: {self._reader.dataset(graphs.idx, gset.idx).shape})'])
f'shape: {ds.shape})'])
item_2.setCheckState(0, QtCore.Qt.Checked)
item_2.setData(0, QtCore.Qt.UserRole, (graphs.idx, gset.idx))
item.addChild(item_2)