Changeset 6386


Ignore:
Timestamp:
05/25/10 13:44:07 (9 years ago)
Author:
curtis
Message:

Get Bio-Formats C++ bindings working again.

Location:
trunk/components
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/autogen/build.xml

    r6016 r6386  
    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"/> 
  • trunk/components/bio-formats/utils/MinimumWriter.java

    r6294 r6386  
    99 
    1010import ome.xml.r201004.enums.DimensionOrder; 
    11 import ome.xml.r201004.enums.EnumerationException; 
    1211import ome.xml.r201004.enums.PixelType; 
    1312import ome.xml.r201004.primitives.PositiveInteger; 
  • trunk/components/native/bf-cpp/build.properties

    r6035 r6386  
    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 
  • trunk/components/native/bf-cpp/include/bio-formats.h

    r6384 r6386  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by curtis via JaceHeaderAutogen on May 25, 2010 12:44:15 PM CDT 
     44 * Created by curtis via JaceHeaderAutogen on May 25, 2010 1:08:16 PM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
  • trunk/components/native/bf-cpp/include/flow-cytometry.h

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

    r6384 r6386  
    4242 * 
    4343 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    44  * Created by curtis via JaceHeaderAutogen on May 25, 2010 12:44:15 PM CDT 
     44 * Created by curtis via JaceHeaderAutogen on May 25, 2010 1:08:16 PM CDT 
    4545 * 
    4646 *----------------------------------------------------------------------------- 
  • trunk/components/native/bf-cpp/source/minimum_writer.cpp

    r5682 r6386  
    5454using jace::proxy::loci::formats::MetadataTools; 
    5555using jace::proxy::loci::formats::meta::IMetadata; 
     56#include "ome-xml.h" 
     57using jace::proxy::ome::xml::r201004::enums::DimensionOrder; 
     58using jace::proxy::ome::xml::r201004::enums::PixelType; 
     59using jace::proxy::ome::xml::r201004::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.setPixelsBinDataBigEndian(Boolean(1), 0, 0); 
     125  meta.setPixelsDimensionOrder(DimensionOrder::XYZCT(), 0); 
     126  meta.setPixelsType( 
     127    PixelType::fromString(FormatTools::getPixelTypeString(pixelType)), 0); 
     128  meta.setPixelsSizeX(PositiveInteger(Integer(w)), 0); 
     129  meta.setPixelsSizeY(PositiveInteger(Integer(h)), 0); 
     130  meta.setPixelsSizeZ(PositiveInteger(Integer(1)), 0); 
     131  meta.setPixelsSizeC(PositiveInteger(Integer(1)), 0); 
     132  meta.setPixelsSizeT(PositiveInteger(Integer(1)), 0); 
     133  meta.setChannelSamplesPerPixel(Integer(1), 0, 0); 
    129134 
    130135  // write image plane to disk 
Note: See TracChangeset for help on using the changeset viewer.