Ignore:
Timestamp:
03/26/11 15:18:44 (9 years ago)
Author:
curtis
Message:

Eliminate dependencies on old IJ2 projects.

Location:
trunk/projects/slim-plugin
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/slim-plugin/pom.xml

    r7616 r7676  
    3838    </dependency> 
    3939    <dependency> 
    40       <groupId>${imagej.groupId}</groupId> 
    41       <artifactId>ij1-bridge-old</artifactId> 
    42       <version>${imagej.version}</version> 
    43     </dependency> 
    44     <dependency> 
    45       <groupId>${imagej.groupId}</groupId> 
    46       <artifactId>ij2-imglib-old</artifactId> 
    47       <version>${imagej.version}</version> 
    48     </dependency> 
    49     <dependency> 
    5040      <groupId>${project.groupId}</groupId> 
    5141      <artifactId>curve-fitter</artifactId> 
     
    6555      <groupId>mpicbg</groupId> 
    6656      <artifactId>imglib</artifactId> 
     57      <version>2.0-SNAPSHOT</version> 
     58    </dependency> 
     59    <dependency> 
     60      <groupId>mpicbg</groupId> 
     61      <artifactId>imglib-ij</artifactId> 
    6762      <version>2.0-SNAPSHOT</version> 
    6863    </dependency> 
  • trunk/projects/slim-plugin/src/main/java/loci/slim/MyStackWindow.java

    r7668 r7676  
    3232POSSIBILITY OF SUCH DAMAGE. 
    3333*/ 
    34  
    3534 
    3635package loci.slim; 
  • trunk/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

    r7674 r7676  
    4242import ij.process.ColorProcessor; 
    4343import ij.process.ImageProcessor; 
    44 import imagej.imglib.process.OldImageUtils; 
    4544 
    4645import java.awt.Canvas; 
     
    500499        } 
    501500        Integer xIndex, yIndex, lifetimeIndex, channelIndex; 
    502         m_width = OldImageUtils.getWidth(image); 
    503         m_height = OldImageUtils.getHeight(image); 
    504         m_channels = OldImageUtils.getNChannels(image); 
     501        m_width = ImageUtils.getWidth(image); 
     502        m_height = ImageUtils.getHeight(image); 
     503        m_channels = ImageUtils.getNChannels(image); 
    505504        //TODO this is broken; returns 1 when there are 16 channels; corrected below 
    506505        System.out.println("ImageUtils.getNChannels returns " + m_channels); 
     
    511510        } 
    512511        System.out.println("corrected to " + m_channels); 
    513         m_timeBins = OldImageUtils.getDimSize(image, FormatTools.LIFETIME); 
     512        m_timeBins = ImageUtils.getDimSize(image, FormatTools.LIFETIME); 
    514513        System.out.println("width " + m_width + " height " + m_height + " timeBins " + m_timeBins + " channels " + m_channels); 
    515514        m_cursor = image.createLocalizableByDimCursor(); 
  • trunk/projects/slim-plugin/src/main/java/loci/slim/analysis/plugins/VisADAnalysisPlugin.java

    r7668 r7676  
    3838import ij.ImagePlus; 
    3939 
    40 // CTR FIXME: remove dependency on ij1bridge 
    41 import imagej.ij1bridge.process.OldLegacyImageUtils; 
    42  
    4340import loci.slim.ui.IUserInterfacePanel.FitFunction; 
    4441import loci.slim.ui.IUserInterfacePanel.FitRegion; 
     
    4744 
    4845import mpicbg.imglib.image.Image; 
     46import mpicbg.imglib.image.display.imagej.ImageJFunctions; 
    4947import mpicbg.imglib.type.numeric.real.DoubleType; 
    5048 
     
    6260@SLIMAnalyzer(name="VisAD") 
    6361public class VisADAnalysisPlugin implements ISLIMAnalyzer { 
    64     public void analyze(Image<DoubleType> image, FitRegion region, FitFunction function) { 
    65         ImagePlus imp = OldLegacyImageUtils.createImagePlus(image, "Fitted results"); 
     62    @Override 
     63                public void analyze(Image<DoubleType> image, FitRegion region, FitFunction function) { 
     64                ImagePlus imp = ImageJFunctions.displayAsVirtualStack(image); 
     65                imp.setTitle("Fitted results"); 
    6666        IJ.runPlugIn(imp, "imagej.visad.VisADPlugin", ""); 
    6767    } 
Note: See TracChangeset for help on using the changeset viewer.