value tab plots complex selection; graphwindows shows last path for export; filedialog uses call not init
This commit is contained in:
@ -9,12 +9,13 @@ from nmreval.fit import data as fit_d
|
||||
from nmreval.fit.model import Model
|
||||
from nmreval.fit.result import FitResult
|
||||
from nmreval.fit.minimizer import FitRoutine
|
||||
from nmreval.lib.colors import TUColorsC, available_cycles
|
||||
from nmreval.lib.colors import available_cycles
|
||||
from nmreval.math.interpol import interpolate
|
||||
from nmreval.math.logfourier import logft
|
||||
from nmreval.math.smooth import smooth
|
||||
from nmreval.nmr.relaxation import Relaxation
|
||||
|
||||
from ..Qt import QtCore, QtWidgets
|
||||
from ..lib.undos import *
|
||||
from ..data.container import *
|
||||
from ..io.filereaders import QFileReader
|
||||
@ -112,6 +113,8 @@ class UpperManagement(QtCore.QObject):
|
||||
self.undostack = QtWidgets.QUndoStack()
|
||||
self.deleteData.connect(self.plot_from_graph)
|
||||
|
||||
self._filereader = None
|
||||
|
||||
def __setitem__(self, key: str, value, **kwargs):
|
||||
if isinstance(value, ExperimentContainer):
|
||||
item = value
|
||||
@ -148,7 +151,9 @@ class UpperManagement(QtCore.QObject):
|
||||
return _id
|
||||
|
||||
def load_files(self, fname: List[str], new_plot: str = None):
|
||||
ret_dic = QFileReader(manager=self).readfiles(fname)
|
||||
if self._filereader is None:
|
||||
self._filereader = QFileReader(manager=self)
|
||||
ret_dic = self._filereader.readfiles(fname)
|
||||
self.add_new_data(ret_dic, new_plot)
|
||||
|
||||
def _load_session(self, sets: dict, graphs: dict):
|
||||
@ -1000,9 +1005,9 @@ class UpperManagement(QtCore.QObject):
|
||||
if opts['axis1'] in ['t', 'invt1000']:
|
||||
t_p = opts['t_param']
|
||||
if len(t_p) == 2:
|
||||
from ...models import Arrhenius as Func
|
||||
from nmreval.models import Arrhenius as Func
|
||||
else:
|
||||
from ...models import VFT as Func
|
||||
from nmreval.models import VFT as Func
|
||||
|
||||
_x = Func.func(x1, *t_p, invt=opts['axis1'])
|
||||
|
||||
@ -1078,7 +1083,7 @@ class UpperManagement(QtCore.QObject):
|
||||
raise ValueError('No file extension detected')
|
||||
|
||||
if suffix == '.nmr':
|
||||
from ...io.sessionwriter import NMRWriter
|
||||
from nmreval.io.sessionwriter import NMRWriter
|
||||
NMRWriter(self.graphs, self.data).export(path)
|
||||
|
||||
return
|
||||
|
Reference in New Issue
Block a user