<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
  
  

  
	  <!-- New body template to add a custom footer block : ajp, Fri 10 Jun 2011 13:48:56 BST -->


  <head>
    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />
    <link rel="stylesheet" type="text/css" media="screen" href="/ome/chrome/agilo/stylesheet/agilo_theme.css" />
    <link rel="stylesheet" type="text/css" media="print" href="/ome/chrome/agilo/stylesheet/print.css" />
    <link rel="stylesheet" type="text/css" media="screen" href="/ome/chrome/agilo/js/lib/select2js/select2.css" />
    <title>
      0004-specification-Add-Iris-enum.patch on Ticket #12121 – Attachment
     – OME
    </title>
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
      <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <link rel="search" href="/ome/search" />
        <link rel="help" href="/ome/wiki/TracGuide" />
        <link rel="alternate" href="/ome/raw-attachment/ticket/12121/0004-specification-Add-Iris-enum.patch" type="text/x-diff; charset=iso-8859-15" title="Original Format" />
        <link rel="up" href="/ome/ticket/12121" title="Ticket #12121" />
        <link rel="start" href="/ome/wiki" />
        <link rel="stylesheet" href="/ome/chrome/common/css/diff.css" type="text/css" /><link rel="stylesheet" href="/ome/chrome/common/css/code.css" type="text/css" /><link rel="stylesheet" href="/ome/chrome/agilo_common/css/licenseNotifier.css" type="text/css" /><link rel="stylesheet" href="/ome/chrome/agilo_pro/css/agilo_pro.css" type="text/css" /><link rel="stylesheet" href="/ome/chrome/agilo/stylesheet/agilo.css" type="text/css" />
        <link rel="shortcut icon" href="/ome/chrome/site/favicon.ico" type="image/x-icon" />
        <link rel="icon" href="/ome/chrome/site/favicon.ico" type="image/x-icon" />
      <link type="application/opensearchdescription+xml" rel="search" href="/ome/search/opensearch" title="Search OME" />
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/common/js/jquery.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/common/js/babel.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/common/js/trac.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/common/js/search.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/common/js/diff.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/agilo_common/js/licenseNotifier.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/agilo/js/sidebar.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/agilo/js/cookies.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/agilo/js/settings.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/agilo/js/collapse.js"></script>
      <script type="text/javascript" charset="utf-8" src="/ome/chrome/agilo/js/ie-patches.js"></script>
      <script type="text/javascript" src="/ome/chrome/common/js/folding.js"></script>
      <script type="text/javascript">
        jQuery(document).ready(function($) {
          $('#preview table.code').enableCollapsibleColumns($('#preview table.code thead th.content'));
        });
      </script>
	<script type="text/javascript" src="/ome/chrome/agilo/js/lib/jquery.form.js"></script>
    <script type="text/javascript" src="/ome/chrome/agilo/js/lib/jquery.cookie.js"></script>
    <script type="text/javascript" src="/ome/chrome/agilo/js/lib/html2canvas.js"></script>
    <script type="text/javascript" src="/ome/chrome/agilo/js/lib/select2js/select2.js"></script>
	<script type="text/javascript" src="/ome/chrome/agilo/js/third_parties_hacks.js"></script>
	<script type="text/javascript" src="/ome/chrome/agilo/js/utilities.js"></script>
	<script type="text/javascript">
	//<![CDATA[
		// Initialize the variables right at the start, so other js can use it in document.ready handlers
		BASE_URL = "/ome";
		CHROME_URL = "/ome/chrome";
		// Normalise base url pattern so it also works with mod_python which can hickup on double slashes...
		if ((/\/$/).test(BASE_URL))
			BASE_URL = BASE_URL.slice(0, -1);
		// No caching of ajax. Ever. Especially in IE 7!
		$.ajaxSetup({cache: false});
		// If we use metadata we want to put json into the data attribute
		if ($.metadata)
			$.metadata.setType('attr', 'data');
		// Disable selection on the navigation
		$(document).ready(function() {
			setTimeout('if ($.fn.disableSelection) $(".menu").disableSelection()',500);
              $("select.searchable, #field-milestone, #field-owner, #field-sprint").select2();
		});
		// this is used to trigger javascript execution when the page is accessed from history (e.g. browser's back button)
		window.onunload = function(){};
	//]]>
	</script>
	    <link rel="stylesheet" type="text/css" href="/ome/chrome/site/style.css" />
	  </head>
	<body>
	<div class="menu">
	<form class="search" id="search_form" action="/ome/search" method="get">
	<label><a href="">Advanced Search</a></label>
	<input type="text" id="proj-search" name="q" size="18" value="" />
	</form>
        <div id="project_logo_container">
            <a id="logo" href="http://trac.openmicroscopy.org.uk/ome">
                <img src="/ome/chrome/site/my_logo.png" alt="OME" />
            </a>
        </div>
        <ul class="button group mainnav">
		                <li><a href="/ome/wiki" class="iconWiki">Wiki</a></li>
		                <li><a href="/ome/timeline" class="iconTimeline">Timeline</a></li>
		                <li><a href="/ome/roadmap" class="iconRoadmap">Roadmap</a></li>
		                <li><a href="/ome/browser" class="iconBrowser">Browse Source</a></li>
		                <li><a href="/ome/report" class="iconTickets">View Tickets</a></li>
		                <li><a href="/ome/search" class="iconSearch">Search</a></li>
		</ul>
        <div class="metanav-container">
            <a class="metanav-logo" href="/ome"></a>
        <ul class="button group metanav">
		                <li><a href="/ome/login" class="iconLogin">Login</a></li>
		                <li><a href="/ome/agilo-help">Help/Guide</a></li>
		                <li><a href="/ome/about" class="iconAbout">About Trac</a></li>
		                <li><a href="/ome/prefs" class="iconPrefs">Preferences</a></li>
		</ul>
        </div>
    </div>
	<div class="sidebar"><!-- TODO: make this a harmonica, or add an all toggle -->
	<!-- TODO: fix the empty space at the bottom. -->
		<label>Tickets</label>
		<ul class="tickets tree">
		</ul>
    <label>Wiki</label>
	<ul class="wiki tree">
	</ul>
	</div>
	<div class="main"><!-- Main Content -->
	<div id="popup-div">Loading...</div>
	<div id="ctxtnav" class="nav">
	<h2>Context Navigation</h2>
	<ul>
		<li class="first last"><a href="/ome/ticket/12121">Back to Ticket #12121</a></li>
	</ul>
	<hr />
	</div>
    <div id="content" class="attachment">
        <h1><a href="/ome/ticket/12121">Ticket #12121</a>: 0004-specification-Add-Iris-enum.patch</h1>
        <table id="info" summary="Description">
          <tbody>
            <tr>
              <th scope="col">File 0004-specification-Add-Iris-enum.patch,
                <span title="5757 bytes">5.6 KB</span>
                (added by rleigh, <a class="timeline" href="/ome/timeline?from=2014-04-19T12%3A35%3A45%2B01%3A00&amp;precision=second" title="See timeline at 04/19/14 12:35:45">5 years ago</a>)</th>
            </tr>
            <tr>
              <td class="message searchable">
                
              </td>
            </tr>
          </tbody>
        </table>
        <div id="preview" class="searchable">
          
  <div class="diff">
  <ul class="entries">
      <li class="entry">
        <h2>
          <a>components/formats-api/src/loci/formats/meta/MetadataConverter.java</a>
        </h2>
        <pre>From 67b54e0d7fa7ca17a353afa518557f00f0db5ad3 Mon Sep 17 00:00:00 2001
From: Roger Leigh &lt;r.leigh@dundee.ac.uk&gt;
Date: Fri, 18 Apr 2014 15:56:46 +0100
Subject: [PATCH 4/7] specification: Add Iris enum

---
 .../formats-api/src/loci/formats/meta/MetadataConverter.java   |  2 +-
 components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java |  4 +++-
 components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java |  6 +++++-
 components/specification/released-schema/2013-10-dev-2/ome.xsd | 10 ++++++++--
 .../specification/src/ome/specification/XMLMockObjects.java    |  3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index a1f28b8..b3ca4cc 100644</pre>
        <table class="trac-diff inline" summary="Differences" cellspacing="0">
              <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
              <thead>
                <tr>
                  <th title="File a/components/formats-api/src/loci/formats/meta/MetadataConverter.java">
                      a
                  </th>
                  <th title="File b/components/formats-api/src/loci/formats/meta/MetadataConverter.java">
                      b
                  </th>
                  <td><em> public final class MetadataConverter {</em> </td>
                </tr>
              </thead>
            <tbody class="unmod">
                  <tr>
                          <th>1552</th><th>1552</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; catch (NullPointerException e) { }</span> </td>
                  </tr><tr>
                          <th>1553</th><th>1553</th><td class="l"><span></span> </td>
                  </tr><tr>
                          <th>1554</th><th>1554</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; try {</span> </td>
                  </tr>
            </tbody><tbody class="mod">
                      <tr class="first">
                        <th>1555</th><th> </th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <del>Boolean</del> iris = src.getObjectiveIris(i, q);</span> </td>
                      </tr>
                      <tr class="last">
                        <th> </th><th>1555</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <ins>Iris</ins> iris = src.getObjectiveIris(i, q);</span> </td>
                      </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>1556</th><th>1556</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; dest.setObjectiveIris(iris, i, q);</span> </td>
                  </tr><tr>
                          <th>1557</th><th>1557</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; }</span> </td>
                  </tr><tr>
                          <th>1558</th><th>1558</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; catch (NullPointerException e) { }</span> </td>
                  </tr>
            </tbody>
        </table>
      </li>
      <li class="entry">
        <h2>
          <a>components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java</a>
        </h2>
        <pre>diff --git a/components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java b/components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java
index 3b5afd9..2c5eff3 100644</pre>
        <table class="trac-diff inline" summary="Differences" cellspacing="0">
              <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
              <thead>
                <tr>
                  <th title="File a/components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java">
                      a
                  </th>
                  <th title="File b/components/formats-gpl/src/loci/formats/in/ZeissCZIReader.java">
                      b
                  </th>
                  <td><em> import loci.formats.meta.MetadataStore;</em> </td>
                </tr>
              </thead>
            <tbody class="unmod">
                  <tr>
                          <th>55</th><th>55</th><td class="l"><span>import ome.xml.model.enums.AcquisitionMode;</span> </td>
                  </tr><tr>
                          <th>56</th><th>56</th><td class="l"><span>import ome.xml.model.enums.Binning;</span> </td>
                  </tr><tr>
                          <th>57</th><th>57</th><td class="l"><span>import ome.xml.model.enums.IlluminationType;</span> </td>
                  </tr>
            </tbody><tbody class="add">
                  <tr class="last first">
                          <th> </th><th>58</th><td class="r"><ins>import ome.xml.model.enums.Iris;</ins> </td>
                  </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>58</th><th>59</th><td class="l"><span>import ome.xml.model.primitives.Color;</span> </td>
                  </tr><tr>
                          <th>59</th><th>60</th><td class="l"><span>import ome.xml.model.primitives.NonNegativeInteger;</span> </td>
                  </tr><tr>
                          <th>60</th><th>61</th><td class="l"><span>import ome.xml.model.primitives.PercentFraction;</span> </td>
                  </tr>
            </tbody>
              <tbody class="skipped">
                <tr>
                  <th><a href="#L2301">…</a></th>
                  <th><a href="#L2302">…</a></th>
                  <td><em> public class ZeissCZIReader extends FormatReader {</em> </td>
                </tr>
              </tbody>
            <tbody class="unmod">
                  <tr>
                          <th>2301</th><th>2302</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; }</span> </td>
                  </tr><tr>
                          <th>2302</th><th>2303</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; String iris = getFirstNodeValue(objective, "Iris");</span> </td>
                  </tr><tr>
                          <th>2303</th><th>2304</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; if (iris != null) {</span> </td>
                  </tr>
            </tbody><tbody class="mod">
                      <tr class="first">
                        <th>2304</th><th> </th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; store.setObjectiveIris(new Boolean(iris), 0, i);</span> </td>
                      </tr>
                      <tr>
                        <th> </th><th>2305</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Boolean irisValue = new Boolean(iris);</span> </td>
                      </tr><tr class="last">
                        <th> </th><th>2306</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; store.setObjectiveIris(irisValue.booleanValue() == true ? Iris.PRESENT : Iris.ABSENT, 0, i);</span> </td>
                      </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>2305</th><th>2307</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; }</span> </td>
                  </tr><tr>
                          <th>2306</th><th>2308</th><td class="l"><span>&nbsp; &nbsp; &nbsp; }</span> </td>
                  </tr><tr>
                          <th>2307</th><th>2309</th><td class="l"><span>&nbsp; &nbsp; }</span> </td>
                  </tr>
            </tbody>
        </table>
      </li>
      <li class="entry">
        <h2>
          <a>components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java</a>
        </h2>
        <pre>diff --git a/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java b/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java
index d7ffbec..257062a 100644</pre>
        <table class="trac-diff inline" summary="Differences" cellspacing="0">
              <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
              <thead>
                <tr>
                  <th title="File a/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java">
                      a
                  </th>
                  <th title="File b/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java">
                      b
                  </th>
                  <td><em> import loci.formats.tiff.TiffCompression;</em> </td>
                </tr>
              </thead>
            <tbody class="unmod">
                  <tr>
                          <th>53</th><th>53</th><td class="l"><span>import loci.formats.tiff.TiffConstants;</span> </td>
                  </tr><tr>
                          <th>54</th><th>54</th><td class="l"><span>import loci.formats.tiff.TiffParser;</span> </td>
                  </tr><tr>
                          <th>55</th><th>55</th><td class="l"><span></span> </td>
                  </tr>
            </tbody><tbody class="add">
                  <tr class="last first">
                          <th> </th><th>56</th><td class="r"><ins>import ome.xml.model.enums.Iris;</ins> </td>
                  </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>56</th><th>57</th><td class="l"><span>import ome.xml.model.primitives.Color;</span> </td>
                  </tr><tr>
                          <th>57</th><th>58</th><td class="l"><span>import ome.xml.model.primitives.NonNegativeInteger;</span> </td>
                  </tr><tr>
                          <th>58</th><th>59</th><td class="l"><span>import ome.xml.model.primitives.PositiveFloat;</span> </td>
                  </tr>
            </tbody>
              <tbody class="skipped">
                <tr>
                  <th><a href="#L1300">…</a></th>
                  <th><a href="#L1301">…</a></th>
                  <td><em> public class ZeissLSMReader extends FormatReader {</em> </td>
                </tr>
              </tbody>
            <tbody class="unmod">
                  <tr>
                          <th>1300</th><th>1301</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; recording.magnification, instrument, 0);</span> </td>
                  </tr><tr>
                          <th>1301</th><th>1302</th><td class="l"><span>&nbsp; &nbsp; &nbsp; }</span> </td>
                  </tr><tr>
                          <th>1302</th><th>1303</th><td class="l"><span>&nbsp; &nbsp; &nbsp; store.setObjectiveLensNA(recording.lensNA, instrument, 0);</span> </td>
                  </tr>
            </tbody><tbody class="mod">
                      <tr class="first">
                        <th>1303</th><th> </th><td class="l"><span>&nbsp; &nbsp; &nbsp; store.setObjectiveIris(recording.iris, instrument, 0);</span> </td>
                      </tr>
                      <tr>
                        <th> </th><th>1304</th><td class="r"><span>&nbsp; &nbsp; &nbsp; if (recording.iris != null) {</span> </td>
                      </tr><tr>
                        <th> </th><th>1305</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; store.setObjectiveIris(recording.iris.booleanValue() == true ? Iris.PRESENT : Iris.ABSENT,</span> </td>
                      </tr><tr>
                        <th> </th><th>1306</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;instrument, 0);</span> </td>
                      </tr><tr class="last">
                        <th> </th><th>1307</th><td class="r"><span>&nbsp; &nbsp; &nbsp; }</span> </td>
                      </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>1304</th><th>1308</th><td class="l"><span>&nbsp; &nbsp; &nbsp; store.setObjectiveID(objectiveID, instrument, 0);</span> </td>
                  </tr><tr>
                          <th>1305</th><th>1309</th><td class="l"><span>&nbsp; &nbsp; }</span> </td>
                  </tr><tr>
                          <th>1306</th><th>1310</th><td class="l"><span>&nbsp; &nbsp; else if (block instanceof Laser) {</span> </td>
                  </tr>
            </tbody>
        </table>
      </li>
      <li class="entry">
        <h2>
          <a>components/specification/released-schema/2013-10-dev-2/ome.xsd</a>
        </h2>
        <pre>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 db31ccb..19d8880 100644</pre>
        <table class="trac-diff inline" summary="Differences" cellspacing="0">
              <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
              <thead>
                <tr>
                  <th title="File a/components/specification/released-schema/2013-10-dev-2/ome.xsd">
                      a
                  </th>
                  <th title="File b/components/specification/released-schema/2013-10-dev-2/ome.xsd">
                      b
                  </th>
                  <td><em></em> </td>
                </tr>
              </thead>
            <tbody class="unmod">
                  <tr>
                          <th>1597</th><th>1597</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:documentation&gt;</span> </td>
                  </tr><tr>
                          <th>1598</th><th>1598</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:annotation&gt;</span> </td>
                  </tr><tr>
                          <th>1599</th><th>1599</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:attribute&gt;</span> </td>
                  </tr>
            </tbody><tbody class="mod">
                      <tr class="first">
                        <th>1600</th><th> </th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:attribute name="Iris" use="optional"<del>&nbsp;type="xsd:boolean"</del>&gt;</span> </td>
                      </tr>
                      <tr class="last">
                        <th> </th><th>1600</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:attribute name="Iris" use="optional"<ins></ins>&gt;</span> </td>
                      </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>1601</th><th>1601</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:annotation&gt;</span> </td>
                  </tr><tr>
                          <th>1602</th><th>1602</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:documentation&gt;</span> </td>
                  </tr>
            </tbody><tbody class="mod">
                      <tr class="first">
                        <th>1603</th><th> </th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Records whether or not the objective was fitted with an Iris. <del>[flag]</del></span> </td>
                      </tr>
                      <tr class="last">
                        <th> </th><th>1603</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Records whether or not the objective was fitted with an Iris. <ins>&nbsp;Present if an Iris is present, or else Absent.</ins></span> </td>
                      </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>1604</th><th>1604</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:documentation&gt;</span> </td>
                  </tr><tr>
                          <th>1605</th><th>1605</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:annotation&gt;</span> </td>
                  </tr>
            </tbody><tbody class="add">
                  <tr class="first">
                          <th> </th><th>1606</th><td class="r"><ins>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:simpleType&gt;</ins> </td>
                  </tr><tr>
                          <th> </th><th>1607</th><td class="r"><ins>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:restriction base="xsd:string"&gt;</ins> </td>
                  </tr><tr>
                          <th> </th><th>1608</th><td class="r"><ins>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:enumeration value="Absent"/&gt;</ins> </td>
                  </tr><tr>
                          <th> </th><th>1609</th><td class="r"><ins>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;xsd:enumeration value="Present"/&gt;</ins> </td>
                  </tr><tr>
                          <th> </th><th>1610</th><td class="r"><ins>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:restriction&gt;</ins> </td>
                  </tr><tr class="last">
                          <th> </th><th>1611</th><td class="r"><ins>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:simpleType&gt;</ins> </td>
                  </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>1606</th><th>1612</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:attribute&gt;</span> </td>
                  </tr><tr>
                          <th>1607</th><th>1613</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:extension&gt;</span> </td>
                  </tr><tr>
                          <th>1608</th><th>1614</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &lt;/xsd:complexContent&gt;</span> </td>
                  </tr>
            </tbody>
        </table>
      </li>
      <li class="entry">
        <h2>
          <a>components/specification/src/ome/specification/XMLMockObjects.java</a>
        </h2>
        <pre>diff --git a/components/specification/src/ome/specification/XMLMockObjects.java b/components/specification/src/ome/specification/XMLMockObjects.java
index 9c2afe3..3754eeb 100644</pre>
        <table class="trac-diff inline" summary="Differences" cellspacing="0">
              <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
              <thead>
                <tr>
                  <th title="File a/components/specification/src/ome/specification/XMLMockObjects.java">
                      a
                  </th>
                  <th title="File b/components/specification/src/ome/specification/XMLMockObjects.java">
                      b
                  </th>
                  <td><em> import ome.xml.model.enums.ExperimentType;</em> </td>
                </tr>
              </thead>
            <tbody class="unmod">
                  <tr>
                          <th>99</th><th>99</th><td class="l"><span>import ome.xml.model.enums.FilamentType;</span> </td>
                  </tr><tr>
                          <th>100</th><th>100</th><td class="l"><span>import ome.xml.model.enums.FilterType;</span> </td>
                  </tr><tr>
                          <th>101</th><th>101</th><td class="l"><span>import ome.xml.model.enums.IlluminationType;</span> </td>
                  </tr>
            </tbody><tbody class="add">
                  <tr class="last first">
                          <th> </th><th>102</th><td class="r"><ins>import ome.xml.model.enums.Iris;</ins> </td>
                  </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>102</th><th>103</th><td class="l"><span>import ome.xml.model.enums.Medium;</span> </td>
                  </tr><tr>
                          <th>103</th><th>104</th><td class="l"><span>import ome.xml.model.enums.Immersion;</span> </td>
                  </tr><tr>
                          <th>104</th><th>105</th><td class="l"><span>import ome.xml.model.enums.LaserType;</span> </td>
                  </tr>
            </tbody>
              <tbody class="skipped">
                <tr>
                  <th><a href="#L369">…</a></th>
                  <th><a href="#L370">…</a></th>
                  <td><em> public class XMLMockObjects</em> </td>
                </tr>
              </tbody>
            <tbody class="unmod">
                  <tr>
                          <th>369</th><th>370</th><td class="l"><span>&nbsp; &nbsp; objective.setCalibratedMagnification(1.0);</span> </td>
                  </tr><tr>
                          <th>370</th><th>371</th><td class="l"><span>&nbsp; &nbsp; objective.setCorrection(CORRECTION);</span> </td>
                  </tr><tr>
                          <th>371</th><th>372</th><td class="l"><span>&nbsp; &nbsp; objective.setImmersion(IMMERSION);</span> </td>
                  </tr>
            </tbody><tbody class="mod">
                      <tr class="first">
                        <th>372</th><th> </th><td class="l"><span>&nbsp; &nbsp; objective.setIris(<del>true</del>);</span> </td>
                      </tr>
                      <tr class="last">
                        <th> </th><th>373</th><td class="r"><span>&nbsp; &nbsp; objective.setIris(<ins>Iris.PRESENT</ins>);</span> </td>
                      </tr>
            </tbody><tbody class="unmod">
                  <tr>
                          <th>373</th><th>374</th><td class="l"><span>&nbsp; &nbsp; objective.setLensNA(0.5);</span> </td>
                  </tr><tr>
                          <th>374</th><th>375</th><td class="l"><span>&nbsp; &nbsp; objective.setNominalMagnification(1.5);</span> </td>
                  </tr><tr>
                          <th>375</th><th>376</th><td class="l"><span>&nbsp; &nbsp; objective.setWorkingDistance(1.0);</span> </td>
                  </tr>
            </tbody>
        </table>
      </li>
  </ul>
</div>

        </div>
    </div>
    <div id="altlinks">
      <h3>Download in other formats:</h3>
      <ul>
        <li class="last first">
          <a rel="nofollow" href="/ome/raw-attachment/ticket/12121/0004-specification-Add-Iris-enum.patch">Original Format</a>
        </li>
      </ul>
    </div>
	<div id="bottom">
	<p><span class="agilo_version">1.3.13-PRO</span> © 2008-2011
	<a href="http://www.agilosoftware.com/" target="_blank">Agilo Software</a> all
	rights reserved
        (this page was served in: 0.20998 sec.)
    </p>
	</div>
	</div>
		<div class="ome-footer">
			<p>
			  <acronym title="Copyright">©</acronym> 2000-2014 University of
			  Dundee &amp; Open Microscopy Environment.
			  <a href="http://www.openmicroscopy.org/site/about/licensing-attribution">Creative Commons Attribution 3.0 Unported License</a><br />
			  OME source code is available under the <a href="http://www.openmicroscopy.org/site/about/licensing-attribution">
			  GNU General public license</a> or through commercial license from
			<a href="http://www.glencoesoftware.com/">Glencoe Software</a>
		  </p>
		</div>
		<div class="left-ribbon-holder">
			<img id="left-hire-ribbon" src="https://www.openmicroscopy.org/site/art/were-hiring-ribbon-100x100.png" usemap="#left-hire-ribbon-map" />
			<map id="_left-hire-ribbon-map" name="left-hire-ribbon-map">
				<area shape="poly" coords="0,63,63,0,87,0,0,87," href="https://www.openmicroscopy.org/site/community/jobs" alt="We're Hiring!" title="OME Jobs" />
				<area shape="poly" coords="0,0,0,60,60,0," href="/ome" />
				<area shape="poly" coords="90,0,100,0,100,70,28,70," href="/ome" />
			</map>
		</div>
	  </body>
</html>