Changeset 7

Timestamp:

05/27/08 17:34:38 (16 years ago)

Author:

meynadie

Message:

Modifs

File:

• pyraw2fits/pyraw2fits.py (modified) (7 diffs)

pyraw2fits/pyraw2fits.py

@@ -7 +7 @@
 import pyfits
 import Tkinter
+from Tkconstants import END
 import numpy
 
 from optparse import OptionParser
-
-
-
+import datetime
+import time
 
 def raw2fits(InputFilename,headers,comments):
@@ -26 +26 @@
     except IOError :
         print "Impossible d'ouvrir l'image"
-        exit (1)
+        # exit (1)
 
     # Creation de l'array d'entiers non signés + byteswap
@@ -63 +63 @@
     prihdr.update('ConvVer',VERSION,'Version de raw2fits')
 
+    for item in headers:
+        prihdr.update(item['key'],item['value'],item['comment'])
+
+    for item in comments:
+        prihdr.add_comment(item)
 
     of = OutputFilename
@@ -78 +83 @@
         self.grid()
 
+        self.labelexptimeVariable = Tkinter.StringVar()
+        self.labelexptimeVariable.set("Temps de pose (s) :")
+        labelexptime = Tkinter.Label(self,textvariable=self.labelexptimeVariable, anchor="w")
+        labelexptime.grid(column=0,columnspan=2,row=1)
+
+        self.exptimeVariable = Tkinter.StringVar()
+        self.exptime = Tkinter.Entry(self,textvariable=self.exptimeVariable)
+        self.exptime.grid(column=0,columnspan=2,row=2,sticky='EW')
+        self.exptimeVariable.set(u"")
+        
+
+        self.labelrf1Variable = Tkinter.StringVar()
+        self.labelrf1Variable.set("RF1 :")
+        labelrf1 = Tkinter.Label(self,textvariable=self.labelrf1Variable,
+                                 anchor="w")
+        labelrf1.grid(column=0,row=3)
+
+        self.rf1 = Tkinter.Listbox(self,height=5,width=8,exportselection=0)
+        self.rf1.pack()
+        for item in ['trou',
+                     '535',
+                     '607',
+                     '215',
+                     '782']:
+            self.rf1.insert(END,item)
+        self.rf1.grid(column=0,row=4)
+        
+        self.labelrf2Variable = Tkinter.StringVar()
+        self.labelrf2Variable.set("RF2 :")
+        labelrf2 = Tkinter.Label(self,textvariable=self.labelrf2Variable,
+                                 anchor="w")
+        labelrf2.grid(column=1,row=3)
+
+        self.rf2 = Tkinter.Listbox(self,height=5,width=8,exportselection=0)
+        self.rf2.pack()
+        for item in ['535h',
+                     'trou',
+                     'dioptre',
+                     'lentille',
+                     '393']:
+            self.rf2.insert(END,item)
+        self.rf2.grid(column=1,row=4)
+
+        self.labelcommentVariable = Tkinter.StringVar()
+        self.labelcommentVariable.set("commentaire :")
+        labelcomment = Tkinter.Label(self,textvariable=self.labelcommentVariable, anchor="w")
+        labelcomment.grid(column=0,columnspan=2,row=5)
+
+        self.commentVariable = Tkinter.StringVar()
+        self.comment = Tkinter.Entry(self,textvariable=self.commentVariable)
+        self.comment.grid(column=0,columnspan=2,row=6,sticky='EW')
+        self.commentVariable.set(u"")
+
+
+        self.labelnameVariable = Tkinter.StringVar()
+        self.labelnameVariable.set("Nom du fichier :")
+        label = Tkinter.Label(self,textvariable=self.labelnameVariable,
+                              anchor="w")
+        label.grid(column=0,row=7,columnspan=2,sticky='EW')
+
         self.entryVariable = Tkinter.StringVar()
         self.entry = Tkinter.Entry(self,textvariable=self.entryVariable)
-        self.entry.grid(column=1,row=0,sticky='EW')
+        self.entry.grid(column=0,columnspan=2,row=8,sticky='EW')
         self.entry.bind("<Return>", self.OnPressEnter)
         self.entryVariable.set(u"")
-        
-        button = Tkinter.Button(self,text=u"Convertir en fits",
+
+
+
+
+
+        button = Tkinter.Button(self,
+                                text="Convertir en fits",
                                 command=self.OnButtonClick)
-        button.grid(column=0,row=2)
+        button.grid(column=0,columnspan=2,row=9)
 
         self.labelVariable = Tkinter.StringVar()
         label = Tkinter.Label(self,textvariable=self.labelVariable,
                               anchor="w",fg="white",bg="blue")
-        label.grid(column=0,row=1,columnspan=2,sticky='EW')
-        self.labelVariable.set(u"Hello !")
+        label.grid(column=0,row=10,columnspan=2,sticky='EW')
+        self.labelVariable.set(u"")
+
+
 
         self.grid_columnconfigure(0,weight=1)
@@ -100 +172 @@
         self.entry.focus_set()
         self.entry.selection_range(0, Tkinter.END)
-        
+
 
     def CommonAction(self):
+        rf1setting = self.rf1.get(self.rf1.curselection()[0])
+        rf2setting = self.rf2.get(self.rf2.curselection()[0])
+
+        exptime = self.exptimeVariable.get()
+        if (exptime == ''):
+            exptime = 0.
+        
         InputFilename = self.entryVariable.get()
         print InputFilename
@@ -108 +187 @@
         self.labelVariable.set("Ecriture de " + OutputFilename)
         headers=[]
+        headers.append({'key':'EXPTIME',
+                        'value':float(exptime),
+                        'comment':'Temps de pose'})
+        headers.append({'key':'RF1FILT',
+                        'value':rf1setting,
+                        'comment':'filtre roue 1'})
+        headers.append({'key':'RF2FILT',
+                        'value':rf2setting,
+                        'comment':'filtre roue 2'})
+        headers.append({'key':'CNVDATE',
+                        'value':datetime.date.today().isoformat(),
+                        'comment':'Date de la conversion fits'})
+        headers.append({'key':'CNVTIME',
+                        'value':time.strftime("%H:%M:%S"),
+                        'comment':'Heure de la conversion fits'})
+
+
         comments=[]
+        commentaire = self.commentVariable.get()
+        if (commentaire != '') :
+            comments.append(commentaire)
         raw2fits(InputFilename,headers,comments)
         
@@ -146 +245 @@
 
 
+