[ome-devel] ScanR patch suggestion

[Melissa Linkert]

Hi Rubén,

Thanks for this.  Your patch has been committed in SVN r6461.

Regards,
-Melissa

On Wed, Jun 2, 2010 at 8:10 AM, Rubén Muñoz <ruben.munoz at embl.de> wrote:
> Hi Melissa,
>
> I changeset 5991, wellLabels was changed to a HashTable. The keys are not necessarily in order during prepend.
> After a minor patch to the current code I get again the correct plane order with both labelled and unlabeled datasets.
>
> Best regards,
>
> Rubén
>
>
>
> Index: components/bio-formats/src/loci/formats/in/ScanrReader.java
> ===================================================================
> --- components/bio-formats/src/loci/formats/in/ScanrReader.java (revision 6439)
> +++ components/bio-formats/src/loci/formats/in/ScanrReader.java (working copy)
> @@ -317,10 +317,7 @@
>     String[] keys = wellLabels.keySet().toArray(new String[wellLabels.size()]);
>     int realPosCount = 0;
>     for (int well=0; well<nWells; well++) {
> -      Integer w = keys.length > 0 ? wellLabels.get(keys[well]) : null;
> -      int wellIndex = w == null ? well + 1 : w.intValue();
> -
> -      String wellPos = getBlock(wellIndex, "W");
> +      String wellPos = getBlock(well + 1, "W");
>       int originalIndex = next;
>
>       for (int pos=0; pos<nPos; pos++) {
>
>