Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a date error in display_exif_tags(). Thank you Nick Hall

Browse Source 
svn: r17351
This commit is contained in:
Rob G. Healey 2011-04-30 00:45:42 +00:00
parent eb7b9fa565
commit a3d91fe9b5
1 changed files with 61 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/plugins/gramplet/EditExifMetadata.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -49,7 +50,7 @@ import gtk
# GRAMPS modules # GRAMPS modules
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
import GrampsDisplay import GrampsDisplay
from QuestionDialog import OkDialog, WarningDialog, QuestionDialog from QuestionDialog import WarningDialog, QuestionDialog
from gen.ggettext import gettext as _ from gen.ggettext import gettext as _
@ -105,18 +106,14 @@ if (software_version and (software_version < Min_VERSION)):
# * ImageMagick -- Convert and Delete all Exif metadata... # * ImageMagick -- Convert and Delete all Exif metadata...
# * jhead -- re-initialize a jpeg image... # * jhead -- re-initialize a jpeg image...
#******************************************************************** #********************************************************************
system_platform = os.sys.platform
# Windows 32bit systems # Windows 32bit systems
system_platform = os.sys.platform
if system_platform == "win32": if system_platform == "win32":
_MAGICK_FOUND = Utils.search_for("convert.exe") _MAGICK_FOUND = Utils.search_for("convert.exe")
_JHEAD_FOUND = Utils.search_for("jhead.exe") _JHEAD_FOUND = Utils.search_for("jhead.exe")
elif system_platform == "linux2":
# all Linux systems
elif system_platform == "Linux2":
_MAGICK_FOUND = Utils.search_for("convert") _MAGICK_FOUND = Utils.search_for("convert")
_JHEAD_FOUND = Utils.search_for("jhead") _JHEAD_FOUND = Utils.search_for("jhead")
# Windows 64bit systems
else: else:
_MAGICK_FOUND = Utils.search_for("convert") _MAGICK_FOUND = Utils.search_for("convert")
_JHEAD_FOUND = Utils.search_for("jhead") _JHEAD_FOUND = Utils.search_for("jhead")
@ -125,7 +122,7 @@ else:
# Constants # Constants
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# available image types for exiv2 and pyexiv2 # available image types for exiv2 and pyexiv2
# [".jpeg", ".jpg", ".jfif", ".exv", ".tiff", ".dng", ".nef", ".pef", ".pgf", ".png", ".psd", ".jp2"] # ["jpeg", "jpg", "exv", "tiff", "dng", "nef", "pef", "pgf", "png", "psd", "jp2"]
# define tooltips for all entries # define tooltips for all entries
_TOOLTIPS = { _TOOLTIPS = {
@ -277,7 +274,6 @@ class EditExifMetadata(Gramplet):
self.image_path = False self.image_path = False
self.plugin_image = False self.plugin_image = False
self.MediaDataTags = False self.MediaDataTags = False
self.SavedEntries = False
self.connect_signal("Media", self.update) self.connect_signal("Media", self.update)
@ -323,6 +319,7 @@ class EditExifMetadata(Gramplet):
ccc_box.add( self.__create_button( ccc_box.add( self.__create_button(
"Clear", False, self.clear_metadata, gtk.STOCK_CLEAR, False) ) "Clear", False, self.clear_metadata, gtk.STOCK_CLEAR, False) )
# is ImageMagick installed?
if _MAGICK_FOUND: if _MAGICK_FOUND:
# Convert button... # Convert button...
ccc_box.add( self.__create_button( ccc_box.add( self.__create_button(
@ -476,7 +473,9 @@ class EditExifMetadata(Gramplet):
self.exif_widgets["Mime:Type"].set_text(_mtype) self.exif_widgets["Mime:Type"].set_text(_mtype)
# determine if it is a mime image object? # determine if it is a mime image object?
if (mime_type and mime_type.startswith("image") ): if mime_type:
if mime_type.startswith("image"):
self.activate_buttons(["Save"])
# display file description/ title... # display file description/ title...
self.exif_widgets["Media:Label"].set_text( _html_escape( self.exif_widgets["Media:Label"].set_text( _html_escape(
@ -493,7 +492,11 @@ class EditExifMetadata(Gramplet):
self.activate_buttons(["Convert"]) self.activate_buttons(["Convert"])
# displays the imge Exif metadata # displays the imge Exif metadata
self.display_exif_tags(self.image_path) self.display_exif_tags(self.orig_image)
else:
self.exif_widgets["Message:Area"].set_text(_("Choose a different image..."))
return
else: else:
self.exif_widgets["Message:Area"].set_text(_("Choose a different image...")) self.exif_widgets["Message:Area"].set_text(_("Choose a different image..."))
@ -540,10 +543,12 @@ class EditExifMetadata(Gramplet):
def __convert_dialog(self, obj): def __convert_dialog(self, obj):
""" """
Handles the Convert Question Dialog... Handles the Convert question Dialog...
""" """
QuestionDialog(_("Edit Image Exif metadata"), _("Convert this image to a .jpeg image?"), # is ImageMagick installled?
if _MAGICK_FOUND:
QuestionDialog(_("Edit Image Exif Metadata"), _("Convert this image to a .jpeg image?"),
_("Convert"), self.convert2Jpeg) _("Convert"), self.convert2Jpeg)
def __save_dialog(self, obj): def __save_dialog(self, obj):
@ -551,12 +556,17 @@ class EditExifMetadata(Gramplet):
Handles the Save question Dialog... Handles the Save question Dialog...
""" """
self.SavedEntries = [self.exif_widgets[widget].get_text() for widget in [
"Description", "Artist", "Copyright", "DateTime", "Latitude", "Longitude"] ]
self.SavedEntries = [entry for entry in self.SavedEntries if entry]
if self.SavedEntries:
QuestionDialog(_("Edit Image Exif Metadata"), _("Save Exif metadata to this image?"), QuestionDialog(_("Edit Image Exif Metadata"), _("Save Exif metadata to this image?"),
_("Save"), self.save_metadata) _("Save"), self.save_metadata)
def __delete_dialog(self, obj): def __delete_dialog(self, obj):
""" """
Handles the Delete Question Dialog... Handles the Delete Dialog...
""" """
QuestionDialog(_("Edit Image Exif Metadata"), _("WARNING! You are about to completely " QuestionDialog(_("Edit Image Exif Metadata"), _("WARNING! You are about to completely "
@ -691,13 +701,13 @@ class EditExifMetadata(Gramplet):
return KeyValue return KeyValue
def display_exif_tags(self, full_path): def display_exif_tags(self, obj):
""" """
once the pyexiv2.Image has been created, we display once the pyexiv2.Image has been created, we display
all of the image Exif metadata... all of the image Exif metadata...
""" """
# set has_data flag... # set has data flag...
self.set_has_data( len(self.MediaDataTags) > 0) self.set_has_data( len(self.MediaDataTags) > 0)
# check to see if we got metadata from the media object? # check to see if we got metadata from the media object?
@ -733,6 +743,9 @@ class EditExifMetadata(Gramplet):
# display "No Exif metadata" message... # display "No Exif metadata" message...
self.exif_widgets["Message:Area"].set_text(_("No Exif metadata for this image...")) self.exif_widgets["Message:Area"].set_text(_("No Exif metadata for this image..."))
# set has_data flag...
self.set_has_data(False)
# Activate Clear and Save buttons.. # Activate Clear and Save buttons..
self.activate_buttons(["Clear", "Save"]) self.activate_buttons(["Clear", "Save"])
@ -850,7 +863,7 @@ class EditExifMetadata(Gramplet):
def convert2Jpeg(self): def convert2Jpeg(self):
""" """
Will attempt to convert an image to a .jpeg image. Will attempt to convert an image to jpeg if it is not?
""" """
# if ImageMagick's convert is installed... # if ImageMagick's convert is installed...
@ -868,7 +881,6 @@ class EditExifMetadata(Gramplet):
self.exif_widgets["Message:Area"].set_text(_("Converting image,\n" self.exif_widgets["Message:Area"].set_text(_("Converting image,\n"
"You will need to delete the original image file...")) "You will need to delete the original image file..."))
# deactivate Convert button...
self.deactivate_buttons(["Convert"]) self.deactivate_buttons(["Convert"])
def _set_exif_KeyTag(self, KeyTag, KeyValue): def _set_exif_KeyTag(self, KeyTag, KeyValue):
@ -1050,9 +1062,8 @@ class EditExifMetadata(Gramplet):
self._set_exif_KeyTag(_DATAMAP["Description"], self.exif_widgets["Description"].get_text() ) self._set_exif_KeyTag(_DATAMAP["Description"], self.exif_widgets["Description"].get_text() )
# Modify Date/ Time... not a data field, but saved anyway... # Modify Date/ Time... not a data field, but saved anyway...
# if no data is available, do NOT set modify Date/ Time? ModDateTime = _format_datetime(datetime.now() )
if datatags: self._set_exif_KeyTag(_DATAMAP["ModDateTime"], _write_date(ModDateTime) )
self._set_exif_KeyTag(_DATAMAP["ModDateTime"], datetime.now() )
# Artist/ Author data field # Artist/ Author data field
self._set_exif_KeyTag(_DATAMAP["Artist"], self.exif_widgets["Artist"].get_text() ) self._set_exif_KeyTag(_DATAMAP["Artist"], self.exif_widgets["Artist"].get_text() )
@ -1063,14 +1074,12 @@ class EditExifMetadata(Gramplet):
# Original Date/ Time data field # Original Date/ Time data field
DateTime = self.exif_widgets["DateTime"].get_text() DateTime = self.exif_widgets["DateTime"].get_text()
if DateTime: if DateTime:
DateTime = _write_date(DateTime) if type(DateTime) is not datetime:
self._set_exif_KeyTag(_DATAMAP["DateTime"], DateTime) DateTime = _process_date(DateTime)
if DateTime:
DateTime = _write_date(DateTime)
if type(DateTime) == datetime: if type(DateTime) == datetime:
DateTime = _format_datetime(DateTime) self.exif_widgets["DateTime"].set_text(_format_datetime(DateTime) )
self.exif_widgets["DateTime"].set_text(DateTime) self._set_exif_KeyTag(_DATAMAP["DateTime"], _write_date(DateTime) )
# Latitude/ Longitude data fields # Latitude/ Longitude data fields
latitude = self.exif_widgets["Latitude"].get_text() latitude = self.exif_widgets["Latitude"].get_text()
@ -1132,7 +1141,7 @@ class EditExifMetadata(Gramplet):
self._set_exif_KeyTag(_DATAMAP["Longitude"], coords_to_rational(longitude)) self._set_exif_KeyTag(_DATAMAP["Longitude"], coords_to_rational(longitude))
if datatags: if datatags:
# set Message Area for to Saved... # set Message Area to Saved...
self.exif_widgets["Message:Area"].set_text(_("Saving Exif metadata to the image...")) self.exif_widgets["Message:Area"].set_text(_("Saving Exif metadata to the image..."))
else: else:
# set Message Area to Cleared... # set Message Area to Cleared...