Affichage, déjà plus « user-friendly ».

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

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 1bcd703..9306809 100755 (executable)
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -8,21 +8,202 @@ $URL$
 
 from Tkinter import *
 import tkFileDialog
 
 from Tkinter import *
 import tkFileDialog

+from glob import glob
+import os
+from os.path import join as pjoin
+from os.path import basename
+from os.path import getsize
+from minwii.loganalyse import LogFileAnalyser
+from pprint import pprint

 
 class Application(Frame) :
     def __init__(self, master=None) :
         Frame.__init__(self, master)
 
 class Application(Frame) :
     def __init__(self, master=None) :
         Frame.__init__(self, master)

-        self.grid()
+        self.configureStretching()

         self.createWidgets()
         self.createWidgets()

+        self.logDir = ''
+        self.logFiles = []
+        self.resultsFrame = None
+        
+        # debug
+        self.chooseDirDialog(dir='/Users/pinbe/minwii_logs')
+    
+    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) :
+        # zone d'affichage des données'
+        self.dataFrame = df = Frame(self)
+        
+        self.identFrame = Identification(df)
+        self.identFrame.grid(sticky=NW)
+        
+        # barre de boutons
+        self.btnFrame = bf = Frame(self)
+        bf.grid(row=1, column=0, sticky=W+S+E)
+        bf.rowconfigure(0, weight=1)
+        for i in range(3) :
+            bf.columnconfigure(i, weight=1)        
+
+        self.chooseLogDir = Button(bf, text="Parcourir…", command=self.chooseDirDialog)
+        self.chooseLogDir.grid(row=0, column=0, sticky=W)
+        
+        self.nav = Navbar(bf, incCallback=self.loadLogFile, decCallback=self.loadLogFile)
+
+        self.quitButton = Button(bf, text='Terminer', command=self.quit)
+        self.quitButton.grid(row=0, column=2, sticky=E)
+    
+    def chooseDirDialog(self, dir=None) :
+        if dir is None :
+            self.logDir = tkFileDialog.askdirectory()
+        else :
+            self.logDir = dir
+        if self.logDir :
+             self.logFiles = glob(pjoin(self.logDir, '*.log'))
+             self._cleanupJunkFiles()
+             self.logFiles.sort()
+             self.dataFrame.grid(row=0, column=0, sticky=NW)
+             self.nav.setSize(len(self.logFiles))
+             self.nav.grid(row=0, column=1)
+             self.loadLogFile(self.nav)
+    
+    def _cleanupJunkFiles(self) :
+        files = []
+        while self.logFiles :
+            f = self.logFiles.pop()
+            if not getsize(f) :
+                os.remove(f)
+                continue
+            # TODO : vérifier qu'il existe des événements
+            else :
+                files.append(f)
+        
+        self.logFiles = files
+        
+    
+    def loadLogFile(self, nav) :
+        index = nav.index - 1
+        filepath = self.logFiles[index]
+        filename = basename(filepath)
+        self.identFrame.setFileName(filename)
+        if self.resultsFrame :
+            self.resultsFrame.destroy()
+        self.resultsFrame = ResultsFrame(self.dataFrame, filepath)
+        self.resultsFrame.layResults()
+        self.resultsFrame.grid()
+
+
+class Navbar(Frame) :
+    def __init__(self, master=None, size=1, incCallback=None, decCallback=None) :
+        Frame.__init__(self, master)
+        self.caption = StringVar()
+        self.createWidgets()
+        self.setSize(size)
+        self.incCallback = incCallback if incCallback else lambda x : None
+        self.decCallback = decCallback if decCallback else lambda x : None
+        self.caption.set('%d / %d' % (self.index, self.to))
+    
+    def createWidgets(self) :
+        self.backBtn = Button(self,
+                              text='◀',
+                              command = self.dec
+                              )
+        self.backBtn.grid(row=0, column=0)
+        
+        self.lbl = Label(self, textvariable=self.caption)
+        self.lbl.grid(row=0, column=1)
+
+        self.nextBtn = Button(self,
+                              text='▶',
+                              command = self.inc)
+        self.nextBtn.grid(row=0, column=2)
+    
+    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 + 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) :
     
     def createWidgets(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()
+        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 openFileDialog(self) :
-        print tkFileDialog.askopenfilename()
+    def layResults(self) :
+        lfa = LogFileAnalyser(self.logFilePath)
+        results = lfa.analyse()
+        if results :
+            for i, kv in enumerate(results) :
+                k, v = kv
+                kl = Label(self, text='%s :' % k)
+                kl.grid(row=i, column=0, sticky=E)
+            
+                vl = Label(self, text=v)
+                vl.grid(row=i, column=1, sticky=W)
+        else :
+            msg = Label(self, text="Pas de données exploitables.")
+            msg.grid()
+            
+        

 
 app = Application()
 app.master.title("Analyseur des sessions MINWii")
 
 app = Application()
 app.master.title("Analyseur des sessions MINWii")