Whitespace normalization, via reindent.py.
diff --git a/Mac/Demo/imgbrowse/imgbrowse.py b/Mac/Demo/imgbrowse/imgbrowse.py
index 262c650..28dffd3 100644
--- a/Mac/Demo/imgbrowse/imgbrowse.py
+++ b/Mac/Demo/imgbrowse/imgbrowse.py
@@ -25,93 +25,93 @@
def main():
- print 'hello world'
- imgbrowse()
+ print 'hello world'
+ imgbrowse()
class imgbrowse(FrameWork.Application):
- def __init__(self):
- # First init menus, etc.
- FrameWork.Application.__init__(self)
- self.lastwin = None
- # Finally, go into the event loop
- self.mainloop()
-
- def makeusermenus(self):
- self.filemenu = m = FrameWork.Menu(self.menubar, "File")
- self.openitem = FrameWork.MenuItem(m, "Open...", "O", self.opendoc)
- self.infoitem = FrameWork.MenuItem(m, "Info", "I", self.info)
- self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
-
- def quit(self, *args):
- self._quit()
-
- def opendoc(self, *args):
- pathname = EasyDialogs.AskFileForOpen() # Any file type
- if not pathname:
- return
- bar = EasyDialogs.ProgressBar('Reading and converting...')
- try:
- rdr = img.reader(imgformat.macrgb16, pathname)
- except img.error, arg:
- EasyDialogs.Message(repr(arg))
- return
- w, h = rdr.width, rdr.height
- bar.set(10)
- data = rdr.read()
- del bar
- pixmap = mac_image.mkpixmap(w, h, imgformat.macrgb16, data)
- self.showimg(w, h, pixmap, data)
-
- def showimg(self, w, h, pixmap, data):
- win = imgwindow(self)
- win.open(w, h, pixmap, data)
- self.lastwin = win
+ def __init__(self):
+ # First init menus, etc.
+ FrameWork.Application.__init__(self)
+ self.lastwin = None
+ # Finally, go into the event loop
+ self.mainloop()
- def info(self, *args):
- if self.lastwin:
- self.lastwin.info()
-
+ def makeusermenus(self):
+ self.filemenu = m = FrameWork.Menu(self.menubar, "File")
+ self.openitem = FrameWork.MenuItem(m, "Open...", "O", self.opendoc)
+ self.infoitem = FrameWork.MenuItem(m, "Info", "I", self.info)
+ self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
+
+ def quit(self, *args):
+ self._quit()
+
+ def opendoc(self, *args):
+ pathname = EasyDialogs.AskFileForOpen() # Any file type
+ if not pathname:
+ return
+ bar = EasyDialogs.ProgressBar('Reading and converting...')
+ try:
+ rdr = img.reader(imgformat.macrgb16, pathname)
+ except img.error, arg:
+ EasyDialogs.Message(repr(arg))
+ return
+ w, h = rdr.width, rdr.height
+ bar.set(10)
+ data = rdr.read()
+ del bar
+ pixmap = mac_image.mkpixmap(w, h, imgformat.macrgb16, data)
+ self.showimg(w, h, pixmap, data)
+
+ def showimg(self, w, h, pixmap, data):
+ win = imgwindow(self)
+ win.open(w, h, pixmap, data)
+ self.lastwin = win
+
+ def info(self, *args):
+ if self.lastwin:
+ self.lastwin.info()
+
class imgwindow(FrameWork.Window):
- def open(self, width, height, pixmap, data):
- self.pixmap = pixmap
- self.data = data
- self.pictrect = (0, 0, width, height)
- bounds = (LEFT, TOP, LEFT+width, TOP+height)
-
- self.wid = Win.NewCWindow(bounds, "Picture", 1, 0, -1, 1, 0)
- self.do_postopen()
-
- def do_update(self, *args):
- pass
- currect = self.fitrect()
- print 'PICT:', self.pictrect
- print 'WIND:', currect
- print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
- currect, QuickDraw.srcCopy, None)
- self.info()
- Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
- currect, QuickDraw.srcCopy, None)
-
- def fitrect(self):
- """Return self.pictrect scaled to fit in window"""
- graf = self.wid.GetWindowPort()
- screenrect = graf.GetPortBounds()
- picwidth = self.pictrect[2] - self.pictrect[0]
- picheight = self.pictrect[3] - self.pictrect[1]
- if picwidth > screenrect[2] - screenrect[0]:
- factor = float(picwidth) / float(screenrect[2]-screenrect[0])
- picwidth = picwidth / factor
- picheight = picheight / factor
- if picheight > screenrect[3] - screenrect[1]:
- factor = float(picheight) / float(screenrect[3]-screenrect[1])
- picwidth = picwidth / factor
- picheight = picheight / factor
- return (screenrect[0], screenrect[1], screenrect[0]+int(picwidth),
- screenrect[1]+int(picheight))
-
- def info(self):
- graf = self.wid.GetWindowPort()
- bits = graf.GetPortBitMapForCopyBits()
- mac_image.dumppixmap(bits.pixmap_data)
+ def open(self, width, height, pixmap, data):
+ self.pixmap = pixmap
+ self.data = data
+ self.pictrect = (0, 0, width, height)
+ bounds = (LEFT, TOP, LEFT+width, TOP+height)
+
+ self.wid = Win.NewCWindow(bounds, "Picture", 1, 0, -1, 1, 0)
+ self.do_postopen()
+
+ def do_update(self, *args):
+ pass
+ currect = self.fitrect()
+ print 'PICT:', self.pictrect
+ print 'WIND:', currect
+ print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
+ currect, QuickDraw.srcCopy, None)
+ self.info()
+ Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
+ currect, QuickDraw.srcCopy, None)
+
+ def fitrect(self):
+ """Return self.pictrect scaled to fit in window"""
+ graf = self.wid.GetWindowPort()
+ screenrect = graf.GetPortBounds()
+ picwidth = self.pictrect[2] - self.pictrect[0]
+ picheight = self.pictrect[3] - self.pictrect[1]
+ if picwidth > screenrect[2] - screenrect[0]:
+ factor = float(picwidth) / float(screenrect[2]-screenrect[0])
+ picwidth = picwidth / factor
+ picheight = picheight / factor
+ if picheight > screenrect[3] - screenrect[1]:
+ factor = float(picheight) / float(screenrect[3]-screenrect[1])
+ picwidth = picwidth / factor
+ picheight = picheight / factor
+ return (screenrect[0], screenrect[1], screenrect[0]+int(picwidth),
+ screenrect[1]+int(picheight))
+
+ def info(self):
+ graf = self.wid.GetWindowPort()
+ bits = graf.GetPortBitMapForCopyBits()
+ mac_image.dumppixmap(bits.pixmap_data)
main()
diff --git a/Mac/Demo/imgbrowse/mac_image.py b/Mac/Demo/imgbrowse/mac_image.py
index 094c58e..9c9eeb7 100644
--- a/Mac/Demo/imgbrowse/mac_image.py
+++ b/Mac/Demo/imgbrowse/mac_image.py
@@ -6,51 +6,51 @@
import MacOS
_fmt_to_mac = {
- imgformat.macrgb16 : (16, 16, 3, 5),
+ imgformat.macrgb16 : (16, 16, 3, 5),
}
def mkpixmap(w, h, fmt, data):
- """kludge a pixmap together"""
- fmtinfo = _fmt_to_mac[fmt]
-
- rv = struct.pack("lHhhhhhhlllhhhhlll",
- id(data)+MacOS.string_id_to_buffer, # HACK HACK!!
- w*2 + 0x8000,
- 0, 0, h, w,
- 0,
- 0, 0, # XXXX?
- 72<<16, 72<<16,
- fmtinfo[0], fmtinfo[1],
- fmtinfo[2], fmtinfo[3],
- 0, 0, 0)
-## print 'Our pixmap, size %d:'%len(rv)
-## dumppixmap(rv)
- return Qd.RawBitMap(rv)
+ """kludge a pixmap together"""
+ fmtinfo = _fmt_to_mac[fmt]
+
+ rv = struct.pack("lHhhhhhhlllhhhhlll",
+ id(data)+MacOS.string_id_to_buffer, # HACK HACK!!
+ w*2 + 0x8000,
+ 0, 0, h, w,
+ 0,
+ 0, 0, # XXXX?
+ 72<<16, 72<<16,
+ fmtinfo[0], fmtinfo[1],
+ fmtinfo[2], fmtinfo[3],
+ 0, 0, 0)
+## print 'Our pixmap, size %d:'%len(rv)
+## dumppixmap(rv)
+ return Qd.RawBitMap(rv)
def dumppixmap(data):
- baseAddr, \
- rowBytes, \
- t, l, b, r, \
- pmVersion, \
- packType, packSize, \
- hRes, vRes, \
- pixelType, pixelSize, \
- cmpCount, cmpSize, \
- planeBytes, pmTable, pmReserved \
- = struct.unpack("lhhhhhhhlllhhhhlll", data)
- print 'Base: 0x%x'%baseAddr
- print 'rowBytes: %d (0x%x)'%(rowBytes&0x3fff, rowBytes)
- print 'rect: %d, %d, %d, %d'%(t, l, b, r)
- print 'pmVersion: 0x%x'%pmVersion
- print 'packing: %d %d'%(packType, packSize)
- print 'resolution: %f x %f'%(float(hRes)/0x10000, float(vRes)/0x10000)
- print 'pixeltype: %d, size %d'%(pixelType, pixelSize)
- print 'components: %d, size %d'%(cmpCount, cmpSize)
- print 'planeBytes: %d (0x%x)'%(planeBytes, planeBytes)
- print 'pmTable: 0x%x'%pmTable
- print 'pmReserved: 0x%x'%pmReserved
- for i in range(0, len(data), 16):
- for j in range(16):
- if i + j < len(data):
- print '%02.2x'%ord(data[i+j]),
- print
+ baseAddr, \
+ rowBytes, \
+ t, l, b, r, \
+ pmVersion, \
+ packType, packSize, \
+ hRes, vRes, \
+ pixelType, pixelSize, \
+ cmpCount, cmpSize, \
+ planeBytes, pmTable, pmReserved \
+ = struct.unpack("lhhhhhhhlllhhhhlll", data)
+ print 'Base: 0x%x'%baseAddr
+ print 'rowBytes: %d (0x%x)'%(rowBytes&0x3fff, rowBytes)
+ print 'rect: %d, %d, %d, %d'%(t, l, b, r)
+ print 'pmVersion: 0x%x'%pmVersion
+ print 'packing: %d %d'%(packType, packSize)
+ print 'resolution: %f x %f'%(float(hRes)/0x10000, float(vRes)/0x10000)
+ print 'pixeltype: %d, size %d'%(pixelType, pixelSize)
+ print 'components: %d, size %d'%(cmpCount, cmpSize)
+ print 'planeBytes: %d (0x%x)'%(planeBytes, planeBytes)
+ print 'pmTable: 0x%x'%pmTable
+ print 'pmReserved: 0x%x'%pmReserved
+ for i in range(0, len(data), 16):
+ for j in range(16):
+ if i + j < len(data):
+ print '%02.2x'%ord(data[i+j]),
+ print