Ajout affichage du nom du fichier.

[minwii.git] / src / minwii / logapp.py

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index b7b749e..2f5cc4f 100755 (executable)
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -8,23 +8,58 @@ $URL$
 
 from Tkinter import *
 import tkFileDialog
+from glob import glob
+from os.path import join as pjoin
 
 class Application(Frame) :
     def __init__(self, master=None) :
         Frame.__init__(self, master)
-        self.grid()
+        self.configureStretching()
         self.createWidgets()
         self.logDir = ''
+        self.logFiles = []
+    
+    def configureStretching(self) :
+        top=self.winfo_toplevel()
+        top.rowconfigure(0, weight=1)
+        top.columnconfigure(0, weight=1)
+        
+        self.grid(sticky=N+S+E+W, padx=10, pady=10)
+        self.rowconfigure(0, weight=1)
+        self.columnconfigure(0, weight=1)
     
     def createWidgets(self) :
-        self.nav = Navbar(self)
-        self.chooseLogDir = Button(self, text="Parcourir…", command=self.openFileDialog)
-        self.chooseLogDir.grid()
-        self.quitButton = Button(self, text='Terminer', command=self.quit)
-        self.quitButton.grid()
+        # zone d'affichage des données'
+        self.dataFrame = df = Frame(self)
+        #df.grid(sticky=NW)
+        
+        self.identFrame = Identification(df)
+        self.identFrame.grid(sticky=NW)
+        self.nav = Navbar(df)
+        self.nav.grid()
+        
+        
+        # barre de boutons
+        self.btnFrame = bf = Frame(self)
+        bf.grid(row=1, column=0, sticky=W+S+E)
+        bf.rowconfigure(0, weight=1)
+        bf.columnconfigure(0, weight=1)
+        bf.columnconfigure(1, weight=1)
+        
+
+        self.chooseLogDir = Button(bf, text="Parcourir…", command=self.openFileDialog)
+        self.chooseLogDir.grid(row=0, column=0, sticky=W)
+
+        self.quitButton = Button(bf, text='Terminer', command=self.quit)
+        self.quitButton.grid(row=0, column=1, sticky=E)
     
     def openFileDialog(self) :
         self.logDir = tkFileDialog.askdirectory()
+        if self.logDir :
+             self.logFiles = glob(pjoin(self.logDir, '*.log'))
+             self.logFiles.sort()
+             self.dataFrame.grid(row=0, column=0, sticky=NW)
+             self.nav.setFileList(self.logFiles)
 
 
 class Navbar(Frame) :
@@ -56,21 +91,62 @@ class Navbar(Frame) :
                               command = self.inc)
         self.nextBtn.grid(row=0, column=2)
     
-    def dec(self) :
-        self.index = self.index - self.step
-        self.caption.set('%d / %d' % (self.index, self.to))
+    def refreshStates(self) :
         if self.index == self.from_ :
             self.backBtn.configure(state=DISABLED)
+        else :
+            self.backBtn.configure(state=NORMAL)
+
         if self.index < self.to :
             self.nextBtn.configure(state=NORMAL)
+        else :
+            self.nextBtn.configure(state=DISABLED)
+
+        self.caption.set('%d / %d' % (self.index, self.to))
+        
+    
+    def dec(self) :
+        self.index = self.index - self.step
+        self.refreshStates()
     
     def inc(self) :
         self.index = self.index + self.step
-        self.caption.set('%d / %d' % (self.index, self.to))
-        if self.index == self.to :
-            self.nextBtn.configure(state=DISABLED)
-        if self.index > self.from_ :
-            self.backBtn.configure(state=NORMAL)
+        self.refreshStates()
+
+    def setFileList(self, fileList) :
+        self.fileList = fileList
+        self.from_ = 1
+        self.to = len(self.fileList)
+        self.index = 1
+        self.refreshStates()
+    
+    def getFile(self) :
+        return self.fileList[self.index - 1]
+
+
+class Identification(Frame) :
+    def __init__(self, master=None) :
+        Frame.__init__(self, master)
+        self.fileName = StringVar()
+        self.createWidgets()
+    
+    def createWidgets(self) :
+        fileLbl = Label(self, text='Fichier :')
+        fileLbl.grid(row=0, column=0)
+
+        fileNameLbl = Label(self, textvariable=self.fileName)
+        
+        nameLbl = Label(self, text='Patient :')
+        nameLbl.grid(row=1, column=0)
+        
+        self.nameEntry = Entry(self, width=40)
+        self.nameEntry.grid(row=1, column=1)
+        
+        commentsLbl = Label(self, text='Commentaires :')
+        commentsLbl.grid(row=2, column=0)
+        
+        self.commentsText = Text(self, width=40, height=4, undo=True, wrap=WORD)
+        self.commentsText.grid(row=2, column=1)
     
 
 app = Application()