On commence à imprimer des résultats, bruts de décoffrage.

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

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 2f5cc4f..4c680ba 100755 (executable)
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -10,6 +10,9 @@ from Tkinter import *
 import tkFileDialog
 from glob import glob
 from os.path import join as pjoin
 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) :
 
 class Application(Frame) :
     def __init__(self, master=None) :


@@ -35,7 +38,7 @@ class Application(Frame) :
         
         self.identFrame = Identification(df)
         self.identFrame.grid(sticky=NW)
         
         self.identFrame = Identification(df)
         self.identFrame.grid(sticky=NW)

-        self.nav = Navbar(df)
+        self.nav = Navbar(df, incCallback=self.loadLogFile, decCallback=self.loadLogFile)

         self.nav.grid()
         
         
         self.nav.grid()
         
         


@@ -59,25 +62,33 @@ class Application(Frame) :
              self.logFiles = glob(pjoin(self.logDir, '*.log'))
              self.logFiles.sort()
              self.dataFrame.grid(row=0, column=0, sticky=NW)
              self.logFiles = glob(pjoin(self.logDir, '*.log'))
              self.logFiles.sort()
              self.dataFrame.grid(row=0, column=0, sticky=NW)

-             self.nav.setFileList(self.logFiles)
+             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) :
 
 
 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)
         Frame.__init__(self, master)

-        self.from_ = from_
-        self.to = to
-        self.index = start
-        self.step = step
-        self.grid()

         self.caption = StringVar()
         self.caption = StringVar()

-        self.caption.set('%d / %d' % (self.index, self.to))

         self.createWidgets()
         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='◀',
     
     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)
                               command = self.dec
                               )
         self.backBtn.grid(row=0, column=0)


@@ -87,7 +98,6 @@ class Navbar(Frame) :
 
         self.nextBtn = Button(self,
                               text='▶',
 
         self.nextBtn = Button(self,
                               text='▶',

-                              state = DISABLED if self.index==self.to else NORMAL,

                               command = self.inc)
         self.nextBtn.grid(row=0, column=2)
     
                               command = self.inc)
         self.nextBtn.grid(row=0, column=2)
     


@@ -106,22 +116,20 @@ class Navbar(Frame) :
         
     
     def dec(self) :
         
     
     def dec(self) :

-        self.index = self.index - self.step
+        self.index = self.index - 1

         self.refreshStates()
         self.refreshStates()

+        self.decCallback(self)

     
     def inc(self) :
     
     def inc(self) :

-        self.index = self.index + self.step
+        self.index = self.index + 1

         self.refreshStates()
         self.refreshStates()

+        self.incCallback(self)

 
 

-    def setFileList(self, fileList) :
-        self.fileList = fileList
+    def setSize(self, size) :

         self.from_ = 1
         self.from_ = 1

-        self.to = len(self.fileList)
+        self.to = size

         self.index = 1
         self.refreshStates()
         self.index = 1
         self.refreshStates()

-    
-    def getFile(self) :
-        return self.fileList[self.index - 1]

 
 
 class Identification(Frame) :
 
 
 class Identification(Frame) :


@@ -130,24 +138,40 @@ class Identification(Frame) :
         self.fileName = StringVar()
         self.createWidgets()
     
         self.fileName = StringVar()
         self.createWidgets()
     

+    def setFileName(self, name) :
+        self.fileName.set(name)
+    

     def createWidgets(self) :
         fileLbl = Label(self, text='Fichier :')
     def createWidgets(self) :
         fileLbl = Label(self, text='Fichier :')

-        fileLbl.grid(row=0, column=0)
+        fileLbl.grid(row=0, column=0, sticky=E)

 
         fileNameLbl = Label(self, textvariable=self.fileName)
 
         fileNameLbl = Label(self, textvariable=self.fileName)

+        fileNameLbl.grid(row=0, column=1, sticky=W)

         
         nameLbl = Label(self, text='Patient :')
         
         nameLbl = Label(self, text='Patient :')

-        nameLbl.grid(row=1, column=0)
+        nameLbl.grid(row=1, column=0, sticky=E)

         
         self.nameEntry = Entry(self, width=40)
         
         self.nameEntry = Entry(self, width=40)

-        self.nameEntry.grid(row=1, column=1)
+        self.nameEntry.grid(row=1, column=1, sticky=W)

         
         commentsLbl = Label(self, text='Commentaires :')
         
         commentsLbl = Label(self, text='Commentaires :')

-        commentsLbl.grid(row=2, column=0)
+        commentsLbl.grid(row=2, column=0, sticky=E)

         
         self.commentsText = Text(self, width=40, height=4, undo=True, wrap=WORD)
         
         self.commentsText = Text(self, width=40, height=4, undo=True, wrap=WORD)

-        self.commentsText.grid(row=2, column=1)
+        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")
 
 app = Application()
 app.master.title("Analyseur des sessions MINWii")