markusro/qdsfit
1
0
Fork 0
Code Issues Pull Requests Releases Activity

moved filereader to extra file

Browse Source
This commit is contained in:
Markus Rosenstihl
2014-09-24 22:07:14 +02:00
parent 737be85ee1
commit ffc817f306
8 changed files with 5601 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/Container.py
View File

@ -1,12 +1,12 @@
# -*- encoding: utf8 -*-
from math import libyaff
from libmath import yafflib
from PyQt4.QtGui import QColor
import numpy as np
from math.BDSMathlib import id_to_color
from data.container_base import BaseObject
from libmath.BDSlib import id_to_color
from container_base import BaseObject
from gui import ContainerWidgets
@ -94,7 +94,7 @@ class YAFF(BaseObject):
self.widget.on_model_changed.connect(self.change_model)
self.widget.configuration_changed.connect(self.change_configuration)
self.color = QColor(32, 120, 29, int(255*0.82))
self._libyaff = libyaff.Yaff(self.widget.getYaffType())
self._libyaff = yafflib.Yaff(self.widget.getYaffType())
self.id_label = self._libyaff.label
self.id_string = "yaff"
self._param_number = self._libyaff.params
@ -114,7 +114,7 @@ class YAFF(BaseObject):
self.updateData()
def change_model(self):
self._libyaff = libyaff.Yaff(self.widget.getYaffType())
self._libyaff = yafflib.Yaff(self.widget.getYaffType())
self._selector_mask = self.widget.selector_mask
self.id_label = self._libyaff.label
self.param_number = self._libyaff.params

2
data/data.py
View File

@ -3,7 +3,7 @@ from PyQt4.QtGui import QColor
import numpy as np
import pyqtgraph as pg
from math.BDSMathlib import FitFunctionCreator
from libmath.BDSlib import FitFunctionCreator
class Data: