From 722dc07355ffd578472d7cfebf20cee0025d93df Mon Sep 17 00:00:00 2001 From: jfsScience Date: Wed, 30 Dec 2020 10:48:14 +0100 Subject: [PATCH] icons for user friendlyness --- CCDpanelsetup.py | 4 ++-- JFShelp.py | 23 ++++++++++------------- JFSphoto.py | 4 +++- images/bulb-off.jpg | Bin 0 -> 386 bytes images/bulb-on.jpg | Bin 0 -> 594 bytes 5 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 images/bulb-off.jpg create mode 100644 images/bulb-on.jpg diff --git a/CCDpanelsetup.py b/CCDpanelsetup.py index 13ef5bf..0ac2816 100644 --- a/CCDpanelsetup.py +++ b/CCDpanelsetup.py @@ -304,11 +304,11 @@ class buildpanel(tk.Frame): self.jfs4calhp.grid(row=device_row+1,column=5,sticky='e',padx=4) 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=shicg_row-1,column=4,sticky='w',padx=4) - self.jfsdark = tk.Button(self,text='save Darkline',fg="blue", command= darkline) + self.jfsdark = tk.Button(self,text='save Dark',image=self.jf.bulbOff,compound=tk.LEFT,fg="blue", command= darkline) self.jfsdark.grid(row=shicg_row,column=4,sticky='e',padx=4) 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=shicg_row+1,column=4,sticky='w') - self.jfsbase = tk.Button(self,text='save Baseline',fg="blue", command= baseline) + self.jfsbase = tk.Button(self,text='save Base',image=self.jf.bulbOn,compound=tk.LEFT,fg="blue", command= baseline) self.jfsbase.grid(row=shicg_row+2,column=4,sticky='e',padx=4) 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=shicg_row+3,column=4,sticky='w') diff --git a/JFShelp.py b/JFShelp.py index 614c5f8..1583376 100644 --- a/JFShelp.py +++ b/JFShelp.py @@ -43,15 +43,16 @@ def center_window(size, window) : return - +def get_icon_image(xx): + directory_path = os.path.dirname(__file__) + file_path = os.path.join(directory_path, 'images\\') + image =Image.open(file_path+xx) + photo = ImageTk.PhotoImage(image) + return photo def jfshelpme(win,helpfor): - #### this is where we store the pictures etc - directory_path = os.path.dirname(__file__) - file_path = os.path.join(directory_path, 'images\\') - top = tk.Toplevel(win) scrolling = tk.Scrollbar(top) scrolling.pack(side=tk.RIGHT, fill=tk.Y) @@ -63,14 +64,10 @@ def jfshelpme(win,helpfor): scrolling.config(command=text.yview) text.config(yscrollcommand=scrolling.set) - image1 = Image.open(file_path+'nm405.gif') - photoImg = ImageTk.PhotoImage(image1) - image2 = Image.open(file_path+'methods.gif') - photoImg2= ImageTk.PhotoImage(image2) - image3 = Image.open(file_path+'kinetics.gif') - photoImg3= ImageTk.PhotoImage(image3) - image4 = Image.open(file_path+'xenon.gif') - photoImg4= ImageTk.PhotoImage(image4) + photoImg = get_icon_image('nm405.gif') + photoImg2= get_icon_image('methods.gif') + photoImg3= get_icon_image('kinetics.gif') + photoImg4= get_icon_image('xenon.gif') text.tag_configure('it', font=('Arial', 10, 'italic')) text.tag_configure('h1', font=('Verdana', 16, 'bold')) diff --git a/JFSphoto.py b/JFSphoto.py index 55b8695..9df9e95 100644 --- a/JFSphoto.py +++ b/JFSphoto.py @@ -130,7 +130,9 @@ class Jfsphoto (object): self.log = True ######### jfs methods self.methods = [] - + ######### get icons + self.bulbOn = get_icon_image('bulb-on.jpg') + self.bulbOff = get_icon_image('bulb-off.jpg') def do_calibrate(self): win = tk.Toplevel() diff --git a/images/bulb-off.jpg b/images/bulb-off.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9b855a3435abdaeb445bd314eba01e14ec7fe42a GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@)?VR+?^QK zos)S9l1z8>b!1@J*w6hZkrl}2EbxddW?X?_wfUrh8rVHu978Ppmri!%b2SiX zWB2CNek7B#v4pRXeR~0?_PT_#xoZTt1wZ;2AH3YRy(0e8Yyai-w=xf$yHI*}p32E} zuXhPl{W-Rf$Ln$lJHygVI*V83FIliGa|&a5;#pzM6Q!|FAMLg|zxWk5ul(^Roy#(x z+^f`Ko_lQn#3r57O2?CLo9&dY*kT8^Dve>uGp{IuG?OZAo9)KpKuw%Nh& zI3AWAo$`76v)^_*yA?Q2oZR48C^LCC$KeTcc&fML-c~sO`SYsw#D+y04}LTr{ViPP z-j;a4qR+s0vOtv{%focOX{n8+v8@;OAC%)Qlwn__A+#?y`o-_K3eokB9htL|<~)z= c$zrhUa&=9*yG8RnFq{}XUHx3vIVCg!07!|OApigX literal 0 HcmV?d00001 diff --git a/images/bulb-on.jpg b/images/bulb-on.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e9d4635e6b0e1e9460797ec1623f7ee135fcc3bd GIT binary patch literal 594 zcmV-Y0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0q03XK~y+Tg_OVR zd0`aC&zCGp5yE7afn+eqDk-b-BL);nVl>zo82klfVqsD!$zZa`BxI1mj||G9r1QDX z=lOnoeedP-8t#3cbGq-I^E~H1fWI)EPO;Hwu;@J^_=Usa0PFRdMIT^>M5R(;>dEDD z!PRQTqHi9#LZQH-Z+NY#R4P0kkEA^w4_d8OwApOvbUG>bFqO$5kGNJ)B9XA@ ziAW^E$z;N!R|Ji8IvrDdvbv$F`v&do6VAbe6!o_ zNRv@6mqVY=hy8vZBasLdJ`oCqu-oloAP~SA(DWJRTDsjYc6D41&Yqpot%iMlhSrKr9x6R4N6n zRtwAJ64L23)jORIv|25w)oK*~7ztsqSio+#19!xr*XyBNF0%@sw?_B-9frdpt*F=Q z!FW7|!C*kE6XNaP|1fAan`G$s`@vu^!1a1%RX!hEGn>uS8h45ikH=Y7n2+}ncd5a4 gy9I7;NWTZ*3*1}>n(mY>hyVZp07*qoM6N<$f@atW%m4rY literal 0 HcmV?d00001