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: 0003-specification-Add-PockelCell-enum.patch

File 0003-specification-Add-PockelCell-enum.patch, 2.2 KB (added by rleigh, 10 years ago)

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

    From 334f638cd577d08e9adace469a2634c06bafa84a Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Fri, 18 Apr 2014 15:38:10 +0100
Subject: [PATCH 3/7] specification: Add PockelCell enum

---
 .../formats-api/src/loci/formats/meta/MetadataConverter.java   |  2 +-
 components/specification/released-schema/2013-10-dev-2/ome.xsd | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index 1ab1c70..a1f28b8 100644
    a b public final class MetadataConverter { 
    38923892        catch (NullPointerException e) { } 
    38933893 
    38943894        try { 
    3895           Boolean pockelCell = 
     3895          PockelCell pockelCell = 
    38963896            src.getLaserPockelCell(instrumentIndex, lightSource); 
    38973897          if (pockelCell != null) { 
    38983898            dest.setLaserPockelCell(pockelCell, instrumentIndex, lightSource); 

  • 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 bd281cd..db31ccb 100644
    a b  
    20362036                                        </xsd:restriction> 
    20372037                                </xsd:simpleType> 
    20382038                        </xsd:attribute> 
    2039                         <xsd:attribute name="PockelCell" use="optional" type="xsd:boolean"> 
     2039                        <xsd:attribute name="PockelCell" use="optional"> 
    20402040                                <xsd:annotation> 
    20412041                                        <xsd:documentation> 
    2042                                                 If true the laser has a PockelCell to rotate the polarization of the beam. [flag] 
     2042                                                If Present the laser has a PockelCell to rotate the polarization of the beam, or Absent if not. [flag] 
    20432043                                        </xsd:documentation> 
    20442044                                </xsd:annotation> 
     2045                                <xsd:simpleType> 
     2046                                        <xsd:restriction base="xsd:string"> 
     2047                                                <xsd:enumeration value="Absent"/> 
     2048                                                <xsd:enumeration value="Present"/> 
     2049                                        </xsd:restriction> 
     2050                                </xsd:simpleType> 
    20452051                        </xsd:attribute> 
    20462052                        <xsd:attribute name="RepetitionRate" use="optional" type="xsd:float"> 
    20472053                                <xsd:annotation> 

1.3.13-PRO © 2008-2011 Agilo Software all rights reserved (this page was served in: 0.23468 sec.)

© 2000-2014 University of Dundee & Open Microscopy Environment. Creative Commons Attribution 3.0 Unported License
OME source code is available under the GNU General public license or through commercial license from Glencoe Software

We're Hiring!