Context Navigation

Back to Ticket #12121

Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.

Ticket #12121: 0005-specification-Add-Tuning-enum.patch

File 0005-specification-Add-Tuning-enum.patch, 3.1 KB (added by rleigh, 10 years ago)

components/formats-api/src/loci/formats/meta/MetadataConverter.java

From 555ff7879a6387a0f6c87d58b63556ab2494fbc3 Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Fri, 18 Apr 2014 16:04:27 +0100
Subject: [PATCH 5/7] specification: Add Tuning enum

---
 .../formats-api/src/loci/formats/meta/MetadataConverter.java      | 6 +++---
 .../test/spec/schema/Schema2011_06_Instrument_Upgrade_Test.java   | 2 +-
 components/specification/released-schema/2013-10-dev-2/ome.xsd    | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index b3ca4cc..456652f 100644

  public final class MetadataConverter {
         catch (NullPointerException e) { }
         try {
           Boolean tuneable = src.getLaserTuneable(instrumentIndex, lightSource);
           if (tuneable != null) {
             dest.setLaserTuneable(tuneable, instrumentIndex, lightSource);
+          Tuning tuning = src.getLaserTuning(instrumentIndex, lightSource);
+          if (tuning != null) {
+            dest.setLaserTuning(tuning, instrumentIndex, lightSource);
+          }
+        }
         catch (NullPointerException e) { }

components/formats-bsd/test/spec/schema/Schema2011_06_Instrument_Upgrade_Test.java

diff --git a/components/formats-bsd/test/spec/schema/Schema2011_06_Instrument_Upgrade_Test.java b/components/formats-bsd/test/spec/schema/Schema2011_06_Instrument_Upgrade_Test.java
index dcd51a2..31fb6dc 100644

  public class Schema2011_06_Instrument_Upgrade_Test {
         Assert.assertNull(laser0.getPockelCell());
         Assert.assertNull(laser0.getPulse());
         Assert.assertNull(laser0.getRepetitionRate());
         Assert.assertNull(laser0.getTuneable());
+        Assert.assertNull(laser0.getTuning());
         Assert.assertNull(laser0.getWavelength());
+    }

components/specification/released-schema/2013-10-dev-2/ome.xsd

diff --git a/components/specification/released-schema/2013-10-dev-2/ome.xsd b/components/specification/released-schema/2013-10-dev-2/ome.xsd
index 19d8880..115ea8e 100644

-                      a
                                         </xsd:documentation>
                                 </xsd:annotation>
                         </xsd:attribute>
                         <xsd:attribute name="Tuneable" use="optional" type="xsd:boolean">
+                        <xsd:attribute name="Tuning" use="optional">
                                 <xsd:annotation>
                                         <xsd:documentation>
                                                 Whether or not the laser is Tuneable [flag]
                                         </xsd:documentation>
                                 </xsd:annotation>
+                                <xsd:simpleType>
+                                        <xsd:restriction base="xsd:string">
+                                                <xsd:enumeration value="None"/>
+                                                <xsd:enumeration value="Tuneable"/>
+                                        </xsd:restriction>
+                                </xsd:simpleType>
                         </xsd:attribute>
                         <xsd:attribute name="Pulse" use="optional">
                                 <xsd:annotation>

Download in other formats:

Original Format