X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/6b42e35663015fc54039285953700611a55d1958..a3fc67f3b4b1b435f90c5d823416b6ec5340b215:/src/minwii/logapp.py?ds=inline

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index b7b749e..4c680ba 100755
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -8,41 +8,87 @@ $URL$
 
 from Tkinter import *
 import tkFileDialog
+from glob import glob
+from os.path import join as pjoin
+from os.path import basename
+from loganalyse import LogFileAnalyser
+from pprint import pprint
 
 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, incCallback=self.loadLogFile, decCallback=self.loadLogFile)
+        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.setSize(len(self.logFiles))
+             self.loadLogFile(self.nav)
+    
+    def loadLogFile(self, nav) :
+        index = nav.index - 1
+        filepath = self.logFiles[index]
+        filename = basename(filepath)
+        self.identFrame.setFileName(filename)
+        rf = ResultsFrame(self.dataFrame, filepath)
+        rf.layResults()
+        rf.grid()
 
 
 class Navbar(Frame) :
-    def __init__(self, master=None, from_=1, to=10, start=1, step=1) :
+    def __init__(self, master=None, size=1, incCallback=None, decCallback=None) :
         Frame.__init__(self, master)
-        self.from_ = from_
-        self.to = to
-        self.index = start
-        self.step = step
-        self.grid()
         self.caption = StringVar()
-        self.caption.set('%d / %d' % (self.index, self.to))
         self.createWidgets()
+        self.setSize(size)
+        self.incCallback = incCallback if incCallback else lambda x : None
+        self.decCallback = decCallback if decCallback else lambda x : None
+        self.grid()
+        self.caption.set('%d / %d' % (self.index, self.to))
     
     def createWidgets(self) :
         self.backBtn = Button(self,
                               text='◀',
-                              state = DISABLED if self.index==self.from_ else NORMAL,
                               command = self.dec
                               )
         self.backBtn.grid(row=0, column=0)
@@ -52,26 +98,80 @@ class Navbar(Frame) :
 
         self.nextBtn = Button(self,
                               text='▶',
-                              state = DISABLED if self.index==self.to else NORMAL,
                               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 - 1
+        self.refreshStates()
+        self.decCallback(self)
     
     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.index = self.index + 1
+        self.refreshStates()
+        self.incCallback(self)
+
+    def setSize(self, size) :
+        self.from_ = 1
+        self.to = size
+        self.index = 1
+        self.refreshStates()
+
+
+class Identification(Frame) :
+    def __init__(self, master=None) :
+        Frame.__init__(self, master)
+        self.fileName = StringVar()
+        self.createWidgets()
     
+    def setFileName(self, name) :
+        self.fileName.set(name)
+    
+    def createWidgets(self) :
+        fileLbl = Label(self, text='Fichier :')
+        fileLbl.grid(row=0, column=0, sticky=E)
+
+        fileNameLbl = Label(self, textvariable=self.fileName)
+        fileNameLbl.grid(row=0, column=1, sticky=W)
+        
+        nameLbl = Label(self, text='Patient :')
+        nameLbl.grid(row=1, column=0, sticky=E)
+        
+        self.nameEntry = Entry(self, width=40)
+        self.nameEntry.grid(row=1, column=1, sticky=W)
+        
+        commentsLbl = Label(self, text='Commentaires :')
+        commentsLbl.grid(row=2, column=0, sticky=E)
+        
+        self.commentsText = Text(self, width=40, height=4, undo=True, wrap=WORD)
+        self.commentsText.grid(row=2, column=1, sticky=W)
+
+class ResultsFrame(Frame) :
+    def __init__(self, master, logFilePath) :
+        Frame.__init__(self, master)
+        self.logFilePath = logFilePath
+    
+    def layResults(self) :
+        lfa = LogFileAnalyser(self.logFilePath)
+        results = lfa.analyse()
+        pprint(results)
+        rawPrint = Label(self, text=str(results))
+        rawPrint.grid()
+        
 
 app = Application()
 app.master.title("Analyseur des sessions MINWii")