Changeset 6840


Ignore:
Timestamp:
08/24/10 11:02:21 (9 years ago)
Author:
callan
Message:

Support for type resolution of light sources. Re-run of code generation. ( ome-xml:r671)

Location:
trunk/components/bio-formats
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/meta/AggregateMetadata.java

    r6616 r6840  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-07-01 12:04:30+0100 
     35 * Created by callan via xsd-fu on 2010-08-24 16:48:47+0100 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    132132        } 
    133133 
     134        public String getLightSourceType(int instrumentIndex, int lightSourceIndex) 
     135        { 
     136                for (Iterator iter = delegates.iterator(); iter.hasNext();) 
     137                { 
     138                        Object o = iter.next(); 
     139                        if (o instanceof MetadataRetrieve) 
     140                        { 
     141                                MetadataRetrieve retrieve = (MetadataRetrieve) o; 
     142                                return retrieve.getLightSourceType(instrumentIndex, lightSourceIndex); 
     143                        } 
     144                } 
     145                return null; 
     146        } 
     147 
    134148        // -- Entity counting (code generated definitions) -- 
    135149 
  • trunk/components/bio-formats/src/loci/formats/meta/DummyMetadata.java

    r6616 r6840  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-07-01 12:04:37+0100 
     35 * Created by callan via xsd-fu on 2010-08-24 16:50:49+0100 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    3939 
    4040package loci.formats.meta; 
    41  
    42 import java.util.Iterator; 
    4341 
    4442import ome.xml.model.enums.*; 
     
    8179        } 
    8280 
     81        public String getLightSourceType(int instrumentIndex, int lightSourceIndex) 
     82        { 
     83                return null; 
     84        } 
     85 
    8386        // -- Entity counting (code generated definitions) -- 
    8487 
  • trunk/components/bio-formats/src/loci/formats/meta/MetadataRetrieve.java

    r6616 r6840  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-07-01 12:04:44+0100 
     35 * Created by callan via xsd-fu on 2010-08-24 16:48:27+0100 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    7777        int getPixelsBinDataCount(int imageIndex); 
    7878 
     79        String getLightSourceType(int instrumentIndex, int lightSourceIndex); 
     80 
    7981        // -- Entity counting (code generated definitions) -- 
    8082 
  • trunk/components/bio-formats/src/loci/formats/meta/MetadataStore.java

    r6616 r6840  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-07-01 12:04:46+0100 
     35 * Created by callan via xsd-fu on 2010-08-24 16:48:21+0100 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
  • trunk/components/bio-formats/src/loci/formats/ome/OMEXMLMetadataImpl.java

    r6616 r6840  
    3333 * 
    3434 * THIS IS AUTOMATICALLY GENERATED CODE.  DO NOT MODIFY. 
    35  * Created by callan via xsd-fu on 2010-07-01 12:04:50+0100 
     35 * Created by callan via xsd-fu on 2010-08-24 16:58:15+0100 
    3636 * 
    3737 *----------------------------------------------------------------------------- 
     
    107107        } 
    108108 
     109        public String getLightSourceType(int instrumentIndex, int lightSourceIndex) 
     110        { 
     111                LightSource o = root.getInstrument(instrumentIndex).getLightSource(lightSourceIndex); 
     112                String className = o.getClass().getName(); 
     113                return className.substring( 
     114                        className.lastIndexOf('.') + 1, className.length()); 
     115        } 
     116 
    109117        // -- Entity counting (code generated definitions) -- 
    110118 
Note: See TracChangeset for help on using the changeset viewer.