[GRASS-SVN] r42360 -
grass/branches/develbranch_6/gui/wxpython/gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri May 28 08:31:31 EDT 2010
Author: martinl
Date: 2010-05-28 08:31:30 -0400 (Fri, 28 May 2010)
New Revision: 42360
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py
Log:
wxGUI/nviz: save to image (ppm/tif)
@todo: use BufferedPaintDC instead
(merge r42359 from trunk)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py 2010-05-28 12:13:54 UTC (rev 42359)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py 2010-05-28 12:31:30 UTC (rev 42360)
@@ -1175,7 +1175,12 @@
def SaveToFile(self, event):
"""!Save map to image
"""
- filetype, ltype = gdialogs.GetImageHandlers(self.MapWindow.img)
+ if self.toolbars['nviz']:
+ filetype = "PPM file (*.ppm)|*.ppm|TIF file (*.tif)|*.tif"
+ ltype = [{ 'ext' : 'ppm', 'type' : -1 },
+ { 'ext' : 'tif', 'type' : wx.BITMAP_TYPE_TIF }]
+ else:
+ filetype, ltype = gdialogs.GetImageHandlers(self.MapWindow.img)
dlg = wx.FileDialog(parent = self,
message = _("Choose a file name to save the image (no need to add extension)"),
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py 2010-05-28 12:13:54 UTC (rev 42359)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_mapdisp.py 2010-05-28 12:31:30 UTC (rev 42360)
@@ -51,13 +51,17 @@
self.progressbar = progressbar
self.window = window
- self.nvizClass = None
+ self._display = None
self.setDaemon(True)
def run(self):
- self.nvizClass = wxnviz.Nviz(self.log)
+ self._display = wxnviz.Nviz(self.log)
+ def GetDisplay(self):
+ """!Get display instance"""
+ return self._display
+
class GLWindow(MapWindow, glcanvas.GLCanvas):
"""!OpenGL canvas for Map Display Window"""
def __init__(self, parent, id,
@@ -106,7 +110,7 @@
logmsg)
self.nvizThread.start()
time.sleep(.1)
- self.nvizClass = self.nvizThread.nvizClass
+ self._display = self.nvizThread.GetDisplay()
# GRASS_REGION needed only for initialization
del os.environ['GRASS_REGION']
@@ -142,13 +146,13 @@
pass # do nothing, to avoid flashing on MSW
def OnSize(self, event):
- self.size = self.parent.GetClientSize()
+ self.size = self.GetClientSize()
if self.GetContext():
Debug.msg(3, "GLCanvas.OnSize(): w = %d, h = %d" % \
(self.size.width, self.size.height))
self.SetCurrent()
- self.nvizClass.ResizeWindow(self.size.width,
- self.size.height)
+ self._display.ResizeWindow(self.size.width,
+ self.size.height)
event.Skip()
@@ -159,7 +163,7 @@
self.SetCurrent()
if not self.initView:
- self.nvizClass.InitView()
+ self._display.InitView()
self.initView = True
self.LoadDataLayers()
@@ -217,10 +221,10 @@
if hasattr(self.parent, "nvizToolWin"):
self.parent.nvizToolWin.UpdateSettings()
- self.nvizClass.SetView(self.view['pos']['x'], self.view['pos']['y'],
- self.iview['height']['value'],
- self.view['persp']['value'],
- self.view['twist']['value'])
+ self._display.SetView(self.view['pos']['x'], self.view['pos']['y'],
+ self.iview['height']['value'],
+ self.view['persp']['value'],
+ self.view['twist']['value'])
# redraw map
self.OnPaint(None)
@@ -236,13 +240,13 @@
def UpdateView(self, event):
"""!Change view settings"""
- self.nvizClass.SetView(self.view['pos']['x'], self.view['pos']['y'],
- self.iview['height']['value'],
- self.view['persp']['value'],
- self.view['twist']['value'])
+ self._display.SetView(self.view['pos']['x'], self.view['pos']['y'],
+ self.iview['height']['value'],
+ self.view['persp']['value'],
+ self.view['twist']['value'])
if event and event.zExag:
- self.nvizClass.SetZExag(self.view['z-exag']['value'])
+ self._display.SetZExag(self.view['z-exag']['value'])
if event: event.Skip()
@@ -263,7 +267,7 @@
if self.render['quick'] is False:
self.parent.statusbarWin['progress'].SetValue(1)
- self.nvizClass.Draw(False, -1)
+ self._display.Draw(False, -1)
elif self.render['quick'] is True:
# quick
mode = wxnviz.DRAW_QUICK_SURFACE | wxnviz.DRAW_QUICK_VOLUME
@@ -271,7 +275,7 @@
mode |= wxnviz.DRAW_QUICK_VLINES
if self.render['vpoints']:
mode |= wxnviz.DRAW_QUICK_VPOINTS
- self.nvizClass.Draw(True, mode)
+ self._display.Draw(True, mode)
else: # None -> reuse last rendered image
pass # TODO
@@ -295,7 +299,7 @@
def EraseMap(self):
"""!Erase the canvas
"""
- self.nvizClass.EraseMap()
+ self._display.EraseMap()
self.SwapBuffers()
def IsLoaded(self, item):
@@ -506,11 +510,11 @@
return
if layer.type == 'raster':
- id = self.nvizClass.LoadSurface(str(layer.name), None, None)
+ id = self._display.LoadSurface(str(layer.name), None, None)
nvizType = 'surface'
errorMsg = _("Loading raster map")
elif layer.type == '3d-raster':
- id = self.nvizClass.LoadVolume(str(layer.name), None, None)
+ id = self._display.LoadVolume(str(layer.name), None, None)
nvizType = 'volume'
errorMsg = _("Loading 3d raster map")
else:
@@ -573,12 +577,12 @@
if layer.type == 'raster':
nvizType = 'surface'
- unloadFn = self.nvizClass.UnloadSurface
+ unloadFn = self._display.UnloadSurface
errorMsg = _("Unable to unload raster map")
successMsg = _("Raster map")
else:
nvizType = 'volume'
- unloadFn = self.nvizClass.UnloadVolume
+ unloadFn = self._display.UnloadVolume
errorMsg = _("Unable to unload 3d raster map")
successMsg = _("3d raster map")
@@ -633,9 +637,9 @@
id = -1
for type in vecType:
if type == 'lines':
- id = self.nvizClass.LoadVector(str(layer.name), False)
+ id = self._display.LoadVector(str(layer.name), False)
else:
- id = self.nvizClass.LoadVector(str(layer.name), True)
+ id = self._display.LoadVector(str(layer.name), True)
if id < 0:
print >> sys.stderr, "Nviz:" + _("Loading vector map <%(name)s> (%(type)s) failed") % \
@@ -685,9 +689,9 @@
id = data[vtype]['object']['id']
if vtype == 'lines':
- ret = self.nvizClass.UnloadVector(id, False)
+ ret = self._display.UnloadVector(id, False)
else:
- ret = self.nvizClass.UnloadVector(id, True)
+ ret = self._display.UnloadVector(id, True)
if ret == 0:
print >> sys.stderr, "Nviz:" + _("Unable to unload vector map <%(name)s> (%(type)s)") % \
{ 'name': layer.name, 'type' : vtype }
@@ -736,14 +740,14 @@
Debug.msg (3, "GLWindow.OnZoomToMap(): layer = %s, type = %s" % \
(layer.name, layer.type))
- self.nvizClass.SetViewportDefault()
+ self._display.SetViewportDefault()
def ResetView(self):
"""!Reset to default view"""
self.view['z-exag']['value'], \
self.iview['height']['value'], \
self.iview['height']['min'], \
- self.iview['height']['max'] = self.nvizClass.SetViewDefault()
+ self.iview['height']['max'] = self._display.SetViewDefault()
self.view['pos']['x'] = UserSettings.Get(group = 'nviz', key = 'view',
subkey = ('pos', 'x'))
@@ -799,29 +803,29 @@
if attrb == 'mask':
# TODO: invert mask
# TODO: broken in NVIZ
- self.nvizClass.UnsetSurfaceMask(id)
+ self._display.UnsetSurfaceMask(id)
elif attrb == 'transp':
- self.nvizClass.UnsetSurfaceTransp(id)
+ self._display.UnsetSurfaceTransp(id)
elif attrb == 'emit':
- self.nvizClass.UnsetSurfaceEmit(id)
+ self._display.UnsetSurfaceEmit(id)
else:
if type(value) == type('') and \
len(value) <= 0: # ignore empty values (TODO: warning)
continue
if attrb == 'topo':
- self.nvizClass.SetSurfaceTopo(id, map, str(value))
+ self._display.SetSurfaceTopo(id, map, str(value))
elif attrb == 'color':
- self.nvizClass.SetSurfaceColor(id, map, str(value))
+ self._display.SetSurfaceColor(id, map, str(value))
elif attrb == 'mask':
# TODO: invert mask
# TODO: broken in NVIZ
- self.nvizClass.SetSurfaceMask(id, False, str(value))
+ self._display.SetSurfaceMask(id, False, str(value))
elif attrb == 'transp':
- self.nvizClass.SetSurfaceTransp(id, map, str(value))
+ self._display.SetSurfaceTransp(id, map, str(value))
elif attrb == 'shine':
- self.nvizClass.SetSurfaceShine(id, map, str(value))
+ self._display.SetSurfaceShine(id, map, str(value))
elif attrb == 'emit':
- self.nvizClass.SetSurfaceEmit(id, map, str(value))
+ self._display.SetSurfaceEmit(id, map, str(value))
data['attribute'][attrb].pop('update')
# draw res
@@ -830,9 +834,9 @@
fine = data['draw']['resolution']['fine']
if data['draw']['all']:
- self.nvizClass.SetSurfaceRes(-1, fine, coarse)
+ self._display.SetSurfaceRes(-1, fine, coarse)
else:
- self.nvizClass.SetSurfaceRes(id, fine, coarse)
+ self._display.SetSurfaceRes(id, fine, coarse)
data['draw']['resolution'].pop('update')
# draw style
@@ -845,18 +849,18 @@
string = True)
style = data['draw']['mode']['value']
if data['draw']['all']:
- self.nvizClass.SetSurfaceStyle(-1, style)
+ self._display.SetSurfaceStyle(-1, style)
else:
- self.nvizClass.SetSurfaceStyle(id, style)
+ self._display.SetSurfaceStyle(id, style)
data['draw']['mode'].pop('update')
# wire color
if data['draw']['wire-color'].has_key('update'):
color = data['draw']['wire-color']['value']
if data['draw']['all']:
- self.nvizClass.SetWireColor(-1, str(color))
+ self._display.SetWireColor(-1, str(color))
else:
- self.nvizClass.SetWireColor(id, str(color))
+ self._display.SetWireColor(id, str(color))
data['draw']['wire-color'].pop('update')
# position
@@ -864,13 +868,13 @@
x = data['position']['x']
y = data['position']['y']
z = data['position']['z']
- self.nvizClass.SetSurfacePosition(id, x, y, z)
+ self._display.SetSurfacePosition(id, x, y, z)
data['position'].pop('update')
def UpdateVolumeProperties(self, id, data, isosurfId = None):
"""!Update volume (isosurface/slice) map object properties"""
if data['draw']['resolution'].has_key('update'):
- self.nvizClass.SetIsosurfaceRes(id, data['draw']['resolution']['value'])
+ self._display.SetIsosurfaceRes(id, data['draw']['resolution']['value'])
data['draw']['resolution'].pop('update')
if data['draw']['shading'].has_key('update'):
@@ -898,27 +902,27 @@
if attrb == 'mask':
# TODO: invert mask
# TODO: broken in NVIZ
- self.nvizClass.UnsetIsosurfaceMask(id, isosurfId)
+ self._display.UnsetIsosurfaceMask(id, isosurfId)
elif attrb == 'transp':
- self.nvizClass.UnsetIsosurfaceTransp(id, isosurfId)
+ self._display.UnsetIsosurfaceTransp(id, isosurfId)
elif attrb == 'emit':
- self.nvizClass.UnsetIsosurfaceEmit(id, isosurfId)
+ self._display.UnsetIsosurfaceEmit(id, isosurfId)
else:
if type(value) == type('') and \
len(value) <= 0: # ignore empty values (TODO: warning)
continue
elif attrb == 'color':
- self.nvizClass.SetIsosurfaceColor(id, isosurfId, map, str(value))
+ self._display.SetIsosurfaceColor(id, isosurfId, map, str(value))
elif attrb == 'mask':
# TODO: invert mask
# TODO: broken in NVIZ
- self.nvizClass.SetIsosurfaceMask(id, isosurfId, False, str(value))
+ self._display.SetIsosurfaceMask(id, isosurfId, False, str(value))
elif attrb == 'transp':
- self.nvizClass.SetIsosurfaceTransp(id, isosurfId, map, str(value))
+ self._display.SetIsosurfaceTransp(id, isosurfId, map, str(value))
elif attrb == 'shine':
- self.nvizClass.SetIsosurfaceShine(id, isosurfId, map, str(value))
+ self._display.SetIsosurfaceShine(id, isosurfId, map, str(value))
elif attrb == 'emit':
- self.nvizClass.SetIsosurfaceEmit(id, isosurfId, map, str(value))
+ self._display.SetIsosurfaceEmit(id, isosurfId, map, str(value))
isosurf[attrb].pop('update')
isosurfId += 1
@@ -949,8 +953,8 @@
else:
flat = False
- self.nvizClass.SetVectorLineMode(id, color,
- width, flat)
+ self._display.SetVectorLineMode(id, color,
+ width, flat)
if data['color'].has_key('update'):
data['color'].pop('update')
@@ -961,15 +965,15 @@
# height
if data['height'].has_key('update'):
- self.nvizClass.SetVectorLineHeight(id,
- data['height']['value'])
+ self._display.SetVectorLineHeight(id,
+ data['height']['value'])
data['height'].pop('update')
# surface
if data['mode'].has_key('update'):
sid = self.GetLayerId(type = 'raster', name = data['mode']['surface'])
if sid > -1:
- self.nvizClass.SetVectorLineSurface(id, sid)
+ self._display.SetVectorLineSurface(id, sid)
data['mode'].pop('update')
@@ -979,9 +983,9 @@
data['width'].has_key('update') or \
data['marker'].has_key('update') or \
data['color'].has_key('update'):
- ret = self.nvizClass.SetVectorPointMode(id, data['color']['value'],
- data['width']['value'], float(data['size']['value']),
- data['marker']['value'] + 1)
+ ret = self._display.SetVectorPointMode(id, data['color']['value'],
+ data['width']['value'], float(data['size']['value']),
+ data['marker']['value'] + 1)
error = None
if ret == -1:
@@ -999,15 +1003,15 @@
# height
if data['height'].has_key('update'):
- self.nvizClass.SetVectorPointHeight(id,
- data['height']['value'])
+ self._display.SetVectorPointHeight(id,
+ data['height']['value'])
data['height'].pop('update')
# surface
if data['mode'].has_key('update'):
sid = self.GetLayerId(type = 'raster', name = data['mode']['surface'])
if sid > -1:
- self.nvizClass.SetVectorPointSurface(id, sid)
+ self._display.SetVectorPointSurface(id, sid)
data['mode'].pop('update')
@@ -1060,4 +1064,21 @@
return -1
+ def SaveToFile(self, FileName, FileType):
+ """!This draws the DC to a buffer that can be saved to a file.
+
+ @todo fix BufferedPaintDC
+ """
+ self._display.SaveToFile(FileName)
+ # pbuffer = wx.EmptyBitmap(max(1, self.Map.width), max(1, self.Map.height))
+ # dc = wx.BufferedPaintDC(self, pbuffer)
+ # dc.Clear()
+ # self.SetCurrent()
+ # self._display.Draw(False, -1)
+ # pbuffer.SaveFile(FileName, FileType)
+ # self.SwapBuffers()
+
+ def GetDisplay(self):
+ """!Get display instance"""
+ return self._display
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py 2010-05-28 12:13:54 UTC (rev 42359)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz_tools.py 2010-05-28 12:31:30 UTC (rev 42360)
@@ -47,6 +47,7 @@
self.parent = parent # MapFrame
self.lmgr = self.parent.GetLayerManager() # GMFrame
self.mapWindow = mapWindow
+ self._display = mapWindow.GetDisplay()
wx.Frame.__init__(self, parent, id, title, pos, size, style)
@@ -1719,7 +1720,7 @@
if type(color) != wx._gdi.Colour: return
color = str(color[0]) + ':' + str(color[1]) + ':' + str(color[2])
- self.mapWindow.nvizClass.SetBgColor(str(color))
+ self._display.SetBgColor(str(color))
if self.parent.statusbarWin['render'].IsChecked():
self.mapWindow.Refresh(False)
@@ -1983,7 +1984,7 @@
slider = self.FindWindowById(self.win['surface']['position']['slider'])
spin = self.FindWindowById(self.win['surface']['position']['spin'])
- x, y, z = self.mapWindow.nvizClass.GetSurfacePosition(id)
+ x, y, z = self._display.GetSurfacePosition(id)
if axis == 0: # x
slider.SetValue(x)
@@ -2012,7 +2013,7 @@
mapLayer = self.mapWindow.GetSelectedLayer()
data = self.mapWindow.GetSelectedLayer(type = 'nviz')
id = data['surface']['object']['id']
- x, y, z = self.mapWindow.nvizClass.GetSurfacePosition(id)
+ x, y, z = self._display.GetSurfacePosition(id)
if axis == 0: # x
x = value
@@ -2300,7 +2301,7 @@
else:
mode |= wxnviz.DM_GOURAUD
- self.mapWindow.nvizClass.SetIsosurfaceMode(id, mode)
+ self._display.SetIsosurfaceMode(id, mode)
if self.parent.statusbarWin['render'].IsChecked():
self.mapWindow.Refresh(False)
@@ -2319,7 +2320,7 @@
return
id = data['object']['id']
- self.mapWindow.nvizClass.SetIsosurfaceRes(id, res)
+ self._display.SetIsosurfaceRes(id, res)
if self.parent.statusbarWin['render'].IsChecked():
self.mapWindow.Refresh(False)
@@ -2338,10 +2339,10 @@
isosurfId = event.GetSelection()
if list.IsChecked(index):
- self.mapWindow.nvizClass.SetIsosurfaceTransp(id, isosurfId, False, "0")
+ self._display.SetIsosurfaceTransp(id, isosurfId, False, "0")
else:
# disable -> make transparent
- self.mapWindow.nvizClass.SetIsosurfaceTransp(id, isosurfId, False, "255")
+ self._display.SetIsosurfaceTransp(id, isosurfId, False, "255")
if self.parent.statusbarWin['render'].IsChecked():
self.mapWindow.Refresh(False)
@@ -2424,9 +2425,9 @@
data['isosurface'].insert(item, isosurfData)
# add isosurface
- self.mapWindow.nvizClass.AddIsosurface(id, level)
+ self._display.AddIsosurface(id, level)
# use by default 3d raster map for color
- self.mapWindow.nvizClass.SetIsosurfaceColor(id, item, True, str(layer.name))
+ self._display.SetIsosurfaceColor(id, item, True, str(layer.name))
# update buttons
self.UpdateIsosurfButtons(list)
@@ -2454,7 +2455,7 @@
# delete isosurface
del data['isosurface'][isosurfId]
- self.mapWindow.nvizClass.DeleteIsosurface(id, isosurfId)
+ self._display.DeleteIsosurface(id, isosurfId)
# update buttons
self.UpdateIsosurfButtons(list)
@@ -2484,7 +2485,7 @@
list.Delete(sel+1)
data['isosurface'].insert(sel-1, data['isosurface'][sel])
del data['isosurface'][sel+1]
- self.mapWindow.nvizClass.MoveIsosurface(id, sel, True)
+ self._display.MoveIsosurface(id, sel, True)
# update buttons
self.UpdateIsosurfButtons(list)
@@ -2514,7 +2515,7 @@
list.Delete(sel)
data['isosurface'].insert(sel+2, data['isosurface'][sel])
del data['isosurface'][sel]
- self.mapWindow.nvizClass.MoveIsosurface(id, sel, False)
+ self._display.MoveIsosurface(id, sel, False)
# update buttons
self.UpdateIsosurfButtons(list)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py 2010-05-28 12:13:54 UTC (rev 42359)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py 2010-05-28 12:31:30 UTC (rev 42360)
@@ -302,7 +302,6 @@
self.zoommenu,
self.analyze,
self.dec,
- self.savefile,
self.printmap):
self.EnableTool(tool, enabled)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py 2010-05-28 12:13:54 UTC (rev 42359)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py 2010-05-28 12:31:30 UTC (rev 42360)
@@ -1092,4 +1092,15 @@
ret = GVL_isosurf_set_drawres(id, res, res, res)
return -2 if ret < 0 else 1
-
+
+ def SaveToFile(self, filename, itype = 'ppm'):
+ """!Save current GL screen to ppm/tif file
+
+ @param filename file name
+ @param itype image type ('ppm' or 'tif')
+ """
+ self.Draw(False, -1)
+ if itype == 'ppm':
+ GS_write_ppm(filename)
+ else:
+ GS_write_tif(filename)
More information about the grass-commit
mailing list