X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/1ba1c6642bcd08f1fde82e6b0d99927346df752b..3af57b5c16f81e9def6aa3e108d3395ea17ca143:/src/minwii/logapp.py?ds=inline diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py index 16be558..1210bf6 100755 --- a/src/minwii/logapp.py +++ b/src/minwii/logapp.py @@ -6,13 +6,17 @@ $Id$ $URL$ """ +import os +os.environ['WINWII_NO_LOG'] = '1' from Tkinter import * import tkFileDialog from glob import glob from os.path import join as pjoin from os.path import basename from os.path import getsize -from loganalyse import LogFileAnalyser +import os.path +from minwii.loganalyse import LogFileAnalyser +from minwii.config import LOGS_DIR from pprint import pprint class Application(Frame) : @@ -22,7 +26,11 @@ class Application(Frame) : self.createWidgets() self.logDir = '' self.logFiles = [] + self.currentFilePath = '' self.resultsFrame = None + + if os.path.exists(LOGS_DIR) : + self.chooseDirDialog(dir=LOGS_DIR) def configureStretching(self) : top=self.winfo_toplevel() @@ -36,50 +44,57 @@ class Application(Frame) : def createWidgets(self) : # 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) - + for i in range(3) : + bf.columnconfigure(i, weight=1) - self.chooseLogDir = Button(bf, text="Parcourir…", command=self.openFileDialog) + 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.nav.grid(row=0, column=1) self.quitButton = Button(bf, text='Terminer', command=self.quit) self.quitButton.grid(row=0, column=2, sticky=E) - def openFileDialog(self) : - self.logDir = tkFileDialog.askdirectory() + def chooseDirDialog(self, dir=None) : + if dir is None : + self.logDir = tkFileDialog.askdirectory(title='Sélectionnez un dossier de fichiers de logs') + 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) + self.logFiles = glob(pjoin(self.logDir, '*.log')) + self._cleanupJunkFiles() + self.logFiles.sort() + self.logFiles.reverse() + 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 : + of = open(f) + lfa = LogFileAnalyser(of) + if lfa.getLastEventTicks() is None : + of.close() + os.remove(f) + continue + else : + of.close() + files.append(f) self.logFiles = files @@ -88,12 +103,14 @@ class Application(Frame) : def loadLogFile(self, nav) : index = nav.index - 1 filepath = self.logFiles[index] - filename = basename(filepath) - self.identFrame.setFileName(filename) + self.currentFilePath = filepath + lfa = LogFileAnalyser(self.currentFilePath) + self.identFrame.refresh(lfa) if self.resultsFrame : self.resultsFrame.destroy() - self.resultsFrame = ResultsFrame(self.dataFrame, filepath) - self.resultsFrame.layResults() + self.resultsFrame = ResultsFrame(self.dataFrame) + self.resultsFrame.layResults(lfa) + lfa.close() self.resultsFrame.grid() @@ -157,10 +174,19 @@ class Identification(Frame) : def __init__(self, master=None) : Frame.__init__(self, master) self.fileName = StringVar() + self.patientName = StringVar() self.createWidgets() - def setFileName(self, name) : - self.fileName.set(name) + #def setFileName(self, name) : + # self.fileName.set(name) + + def refresh(self, lfa) : + filename = basename(lfa.logfile.name) + self.fileName.set(filename) + metadata = lfa.getMetadata() + self.patientName.set(metadata.get('PatientName', '')) + self.commentsText.delete(1.0, END) + self.commentsText.insert(1.0, metadata.get('Comments', '')) def createWidgets(self) : fileLbl = Label(self, text='Fichier :') @@ -172,7 +198,7 @@ class Identification(Frame) : nameLbl = Label(self, text='Patient :') nameLbl.grid(row=1, column=0, sticky=E) - self.nameEntry = Entry(self, width=40) + self.nameEntry = Entry(self, width=40, textvariable=self.patientName) self.nameEntry.grid(row=1, column=1, sticky=W) commentsLbl = Label(self, text='Commentaires :') @@ -180,17 +206,27 @@ class Identification(Frame) : self.commentsText = Text(self, width=40, height=4, undo=True, wrap=WORD) self.commentsText.grid(row=2, column=1, sticky=W) + + self.saveBtn = Button(self, text='Enregistrer', command=self.saveMetadata) + self.saveBtn.grid(row=3, column=1, sticky=E) + + def saveMetadata(self): + app = self.master.master + filepath = app.currentFilePath + lfa = LogFileAnalyser(filepath, mode='r+') + patientName = '%s\n' % self.nameEntry.get().replace('\n', ' ').strip() + comments = '%s\n' % self.commentsText.get(1.0, END).replace('\n', ' ').strip() + metadata = (('PatientName', self.nameEntry.get()), + ('Comments', comments)) + lfa.setMetadata(metadata) + class ResultsFrame(Frame) : - def __init__(self, master, logFilePath) : - Frame.__init__(self, master) - self.logFilePath = logFilePath - def layResults(self) : - lfa = LogFileAnalyser(self.logFilePath) + def layResults(self, lfa) : results = lfa.analyse() if results : - for i, kv in enumerate(results.items()) : + for i, kv in enumerate(results) : k, v = kv kl = Label(self, text='%s :' % k) kl.grid(row=i, column=0, sticky=E) @@ -202,7 +238,10 @@ class ResultsFrame(Frame) : msg.grid() +def main() : + app = Application() + app.master.title("Analyseur des sessions MINWii") + app.mainloop() -app = Application() -app.master.title("Analyseur des sessions MINWii") -app.mainloop() +if __name__ == '__main__' : + main() \ No newline at end of file