diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/changelog mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/changelog --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/changelog 2013-05-31 17:09:58.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/changelog 2014-04-28 16:36:56.000000000 +0000 @@ -1,3 +1,17 @@ +mgltools-viewerframework (1.5.7~rc1+cvs.20140424-1) unstable; urgency=medium + + * New upstream version. + * Fixed runtime error for specifying font Helvetica for button + * Recommending ttf-mscorefonts-installer + + -- Steffen Moeller Thu, 24 Apr 2014 17:40:49 +0200 + +mgltools-viewerframework (1.5.7~rc1~cvs.20130917-1) unstable; urgency=low + + * New upstream version. + + -- Steffen Moeller Tue, 17 Sep 2013 14:47:48 +0200 + mgltools-viewerframework (1.5.7~rc1~cvs.20130519-1) unstable; urgency=low * New upstream version. diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/control mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/control --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/control 2013-05-20 15:23:02.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/control 2014-04-28 16:36:56.000000000 +0000 @@ -8,7 +8,7 @@ Thorsten Alteholz , Andreas Tille Build-Depends: debhelper (>= 8), python-all (>= 2.6) -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 XS-Python-Version: >= 2.5 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/viewerframework/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mgltools/viewerframework/trunk/ @@ -18,6 +18,7 @@ XB-Python-Version: ${python:Versions} Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-bhtree, idle +Recommends: ttf-mscorefonts-installer Description: ViewerFramework supports building visualization applications This framework provides support for loading dynamically commands from libraries as they are needed. It has been designed to be specialized diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/get-orig-source/get-orig-source mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/get-orig-source/get-orig-source --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/get-orig-source/get-orig-source 2013-05-18 11:52:25.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/get-orig-source/get-orig-source 2013-09-17 11:29:59.000000000 +0000 @@ -95,7 +95,7 @@ mv "$package" "$origDirname" echo -n "I: Number of files in package: " -GZIP=-9 tar --exclude CVS -czvf "$TARDIR/$origFilename" "$origDirname" | wc -l +GZIP=-9n tar --exclude CVS -czvf "$TARDIR/$origFilename" "$origDirname" | wc -l mv "$origDirname" "$package" echo "I: done" diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/patches/fix_font_attribute.patch mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/patches/fix_font_attribute.patch --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/patches/fix_font_attribute.patch 1970-01-01 00:00:00.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/patches/fix_font_attribute.patch 2014-04-28 16:36:56.000000000 +0000 @@ -0,0 +1,13 @@ +Index: ViewerFramework-1.5.7~rc1+cvs.20140424/ViewerFramework/basicCommand.py +=================================================================== +--- ViewerFramework-1.5.7~rc1+cvs.20140424.orig/ViewerFramework/basicCommand.py ++++ ViewerFramework-1.5.7~rc1+cvs.20140424/ViewerFramework/basicCommand.py +@@ -2336,7 +2336,7 @@ + self.vf.GUI.toolsButtonBarMaster, width=10, + var=self.vf.GUI.toolsButtonBarTabVar, + value='Scenario', indicatoron=False, +- text='Scenario', font=('Helvetica', '', 10), padx=3, pady=0) ++ text='Scenario', font=('Helvetica',10), padx=3, pady=0) + button.pack(side='left', anchor='w') + #button = self.vf.GUI.toolsNoteBook.tab(1) + button.configure(command=self.adjustWidth) diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/patches/series mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/patches/series --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/debian/patches/series 2013-05-20 15:23:02.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/debian/patches/series 2014-04-28 16:36:56.000000000 +0000 @@ -1 +1,2 @@ #20.05.2013, ta, applied upstream: do_not_assign_debug.patch +fix_font_attribute.patch diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/basicCommand.py mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/basicCommand.py --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/basicCommand.py 2012-04-25 18:40:18.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/basicCommand.py 2013-09-06 23:50:17.000000000 +0000 @@ -19,9 +19,9 @@ - ResetUndoCommand. """ -# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/basicCommand.py,v 1.152 2012/04/25 18:40:18 sanner Exp $ +# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/basicCommand.py,v 1.154 2013/09/06 23:50:17 sanner Exp $ # -# $Id: basicCommand.py,v 1.152 2012/04/25 18:40:18 sanner Exp $ +# $Id: basicCommand.py,v 1.154 2013/09/06 23:50:17 sanner Exp $ # import os, sys, subprocess @@ -840,8 +840,8 @@ #when show documentation on after selcting a package #dg is expanded to show documenttation #if var==1 and docw.size()>0: - if docw.size()>0: - dg.expand() + ##if docw.size()>0: + ## dg.expand() def displayCmds_cb(self, event=None): @@ -1922,7 +1922,8 @@ newfile = self.vf.askFileSave(types = [ ('Pmv sesion files', '*.psf'), ('all files', '*.py')], - title = 'Save Session in File:') + defaultextension=".psf", + title = 'Save Session in File:') if not newfile is None: self.doitWrapper(newfile, redraw=0) diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/VFCommand.py mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/VFCommand.py --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/VFCommand.py 2012-05-30 18:32:36.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/VFCommand.py 2013-10-03 22:32:20.000000000 +0000 @@ -21,9 +21,9 @@ """ -# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/VFCommand.py,v 1.115 2012/05/30 18:32:36 sanner Exp $ +# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/VFCommand.py,v 1.117 2013/10/03 22:32:20 annao Exp $ # -# $Id: VFCommand.py,v 1.115 2012/05/30 18:32:36 sanner Exp $ +# $Id: VFCommand.py,v 1.117 2013/10/03 22:32:20 annao Exp $ # import numpy.oldnumeric as Numeric @@ -688,6 +688,7 @@ self.undoStack = [] # SD Oct 2010 # self.undoStack stores objects needed to perform undo. # This replaces the need to store nodes and string representation for the undo log. + self.objectState = {} def setLastUsedValues(self, formName='default', **kw): @@ -929,6 +930,8 @@ def doitWrapper(self, *args, **kw): """wrapper of doit() to call beforeDoit and afterDoit()""" + if self.vf.frozen(): return + # negateCmds will hold commands to negate this command negateCmds = None diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/VFGUI.py mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/VFGUI.py --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/VFGUI.py 2012-11-05 23:54:53.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/VFGUI.py 2013-06-10 20:55:16.000000000 +0000 @@ -12,9 +12,9 @@ ViewerFramework base class """ -# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/VFGUI.py,v 1.195 2012/11/05 23:54:53 sanner Exp $ +# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/VFGUI.py,v 1.196 2013/06/10 20:55:16 annao Exp $ # -# $Id: VFGUI.py,v 1.195 2012/11/05 23:54:53 sanner Exp $ +# $Id: VFGUI.py,v 1.196 2013/06/10 20:55:16 annao Exp $ # @@ -1851,8 +1851,9 @@ return file def askFileSave(self, master, idir=None, ifile=None, types = None, - title='Save'): - file = fileSaveAsk(master, idir, ifile, types, title) + title='Save', defaultextension=None): + file = fileSaveAsk(master, idir, ifile, types, title, + defaultextension=defaultextension) return file def addtoolbarDictGUI(self,cmdGUI, cmdcb=None): @@ -2025,13 +2026,14 @@ def fileSaveAsk(master, idir=None, ifile=None, types = None, - title='Save'): + title='Save', defaultextension=None): if types is None: types = [ ('All files', '*') ] file = tkFileDialog.asksaveasfilename( parent = master, filetypes=types, initialdir=idir, initialfile=ifile, - title=title) + title=title, + defaultextension=defaultextension) if file=='': file = None return file diff -Nru mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/VF.py mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/VF.py --- mgltools-viewerframework-1.5.7~rc1~cvs.20130519/ViewerFramework/VF.py 2012-05-30 18:32:03.000000000 +0000 +++ mgltools-viewerframework-1.5.7~rc1+cvs.20140424/ViewerFramework/VF.py 2013-10-03 22:31:33.000000000 +0000 @@ -8,9 +8,9 @@ # ######################################################################### # -# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/VF.py,v 1.215 2012/05/30 18:32:03 sanner Exp $ +# $Header: /opt/cvs/python/packages/share1.5/ViewerFramework/VF.py,v 1.218 2013/10/03 22:31:33 annao Exp $ # -# $Id: VF.py,v 1.215 2012/05/30 18:32:03 sanner Exp $ +# $Id: VF.py,v 1.218 2013/10/03 22:31:33 annao Exp $ # """defines base classe ViewerFramework @@ -255,7 +255,16 @@ DejaVu Camera object along with support for adding GUI and commands dynamically. """ - + + def freeze(self): + self.__frozen = True + + def unfreeze(self): + self.__frozen = False + + def frozen(self): + return self.__frozen == True + def __init__(self, title='ViewerFrameWork', logMode='no', libraries=[], gui=1, resourceFile = '_vfrc', viewerClass=Viewer, master=None, guiVisible=1, withShell=1, @@ -280,6 +289,7 @@ for testing, such that exception are seen by the testing framework """ + self.__frozen = False self.hasGui = gui self.embeded=False self.cmdHistory = [] # history of command [(cmd, args, kw)] @@ -1166,8 +1176,12 @@ labeltext='call initGeom methods') #call initGeom method of all commands creating geometry + from time import time + #t0 = time() for com in self.cmdsWithOnAddObj: com.onAddObjectToViewer(obj) + #t1 = time() + #print 'INITI', com, t1-t0 #check for gui if self.hasGui: self.GUI.updateProgressBar() @@ -1180,10 +1194,13 @@ lenCommands = len(self.onAddObjectCmds) #call functions that need to be called on object + #t0 = time() for com in self.onAddObjectCmds: com[2]['redraw']=0 com[2]['log']=0 - apply( com[0], (obj,)+com[1], com[2]) + #t1 = time() + #print 'INITI2', com, t1-t0 + com[0]( *((obj,)+com[1]), **com[2] ) # note we have to re-configure the progress bar because doitWrapper # will overwrite the mode to 'percent' #check for gui @@ -1343,11 +1360,11 @@ for c in self.commands.values(): c.onAddNewCmd(command) - if hasattr(command, 'onAddObjectToViewer'): - if callable(command.onAddObjectToViewer): - self.cmdsWithOnAddObj.append(command) - for o in self.objects: - command.onAddObjectToViewer(o) + #if hasattr(command, 'onAddObjectToViewer'): + # if callable(command.onAddObjectToViewer): + # self.cmdsWithOnAddObj.append(command) + # for o in self.objects: + # command.onAddObjectToViewer(o) if hasattr(command, 'onRemoveObjectFromViewer'): if callable(command.onRemoveObjectFromViewer): @@ -1424,10 +1441,11 @@ def askFileSave(self, idir=None, ifile=None, types=None, title='Save', - relative=True): + relative=True, defaultextension=None): if self.hasGui: file = self.GUI.askFileSave(self.GUI.ROOT, idir=idir, ifile=ifile, - types=types, title=title) + types=types, title=title, + defaultextension=defaultextension) if file is () or file is None: # this is returned if one clcik on the file list and # then clicks Cancel return