Skip to content

Commit 1ee6f2f

Browse files
author
HACKERMD
committed
Fix bug that prevented setting values for "AcquiredDate" attribute
Also change name of the attribute from "AcquiredDate" to "AcquisitionDate" according to the OME model
1 parent 41ba691 commit 1ee6f2f

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

bioformats/omexml.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def xsd_now():
3636
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3737
xsi:schemaLocation="http://www.openmicroscopy.org/Schemas/OME/2013-06 http://www.openmicroscopy.org/Schemas/OME/2012-03/ome.xsd">
3838
<Image ID="Image:0" Name="default.png">
39-
<AcquiredDate>%(DEFAULT_NOW)s</AcquiredDate>
39+
<AcquisitionDate>%(DEFAULT_NOW)s</AcquisitionDate>
4040
<Pixels DimensionOrder="XYCTZ"
4141
ID="Pixels:0"
4242
SizeC="1"
@@ -278,7 +278,7 @@ class OMEXML(object):
278278
derived objects. For instance:
279279
280280
>>> o = OMEXML()
281-
>>> print o.image().AcquiredDate
281+
>>> print o.image().AcquisitionDate
282282
283283
will get you the date that image # 0 was acquired.
284284
@@ -354,7 +354,7 @@ def set_image_count(self, value):
354354
new_image = self.Image(ElementTree.SubElement(root, qn(self.ns['ome'], "Image")))
355355
new_image.ID = str(uuid.uuid4())
356356
new_image.Name = "default.png"
357-
new_image.AcquiredDate = xsd_now()
357+
new_image.AcquisitionDate = xsd_now()
358358
new_pixels = self.Pixels(
359359
ElementTree.SubElement(new_image.node, qn(self.ns['ome'], "Pixels")))
360360
new_pixels.ID = str(uuid.uuid4())
@@ -411,20 +411,21 @@ def set_Name(self, value):
411411
self.node.set("Name", value)
412412
Name = property(get_Name, set_Name)
413413

414-
def get_AcquiredDate(self):
414+
def get_AcquisitionDate(self):
415415
'''The date in ISO-8601 format'''
416-
acquired_date = self.node.find(qn(self.ns["ome"], "AcquiredDate"))
416+
acquired_date = self.node.find(qn(self.ns["ome"], "AcquisitionDate"))
417417
if acquired_date is None:
418418
return None
419419
return get_text(acquired_date)
420420

421-
def set_AcquiredDate(self, date):
422-
acquired_date = self.node.find(qn(self.ns["ome"], "AcquiredDate"))
421+
def set_AcquisitionDate(self, date):
422+
acquired_date = self.node.find(qn(self.ns["ome"], "AcquisitionDate"))
423423
if acquired_date is None:
424424
acquired_date = ElementTree.SubElement(
425-
self.node, qn(self.ns, "AcquiredDate"))
425+
self.node, qn(self.ns["ome"], "AcquisitionDate"))
426426
set_text(acquired_date, date)
427-
AcquiredDate = property(get_AcquiredDate, set_AcquiredDate)
427+
AcquisitionDate = property(get_AcquisitionDate, set_AcquisitionDate)
428+
428429

429430
@property
430431
def Pixels(self):

0 commit comments

Comments
 (0)