Issus with loading Photometer Data and afterward normal data

This commit is contained in:
jfsScience 2020-12-02 13:09:07 +01:00
parent ba2888dfd7
commit 28762ed524
6 changed files with 24 additions and 44 deletions

View File

@ -42,7 +42,6 @@ def openfile(self, CCDplot):
try:
with open(filename) as csvfile:
readCSV = csv.reader(csvfile, delimiter=' ')
for row in readCSV:
if (line_count == 3):
config.SHsent = int(row[1])
@ -50,7 +49,11 @@ def openfile(self, CCDplot):
if (line_count > 3):
config.rxData16[line_count-4] = int(row[1])
line_count += 1
CCDpanelsetup.buildpanel.updateplot(self, CCDplot)
if config.photometer==1:
CCDpanelsetup.buildpanel.updateplot_B(self, CCDplot)
else:
config.photometer=0
CCDpanelsetup.buildpanel.updateplot(self, CCDplot)
except IOError:

View File

@ -251,6 +251,7 @@ class buildpanel(tk.Frame):
self.jfsbase_absorption.config(state=tk.NORMAL)
def loaddata():
self.jf.load_pandas()
config.photometer=1
self.updateplot(CCDplot)
self.jfsdark_check.config(state=tk.NORMAL)
self.jfsbase_check.config(state=tk.NORMAL)
@ -297,6 +298,11 @@ class buildpanel(tk.Frame):
self.jfspdmath = tk.Button(self,text='Math..',fg="blue", command=loaddata)
self.jfspdmath.grid(row=save_row,column=4,sticky='e')
### Reset changes from loading phometerfile
def reset_settings(self):
print('reset settings 1')
self.jf.reset_settings()
### Callbacks for traces, buttons, etc ###
def callback(self):
self.bopen.config(state=tk.DISABLED)
@ -368,6 +374,9 @@ class buildpanel(tk.Frame):
status.set("Device doesn't exist")
colr.configure(fg="red")
def updateplot_B(self,CCDplot):
self.jf.reset_settings()
self.updateplot(CCDplot)
def updateplot(self, CCDplot):
CCDplot.a.clear()

View File

@ -60,3 +60,4 @@ class buildplot(tk.Frame ):
print('you pressed %s' % event.key)
key_press_handler(event, canvas, toolbar)

View File

@ -199,7 +199,7 @@ class Jfsphoto (object):
filename = filedialog.askopenfilename(defaultextension=".csv", title="Open file ")
try:
self.df = pd.read_csv(filename,index_col=0)
config.rxData16=self.df['p1']
config.rxData16=self.df['p1'].copy()
self.do_save_baseline(self.df['baseline'])
self.do_save_darkline(self.df['darkline'])
self.baseline_checked.set(1)
@ -233,6 +233,11 @@ class Jfsphoto (object):
except IOError:
messagebox.showerror("By the great otter!","There's a problem opening the file.")
def reset_settings(self):
self.baseline_checked.set(0)
self.darkline_checked.set(0)
self.nm_checked.set(0)
def conf_write(self):
config = ConfigParser()
config.read('config.ini')

View File

@ -30,3 +30,6 @@ txfull = np.uint8([0,0,0,0,0,0,0,0,0,0,0,0])
datainvert = 1
offset = 0
balanced = 0
#Photometer status Photometer off
photometer = 0

View File

@ -1,41 +0,0 @@
#etwas zum üben zum Problem der classes in classes
class Mieter(object):
def __init__(self):
self.m =0
def set(self,i):
self.m = i
def get():
return self.m
class Room(object):
# note: class name is Capitalized
mx = Mieter
def __init__(self, number):
self.room_number = number
def get_room_num(self):
return self.room_number
class House(object,Mieter):
def __init__(self, num_rooms,mieter):
self.rooms=[Room(i) for i in range(1,num_rooms+1)]
self.rooms.mx.set(1)
def __iter__(self):
return iter(self.rooms)
mansion = House(10,1)
for i in mansion:
print(i.get_room_num(),' ',i.mx)