Ignore:
Timestamp:
03/21/11 16:16:40 (9 years ago)
Author:
aivar
Message:

Fixed problem when running within NetBeans. Changed all package names to disambiguate from mainstream plugin, util, and workflow packages.

Location:
trunk/projects/deep-zoom-plugin/src/main/java/loci
Files:
6 added
3 deleted
1 edited
28 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/DeepZoom.java

    r7490 r7659  
    2929*/ 
    3030 
    31 package loci.deepzoomplugin; 
     31package loci.deepzoom; 
    3232 
    3333import ij.IJ; 
     
    8787        dialog.addStringField("URL (optional): ", url); 
    8888        dialog.addChoice("Implementation: ", m_choices, Implementation.CHAINED.toString()); 
     89        dialog.addMessage("Uses Seadragon Ajax Code, built on Microsoft technology."); 
    8990        dialog.showDialog(); 
    9091        if (dialog.wasCanceled()) { 
     
    117118                        deepZoomExporter1 = new loci.chainableplugin.deepzoom.DeepZoomExporter 
    118119                                (launch, false, folder, url, name, description, width, height); 
    119                 loci.plugin.ImageWrapper imageWrapper1 = new loci.plugin.ImageWrapper(ip); 
     120                loci.deepzoom.plugin.ImageWrapper imageWrapper1 = new loci.deepzoom.plugin.ImageWrapper(ip); 
    120121                deepZoomExporter1.process(imageWrapper1); 
    121122                break; 
     
    125126                        deepZoomExporter2 = new loci.multiinstanceplugin.deepzoom.DeepZoomExporter 
    126127                                (launch, false, folder, url, name, description, width, height); 
    127                 loci.plugin.ImageWrapper imageWrapper2 = new loci.plugin.ImageWrapper(ip); 
     128                loci.deepzoom.plugin.ImageWrapper imageWrapper2 = new loci.deepzoom.plugin.ImageWrapper(ip); 
    128129                deepZoomExporter2.process(imageWrapper2); 
    129130                break; 
     
    133134                        deepZoomExporter3 = new loci.multiinstanceplugin.deepzoom.DeepZoomExporter 
    134135                                (launch, false, folder, url, name, description, width, height); 
    135                 loci.plugin.ImageWrapper imageWrapper3 = new loci.plugin.ImageWrapper(ip); 
     136                loci.deepzoom.plugin.ImageWrapper imageWrapper3 = new loci.deepzoom.plugin.ImageWrapper(ip); 
    136137                deepZoomExporter3.process(imageWrapper3); 
    137138                break; 
     
    162163        prefs.put(FILE, file); 
    163164 
    164         generateDeepZoom(file, "folder", "name", 640, 480); 
    165         System.exit(0); 
     165      //  generateDeepZoom(file, "folder", "name", 640, 480); 
     166      //  System.exit(0); 
    166167         
    167168        IJ.open(file); 
     
    196197                int height = imp.getHeight(); 
    197198                ij.ImageStack stack = imp.getStack(); 
    198                 byte[] R = (byte[])stack.getPixels(1); 
    199                 byte[] G = (byte[])stack.getPixels(2); 
    200                 byte[] B; 
    201                 if (stackSize>2) 
    202                         B = (byte[])stack.getPixels(3); 
    203                 else 
    204                         B = new byte[width*height]; 
    205                 imp.trimProcessor(); 
    206                 ij.process.ColorProcessor cp = new ij.process.ColorProcessor(width, height); 
    207                 cp.setRGB(R, G, B); 
    208                 if (imp.isInvertedLut()) 
    209                         cp.invert(); 
    210                 imp.setImage(cp.createImage()); 
    211                 imp.killStack(); 
     199                if (stack.getPixels(1) instanceof byte[]) { 
     200                    byte[] R = (byte[])stack.getPixels(1); 
     201                    byte[] G = (byte[])stack.getPixels(2); 
     202                    byte[] B; 
     203                    if (stackSize>2) 
     204                            B = (byte[])stack.getPixels(3); 
     205                    else 
     206                            B = new byte[width*height]; 
     207                    imp.trimProcessor(); 
     208                    ij.process.ColorProcessor cp = new ij.process.ColorProcessor(width, height); 
     209                    cp.setRGB(R, G, B); 
     210                    if (imp.isInvertedLut()) 
     211                            cp.invert(); 
     212                    imp.setImage(cp.createImage()); 
     213                    imp.killStack(); 
     214                } 
    212215        } 
    213216 
     
    231234                = new loci.chainableplugin.deepzoom.DeepZoomExporter 
    232235                        (false, false, folder, null, name, name, width, height); 
    233         loci.plugin.ImageWrapper imageWrapper1 = new loci.plugin.ImageWrapper(ip); 
     236        loci.deepzoom.plugin.ImageWrapper imageWrapper1 = new loci.deepzoom.plugin.ImageWrapper(ip); 
    234237        deepZoomExporter1.process(imageWrapper1); 
    235238    } 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/plugin/ImageWrapper.java

    r7364 r7659  
    3333*/ 
    3434 
    35 package loci.plugin; 
     35package loci.deepzoom.plugin; 
    3636 
    3737import ij.process.ColorProcessor; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/plugin/annotations/Img.java

    r7403 r7659  
    44 */ 
    55 
    6 package loci.plugin.annotations; 
     6package loci.deepzoom.plugin.annotations; 
    77 
    88import java.lang.annotation.*; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/plugin/annotations/Input.java

    r7403 r7659  
    44 */ 
    55 
    6 package loci.plugin.annotations; 
     6package loci.deepzoom.plugin.annotations; 
    77 
    88import java.lang.annotation.Retention; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/plugin/annotations/Output.java

    r7403 r7659  
    44 */ 
    55 
    6 package loci.plugin.annotations; 
     6package loci.deepzoom.plugin.annotations; 
    77 
    88import java.lang.annotation.Retention; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/util/xmllight/XMLException.java

    r7438 r7659  
    44 */ 
    55 
    6 package loci.util.xmllight; 
     6package loci.deepzoom.util.xmllight; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/util/xmllight/XMLParser.java

    r7456 r7659  
    44 */ 
    55 
    6 package loci.util.xmllight; 
     6package loci.deepzoom.util.xmllight; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/util/xmllight/XMLTag.java

    r7438 r7659  
    44 */ 
    55 
    6 package loci.util.xmllight; 
     6package loci.deepzoom.util.xmllight; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/util/xmllight/XMLWriter.java

    r7438 r7659  
    44 */ 
    55 
    6 package loci.util.xmllight; 
     6package loci.deepzoom.util.xmllight; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/IModule.java

    r7511 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    8 import loci.workflow.plugin.ItemWrapper; 
    9 import loci.workflow.plugin.IPluginLauncher; 
     8import loci.deepzoom.workflow.plugin.ItemWrapper; 
     9import loci.deepzoom.workflow.plugin.IPluginLauncher; 
    1010 
    1111/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/IModuleFactory.java

    r7495 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    8 import loci.util.xmllight.XMLException; 
     8import loci.deepzoom.util.xmllight.XMLException; 
    99 
    1010/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/IOutputListener.java

    r7511 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    8 import loci.workflow.plugin.ItemWrapper; 
     8import loci.deepzoom.workflow.plugin.ItemWrapper; 
    99 
    1010/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/IWorkFlow.java

    r7511 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/ModuleFactory.java

    r7511 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    88import java.util.HashMap; 
    99import java.util.Map; 
    1010 
    11 import loci.util.xmllight.XMLParser; 
    12 import loci.util.xmllight.XMLException; 
    13 import loci.util.xmllight.XMLTag; 
     11import loci.deepzoom.util.xmllight.XMLParser; 
     12import loci.deepzoom.util.xmllight.XMLException; 
     13import loci.deepzoom.util.xmllight.XMLTag; 
    1414 
    1515/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/PluginModule.java

    r7511 r7659  
    1212 */ 
    1313 
    14 package loci.workflow; 
     14package loci.deepzoom.workflow; 
    1515 
    1616import java.util.Collections; 
     
    1919import java.util.Set; 
    2020 
    21 import loci.workflow.plugin.AbstractPlugin; 
    22 import loci.workflow.plugin.ItemWrapper; 
    23 import loci.workflow.plugin.IPlugin; 
    24 import loci.workflow.plugin.IPluginLauncher; 
    25 import loci.workflow.plugin.PluginAnnotations; 
    26 import loci.workflow.plugin.PluginClassException; 
    27 import loci.workflow.plugin.PluginLauncher; 
    28 import loci.plugin.annotations.Input; 
    29 import loci.plugin.annotations.Output; 
    30 import loci.util.xmllight.XMLException; 
    31 import loci.util.xmllight.XMLParser; 
    32 import loci.util.xmllight.XMLTag; 
    33 import loci.util.xmllight.XMLWriter; 
     21import loci.deepzoom.workflow.plugin.AbstractPlugin; 
     22import loci.deepzoom.workflow.plugin.ItemWrapper; 
     23import loci.deepzoom.workflow.plugin.IPlugin; 
     24import loci.deepzoom.workflow.plugin.IPluginLauncher; 
     25import loci.deepzoom.workflow.plugin.PluginAnnotations; 
     26import loci.deepzoom.workflow.plugin.PluginClassException; 
     27import loci.deepzoom.workflow.plugin.PluginLauncher; 
     28import loci.deepzoom.plugin.annotations.Input; 
     29import loci.deepzoom.plugin.annotations.Output; 
     30import loci.deepzoom.util.xmllight.XMLException; 
     31import loci.deepzoom.util.xmllight.XMLParser; 
     32import loci.deepzoom.util.xmllight.XMLTag; 
     33import loci.deepzoom.util.xmllight.XMLWriter; 
    3434 
    3535/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/PluginModuleFactory.java

    r7511 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/Wire.java

    r7495 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/WorkFlow.java

    r7516 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
    7  
    8 import loci.util.xmllight.XMLParser; 
    9 import loci.util.xmllight.XMLWriter; 
    10 import loci.util.xmllight.XMLException; 
    11 import loci.util.xmllight.XMLTag; 
     6package loci.deepzoom.workflow; 
     7 
     8import loci.deepzoom.util.xmllight.XMLParser; 
     9import loci.deepzoom.util.xmllight.XMLWriter; 
     10import loci.deepzoom.util.xmllight.XMLException; 
     11import loci.deepzoom.util.xmllight.XMLTag; 
    1212import java.lang.StringBuilder; 
    1313import java.util.ArrayList; 
     
    1616import java.util.Map; 
    1717 
    18 import loci.plugin.annotations.Input; 
    19 import loci.plugin.annotations.Output; 
    20 import loci.workflow.plugin.ItemWrapper; 
    21 import loci.workflow.plugin.IPluginLauncher; 
    22 import loci.workflow.plugin.PluginScheduler; 
     18import loci.deepzoom.plugin.annotations.Input; 
     19import loci.deepzoom.plugin.annotations.Output; 
     20import loci.deepzoom.workflow.plugin.ItemWrapper; 
     21import loci.deepzoom.workflow.plugin.IPluginLauncher; 
     22import loci.deepzoom.workflow.plugin.PluginScheduler; 
    2323 
    2424/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/WorkFlowFactory.java

    r7495 r7659  
    44 */ 
    55 
    6 package loci.workflow; 
     6package loci.deepzoom.workflow; 
    77 
    88/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/AbstractPlugin.java

    r7509 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737import java.util.Map; 
    3838 
    39 import loci.plugin.annotations.Input; 
    40 import loci.plugin.annotations.Output; 
    41 import loci.workflow.plugin.ItemWrapper; 
     39import loci.deepzoom.plugin.annotations.Input; 
     40import loci.deepzoom.plugin.annotations.Output; 
     41import loci.deepzoom.workflow.plugin.ItemWrapper; 
    4242 
    4343/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/IPlugin.java

    r7509 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/IPluginInternal.java

    r7509 r7659  
    3434 
    3535 
    36 package loci.workflow.plugin; 
     36package loci.deepzoom.workflow.plugin; 
    3737 
    3838import java.util.Map; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/IPluginLauncher.java

    r7509 r7659  
    3434 
    3535 
    36 package loci.workflow.plugin; 
     36package loci.deepzoom.workflow.plugin; 
    3737 
    3838/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/ItemWrapper.java

    r7509 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737import loci.chainableplugin.IPropertyCollection; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/PluginAnnotations.java

    r7509 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737import java.lang.annotation.Annotation; 
     
    3939import java.util.Set; 
    4040 
    41 import loci.plugin.annotations.Img; 
    42 import loci.plugin.annotations.Input; 
    43 import loci.plugin.annotations.Output; 
     41import loci.deepzoom.plugin.annotations.Img; 
     42import loci.deepzoom.plugin.annotations.Input; 
     43import loci.deepzoom.plugin.annotations.Output; 
    4444 
    4545/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/PluginClassException.java

    r7509 r7659  
    3434 
    3535 
    36 package loci.workflow.plugin; 
     36package loci.deepzoom.workflow.plugin; 
    3737 
    3838/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/PluginLauncher.java

    r7509 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737import java.util.UUID; 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/PluginScheduler.java

    r7516 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737import java.util.HashMap; 
     
    4141import java.util.concurrent.TimeUnit; 
    4242 
    43 import loci.workflow.plugin.ItemWrapper; 
     43import loci.deepzoom.workflow.plugin.ItemWrapper; 
    4444 
    4545/** 
  • trunk/projects/deep-zoom-plugin/src/main/java/loci/deepzoom/workflow/plugin/TeardownException.java

    r7509 r7659  
    3333*/ 
    3434 
    35 package loci.workflow.plugin; 
     35package loci.deepzoom.workflow.plugin; 
    3636 
    3737/** 
Note: See TracChangeset for help on using the changeset viewer.