From: pin Date: Fri, 23 Jul 2010 12:40:10 +0000 (+0000) Subject: Avance recul dans les fichiers. X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/4722346740569925bc0f88d4b5bba44df6b01a5d Avance recul dans les fichiers. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@287 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py index 2f5cc4f..b48140c 100755 --- a/src/minwii/logapp.py +++ b/src/minwii/logapp.py @@ -10,6 +10,7 @@ from Tkinter import * import tkFileDialog from glob import glob from os.path import join as pjoin +from os.path import basename class Application(Frame) : def __init__(self, master=None) : @@ -35,7 +36,7 @@ class Application(Frame) : 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() @@ -59,25 +60,30 @@ class Application(Frame) : 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) 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) @@ -87,7 +93,6 @@ 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) @@ -106,22 +111,20 @@ class Navbar(Frame) : def dec(self) : - self.index = self.index - self.step + self.index = self.index - 1 self.refreshStates() + self.decCallback(self) def inc(self) : - self.index = self.index + self.step + self.index = self.index + 1 self.refreshStates() + self.incCallback(self) - def setFileList(self, fileList) : - self.fileList = fileList + def setSize(self, size) : self.from_ = 1 - self.to = len(self.fileList) + self.to = size self.index = 1 self.refreshStates() - - def getFile(self) : - return self.fileList[self.index - 1] class Identification(Frame) : @@ -130,23 +133,27 @@ class Identification(Frame) : 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) + 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) + nameLbl.grid(row=1, column=0, sticky=E) 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.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.grid(row=2, column=1) + self.commentsText.grid(row=2, column=1, sticky=W) app = Application()