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

.nmr files recognize all data types; closes #71

Browse Source
This commit is contained in:
Dominik Demuth 2023-05-19 16:53:54 +02:00
parent 8673e5acdb
commit 84d136dd4c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui_qt/data/container.py
View File

@ -10,6 +10,7 @@ from nmreval.data.points import Points
from nmreval.data.signals import Signal from nmreval.data.signals import Signal
from nmreval.utils.text import convert from nmreval.utils.text import convert
from nmreval.data.bds import BDS from nmreval.data.bds import BDS
from nmreval.data.dsc import DSC
from nmreval.lib.colors import BaseColor, TUColors from nmreval.lib.colors import BaseColor, TUColors
from nmreval.lib.lines import LineStyle from nmreval.lib.lines import LineStyle
from nmreval.lib.symbols import SymbolStyle, symbolcycle from nmreval.lib.symbols import SymbolStyle, symbolcycle
@ -488,6 +489,9 @@ class PointContainer(ExperimentContainer):
self.mode = 'pts' self.mode = 'pts'
self._init_plot(**kwargs) self._init_plot(**kwargs)
if isinstance(self._data, DSC):
self.mode = 'dsc'
def _init_plot(self, **kwargs): def _init_plot(self, **kwargs):
self.plot_imag = None self.plot_imag = None

4
src/nmreval/io/nmrreader.py
View File

@ -5,6 +5,8 @@ from collections import OrderedDict
from .read_old_nmr import HAS_BSDDB3, _read_file_v1 from .read_old_nmr import HAS_BSDDB3, _read_file_v1
from ..data.nmr import FID, Spectrum from ..data.nmr import FID, Spectrum
from ..data.bds import BDS
from ..data.dsc import DSC
from ..data.points import Points from ..data.points import Points
from ..fit.result import FitResult, FitResultCreator from ..fit.result import FitResult, FitResultCreator
from ..lib.colors import Colors from ..lib.colors import Colors
@ -51,7 +53,7 @@ class NMRReader:
states = pickle.load(fp) states = pickle.load(fp)
datalist = OrderedDict() datalist = OrderedDict()
_dtypes = {'pts': Points, 'fit': FitResult, 'fid': FID} _dtypes = {'pts': Points, 'fit': FitResult, 'fid': FID, 'bds': BDS, 'dsc': DSC}
for s in states['sets']: for s in states['sets']:
set_id = s.pop('id') set_id = s.pop('id')