Changeset 6638


Ignore:
Timestamp:
07/02/10 15:20:34 (9 years ago)
Author:
curtis
Message:

Enable toggling of debug print statements using DEBUG flag.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/test/loci/plugins/in/ImporterTest.java

    r6637 r6638  
    9898   
    9999  private enum ChannelOrder {ZCT, ZTC, CZT, CTZ, TZC, TCZ}; 
    100    
     100 
     101  /** Whether to log debugging messages to stdout. */ 
     102  private static final boolean DEBUG = false; 
     103 
    101104  private static final boolean[] BOOLEAN_STATES = new boolean[] {false, true}; 
    102105   
     
    131134   
    132135  static { 
    133  
    134136    //String template = "test_C%s_TP%s&sizeX=50&sizeY=20&sizeZ=7.fake"; 
    135137    String template = constructFakeFilename("test_C%s_TP%s", FormatTools.UINT8, FAKE_SIZE_X, FAKE_SIZE_Y, FAKE_PLANE_COUNT, 1, 1, 
     
    236238  } 
    237239 
     240  /** Logs the given messages to stdout. */ 
     241  private void log(String s) { 
     242    System.out.println(s); 
     243  } 
     244 
    238245  /** a debug routine for printing the SIZCT indices of a slice in a FakeFile stack */ 
    239246  private void printVals(ImageProcessor proc) 
    240247  { 
    241     System.out.println( 
     248    if (DEBUG) log( 
    242249        " S=" + sIndex(proc) + 
    243250        " I=" + iIndex(proc) + 
     
    437444    // else a regular ImagePlus 
    438445     
    439     //System.out.println("  getting color table from a regular ImagePlus."); 
     446    //if (DEBUG) log("  getting color table from a regular ImagePlus."); 
    440447     
    441448    IndexColorModel icm = (IndexColorModel)imp.getProcessor().getColorModel(); 
     
    470477      // OR Use red in case lut len < 3 and zero fills other channels 
    471478     
    472     //System.out.println("  did a lut lookup in getPixelValue("+z+","+c+","+t+") = "+value+" (rawValue = "+rawValue+")"); 
     479    //if (DEBUG) log("  did a lut lookup in getPixelValue("+z+","+c+","+t+") = "+value+" (rawValue = "+rawValue+")"); 
    473480     
    474481    return value; 
     
    533540     
    534541    /* TODO - helper for testing falseColor problems 
    535     System.out.println("  expected min rgb : "+minR+" "+minG+" "+minB); 
    536     System.out.println("  expected max rgb : "+maxR+" "+maxG+" "+maxB); 
    537     System.out.println("  actual min rgb : "+reds[0]+" "+greens[0]+" "+blues[0]); 
    538     System.out.println("  actual max rgb : "+(reds[255]&0xff)+" "+(greens[255]&0xff)+" "+(blues[255]&0xff)); 
     542    if (DEBUG) log("  expected min rgb : "+minR+" "+minG+" "+minB); 
     543    if (DEBUG) log("  expected max rgb : "+maxR+" "+maxG+" "+maxB); 
     544    if (DEBUG) log("  actual min rgb : "+reds[0]+" "+greens[0]+" "+blues[0]); 
     545    if (DEBUG) log("  actual max rgb : "+(reds[255]&0xff)+" "+(greens[255]&0xff)+" "+(blues[255]&0xff)); 
    539546    */ 
    540547     
     
    583590    int tempT = tIndex(imp, z, c, t, indexed, falseColor); 
    584591     
    585     //System.out.println("actual CZT "+tempC+" "+tempZ+" "+tempT); 
    586      
    587     //System.out.println("  indices test (I forced to 0)"); 
    588     //System.out.println("    expected (sizct): "+expS+" "+0+" "+expZ+" "+expC+" "+expT); 
    589     //System.out.println("    actual (sizct):   "+tempS+" "+0+" "+tempZ+" "+tempC+" "+tempT); 
     592    //if (DEBUG) log("actual CZT "+tempC+" "+tempZ+" "+tempT); 
     593     
     594    //if (DEBUG) log("  indices test (I forced to 0)"); 
     595    //if (DEBUG) log("    expected (sizct): "+expS+" "+0+" "+expZ+" "+expC+" "+expT); 
     596    //if (DEBUG) log("    actual (sizct):   "+tempS+" "+0+" "+tempZ+" "+tempC+" "+tempT); 
    590597     
    591598    //TODO - remove this debugging code 
    592599    if ((expS != tempS) || /*(expI != tempI) ||*/ (expZ != tempZ) || (expC != tempC) || (expT != tempT)) 
    593600    { 
    594       //System.out.println("  indices test"); 
    595       //System.out.println("    expected (sizct): "+expS+" "+expI+" "+expZ+" "+expC+" "+expT); 
    596       //System.out.println("    actual (sizct):   "+tempS+" "+tempI+" "+tempZ+" "+tempC+" "+tempT); 
     601      //if (DEBUG) log("  indices test"); 
     602      //if (DEBUG) log("    expected (sizct): "+expS+" "+expI+" "+expZ+" "+expC+" "+expT); 
     603      //if (DEBUG) log("    actual (sizct):   "+tempS+" "+tempI+" "+tempZ+" "+tempC+" "+tempT); 
    597604 
    598605      return false; 
     
    612619  private void stackInZctOrderTest(ImagePlus imp, int maxZ, int maxC, int maxT, boolean indexed, boolean falseColor) 
    613620  { 
    614     System.out.println("stackInZctOrderTest()"); 
     621    if (DEBUG) log("stackInZctOrderTest()"); 
    615622     
    616623    boolean success = true; 
     
    643650  private void stackInCztOrderTest(ImagePlus imp, int maxZ, int maxC, int maxT, boolean indexed, boolean falseColor,int inputChan, int inputChanPerPlane) 
    644651  { 
    645     System.out.println("stackInCztOrderTest()"); 
     652    if (DEBUG) log("stackInCztOrderTest()"); 
    646653     
    647654    boolean success = true; 
     
    766773    ImageStack st = imp.getStack(); 
    767774     
    768     //System.out.println("groupedFilesTest"); 
     775    //if (DEBUG) log("groupedFilesTest"); 
    769776    int slice = 0; 
    770777    for (int t = 0; t < expNumT; t++) { 
     
    787794  private void swappedZtTest(ImagePlus imp, int pixType, boolean virtual, int originalZ, int originalC, int originalT) 
    788795  { 
    789     System.out.println("swappedZtTest() : virtual "+virtual+" pixType "+FormatTools.getPixelTypeString(pixType)); 
     796    if (DEBUG) log("swappedZtTest() : virtual "+virtual+" pixType "+FormatTools.getPixelTypeString(pixType)); 
    790797     
    791798    stackTest(imp,(originalZ*originalC*originalT)); 
     
    827834            actualT = zIndex(proc); // Z<->T swapped 
    828835          } 
    829           //System.out.println("--\nexp CZT "+cIndex+" "+zIndex+" "+tIndex); 
    830           //System.out.println("act CZT "+actualC+" "+actualZ+" "+actualT); 
     836          //if (DEBUG) log("--\nexp CZT "+cIndex+" "+zIndex+" "+tIndex); 
     837          //if (DEBUG) log("act CZT "+actualC+" "+actualZ+" "+actualT); 
    831838          assertEquals(zIndex, actualZ); 
    832839          assertEquals(cIndex, actualC); 
     
    979986        for (int t = 0; t < sizeT; t++) { 
    980987          for (int c = 0; c < sizeC; c++) { 
    981             //System.out.println("index "+index); 
     988            //if (DEBUG) log("index "+index); 
    982989            ImageProcessor proc = st.getProcessor(++slice); 
    983990            //printVals(proc); 
    984             //System.out.println("s z c t "+s+" "+z+" "+c+" "+t); 
    985             //System.out.println("z c t "+z+" "+c+" "+t); 
    986             //System.out.println("is iz ic it "+sIndex(proc)+" "+zIndex(proc)+" "+cIndex(proc)+" "+tIndex(proc)); 
     991            //if (DEBUG) log("s z c t "+s+" "+z+" "+c+" "+t); 
     992            //if (DEBUG) log("z c t "+z+" "+c+" "+t); 
     993            //if (DEBUG) log("is iz ic it "+sIndex(proc)+" "+zIndex(proc)+" "+cIndex(proc)+" "+tIndex(proc)); 
    987994            // test the values 
    988995            assertEquals(z,zIndex(proc)); 
     
    10101017          for (int z = 0; z < sizeZ; z++) { 
    10111018            ImageProcessor proc = st.getProcessor(++slice); 
    1012             //System.out.println("index "+index); 
    1013             //System.out.println("s z c t "+s+" "+z+" "+c+" "+t); 
    1014             //System.out.println("iz ic it "+zIndex(proc)+" "+cIndex(proc)+" "+tIndex(proc)); 
     1019            //if (DEBUG) log("index "+index); 
     1020            //if (DEBUG) log("s z c t "+s+" "+z+" "+c+" "+t); 
     1021            //if (DEBUG) log("iz ic it "+zIndex(proc)+" "+cIndex(proc)+" "+tIndex(proc)); 
    10151022            // test the values 
    10161023            assertEquals(z,zIndex(proc)); 
     
    10431050            ImageProcessor proc = st.getProcessor(++slice); 
    10441051            //printVals(proc); 
    1045             //System.out.println("index "+index); 
    1046             //System.out.println("s z c t "+s+" "+z+" "+c+" "+t); 
    1047             //System.out.println("iz ic it "+zIndex(proc)+" "+cIndex(proc)+" "+tIndex(proc)); 
     1052            //if (DEBUG) log("index "+index); 
     1053            //if (DEBUG) log("s z c t "+s+" "+z+" "+c+" "+t); 
     1054            //if (DEBUG) log("iz ic it "+zIndex(proc)+" "+cIndex(proc)+" "+tIndex(proc)); 
    10481055            // test the values 
    10491056            assertEquals(z,zIndex(proc)); 
     
    12491256  private void datasetSwapDimsTester(boolean virtual, int pixType, int x, int y, int z, int t) 
    12501257  { 
    1251     System.out.println("datsetSwapDimsTester() virtual = "+virtual+" pixType = "+FormatTools.getPixelTypeString(pixType)); 
     1258    if (DEBUG) log("datsetSwapDimsTester() virtual = "+virtual+" pixType = "+FormatTools.getPixelTypeString(pixType)); 
    12521259    int c = 3; 
    12531260    ChannelOrder swappedOrder = ChannelOrder.TCZ; // original order is ZCT 
     
    13601367  private void autoscaleTester(int pixType, boolean wantAutoscale) 
    13611368  { 
    1362     System.out.println("autoscaleTester() : pix "+FormatTools.getPixelTypeString(pixType)+" scale "+wantAutoscale); 
     1369    if (DEBUG) log("autoscaleTester() : pix "+FormatTools.getPixelTypeString(pixType)+" scale "+wantAutoscale); 
    13631370 
    13641371    if ((pixType == FormatTools.UINT8) && (wantAutoscale)) 
    1365       System.out.println("  broken case"); 
     1372      if (DEBUG) log("  broken case"); 
    13661373     
    13671374    final int sizeZ = 2, sizeC = 3, sizeT = 4, sizeX = 51, sizeY = 16; 
     
    14521459                                    boolean falseColor, int numSeries, boolean wantLutDefined) 
    14531460  { 
    1454     System.out.println("colorDefaultTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+ 
     1461    if (DEBUG) log("colorDefaultTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+ 
    14551462        channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries+" defineLut "+wantLutDefined); 
    14561463     
     
    15401547                                    boolean falseColor, int numSeries) 
    15411548  { 
    1542     System.out.println("colorCompositeTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
     1549    if (DEBUG) log("colorCompositeTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
    15431550     
    15441551    int sizeX = 55, sizeY = 71, sizeZ = 3, sizeT = 4; 
     
    16061613                                    boolean falseColor, int numSeries) 
    16071614  { 
    1608     System.out.println("colorColorizedTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
     1615    if (DEBUG) log("colorColorizedTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
    16091616     
    16101617    int sizeX = 55, sizeY = 71, sizeZ = 3, sizeT = 4; 
     
    16681675      boolean falseColor, int numSeries) 
    16691676  { 
    1670     System.out.println("colorGrayscaleTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
     1677    if (DEBUG) log("colorGrayscaleTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
    16711678   
    16721679    int sizeX = 55, sizeY = 71, sizeZ = 3, sizeT = 4; 
     
    17291736      boolean falseColor, int numSeries) 
    17301737  { 
    1731     System.out.println("colorCustomTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
     1738    if (DEBUG) log("colorCustomTester(): pixType "+FormatTools.getPixelTypeString(pixType)+" indexed "+indexed+" channels "+channels+" chanPerPlane "+chanPerPlane+" falseColor "+falseColor+" numSeries "+numSeries); 
    17321739   
    17331740    int sizeX = 55, sizeY = 71, sizeZ = 3, sizeT = 4; 
     
    24182425                for (boolean falseColor : BOOLEAN_STATES) { 
    24192426   
    2420                   //System.out.println(" format "+pixFormat+"indexed "+indexed+" rgb "+rgb+" fasleColor "+falseColor+" c "+c+" s "+s); 
     2427                  //if (DEBUG) log(" format "+pixFormat+"indexed "+indexed+" rgb "+rgb+" fasleColor "+falseColor+" c "+c+" s "+s); 
    24212428                   
    24222429                  // TODO see what happens when we remove this 
    24232430                  //if ((chanCount*numSeries*3) > 25)  // IJ slider limitation 
    24242431                  //{ 
    2425                   //  System.out.println("************************* chanCount "+chanCount+" numSeries "+numSeries+" 25 sliders exceeded "+(chanCount*numSeries*3)); 
     2432                  //  if (DEBUG) log("************************* chanCount "+chanCount+" numSeries "+numSeries+" 25 sliders exceeded "+(chanCount*numSeries*3)); 
    24262433                  //  continue; 
    24272434                  //} 
     
    25472554                  //if ((c*s*3) <= 25)  // IJ slider limitation 
    25482555                  { 
    2549                     //System.out.println("format "+pixFormat+" x "+x+" y "+y+" z "+z+" c "+c+" t "+t+" s "+s); 
     2556                    //if (DEBUG) log("format "+pixFormat+" x "+x+" y "+y+" z "+z+" c "+c+" t "+t+" s "+s); 
    25502557                    colorCustomTester(pixFormat,x,y,z,c,t,s); 
    25512558                  } 
     
    25602567    for (int pixType : PIXEL_TYPES) { 
    25612568      for (boolean autoscale : BOOLEAN_STATES) { 
    2562         //System.out.println("testColorAutoscale(): pixType = "+FormatTools.getPixelTypeString(pixType)+" autoscale = "+autoscale); 
     2569        //if (DEBUG) log("testColorAutoscale(): pixType = "+FormatTools.getPixelTypeString(pixType)+" autoscale = "+autoscale); 
    25632570        autoscaleTester(pixType,autoscale); 
    25642571      } 
     
    27612768                        try { 
    27622769                          memorySpecifyRangeTester(z,c,t,zFrom,zTo,zBy,cFrom,cTo,cBy,tFrom,tTo,tBy); 
    2763                           System.out.println("memorySpecifyRange() test failed: combo = zct "+z+" "+c+" "+t+ 
     2770                          if (DEBUG) log("memorySpecifyRange() test failed: combo = zct "+z+" "+c+" "+t+ 
    27642771                            " z vals "+zFrom+" "+zTo+" "+zBy+ 
    27652772                            " c vals "+cFrom+" "+cTo+" "+cBy+ 
     
    29532960    ImagePlus imp = imps[0]; 
    29542961    
    2955     System.out.println("  Returned imp: Z = " +imp.getNSlices()+ " C = " +imp.getNChannels()+" T = "+imp.getNFrames()); 
     2962    if (DEBUG) log("  Returned imp: Z = " +imp.getNSlices()+ " C = " +imp.getNChannels()+" T = "+imp.getNFrames()); 
    29562963    for (int tIndex = 0; tIndex < imp.getNFrames(); tIndex++) { 
    29572964      for (int cIndex = 0; cIndex < imp.getNChannels(); cIndex++) { 
     
    29692976    int expectedSizeC = effectiveC(sizeC, rgb, lutLen, indexed, falseColor); 
    29702977       
    2971     //System.out.println("  chans channsPerPlane planes expectedSizeC "+totalChannels+" "+channelsPerPlane+" "+totalPlanes+" "+expectedSizeC); 
     2978    //if (DEBUG) log("  chans channsPerPlane planes expectedSizeC "+totalChannels+" "+channelsPerPlane+" "+totalPlanes+" "+expectedSizeC); 
    29722979 
    29732980    xyzctTest(imp,sizeX,sizeY,sizeZ,expectedSizeC,sizeT); 
     
    29902997    } 
    29912998    else 
    2992       System.out.println("  Not a composite image"); 
     2999      if (DEBUG) log("  Not a composite image"); 
    29933000 
    29943001    /* 
     
    29983005      for (int tIndex = 0; tIndex < sizeT; tIndex++) 
    29993006        for (int zIndex = 0; zIndex < sizeZ; zIndex++) 
    3000           System.out.println("  iIndex pix val ("+zIndex+","+cIndex+","+tIndex+") = "+getPixelValue(10,0,imp,zIndex,cIndex,tIndex,indexed,falseColor)); 
     3007          if (DEBUG) log("  iIndex pix val ("+zIndex+","+cIndex+","+tIndex+") = "+getPixelValue(10,0,imp,zIndex,cIndex,tIndex,indexed,falseColor)); 
    30013008          //assertEquals(iIndex++,getPixelValue(10,0,imp,zIndex,cIndex,tIndex,indexed)); 
    30023009 
     
    30103017  public void testColorizeSubcases() 
    30113018  { 
    3012     System.out.println("testColorizeSubcases() - begin special cases"); 
     3019    if (DEBUG) log("testColorizeSubcases() - begin special cases"); 
    30133020     
    30143021    // INDEXED and sizeC == 1,2,3,anything bigger than 3 
    30153022     
    30163023    // sizeC == 1, rgb == 1, indexed, 8 bit, implicit lut length of 3 - KEY test to do, also note can vary lut len 
    3017     System.out.println("1/1 indexed"); 
     3024    if (DEBUG) log("1/1 indexed"); 
    30183025    colorizeSubcaseTester(FormatTools.UINT8,1,1,INDEXED,REAL_COLOR,-1); 
    3019     System.out.println("1/1 indexed falseColor"); 
     3026    if (DEBUG) log("1/1 indexed falseColor"); 
    30203027    colorizeSubcaseTester(FormatTools.UINT8,1,1,INDEXED,FALSE_COLOR,-1); 
    3021     System.out.println("1/1/indexed lutLen==2"); 
     3028    if (DEBUG) log("1/1/indexed lutLen==2"); 
    30223029    colorizeSubcaseTester(FormatTools.UINT8,1,1,INDEXED,REAL_COLOR,2); 
    30233030     
    30243031    // sizeC == 1, rgb == 1, indexed, 16 bit, implicit lut length of 3 - 2nd important test to do, also note can vary lut len 
    3025     System.out.println("1/1 indexed (16-bit)"); 
     3032    if (DEBUG) log("1/1 indexed (16-bit)"); 
    30263033    colorizeSubcaseTester(FormatTools.UINT16,1,1,INDEXED,REAL_COLOR,-1); 
    3027     System.out.println("1/1 indexed (16-bit) falseColor"); 
     3034    if (DEBUG) log("1/1 indexed (16-bit) falseColor"); 
    30283035    colorizeSubcaseTester(FormatTools.UINT16,1,1,INDEXED,FALSE_COLOR,-1); 
    3029     System.out.println("1/1/indexed (16-bit) lutLen==2"); 
     3036    if (DEBUG) log("1/1/indexed (16-bit) lutLen==2"); 
    30303037    colorizeSubcaseTester(FormatTools.UINT16,1,1,INDEXED,REAL_COLOR,2); 
    30313038 
    30323039    // sizeC = 3 and rgb = 1 
    3033     System.out.println("3/1 indexed"); 
     3040    if (DEBUG) log("3/1 indexed"); 
    30343041    colorizeSubcaseTester(FormatTools.UINT8,3,1,INDEXED,REAL_COLOR,-1); 
    3035     System.out.println("3/1 indexed falseColor"); 
     3042    if (DEBUG) log("3/1 indexed falseColor"); 
    30363043    colorizeSubcaseTester(FormatTools.UINT8,3,1,INDEXED,FALSE_COLOR,-1);                            // TODO - might be working 
    30373044 
    30383045    // sizeC = 3 and rgb = 3 : interleaved 
    3039     System.out.println("3/3 indexed"); 
     3046    if (DEBUG) log("3/3 indexed"); 
    30403047    colorizeSubcaseTester(FormatTools.UINT8,3,3,INDEXED,REAL_COLOR,-1); 
    30413048    // TODO - enable this failing test 
    3042     //System.out.println("3/3 indexed falseColor"); 
     3049    //if (DEBUG) log("3/3 indexed falseColor"); 
    30433050    //colorizeSubcaseTester(FormatTools.UINT8,3,3,INDEXED,FALSE_COLOR,-1); 
    30443051 
     
    30503057    // sizeC = 4 and rgb = 4 : interleaved including alpha 
    30513058    // if indexed == true this combo throws exception in CompositeImage constructor 
    3052     System.out.println("4/4 nonindexed");                                                // TODO - might be working 
     3059    if (DEBUG) log("4/4 nonindexed");                                                // TODO - might be working 
    30533060    colorizeSubcaseTester(FormatTools.UINT8,4,4,NOT_INDEXED,REAL_COLOR,-1); 
    30543061 
    30553062    // sizeC = 6, rgb = 3, indexed = false 
    30563063    // if indexed == true this combo throws exception in CompositeImage constructor 
    3057     System.out.println("6/3 nonindexed"); 
     3064    if (DEBUG) log("6/3 nonindexed"); 
    30583065    colorizeSubcaseTester(FormatTools.UINT8,6,3,NOT_INDEXED,REAL_COLOR,-1); 
    30593066    
    30603067    // sizeC = 12, rgb = 3, indexed = false 
    3061     System.out.println("12/3 nonindexed"); 
     3068    if (DEBUG) log("12/3 nonindexed"); 
    30623069    colorizeSubcaseTester(FormatTools.UINT8,12,3,NOT_INDEXED,REAL_COLOR,-1); 
    30633070 
    3064     System.out.println("testColorizeSubcases() - past special cases"); 
     3071    if (DEBUG) log("testColorizeSubcases() - past special cases"); 
    30653072 
    30663073    /* 
     
    30743081                if (!indexed && falseColor)  // if !indexed make sure falseColor is false to avoid illegal combo 
    30753082                  continue; 
    3076                 System.out.println("Colorized: pixType("+FormatTools.getPixelTypeString(pixType)+") sizeC("+sizeC+") rgb("+rgb+") indexed("+indexed+") falseColor("+falseColor+")"); 
     3083                if (DEBUG) log("Colorized: pixType("+FormatTools.getPixelTypeString(pixType)+") sizeC("+sizeC+") rgb("+rgb+") indexed("+indexed+") falseColor("+falseColor+")"); 
    30773084                colorizeSubcaseTester(pixType,sizeC,rgb,indexed,falseColor,-1); 
    30783085              } 
    3079     System.out.println("testColorizeSubcases() - past all cases"); 
     3086    if (DEBUG) log("testColorizeSubcases() - past all cases"); 
    30803087    */ 
    30813088     
    3082     System.out.println("testColorizeSubcases() : numerous failures : actual tests commented out to see all print statements."); 
     3089    if (DEBUG) log("testColorizeSubcases() : numerous failures : actual tests commented out to see all print statements."); 
    30833090  } 
    30843091 
     
    30923099        if (!indexed)  // TODO - remove this limitation when BF updated 
    30933100          compositeSubcaseTester(channels,indexed); 
    3094     System.out.println("compositeSubcases() unfinished but 2<=sizeC<=7 nonindexed working"); 
     3101    if (DEBUG) log("compositeSubcases() unfinished but 2<=sizeC<=7 nonindexed working"); 
    30953102  } 
    30963103 
Note: See TracChangeset for help on using the changeset viewer.