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

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

Location:
branches/4.2/components/native/bf-cpp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • 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 
Note: See TracChangeset for help on using the changeset viewer.