Changeset 6496


Ignore:
Timestamp:
06/07/10 15:02:27 (9 years ago)
Author:
melissa
Message:

Updated bf-cpp to compile with latest ome.xml.* and loci.formats.meta.* changes.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/autogen/build.xml

    r6016 r6496  
    6767      classpath="${classes.dir}:${component.runtime-cp}" 
    6868      fork="true" dir="${component.jace-header-dir}"> 
     69      <arg value="ome-xml"/> 
     70      <arg value="${root.dir}/components/ome-xml/src"/> 
     71    </java> 
     72    <java classname="${component.jace-header-class}" 
     73      classpath="${classes.dir}:${component.runtime-cp}" 
     74      fork="true" dir="${component.jace-header-dir}"> 
    6975      <arg value="flow-cytometry"/> 
    7076      <arg value="${root.dir}/components/flow-cytometry/src"/> 
  • branches/4.2/components/bio-formats/utils/MinimumWriter.java

    r6491 r6496  
    99 
    1010import ome.xml.model.enums.DimensionOrder; 
    11 import ome.xml.model.enums.EnumerationException; 
    1211import ome.xml.model.enums.PixelType; 
    1312import ome.xml.model.primitives.PositiveInteger; 
  • branches/4.2/components/native/bf-cpp/build.properties

    r6035 r6496  
    2727              ${artifact.dir}/bio-formats.jar:\ 
    2828              ${artifact.dir}/loci-common.jar:\ 
     29              ${artifact.dir}/ome-xml.jar:\ 
    2930              ${artifact.dir}/flow-cytometry.jar 
    3031 
  • branches/4.2/components/native/bf-cpp/include/bio-formats.h

    r6053 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by melissa via JaceHeaderAutogen on Mar 19, 2010 1:24:53 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 1:51:50 PM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
     
    7171#include "jace/proxy/loci/formats/IFormatReader.h" 
    7272#include "jace/proxy/loci/formats/IFormatWriter.h" 
     73#include "jace/proxy/loci/formats/IMetadataConfigurable.h" 
    7374#include "jace/proxy/loci/formats/ImageReader.h" 
    7475#include "jace/proxy/loci/formats/ImageTools.h" 
     
    128129//using namespace jace::proxy::loci::formats::codec; 
    129130 
    130 #include "jace/proxy/loci/formats/enums/AcquisitionMode.h" 
    131 #include "jace/proxy/loci/formats/enums/ArcType.h" 
    132 #include "jace/proxy/loci/formats/enums/Binning.h" 
    133 #include "jace/proxy/loci/formats/enums/ContrastMethod.h" 
    134 #include "jace/proxy/loci/formats/enums/Correction.h" 
    135 #include "jace/proxy/loci/formats/enums/DetectorType.h" 
    136 #include "jace/proxy/loci/formats/enums/DimensionOrder.h" 
    137 #include "jace/proxy/loci/formats/enums/Enumeration.h" 
    138 #include "jace/proxy/loci/formats/enums/EnumerationException.h" 
    139 #include "jace/proxy/loci/formats/enums/EnumerationProvider.h" 
    140 #include "jace/proxy/loci/formats/enums/ExperimentType.h" 
    141 #include "jace/proxy/loci/formats/enums/FilamentType.h" 
    142 #include "jace/proxy/loci/formats/enums/FilterType.h" 
    143 #include "jace/proxy/loci/formats/enums/FontFamily.h" 
    144 #include "jace/proxy/loci/formats/enums/FontStyle.h" 
    145 #include "jace/proxy/loci/formats/enums/IEnumerationProvider.h" 
    146 #include "jace/proxy/loci/formats/enums/IlluminationType.h" 
    147 #include "jace/proxy/loci/formats/enums/Immersion.h" 
    148 #include "jace/proxy/loci/formats/enums/LaserMedium.h" 
    149 #include "jace/proxy/loci/formats/enums/LaserType.h" 
    150 #include "jace/proxy/loci/formats/enums/LineCap.h" 
    151 #include "jace/proxy/loci/formats/enums/Marker.h" 
    152 #include "jace/proxy/loci/formats/enums/Medium.h" 
    153 #include "jace/proxy/loci/formats/enums/MicrobeamManipulationType.h" 
    154 #include "jace/proxy/loci/formats/enums/MicroscopeType.h" 
    155 #include "jace/proxy/loci/formats/enums/NamingConvention.h" 
    156 #include "jace/proxy/loci/formats/enums/PixelType.h" 
    157 #include "jace/proxy/loci/formats/enums/Pulse.h" 
    158 //using namespace jace::proxy::loci::formats::enums; 
    159  
    160 #include "jace/proxy/loci/formats/enums/handler/AcquisitionModeEnumHandler.h" 
    161 #include "jace/proxy/loci/formats/enums/handler/ArcTypeEnumHandler.h" 
    162 #include "jace/proxy/loci/formats/enums/handler/BinningEnumHandler.h" 
    163 #include "jace/proxy/loci/formats/enums/handler/ContrastMethodEnumHandler.h" 
    164 #include "jace/proxy/loci/formats/enums/handler/CorrectionEnumHandler.h" 
    165 #include "jace/proxy/loci/formats/enums/handler/DetectorTypeEnumHandler.h" 
    166 #include "jace/proxy/loci/formats/enums/handler/DimensionOrderEnumHandler.h" 
    167 #include "jace/proxy/loci/formats/enums/handler/ExperimentTypeEnumHandler.h" 
    168 #include "jace/proxy/loci/formats/enums/handler/FilamentTypeEnumHandler.h" 
    169 #include "jace/proxy/loci/formats/enums/handler/FilterTypeEnumHandler.h" 
    170 #include "jace/proxy/loci/formats/enums/handler/FontFamilyEnumHandler.h" 
    171 #include "jace/proxy/loci/formats/enums/handler/FontStyleEnumHandler.h" 
    172 #include "jace/proxy/loci/formats/enums/handler/HandlerFactory.h" 
    173 #include "jace/proxy/loci/formats/enums/handler/IEnumerationHandler.h" 
    174 #include "jace/proxy/loci/formats/enums/handler/IlluminationTypeEnumHandler.h" 
    175 #include "jace/proxy/loci/formats/enums/handler/ImmersionEnumHandler.h" 
    176 #include "jace/proxy/loci/formats/enums/handler/LaserMediumEnumHandler.h" 
    177 #include "jace/proxy/loci/formats/enums/handler/LaserTypeEnumHandler.h" 
    178 #include "jace/proxy/loci/formats/enums/handler/LineCapEnumHandler.h" 
    179 #include "jace/proxy/loci/formats/enums/handler/MarkerEnumHandler.h" 
    180 #include "jace/proxy/loci/formats/enums/handler/MediumEnumHandler.h" 
    181 #include "jace/proxy/loci/formats/enums/handler/MicrobeamManipulationTypeEnumHandler.h" 
    182 #include "jace/proxy/loci/formats/enums/handler/MicroscopeTypeEnumHandler.h" 
    183 #include "jace/proxy/loci/formats/enums/handler/NamingConventionEnumHandler.h" 
    184 #include "jace/proxy/loci/formats/enums/handler/PixelTypeEnumHandler.h" 
    185 #include "jace/proxy/loci/formats/enums/handler/PulseEnumHandler.h" 
    186 //using namespace jace::proxy::loci::formats::enums::handler; 
    187  
    188131#include "jace/proxy/loci/formats/gui/AWTImageTools.h" 
    189132#include "jace/proxy/loci/formats/gui/BufferedImageReader.h" 
     
    223166#include "jace/proxy/loci/formats/in/BMPReader.h" 
    224167#include "jace/proxy/loci/formats/in/BaseTiffReader.h" 
     168#include "jace/proxy/loci/formats/in/BioRadGelReader.h" 
    225169#include "jace/proxy/loci/formats/in/BioRadReader.h" 
    226170#include "jace/proxy/loci/formats/in/BurleighReader.h" 
    227171#include "jace/proxy/loci/formats/in/CellomicsReader.h" 
     172#include "jace/proxy/loci/formats/in/DefaultMetadataOptions.h" 
    228173#include "jace/proxy/loci/formats/in/DeltavisionReader.h" 
    229174#include "jace/proxy/loci/formats/in/DicomReader.h" 
     
    254199#include "jace/proxy/loci/formats/in/JPEG2000Reader.h" 
    255200#include "jace/proxy/loci/formats/in/JPEGReader.h" 
     201#include "jace/proxy/loci/formats/in/JPKReader.h" 
    256202#include "jace/proxy/loci/formats/in/KhorosReader.h" 
    257203#include "jace/proxy/loci/formats/in/L2DReader.h" 
     
    269215#include "jace/proxy/loci/formats/in/MRCReader.h" 
    270216#include "jace/proxy/loci/formats/in/MRWReader.h" 
     217#include "jace/proxy/loci/formats/in/MetadataLevel.h" 
     218#include "jace/proxy/loci/formats/in/MetadataOptions.h" 
    271219#include "jace/proxy/loci/formats/in/MetamorphHandler.h" 
    272220#include "jace/proxy/loci/formats/in/MetamorphReader.h" 
     
    274222#include "jace/proxy/loci/formats/in/MicromanagerReader.h" 
    275223#include "jace/proxy/loci/formats/in/MinimalTiffReader.h" 
     224#include "jace/proxy/loci/formats/in/MolecularImagingReader.h" 
    276225#include "jace/proxy/loci/formats/in/NAFReader.h" 
    277226#include "jace/proxy/loci/formats/in/ND2Reader.h" 
     
    297246#include "jace/proxy/loci/formats/in/QTReader.h" 
    298247#include "jace/proxy/loci/formats/in/QuesantReader.h" 
     248#include "jace/proxy/loci/formats/in/RHKReader.h" 
     249#include "jace/proxy/loci/formats/in/SBIGReader.h" 
    299250#include "jace/proxy/loci/formats/in/SDTInfo.h" 
    300251#include "jace/proxy/loci/formats/in/SDTReader.h" 
     
    307258#include "jace/proxy/loci/formats/in/TCSReader.h" 
    308259#include "jace/proxy/loci/formats/in/TargaReader.h" 
     260#include "jace/proxy/loci/formats/in/TextReader.h" 
    309261#include "jace/proxy/loci/formats/in/TiffDelegateReader.h" 
    310262#include "jace/proxy/loci/formats/in/TiffJAIReader.h" 
     
    333285 
    334286#include "jace/proxy/loci/formats/ome/AbstractOMEXMLMetadata.h" 
    335 #include "jace/proxy/loci/formats/ome/OMEXML2003FCMetadata.h" 
    336 #include "jace/proxy/loci/formats/ome/OMEXML200706Metadata.h" 
    337 #include "jace/proxy/loci/formats/ome/OMEXML200802Metadata.h" 
    338 #include "jace/proxy/loci/formats/ome/OMEXML200809Metadata.h" 
    339287#include "jace/proxy/loci/formats/ome/OMEXMLMetadata.h" 
     288#include "jace/proxy/loci/formats/ome/OMEXMLMetadataImpl.h" 
    340289#include "jace/proxy/loci/formats/ome/OmeisException.h" 
    341290#include "jace/proxy/loci/formats/ome/OmeisImporter.h" 
  • branches/4.2/components/native/bf-cpp/include/flow-cytometry.h

    r6053 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by melissa via JaceHeaderAutogen on Mar 19, 2010 1:24:54 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 1:51:52 PM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
  • branches/4.2/components/native/bf-cpp/include/loci-common.h

    r6053 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by melissa via JaceHeaderAutogen on Mar 19, 2010 1:24:54 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 1:51:51 PM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
     
    5959#include "jace/proxy/loci/common/DataTools.h" 
    6060#include "jace/proxy/loci/common/DateTools.h" 
     61#include "jace/proxy/loci/common/DebugTools.h" 
    6162#include "jace/proxy/loci/common/FileHandle.h" 
    6263#include "jace/proxy/loci/common/GZipHandle.h" 
     
    6768#include "jace/proxy/loci/common/IniTable.h" 
    6869#include "jace/proxy/loci/common/Location.h" 
     70#include "jace/proxy/loci/common/NIOByteBufferProvider.h" 
    6971#include "jace/proxy/loci/common/NIOFileHandle.h" 
    7072#include "jace/proxy/loci/common/NIOInputStream.h" 
     
    7476#include "jace/proxy/loci/common/ReflectedUniverse.h" 
    7577#include "jace/proxy/loci/common/Region.h" 
     78#include "jace/proxy/loci/common/StatusEvent.h" 
     79#include "jace/proxy/loci/common/StatusListener.h" 
     80#include "jace/proxy/loci/common/StatusReporter.h" 
    7681#include "jace/proxy/loci/common/StreamHandle.h" 
    7782#include "jace/proxy/loci/common/URLHandle.h" 
  • branches/4.2/components/native/bf-cpp/source/minimum_writer.cpp

    r5682 r6496  
    5454using jace::proxy::loci::formats::MetadataTools; 
    5555using jace::proxy::loci::formats::meta::IMetadata; 
     56#include "ome-xml.h" 
     57using jace::proxy::ome::xml::model::enums::DimensionOrder; 
     58using jace::proxy::ome::xml::model::enums::PixelType; 
     59using jace::proxy::ome::xml::model::primitives::PositiveInteger; 
    5660 
    5761#include <iostream> 
     
    118122  IMetadata meta = MetadataTools::createOMEXMLMetadata(); 
    119123  meta.createRoot(); 
    120   meta.setPixelsBigEndian(Boolean(1), 0, 0); 
    121   meta.setPixelsDimensionOrder("XYZCT", 0, 0); 
    122   meta.setPixelsPixelType(FormatTools::getPixelTypeString(pixelType), 0, 0); 
    123   meta.setPixelsSizeX(Integer(w), 0, 0); 
    124   meta.setPixelsSizeY(Integer(h), 0, 0); 
    125   meta.setPixelsSizeZ(Integer(1), 0, 0); 
    126   meta.setPixelsSizeC(Integer(1), 0, 0); 
    127   meta.setPixelsSizeT(Integer(1), 0, 0); 
    128   meta.setLogicalChannelSamplesPerPixel(Integer(1), 0, 0); 
     124  meta.setImageID("Image:0", 0); 
     125  meta.setPixelsID("Pixels:0", 0); 
     126  meta.setPixelsBinDataBigEndian(Boolean(1), 0, 0); 
     127  meta.setPixelsDimensionOrder(DimensionOrder::XYZCT(), 0); 
     128  meta.setPixelsType( 
     129    PixelType::fromString(FormatTools::getPixelTypeString(pixelType)), 0); 
     130  meta.setPixelsSizeX(PositiveInteger(Integer(w)), 0); 
     131  meta.setPixelsSizeY(PositiveInteger(Integer(h)), 0); 
     132  meta.setPixelsSizeZ(PositiveInteger(Integer(1)), 0); 
     133  meta.setPixelsSizeC(PositiveInteger(Integer(1)), 0); 
     134  meta.setPixelsSizeT(PositiveInteger(Integer(1)), 0); 
     135  meta.setChannelID("Channel:0:0", 0, 0); 
     136  meta.setChannelSamplesPerPixel(Integer(1), 0, 0); 
    129137 
    130138  // write image plane to disk 
  • branches/4.2/components/native/bf-cpp/src/conflicts.txt

    r5783 r6496  
    5151loci.formats.out.TiffWriter.COMPRESSION_LZW 
    5252loci.formats.out.TiffWriter.COMPRESSION_JPEG 
     53ome.xml.model.enums.Compression.NONE 
     54ome.xml.model.enums.LineCap.LINE 
  • trunk/components/native/bf-cpp/include/bio-formats.h

    r6386 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by curtis via JaceHeaderAutogen on May 25, 2010 1:08:16 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 10:59:00 AM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
     
    258258#include "jace/proxy/loci/formats/in/TCSReader.h" 
    259259#include "jace/proxy/loci/formats/in/TargaReader.h" 
     260#include "jace/proxy/loci/formats/in/TextReader.h" 
    260261#include "jace/proxy/loci/formats/in/TiffDelegateReader.h" 
    261262#include "jace/proxy/loci/formats/in/TiffJAIReader.h" 
  • trunk/components/native/bf-cpp/include/flow-cytometry.h

    r6386 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by curtis via JaceHeaderAutogen on May 25, 2010 1:08:17 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 10:59:02 AM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
  • trunk/components/native/bf-cpp/include/loci-common.h

    r6386 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by curtis via JaceHeaderAutogen on May 25, 2010 1:08:16 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 10:59:00 AM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
  • trunk/components/native/bf-cpp/include/ome-xml.h

    r6386 r6496  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by curtis via JaceHeaderAutogen on May 25, 2010 1:08:17 PM CDT 
     44 * Created by melissa via JaceHeaderAutogen on Jun 7, 2010 10:59:01 AM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
     
    5555#include "jace/proxy/ome/xml/CustomNode.h" 
    5656#include "jace/proxy/ome/xml/DOMUtil.h" 
    57 #include "jace/proxy/ome/xml/MetadataRetrieve.h" 
    58 #include "jace/proxy/ome/xml/MetadataStore.h" 
    5957#include "jace/proxy/ome/xml/OMEXMLFactory.h" 
    60 #include "jace/proxy/ome/xml/OMEXMLMetadataImpl.h" 
    6158#include "jace/proxy/ome/xml/OMEXMLNode.h" 
    6259//using namespace jace::proxy::ome::xml; 
     60 
     61#include "jace/proxy/ome/xml/model/AbstractOMEModelObject.h" 
     62#include "jace/proxy/ome/xml/model/Annotation.h" 
     63#include "jace/proxy/ome/xml/model/AnnotationRef.h" 
     64#include "jace/proxy/ome/xml/model/Arc.h" 
     65#include "jace/proxy/ome/xml/model/BinData.h" 
     66#include "jace/proxy/ome/xml/model/BinaryFile.h" 
     67#include "jace/proxy/ome/xml/model/BooleanAnnotation.h" 
     68#include "jace/proxy/ome/xml/model/Channel.h" 
     69#include "jace/proxy/ome/xml/model/ChannelRef.h" 
     70#include "jace/proxy/ome/xml/model/Contact.h" 
     71#include "jace/proxy/ome/xml/model/Dataset.h" 
     72#include "jace/proxy/ome/xml/model/DatasetRef.h" 
     73#include "jace/proxy/ome/xml/model/Detector.h" 
     74#include "jace/proxy/ome/xml/model/DetectorSettings.h" 
     75#include "jace/proxy/ome/xml/model/Dichroic.h" 
     76#include "jace/proxy/ome/xml/model/DichroicRef.h" 
     77#include "jace/proxy/ome/xml/model/DoubleAnnotation.h" 
     78#include "jace/proxy/ome/xml/model/Ellipse.h" 
     79#include "jace/proxy/ome/xml/model/EmissionFilterRef.h" 
     80#include "jace/proxy/ome/xml/model/ExcitationFilterRef.h" 
     81#include "jace/proxy/ome/xml/model/Experiment.h" 
     82#include "jace/proxy/ome/xml/model/ExperimentRef.h" 
     83#include "jace/proxy/ome/xml/model/Experimenter.h" 
     84#include "jace/proxy/ome/xml/model/ExperimenterRef.h" 
     85#include "jace/proxy/ome/xml/model/External.h" 
     86#include "jace/proxy/ome/xml/model/Filament.h" 
     87#include "jace/proxy/ome/xml/model/FileAnnotation.h" 
     88#include "jace/proxy/ome/xml/model/Filter.h" 
     89#include "jace/proxy/ome/xml/model/FilterRef.h" 
     90#include "jace/proxy/ome/xml/model/FilterSet.h" 
     91#include "jace/proxy/ome/xml/model/FilterSetRef.h" 
     92#include "jace/proxy/ome/xml/model/Group.h" 
     93#include "jace/proxy/ome/xml/model/GroupRef.h" 
     94#include "jace/proxy/ome/xml/model/Image.h" 
     95#include "jace/proxy/ome/xml/model/ImageRef.h" 
     96#include "jace/proxy/ome/xml/model/ImagingEnvironment.h" 
     97#include "jace/proxy/ome/xml/model/Instrument.h" 
     98#include "jace/proxy/ome/xml/model/InstrumentRef.h" 
     99#include "jace/proxy/ome/xml/model/Laser.h" 
     100#include "jace/proxy/ome/xml/model/Leader.h" 
     101#include "jace/proxy/ome/xml/model/LightEmittingDiode.h" 
     102#include "jace/proxy/ome/xml/model/LightPath.h" 
     103#include "jace/proxy/ome/xml/model/LightSource.h" 
     104#include "jace/proxy/ome/xml/model/LightSourceSettings.h" 
     105#include "jace/proxy/ome/xml/model/Line.h" 
     106#include "jace/proxy/ome/xml/model/ListAnnotation.h" 
     107#include "jace/proxy/ome/xml/model/LongAnnotation.h" 
     108#include "jace/proxy/ome/xml/model/ManufacturerSpec.h" 
     109#include "jace/proxy/ome/xml/model/Mask.h" 
     110#include "jace/proxy/ome/xml/model/MetadataOnly.h" 
     111#include "jace/proxy/ome/xml/model/MicrobeamManipulation.h" 
     112#include "jace/proxy/ome/xml/model/MicrobeamManipulationRef.h" 
     113#include "jace/proxy/ome/xml/model/Microscope.h" 
     114#include "jace/proxy/ome/xml/model/OME.h" 
     115#include "jace/proxy/ome/xml/model/OMEModel.h" 
     116#include "jace/proxy/ome/xml/model/OMEModelImpl.h" 
     117#include "jace/proxy/ome/xml/model/OMEModelObject.h" 
     118#include "jace/proxy/ome/xml/model/OTF.h" 
     119#include "jace/proxy/ome/xml/model/OTFRef.h" 
     120#include "jace/proxy/ome/xml/model/Objective.h" 
     121#include "jace/proxy/ome/xml/model/ObjectiveSettings.h" 
     122#include "jace/proxy/ome/xml/model/Path.h" 
     123#include "jace/proxy/ome/xml/model/Pixels.h" 
     124#include "jace/proxy/ome/xml/model/Plane.h" 
     125#include "jace/proxy/ome/xml/model/Plate.h" 
     126#include "jace/proxy/ome/xml/model/PlateAcquisition.h" 
     127#include "jace/proxy/ome/xml/model/PlateRef.h" 
     128#include "jace/proxy/ome/xml/model/Point.h" 
     129#include "jace/proxy/ome/xml/model/Polyline.h" 
     130#include "jace/proxy/ome/xml/model/Project.h" 
     131#include "jace/proxy/ome/xml/model/ProjectRef.h" 
     132#include "jace/proxy/ome/xml/model/Pump.h" 
     133#include "jace/proxy/ome/xml/model/ROI.h" 
     134#include "jace/proxy/ome/xml/model/ROIRef.h" 
     135#include "jace/proxy/ome/xml/model/Reagent.h" 
     136#include "jace/proxy/ome/xml/model/ReagentRef.h" 
     137#include "jace/proxy/ome/xml/model/Rectangle.h" 
     138#include "jace/proxy/ome/xml/model/Reference.h" 
     139#include "jace/proxy/ome/xml/model/Screen.h" 
     140#include "jace/proxy/ome/xml/model/ScreenRef.h" 
     141#include "jace/proxy/ome/xml/model/Settings.h" 
     142#include "jace/proxy/ome/xml/model/Shape.h" 
     143#include "jace/proxy/ome/xml/model/StageLabel.h" 
     144#include "jace/proxy/ome/xml/model/StringAnnotation.h" 
     145#include "jace/proxy/ome/xml/model/StructuredAnnotations.h" 
     146#include "jace/proxy/ome/xml/model/Text.h" 
     147#include "jace/proxy/ome/xml/model/TiffData.h" 
     148#include "jace/proxy/ome/xml/model/TimestampAnnotation.h" 
     149#include "jace/proxy/ome/xml/model/TransmittanceRange.h" 
     150#include "jace/proxy/ome/xml/model/UUID.h" 
     151#include "jace/proxy/ome/xml/model/Union.h" 
     152#include "jace/proxy/ome/xml/model/Well.h" 
     153#include "jace/proxy/ome/xml/model/WellSample.h" 
     154#include "jace/proxy/ome/xml/model/WellSampleRef.h" 
     155#include "jace/proxy/ome/xml/model/XMLAnnotation.h" 
     156//using namespace jace::proxy::ome::xml::model; 
     157 
     158#include "jace/proxy/ome/xml/model/enums/AcquisitionMode.h" 
     159#include "jace/proxy/ome/xml/model/enums/ArcType.h" 
     160#include "jace/proxy/ome/xml/model/enums/Binning.h" 
     161#include "jace/proxy/ome/xml/model/enums/Compression.h" 
     162#include "jace/proxy/ome/xml/model/enums/ContrastMethod.h" 
     163#include "jace/proxy/ome/xml/model/enums/Correction.h" 
     164#include "jace/proxy/ome/xml/model/enums/DetectorType.h" 
     165#include "jace/proxy/ome/xml/model/enums/DimensionOrder.h" 
     166#include "jace/proxy/ome/xml/model/enums/Enumeration.h" 
     167#include "jace/proxy/ome/xml/model/enums/EnumerationException.h" 
     168#include "jace/proxy/ome/xml/model/enums/ExperimentType.h" 
     169#include "jace/proxy/ome/xml/model/enums/FilamentType.h" 
     170#include "jace/proxy/ome/xml/model/enums/FillRule.h" 
     171#include "jace/proxy/ome/xml/model/enums/FilterType.h" 
     172#include "jace/proxy/ome/xml/model/enums/FontFamily.h" 
     173#include "jace/proxy/ome/xml/model/enums/FontStyle.h" 
     174#include "jace/proxy/ome/xml/model/enums/IlluminationType.h" 
     175#include "jace/proxy/ome/xml/model/enums/Immersion.h" 
     176#include "jace/proxy/ome/xml/model/enums/LaserMedium.h" 
     177#include "jace/proxy/ome/xml/model/enums/LaserType.h" 
     178#include "jace/proxy/ome/xml/model/enums/LineCap.h" 
     179#include "jace/proxy/ome/xml/model/enums/Marker.h" 
     180#include "jace/proxy/ome/xml/model/enums/Medium.h" 
     181#include "jace/proxy/ome/xml/model/enums/MicrobeamManipulationType.h" 
     182#include "jace/proxy/ome/xml/model/enums/MicroscopeType.h" 
     183#include "jace/proxy/ome/xml/model/enums/NamingConvention.h" 
     184#include "jace/proxy/ome/xml/model/enums/PixelType.h" 
     185#include "jace/proxy/ome/xml/model/enums/Pulse.h" 
     186//using namespace jace::proxy::ome::xml::model::enums; 
     187 
     188#include "jace/proxy/ome/xml/model/enums/handlers/AcquisitionModeEnumHandler.h" 
     189#include "jace/proxy/ome/xml/model/enums/handlers/ArcTypeEnumHandler.h" 
     190#include "jace/proxy/ome/xml/model/enums/handlers/BinningEnumHandler.h" 
     191#include "jace/proxy/ome/xml/model/enums/handlers/CompressionEnumHandler.h" 
     192#include "jace/proxy/ome/xml/model/enums/handlers/ContrastMethodEnumHandler.h" 
     193#include "jace/proxy/ome/xml/model/enums/handlers/CorrectionEnumHandler.h" 
     194#include "jace/proxy/ome/xml/model/enums/handlers/DetectorTypeEnumHandler.h" 
     195#include "jace/proxy/ome/xml/model/enums/handlers/DimensionOrderEnumHandler.h" 
     196#include "jace/proxy/ome/xml/model/enums/handlers/ExperimentTypeEnumHandler.h" 
     197#include "jace/proxy/ome/xml/model/enums/handlers/FilamentTypeEnumHandler.h" 
     198#include "jace/proxy/ome/xml/model/enums/handlers/FillRuleEnumHandler.h" 
     199#include "jace/proxy/ome/xml/model/enums/handlers/FilterTypeEnumHandler.h" 
     200#include "jace/proxy/ome/xml/model/enums/handlers/FontFamilyEnumHandler.h" 
     201#include "jace/proxy/ome/xml/model/enums/handlers/FontStyleEnumHandler.h" 
     202#include "jace/proxy/ome/xml/model/enums/handlers/IEnumerationHandler.h" 
     203#include "jace/proxy/ome/xml/model/enums/handlers/IlluminationTypeEnumHandler.h" 
     204#include "jace/proxy/ome/xml/model/enums/handlers/ImmersionEnumHandler.h" 
     205#include "jace/proxy/ome/xml/model/enums/handlers/LaserMediumEnumHandler.h" 
     206#include "jace/proxy/ome/xml/model/enums/handlers/LaserTypeEnumHandler.h" 
     207#include "jace/proxy/ome/xml/model/enums/handlers/LineCapEnumHandler.h" 
     208#include "jace/proxy/ome/xml/model/enums/handlers/MarkerEnumHandler.h" 
     209#include "jace/proxy/ome/xml/model/enums/handlers/MediumEnumHandler.h" 
     210#include "jace/proxy/ome/xml/model/enums/handlers/MicrobeamManipulationTypeEnumHandler.h" 
     211#include "jace/proxy/ome/xml/model/enums/handlers/MicroscopeTypeEnumHandler.h" 
     212#include "jace/proxy/ome/xml/model/enums/handlers/NamingConventionEnumHandler.h" 
     213#include "jace/proxy/ome/xml/model/enums/handlers/PixelTypeEnumHandler.h" 
     214#include "jace/proxy/ome/xml/model/enums/handlers/PulseEnumHandler.h" 
     215//using namespace jace::proxy::ome::xml::model::enums::handlers; 
     216 
     217#include "jace/proxy/ome/xml/model/primitives/NonNegativeInteger.h" 
     218#include "jace/proxy/ome/xml/model/primitives/PercentFraction.h" 
     219#include "jace/proxy/ome/xml/model/primitives/PositiveInteger.h" 
     220#include "jace/proxy/ome/xml/model/primitives/PrimitiveType.h" 
     221//using namespace jace::proxy::ome::xml::model::primitives; 
    63222 
    64223#include "jace/proxy/ome/xml/r2003fc/ome/ArcNode.h" 
     
    365524//using namespace jace::proxy::ome::xml::r200809::spw; 
    366525 
    367 #include "jace/proxy/ome/xml/r201004/AbstractOMEModelObject.h" 
    368 #include "jace/proxy/ome/xml/r201004/Annotation.h" 
    369 #include "jace/proxy/ome/xml/r201004/AnnotationRef.h" 
    370 #include "jace/proxy/ome/xml/r201004/Arc.h" 
    371 #include "jace/proxy/ome/xml/r201004/BinData.h" 
    372 #include "jace/proxy/ome/xml/r201004/BinaryFile.h" 
    373 #include "jace/proxy/ome/xml/r201004/BooleanAnnotation.h" 
    374 #include "jace/proxy/ome/xml/r201004/Channel.h" 
    375 #include "jace/proxy/ome/xml/r201004/ChannelRef.h" 
    376 #include "jace/proxy/ome/xml/r201004/Contact.h" 
    377 #include "jace/proxy/ome/xml/r201004/Dataset.h" 
    378 #include "jace/proxy/ome/xml/r201004/DatasetRef.h" 
    379 #include "jace/proxy/ome/xml/r201004/Detector.h" 
    380 #include "jace/proxy/ome/xml/r201004/DetectorSettings.h" 
    381 #include "jace/proxy/ome/xml/r201004/Dichroic.h" 
    382 #include "jace/proxy/ome/xml/r201004/DichroicRef.h" 
    383 #include "jace/proxy/ome/xml/r201004/DoubleAnnotation.h" 
    384 #include "jace/proxy/ome/xml/r201004/Ellipse.h" 
    385 #include "jace/proxy/ome/xml/r201004/EmissionFilterRef.h" 
    386 #include "jace/proxy/ome/xml/r201004/ExcitationFilterRef.h" 
    387 #include "jace/proxy/ome/xml/r201004/Experiment.h" 
    388 #include "jace/proxy/ome/xml/r201004/ExperimentRef.h" 
    389 #include "jace/proxy/ome/xml/r201004/Experimenter.h" 
    390 #include "jace/proxy/ome/xml/r201004/ExperimenterRef.h" 
    391 #include "jace/proxy/ome/xml/r201004/External.h" 
    392 #include "jace/proxy/ome/xml/r201004/Filament.h" 
    393 #include "jace/proxy/ome/xml/r201004/FileAnnotation.h" 
    394 #include "jace/proxy/ome/xml/r201004/Filter.h" 
    395 #include "jace/proxy/ome/xml/r201004/FilterRef.h" 
    396 #include "jace/proxy/ome/xml/r201004/FilterSet.h" 
    397 #include "jace/proxy/ome/xml/r201004/FilterSetRef.h" 
    398 #include "jace/proxy/ome/xml/r201004/Group.h" 
    399 #include "jace/proxy/ome/xml/r201004/GroupRef.h" 
    400 #include "jace/proxy/ome/xml/r201004/Image.h" 
    401 #include "jace/proxy/ome/xml/r201004/ImageRef.h" 
    402 #include "jace/proxy/ome/xml/r201004/ImagingEnvironment.h" 
    403 #include "jace/proxy/ome/xml/r201004/Instrument.h" 
    404 #include "jace/proxy/ome/xml/r201004/InstrumentRef.h" 
    405 #include "jace/proxy/ome/xml/r201004/Laser.h" 
    406 #include "jace/proxy/ome/xml/r201004/Leader.h" 
    407 #include "jace/proxy/ome/xml/r201004/LightEmittingDiode.h" 
    408 #include "jace/proxy/ome/xml/r201004/LightPath.h" 
    409 #include "jace/proxy/ome/xml/r201004/LightSource.h" 
    410 #include "jace/proxy/ome/xml/r201004/LightSourceSettings.h" 
    411 #include "jace/proxy/ome/xml/r201004/Line.h" 
    412 #include "jace/proxy/ome/xml/r201004/ListAnnotation.h" 
    413 #include "jace/proxy/ome/xml/r201004/LongAnnotation.h" 
    414 #include "jace/proxy/ome/xml/r201004/ManufacturerSpec.h" 
    415 #include "jace/proxy/ome/xml/r201004/Mask.h" 
    416 #include "jace/proxy/ome/xml/r201004/MetadataOnly.h" 
    417 #include "jace/proxy/ome/xml/r201004/MicrobeamManipulation.h" 
    418 #include "jace/proxy/ome/xml/r201004/MicrobeamManipulationRef.h" 
    419 #include "jace/proxy/ome/xml/r201004/Microscope.h" 
    420 #include "jace/proxy/ome/xml/r201004/OME.h" 
    421 #include "jace/proxy/ome/xml/r201004/OMEModel.h" 
    422 #include "jace/proxy/ome/xml/r201004/OMEModelImpl.h" 
    423 #include "jace/proxy/ome/xml/r201004/OMEModelObject.h" 
    424 #include "jace/proxy/ome/xml/r201004/OTF.h" 
    425 #include "jace/proxy/ome/xml/r201004/OTFRef.h" 
    426 #include "jace/proxy/ome/xml/r201004/Objective.h" 
    427 #include "jace/proxy/ome/xml/r201004/ObjectiveSettings.h" 
    428 #include "jace/proxy/ome/xml/r201004/Path.h" 
    429 #include "jace/proxy/ome/xml/r201004/Pixels.h" 
    430 #include "jace/proxy/ome/xml/r201004/Plane.h" 
    431 #include "jace/proxy/ome/xml/r201004/Plate.h" 
    432 #include "jace/proxy/ome/xml/r201004/PlateAcquisition.h" 
    433 #include "jace/proxy/ome/xml/r201004/PlateRef.h" 
    434 #include "jace/proxy/ome/xml/r201004/Point.h" 
    435 #include "jace/proxy/ome/xml/r201004/Polyline.h" 
    436 #include "jace/proxy/ome/xml/r201004/Project.h" 
    437 #include "jace/proxy/ome/xml/r201004/ProjectRef.h" 
    438 #include "jace/proxy/ome/xml/r201004/Pump.h" 
    439 #include "jace/proxy/ome/xml/r201004/ROI.h" 
    440 #include "jace/proxy/ome/xml/r201004/ROIRef.h" 
    441 #include "jace/proxy/ome/xml/r201004/Reagent.h" 
    442 #include "jace/proxy/ome/xml/r201004/ReagentRef.h" 
    443 #include "jace/proxy/ome/xml/r201004/Rectangle.h" 
    444 #include "jace/proxy/ome/xml/r201004/Reference.h" 
    445 #include "jace/proxy/ome/xml/r201004/Screen.h" 
    446 #include "jace/proxy/ome/xml/r201004/ScreenRef.h" 
    447 #include "jace/proxy/ome/xml/r201004/Settings.h" 
    448 #include "jace/proxy/ome/xml/r201004/Shape.h" 
    449 #include "jace/proxy/ome/xml/r201004/StageLabel.h" 
    450 #include "jace/proxy/ome/xml/r201004/StringAnnotation.h" 
    451 #include "jace/proxy/ome/xml/r201004/StructuredAnnotations.h" 
    452 #include "jace/proxy/ome/xml/r201004/Text.h" 
    453 #include "jace/proxy/ome/xml/r201004/TiffData.h" 
    454 #include "jace/proxy/ome/xml/r201004/TimestampAnnotation.h" 
    455 #include "jace/proxy/ome/xml/r201004/TransmittanceRange.h" 
    456 #include "jace/proxy/ome/xml/r201004/UUID.h" 
    457 #include "jace/proxy/ome/xml/r201004/Union.h" 
    458 #include "jace/proxy/ome/xml/r201004/Well.h" 
    459 #include "jace/proxy/ome/xml/r201004/WellSample.h" 
    460 #include "jace/proxy/ome/xml/r201004/WellSampleRef.h" 
    461 #include "jace/proxy/ome/xml/r201004/XMLAnnotation.h" 
    462 //using namespace jace::proxy::ome::xml::r201004; 
    463  
    464 #include "jace/proxy/ome/xml/r201004/enums/AcquisitionMode.h" 
    465 #include "jace/proxy/ome/xml/r201004/enums/ArcType.h" 
    466 #include "jace/proxy/ome/xml/r201004/enums/Binning.h" 
    467 #include "jace/proxy/ome/xml/r201004/enums/Compression.h" 
    468 #include "jace/proxy/ome/xml/r201004/enums/ContrastMethod.h" 
    469 #include "jace/proxy/ome/xml/r201004/enums/Correction.h" 
    470 #include "jace/proxy/ome/xml/r201004/enums/DetectorType.h" 
    471 #include "jace/proxy/ome/xml/r201004/enums/DimensionOrder.h" 
    472 #include "jace/proxy/ome/xml/r201004/enums/Enumeration.h" 
    473 #include "jace/proxy/ome/xml/r201004/enums/EnumerationException.h" 
    474 #include "jace/proxy/ome/xml/r201004/enums/ExperimentType.h" 
    475 #include "jace/proxy/ome/xml/r201004/enums/FilamentType.h" 
    476 #include "jace/proxy/ome/xml/r201004/enums/FillRule.h" 
    477 #include "jace/proxy/ome/xml/r201004/enums/FilterType.h" 
    478 #include "jace/proxy/ome/xml/r201004/enums/FontFamily.h" 
    479 #include "jace/proxy/ome/xml/r201004/enums/FontStyle.h" 
    480 #include "jace/proxy/ome/xml/r201004/enums/IlluminationType.h" 
    481 #include "jace/proxy/ome/xml/r201004/enums/Immersion.h" 
    482 #include "jace/proxy/ome/xml/r201004/enums/LaserMedium.h" 
    483 #include "jace/proxy/ome/xml/r201004/enums/LaserType.h" 
    484 #include "jace/proxy/ome/xml/r201004/enums/LineCap.h" 
    485 #include "jace/proxy/ome/xml/r201004/enums/Marker.h" 
    486 #include "jace/proxy/ome/xml/r201004/enums/Medium.h" 
    487 #include "jace/proxy/ome/xml/r201004/enums/MicrobeamManipulationType.h" 
    488 #include "jace/proxy/ome/xml/r201004/enums/MicroscopeType.h" 
    489 #include "jace/proxy/ome/xml/r201004/enums/NamingConvention.h" 
    490 #include "jace/proxy/ome/xml/r201004/enums/PixelType.h" 
    491 #include "jace/proxy/ome/xml/r201004/enums/ProfileSource.h" 
    492 #include "jace/proxy/ome/xml/r201004/enums/Pulse.h" 
    493 //using namespace jace::proxy::ome::xml::r201004::enums; 
    494  
    495 #include "jace/proxy/ome/xml/r201004/enums/handlers/AcquisitionModeEnumHandler.h" 
    496 #include "jace/proxy/ome/xml/r201004/enums/handlers/ArcTypeEnumHandler.h" 
    497 #include "jace/proxy/ome/xml/r201004/enums/handlers/BinningEnumHandler.h" 
    498 #include "jace/proxy/ome/xml/r201004/enums/handlers/CompressionEnumHandler.h" 
    499 #include "jace/proxy/ome/xml/r201004/enums/handlers/ContrastMethodEnumHandler.h" 
    500 #include "jace/proxy/ome/xml/r201004/enums/handlers/CorrectionEnumHandler.h" 
    501 #include "jace/proxy/ome/xml/r201004/enums/handlers/DetectorTypeEnumHandler.h" 
    502 #include "jace/proxy/ome/xml/r201004/enums/handlers/DimensionOrderEnumHandler.h" 
    503 #include "jace/proxy/ome/xml/r201004/enums/handlers/ExperimentTypeEnumHandler.h" 
    504 #include "jace/proxy/ome/xml/r201004/enums/handlers/FilamentTypeEnumHandler.h" 
    505 #include "jace/proxy/ome/xml/r201004/enums/handlers/FillRuleEnumHandler.h" 
    506 #include "jace/proxy/ome/xml/r201004/enums/handlers/FilterTypeEnumHandler.h" 
    507 #include "jace/proxy/ome/xml/r201004/enums/handlers/FontFamilyEnumHandler.h" 
    508 #include "jace/proxy/ome/xml/r201004/enums/handlers/FontStyleEnumHandler.h" 
    509 #include "jace/proxy/ome/xml/r201004/enums/handlers/IEnumerationHandler.h" 
    510 #include "jace/proxy/ome/xml/r201004/enums/handlers/IlluminationTypeEnumHandler.h" 
    511 #include "jace/proxy/ome/xml/r201004/enums/handlers/ImmersionEnumHandler.h" 
    512 #include "jace/proxy/ome/xml/r201004/enums/handlers/LaserMediumEnumHandler.h" 
    513 #include "jace/proxy/ome/xml/r201004/enums/handlers/LaserTypeEnumHandler.h" 
    514 #include "jace/proxy/ome/xml/r201004/enums/handlers/LineCapEnumHandler.h" 
    515 #include "jace/proxy/ome/xml/r201004/enums/handlers/MarkerEnumHandler.h" 
    516 #include "jace/proxy/ome/xml/r201004/enums/handlers/MediumEnumHandler.h" 
    517 #include "jace/proxy/ome/xml/r201004/enums/handlers/MicrobeamManipulationTypeEnumHandler.h" 
    518 #include "jace/proxy/ome/xml/r201004/enums/handlers/MicroscopeTypeEnumHandler.h" 
    519 #include "jace/proxy/ome/xml/r201004/enums/handlers/NamingConventionEnumHandler.h" 
    520 #include "jace/proxy/ome/xml/r201004/enums/handlers/PixelTypeEnumHandler.h" 
    521 #include "jace/proxy/ome/xml/r201004/enums/handlers/PulseEnumHandler.h" 
    522 //using namespace jace::proxy::ome::xml::r201004::enums::handlers; 
    523  
    524 #include "jace/proxy/ome/xml/r201004/primitives/NonNegativeInteger.h" 
    525 #include "jace/proxy/ome/xml/r201004/primitives/PercentFraction.h" 
    526 #include "jace/proxy/ome/xml/r201004/primitives/PositiveInteger.h" 
    527 #include "jace/proxy/ome/xml/r201004/primitives/PrimitiveType.h" 
    528 //using namespace jace::proxy::ome::xml::r201004::primitives; 
    529  
    530526#endif 
  • trunk/components/native/bf-cpp/source/minimum_writer.cpp

    r6458 r6496  
    122122  IMetadata meta = MetadataTools::createOMEXMLMetadata(); 
    123123  meta.createRoot(); 
     124  meta.setImageID("Image:0", 0); 
     125  meta.setPixelsID("Pixels:0", 0); 
    124126  meta.setPixelsBinDataBigEndian(Boolean(1), 0, 0); 
    125127  meta.setPixelsDimensionOrder(DimensionOrder::XYZCT(), 0); 
     
    131133  meta.setPixelsSizeC(PositiveInteger(Integer(1)), 0); 
    132134  meta.setPixelsSizeT(PositiveInteger(Integer(1)), 0); 
     135  meta.setChannelID("Channel:0:0", 0, 0); 
    133136  meta.setChannelSamplesPerPixel(Integer(1), 0, 0); 
    134137 
Note: See TracChangeset for help on using the changeset viewer.