From 930822b3cff4b394dffb6068590733e7cc98c441 Mon Sep 17 00:00:00 2001 From: tfmoraes Date: Wed, 27 Jan 2010 11:45:45 +0000 Subject: [PATCH] FIX: the filename pattern in export images --- invesalius/data/viewer_slice.py | 44 +++++++++++++++++++++----------------------- invesalius/data/viewer_volume.py | 41 ++++++++++++++++++++--------------------- invesalius/gui/dialogs.py | 10 ++++------ invesalius/gui/task_exporter.py | 1 - 4 files changed, 45 insertions(+), 51 deletions(-) diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index 0894cec..ab9284b 100755 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -865,36 +865,34 @@ class Viewer(wx.Panel): writer.SetFilePrefix(filename.split(".")[0]) writer.SetRenderWindow(renwin) writer.Write() - return else: #Use tiling to generate a large rendering. image = vtk.vtkRenderLargeImage() image.SetInput(self.ren) image.SetMagnification(2) - image = image.GetOutput() - - - # write image file - if (filetype == const.FILETYPE_BMP): - writer = vtk.vtkBMPWriter() - elif (filetype == const.FILETYPE_JPG): - writer = vtk.vtkJPEGWriter() - elif (filetype == const.FILETYPE_PNG): - writer = vtk.vtkPNGWriter() - elif (filetype == const.FILETYPE_PS): - writer = vtk.vtkPostScriptWriter() - elif (filetype == const.FILETYPE_TIF): - writer = vtk.vtkTIFFWriter() - filename = "%s.tif"%filename.strip(".tif") - - writer.SetInput(image) - writer.SetFileName(filename) - writer.Write() - - for actor in view_prop_list: - self.ren.AddViewProp(actor) + image = image.GetOutput() + + + # write image file + if (filetype == const.FILETYPE_BMP): + writer = vtk.vtkBMPWriter() + elif (filetype == const.FILETYPE_JPG): + writer = vtk.vtkJPEGWriter() + elif (filetype == const.FILETYPE_PNG): + writer = vtk.vtkPNGWriter() + elif (filetype == const.FILETYPE_PS): + writer = vtk.vtkPostScriptWriter() + elif (filetype == const.FILETYPE_TIF): + writer = vtk.vtkTIFFWriter() + filename = "%s.tif"%filename.strip(".tif") + + writer.SetInput(image) + writer.SetFileName(filename) + writer.Write() + for actor in view_prop_list: + self.ren.AddViewProp(actor) ps.Publisher().sendMessage('End busy cursor') diff --git a/invesalius/data/viewer_volume.py b/invesalius/data/viewer_volume.py index a28f24e..29910df 100755 --- a/invesalius/data/viewer_volume.py +++ b/invesalius/data/viewer_volume.py @@ -159,35 +159,34 @@ class Viewer(wx.Panel): image = vtk.vtkWindowToImageFilter() image.SetInput(renwin) writer = vtk.vtkPOVExporter() - writer.SetFilePrefix(filename.split(".")[0]) + writer.SetFileName(filename) writer.SetRenderWindow(renwin) writer.Write() - return else: #Use tiling to generate a large rendering. image = vtk.vtkRenderLargeImage() image.SetInput(self.ren) image.SetMagnification(2) - image = image.GetOutput() - - - # write image file - if (filetype == const.FILETYPE_BMP): - writer = vtk.vtkBMPWriter() - elif (filetype == const.FILETYPE_JPG): - writer = vtk.vtkJPEGWriter() - elif (filetype == const.FILETYPE_PNG): - writer = vtk.vtkPNGWriter() - elif (filetype == const.FILETYPE_PS): - writer = vtk.vtkPostScriptWriter() - elif (filetype == const.FILETYPE_TIF): - writer = vtk.vtkTIFFWriter() - filename = "%s.tif"%filename.strip(".tif") - - writer.SetInput(image) - writer.SetFileName(filename) - writer.Write() + image = image.GetOutput() + + + # write image file + if (filetype == const.FILETYPE_BMP): + writer = vtk.vtkBMPWriter() + elif (filetype == const.FILETYPE_JPG): + writer = vtk.vtkJPEGWriter() + elif (filetype == const.FILETYPE_PNG): + writer = vtk.vtkPNGWriter() + elif (filetype == const.FILETYPE_PS): + writer = vtk.vtkPostScriptWriter() + elif (filetype == const.FILETYPE_TIF): + writer = vtk.vtkTIFFWriter() + filename = "%s.tif"%filename.strip(".tif") + + writer.SetInput(image) + writer.SetFileName(filename) + writer.Write() ps.Publisher().sendMessage('End busy cursor') diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 0aa949d..854fdcb 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -537,16 +537,14 @@ def ExportPicture(type_=""): utils.debug("ExportPicture") project = proj.Project() - if sys.platform == 'win32': - project_name = project.name - else: - project_name = project.name+".jpg" - + project_name = "%s_%s" % (project.name, type_) + if not sys.platform in ('win32', 'linux2'): + project_name += ".jpg" dlg = wx.FileDialog(None, "Save %s picture as..." %type_, "", # last used directory - "%s_%s"%(project_name, type_), # filename + project_name, # filename WILDCARD_SAVE_PICTURE, wx.SAVE|wx.OVERWRITE_PROMPT) dlg.SetFilterIndex(1) # default is VTI diff --git a/invesalius/gui/task_exporter.py b/invesalius/gui/task_exporter.py index b55256e..6d4b049 100644 --- a/invesalius/gui/task_exporter.py +++ b/invesalius/gui/task_exporter.py @@ -247,7 +247,6 @@ class InnerTaskPanel(wx.Panel): value = dlg.ExportPicture(self.id_to_name[id]) if value: filename, filetype = value - print filename, filetype ps.Publisher().sendMessage('Export picture to file', (id, filename, filetype)) -- libgit2 0.21.2