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: 0006-specification-Add-Visible-ROI-enum.patch
| File 0006-specification-Add-Visible-ROI-enum.patch,
6.8 KB
(added by rleigh, 10 years ago) |
|
|
-
From 69d7533fe994beed6429c33837cde6362b11aadd Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Sat, 19 Apr 2014 12:22:26 +0100
Subject: [PATCH 6/7] specification: Add Visible ROI enum
---
.../src/loci/formats/meta/MetadataConverter.java | 16 ++++++++--------
.../spec/schema/Schema2011_06_File_Upgrade_Test.java | 7 ++++---
.../specification/released-schema/2013-10-dev-2/ROI.xsd | 10 ++++++++--
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index 456652f..c44c344 100644
|
a
|
b
|
public final class MetadataConverter { |
| 2346 | 2346 | catch (NullPointerException e) { } |
| 2347 | 2347 | |
| 2348 | 2348 | try { |
| 2349 | | Boolean visible = src.getEllipseVisible(i, q); |
| | 2349 | Visible visible = src.getEllipseVisible(i, q); |
| 2350 | 2350 | dest.setEllipseVisible(visible, i, q); |
| 2351 | 2351 | } |
| 2352 | 2352 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 2475 | 2475 | catch (NullPointerException e) { } |
| 2476 | 2476 | |
| 2477 | 2477 | try { |
| 2478 | | Boolean visible = src.getLabelVisible(i, q); |
| | 2478 | Visible visible = src.getLabelVisible(i, q); |
| 2479 | 2479 | dest.setLabelVisible(visible, i, q); |
| 2480 | 2480 | } |
| 2481 | 2481 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 2592 | 2592 | catch (NullPointerException e) { } |
| 2593 | 2593 | |
| 2594 | 2594 | try { |
| 2595 | | Boolean visible = src.getLineVisible(i, q); |
| | 2595 | Visible visible = src.getLineVisible(i, q); |
| 2596 | 2596 | dest.setLineVisible(visible, i, q); |
| 2597 | 2597 | } |
| 2598 | 2598 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 2733 | 2733 | catch (NullPointerException e) { } |
| 2734 | 2734 | |
| 2735 | 2735 | try { |
| 2736 | | Boolean visible = src.getMaskVisible(i, q); |
| | 2736 | Visible visible = src.getMaskVisible(i, q); |
| 2737 | 2737 | dest.setMaskVisible(visible, i, q); |
| 2738 | 2738 | } |
| 2739 | 2739 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 2862 | 2862 | catch (NullPointerException e) { } |
| 2863 | 2863 | |
| 2864 | 2864 | try { |
| 2865 | | Boolean visible = src.getPointVisible(i, q); |
| | 2865 | Visible visible = src.getPointVisible(i, q); |
| 2866 | 2866 | dest.setPointVisible(visible, i, q); |
| 2867 | 2867 | } |
| 2868 | 2868 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 2979 | 2979 | catch (NullPointerException e) { } |
| 2980 | 2980 | |
| 2981 | 2981 | try { |
| 2982 | | Boolean visible = src.getPolygonVisible(i, q); |
| | 2982 | Visible visible = src.getPolygonVisible(i, q); |
| 2983 | 2983 | dest.setPolygonVisible(visible, i, q); |
| 2984 | 2984 | } |
| 2985 | 2985 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 3090 | 3090 | catch (NullPointerException e) { } |
| 3091 | 3091 | |
| 3092 | 3092 | try { |
| 3093 | | Boolean visible = src.getPolylineVisible(i, q); |
| | 3093 | Visible visible = src.getPolylineVisible(i, q); |
| 3094 | 3094 | dest.setPolylineVisible(visible, i, q); |
| 3095 | 3095 | } |
| 3096 | 3096 | catch (NullPointerException e) { } |
| … |
… |
public final class MetadataConverter { |
| 3213 | 3213 | catch (NullPointerException e) { } |
| 3214 | 3214 | |
| 3215 | 3215 | try { |
| 3216 | | Boolean visible = src.getRectangleVisible(i, q); |
| | 3216 | Visible visible = src.getRectangleVisible(i, q); |
| 3217 | 3217 | dest.setRectangleVisible(visible, i, q); |
| 3218 | 3218 | } |
| 3219 | 3219 | catch (NullPointerException e) { } |
-
diff --git a/components/formats-bsd/test/spec/schema/Schema2011_06_File_Upgrade_Test.java b/components/formats-bsd/test/spec/schema/Schema2011_06_File_Upgrade_Test.java
index 1c5e636..65217d7 100644
|
a
|
b
|
import loci.common.services.ServiceFactory; |
| 45 | 45 | import loci.common.xml.XMLTools; |
| 46 | 46 | import loci.formats.services.OMEXMLService; |
| 47 | 47 | |
| | 48 | import ome.xml.model.enums.Visible; |
| 48 | 49 | import ome.xml.model.BinData; |
| 49 | 50 | import ome.xml.model.Channel; |
| 50 | 51 | import ome.xml.model.Dataset; |
| … |
… |
public class Schema2011_06_File_Upgrade_Test { |
| 902 | 903 | Assert.assertEquals(Label.class.getName(), shape11.getClass().getName()); |
| 903 | 904 | Label label11 = (Label) shape11; |
| 904 | 905 | Assert.assertEquals(MESSAGE_REMOVED_PATH, label11.getText()); |
| 905 | | Assert.assertFalse(label11.getVisible() |
| | 906 | Assert.assertFalse(label11.getVisible() != Visible.VISIBLE); |
| 906 | 907 | Assert.assertEquals(Double.valueOf(0), label11.getX()); |
| 907 | 908 | Assert.assertEquals(Double.valueOf(0), label11.getY()); |
| 908 | 909 | } |
| … |
… |
public class Schema2011_06_File_Upgrade_Test { |
| 914 | 915 | Assert.assertEquals(Label.class.getName(), shape12.getClass().getName()); |
| 915 | 916 | Label label12 = (Label) shape12; |
| 916 | 917 | Assert.assertEquals(MESSAGE_REMOVED_PATH, label12.getText()); |
| 917 | | Assert.assertFalse(label12.getVisible() |
| | 918 | Assert.assertFalse(label12.getVisible() != Visible.VISIBLE); |
| 918 | 919 | Assert.assertEquals(Double.valueOf(0), label12.getX()); |
| 919 | 920 | Assert.assertEquals(Double.valueOf(0), label12.getY()); |
| 920 | 921 | } |
| … |
… |
public class Schema2011_06_File_Upgrade_Test { |
| 925 | 926 | Assert.assertEquals(Label.class.getName(), shape13.getClass().getName()); |
| 926 | 927 | Label label13 = (Label) shape13; |
| 927 | 928 | Assert.assertEquals(MESSAGE_REMOVED_PATH, label13.getText()); |
| 928 | | Assert.assertFalse(label13.getVisible() |
| | 929 | Assert.assertFalse(label13.getVisible() != Visible.VISIBLE); |
| 929 | 930 | Assert.assertEquals(Double.valueOf(0), label13.getX()); |
| 930 | 931 | Assert.assertEquals(Double.valueOf(0), label13.getY()); |
| 931 | 932 | } |
-
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 8bca01b..ed7160c 100644
|
a
|
b
|
|
| 226 | 226 | </xsd:restriction> |
| 227 | 227 | </xsd:simpleType> |
| 228 | 228 | </xsd:attribute> |
| 229 | | <xsd:attribute name="Visible" use="optional" type="xsd:boolean"> |
| | 229 | <xsd:attribute name="Visible" use="optional"> |
| 230 | 230 | <xsd:annotation> |
| 231 | 231 | <xsd:documentation> |
| 232 | 232 | Controls whether the shape is currently visible, |
| 233 | | true is visible, false is hidden. |
| | 233 | Visible is visible, Hidden is hidden. |
| 234 | 234 | </xsd:documentation> |
| 235 | 235 | </xsd:annotation> |
| | 236 | <xsd:simpleType> |
| | 237 | <xsd:restriction base="xsd:string"> |
| | 238 | <xsd:enumeration value="Visible"/> |
| | 239 | <xsd:enumeration value="Hidden"/> |
| | 240 | </xsd:restriction> |
| | 241 | </xsd:simpleType> |
| 236 | 242 | </xsd:attribute> |
| 237 | 243 | |
| 238 | 244 | <xsd:attribute name="Locked" use="optional" type="xsd:boolean"> |
Download in other formats:
1.3.13-PRO © 2008-2011
Agilo Software all
rights reserved
(this page was served in: 0.29540 sec.)
