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: 0007-specification-Add-Editable-ROI-enum.patch

File 0007-specification-Add-Editable-ROI-enum.patch, 5.0 KB (added by rleigh, 10 years ago)

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

    From f806003732d614e2bfd06c061816af9acd9deddf Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Sat, 19 Apr 2014 12:22:49 +0100
Subject: [PATCH 7/7] specification: Add Editable ROI enum

---
 .../src/loci/formats/meta/MetadataConverter.java   | 32 +++++++++++-----------
 .../released-schema/2013-10-dev-2/ROI.xsd          | 12 ++++++--
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index c44c344..ef2ce81 100644
    a b public final class MetadataConverter { 
    22922292          catch (NullPointerException e) { } 
    22932293 
    22942294          try { 
    2295             Boolean locked = src.getEllipseLocked(i, q); 
    2296             dest.setEllipseLocked(locked, i, q); 
     2295            Editable editable = src.getEllipseEditable(i, q); 
     2296            dest.setEllipseEditable(editable, i, q); 
    22972297          } 
    22982298          catch (NullPointerException e) { } 
    22992299 
    … … public final class MetadataConverter { 
    24212421          catch (NullPointerException e) { } 
    24222422 
    24232423          try { 
    2424             Boolean locked = src.getLabelLocked(i, q); 
    2425             dest.setLabelLocked(locked, i, q); 
     2424            Editable editable = src.getLabelEditable(i, q); 
     2425            dest.setLabelEditable(editable, i, q); 
    24262426          } 
    24272427          catch (NullPointerException e) { } 
    24282428 
    … … public final class MetadataConverter { 
    25382538          catch (NullPointerException e) { } 
    25392539 
    25402540          try { 
    2541             Boolean locked = src.getLineLocked(i, q); 
    2542             dest.setLineLocked(locked, i, q); 
     2541            Editable editable = src.getLineEditable(i, q); 
     2542            dest.setLineEditable(editable, i, q); 
    25432543          } 
    25442544          catch (NullPointerException e) { } 
    25452545 
    … … public final class MetadataConverter { 
    26792679          catch (NullPointerException e) { } 
    26802680 
    26812681          try { 
    2682             Boolean locked = src.getMaskLocked(i, q); 
    2683             dest.setMaskLocked(locked, i, q); 
     2682            Editable editable = src.getMaskEditable(i, q); 
     2683            dest.setMaskEditable(editable, i, q); 
    26842684          } 
    26852685          catch (NullPointerException e) { } 
    26862686 
    … … public final class MetadataConverter { 
    28082808          catch (NullPointerException e) { } 
    28092809 
    28102810          try { 
    2811             Boolean locked = src.getPointLocked(i, q); 
    2812             dest.setPointLocked(locked, i, q); 
     2811            Editable editable = src.getPointEditable(i, q); 
     2812            dest.setPointEditable(editable, i, q); 
    28132813          } 
    28142814          catch (NullPointerException e) { } 
    28152815 
    … … public final class MetadataConverter { 
    29252925          catch (NullPointerException e) { } 
    29262926 
    29272927          try { 
    2928             Boolean locked = src.getPolygonLocked(i, q); 
    2929             dest.setPolygonLocked(locked, i, q); 
     2928            Editable editable = src.getPolygonEditable(i, q); 
     2929            dest.setPolygonEditable(editable, i, q); 
    29302930          } 
    29312931          catch (NullPointerException e) { } 
    29322932 
    … … public final class MetadataConverter { 
    30363036          catch (NullPointerException e) { } 
    30373037 
    30383038          try { 
    3039             Boolean locked = src.getPolylineLocked(i, q); 
    3040             dest.setPolylineLocked(locked, i, q); 
     3039            Editable editable = src.getPolylineEditable(i, q); 
     3040            dest.setPolylineEditable(editable, i, q); 
    30413041          } 
    30423042          catch (NullPointerException e) { } 
    30433043 
    … … public final class MetadataConverter { 
    31593159          catch (NullPointerException e) { } 
    31603160 
    31613161          try { 
    3162             Boolean locked = src.getRectangleLocked(i, q); 
    3163             dest.setRectangleLocked(locked, i, q); 
     3162            Editable editable = src.getRectangleEditable(i, q); 
     3163            dest.setRectangleEditable(editable, i, q); 
    31643164          } 
    31653165          catch (NullPointerException e) { } 
    31663166 

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

    diff --git a/components/specification/released-schema/2013-10-dev-2/ROI.xsd b/components/specification/released-schema/2013-10-dev-2/ROI.xsd
index ed7160c..f194b40 100644
    a b  
    241241                                </xsd:simpleType> 
    242242                        </xsd:attribute> 
    243243 
    244                         <xsd:attribute name="Locked" use="optional" type="xsd:boolean"> 
     244                        <xsd:attribute name="Editable" use="optional"> 
    245245                                <xsd:annotation> 
    246246                                        <xsd:documentation> 
    247                                                 Controls whether the shape is locked and read only, 
    248                                                 true is locked, false is editable. 
     247                                                Controls whether the shape is editable, 
     248                                                ReadOnly is locked and read-only, ReadWrite is unlocked and editable. 
    249249                                        </xsd:documentation> 
    250250                                </xsd:annotation> 
     251                                <xsd:simpleType> 
     252                                        <xsd:restriction base="xsd:string"> 
     253                                                <xsd:enumeration value="ReadOnly"/> 
     254                                                <xsd:enumeration value="ReadWrite"/> 
     255                                        </xsd:restriction> 
     256                                </xsd:simpleType> 
    251257                        </xsd:attribute> 
    252258 
    253259 

1.3.13-PRO © 2008-2011 Agilo Software all rights reserved (this page was served in: 0.27731 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!