Changeset 7398


Ignore:
Timestamp:
12/10/10 13:38:28 (9 years ago)
Author:
curtis
Message:

Update slim-plugin to use new IJ2 project layout.

Location:
branches/maven
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • branches/maven/pom.xml

    r7383 r7398  
    4242    <module>projects/ome-xml</module> 
    4343    <module>projects/slim-plotter</module> 
    44     <!--<module>projects/slim-plugin</module>--> 
     44    <module>projects/slim-plugin</module> 
    4545    <module>projects/test-suite</module> 
    4646    <module>projects/utils</module> 
  • branches/maven/projects/slim-plugin/pom.xml

    r7383 r7398  
    3030 
    3131  <dependencies> 
    32     <!-- TODO: define a real POM for fiji-lib --> 
    33     <dependency> 
    34       <groupId>fiji</groupId> 
    35       <artifactId>fiji-lib</artifactId> 
    36       <version>20100908</version> 
    37     </dependency> 
    3832    <dependency> 
    3933      <groupId>imagej</groupId> 
     
    4337    <dependency> 
    4438      <groupId>imagej</groupId> 
    45       <artifactId>ij-visad</artifactId> 
     39      <artifactId>ij1-bridge</artifactId> 
    4640      <version>2.0-SNAPSHOT</version> 
     41    </dependency> 
     42    <dependency> 
     43      <groupId>imagej</groupId> 
     44      <artifactId>ij1-plugin</artifactId> 
     45      <version>2.0-SNAPSHOT</version> 
     46    </dependency> 
     47    <dependency> 
     48      <groupId>imagej</groupId> 
     49      <artifactId>ij2-imglib</artifactId> 
     50      <version>2.0-SNAPSHOT</version> 
     51    </dependency> 
     52    <dependency> 
     53      <groupId>jfree</groupId> 
     54      <artifactId>jcommon</artifactId> 
     55      <version>1.0.15</version> 
    4756    </dependency> 
    4857    <dependency> 
     
    6271    </dependency> 
    6372    <dependency> 
    64       <groupId>loci</groupId> 
    65       <artifactId>loci-common</artifactId> 
    66       <version>5.0-SNAPSHOT</version> 
     73      <groupId>mpicbg</groupId> 
     74      <artifactId>imglib</artifactId> 
     75      <version>2.0-SNAPSHOT</version> 
    6776    </dependency> 
    6877    <dependency> 
     
    7079      <artifactId>imglib-io</artifactId> 
    7180      <version>2.0-SNAPSHOT</version> 
    72     </dependency> 
    73     <dependency> 
    74       <groupId>net.java.dev.jna</groupId> 
    75       <artifactId>jna</artifactId> 
    76       <version>3.2.2</version> 
    7781    </dependency> 
    7882    <dependency> 
  • branches/maven/projects/slim-plugin/src/main/java/loci/slim/GrayScaleImage.java

    r7293 r7398  
    7878 
    7979        // building an image stack 
    80         m_imageStack = new ImageStack(m_width, m_height, ColorModel.getRGBdefault(), null); 
     80        m_imageStack = new ImageStack(m_width, m_height, ColorModel.getRGBdefault()); 
    8181        m_saveOutPixels = new byte[channels][]; 
    8282 
  • branches/maven/projects/slim-plugin/src/main/java/loci/slim/SLIMPlugInAuto.java

    r7164 r7398  
    3636import ij.process.ImageProcessor; 
    3737 
     38import imagej.ij1bridge.ImgLibImageStack; 
    3839import imagej.plugin.Dimensions; 
    3940import imagej.plugin.IAutoDisplayPlugin; 
     
    5556        System.out.println("SLIMPlugInAuto.setup " + ip); 
    5657        ImageStack imageStack = ip.getImageStack(); 
    57         if (null != imageStack) { 
    58             m_image = imageStack.getStorage(); 
     58        if (imageStack instanceof ImgLibImageStack) { 
     59            // CTR FIXME: remove dependency on ij1-bridge 
     60            m_image = ((ImgLibImageStack) imageStack).getStorage(); 
    5961            System.out.println("imageStack.getStorage is " + m_image); 
    6062        } 
  • branches/maven/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

    r7294 r7398  
    4343import ij.process.ImageProcessor; 
    4444 
    45 import imagej.process.ImageUtils; 
    46  
    47 import imagej.io.ImageOpener; 
     45import imagej.imglib.process.ImageUtils; 
    4846 
    4947import java.awt.Canvas; 
     
    8179import mpicbg.imglib.image.Image; 
    8280import mpicbg.imglib.image.ImageFactory; 
     81import mpicbg.imglib.io.ImageOpener; 
    8382import mpicbg.imglib.type.numeric.RealType; 
    8483import mpicbg.imglib.type.numeric.real.DoubleType; 
  • branches/maven/projects/slim-plugin/src/main/java/loci/slim/analysis/plugins/VisADAnalysisPlugin.java

    r7299 r7398  
    99import ij.ImagePlus; 
    1010 
    11 import imagej.process.ImageUtils; 
     11// CTR FIXME: remove dependency on ij1bridge 
     12import imagej.ij1bridge.process.ImageUtils; 
    1213 
    1314import loci.slim.ui.IUserInterfacePanel.FitFunction; 
Note: See TracChangeset for help on using the changeset viewer.