From 6920e30d8287a464f14ea92e412e354501d07d30 Mon Sep 17 00:00:00 2001
From: jens <jefro@fsksoft.de>
Date: Tue, 1 Dec 2020 22:57:40 +0100
Subject: [PATCH] Update Displayformat

---
 CCDpanelsetup.py | 37 ++++++++++++++++++++++++-------------
 pyCCDGUI.py      |  1 -
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/CCDpanelsetup.py b/CCDpanelsetup.py
index 0d72b35..1d5086a 100644
--- a/CCDpanelsetup.py
+++ b/CCDpanelsetup.py
@@ -59,7 +59,7 @@ class buildpanel(tk.Frame):
     #Create all widgets and space between them
     self.devicefields(device_row)
     #insert vertical space
-    self.grid_rowconfigure(device_row+3, minsize=30)
+    self.grid_rowconfigure(device_row+3, minsize=20) #30
     self.CCDparamfields(shicg_row)
     #insert vertical space
     self.grid_rowconfigure(shicg_row+4, minsize=30) 
@@ -75,6 +75,8 @@ class buildpanel(tk.Frame):
     self.updateplotfields(update_row, CCDplot)
     #
     self.jf = JFSphoto
+
+
     self.jfsAddOns(CCDplot)
   
 
@@ -228,6 +230,15 @@ class buildpanel(tk.Frame):
 
   def jfsAddOns(self,CCDplot):
         
+        device_row = 10
+        shicg_row = 20
+        con_row = 30
+        avg_row = 40
+        col_row = 50
+        plt_row = 60
+        save_row = 70
+        upd_row = 80
+        
         def darkline():
               if (self.jf.do_save_darkline(config.rxData16)==1):
                 self.jfsdark_check.config(state=tk.NORMAL)
@@ -246,29 +257,29 @@ class buildpanel(tk.Frame):
               self.jfsbase_transmission.config(state=tk.NORMAL)
               self.jfsbase_absorption.config(state=tk.NORMAL)
 
-        self.jfstitel = tk.Label(self, text=' Photometer ')
+        self.jfstitel = tk.Label(self, text=' Photometer ',fg="#6A9662")
         #self.jfstitel.config(font=("Courier",0))
-        self.jfstitel.grid(row=10,column=4,columnspan=2)
+        self.jfstitel.grid(row=device_row,column=4,columnspan=2,sticky='w')
         self.jfs4cal = tk.Button(self,text='Calibration',fg="blue", command=self.jf.do_calibrate)
-        self.jfs4cal.grid(row=11,column=4)
+        self.jfs4cal.grid(row=device_row+1,column=4,sticky='w')
         self.jfs4nm_check = tk.Checkbutton(self,text="[nm] scale on/off",variable=self.jf.nm_checked,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
-        self.jfs4nm_check.grid(row=12,column=4)
+        self.jfs4nm_check.grid(row=shicg_row-1,column=4,sticky='w')
         self.jfsdark = tk.Button(self,text='save Darkline',fg="blue", command= darkline)
-        self.jfsdark.grid(row=13,column=4)
+        self.jfsdark.grid(row=shicg_row,column=4,sticky='w')
         self.jfsdark_check = tk.Checkbutton(self,text="Darkline on/off",variable=self.jf.darkline_checked,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
-        self.jfsdark_check.grid(row=14,column=4)
+        self.jfsdark_check.grid(row=shicg_row+1,column=4,sticky='w')
         self.jfsbase = tk.Button(self,text='save Baseline',fg="blue", command= baseline)
-        self.jfsbase.grid(row=15,column=4)
+        self.jfsbase.grid(row=shicg_row+2,column=4,sticky='w')
         self.jfsbase_check = tk.Checkbutton(self,text="Baseline on/off",variable=self.jf.baseline_checked,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
-        self.jfsbase_check.grid(row=16,column=4)
+        self.jfsbase_check.grid(row=shicg_row+3,column=4,sticky='w')
         self.jfsbase_absorption = tk.Radiobutton(self,text="Absorption",variable=self.jf.abs_trans,value=0,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
-        self.jfsbase_absorption.grid(row=17,column=4)
+        self.jfsbase_absorption.grid(row=con_row,column=4,sticky='wS')
         self.jfsbase_transmission = tk.Radiobutton(self,text="Transmision",variable=self.jf.abs_trans,value=1,state=tk.DISABLED,command=lambda CCDplot=CCDplot: self.updateplot(CCDplot))
-        self.jfsbase_transmission.grid(row=18,column=4)
+        self.jfsbase_transmission.grid(row=avg_row,column=4,sticky='w')
         self.jfspdsave = tk.Button(self,text='save Data',fg="blue", command=self.jf.save_pandas)
-        self.jfspdsave.grid(row=19,column=4)
+        self.jfspdsave.grid(row=col_row,column=4,sticky='w')
         self.jfspdload = tk.Button(self,text='load Data',fg="blue", command=loaddata)
-        self.jfspdload.grid(row=20,column=4)
+        self.jfspdload.grid(row=col_row+1,column=4,sticky='w')
 
   ### Callbacks for traces, buttons, etc ###
   def callback(self):
diff --git a/pyCCDGUI.py b/pyCCDGUI.py
index 91f0a00..8ddef3b 100644
--- a/pyCCDGUI.py
+++ b/pyCCDGUI.py
@@ -50,5 +50,4 @@ if __name__ == '__main__':
   jfs.conf_read()
   panel = CCDpanelsetup.buildpanel(root, CCDplot, SerQueue, jfs)
   panel.grid(row=0, column=2)
-
   root.mainloop()