Changeset 7616


Ignore:
Timestamp:
02/15/11 17:00:44 (9 years ago)
Author:
curtis
Message:

Update slim-plugin dependencies to match latest ImageJ2 project structure.

Location:
trunk/projects/slim-plugin
Files:
3 edited

Legend:

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

    r7612 r7616  
    3939    <dependency> 
    4040      <groupId>${imagej.groupId}</groupId> 
    41       <artifactId>ij1-bridge</artifactId> 
     41      <artifactId>ij1-bridge-old</artifactId> 
    4242      <version>${imagej.version}</version> 
    4343    </dependency> 
    4444    <dependency> 
    4545      <groupId>${imagej.groupId}</groupId> 
    46       <artifactId>ij1-plugin</artifactId> 
    47       <version>${imagej.version}</version> 
    48     </dependency> 
    49     <dependency> 
    50       <groupId>${imagej.groupId}</groupId> 
    51       <artifactId>ij2-imglib</artifactId> 
     46      <artifactId>ij2-imglib-old</artifactId> 
    5247      <version>${imagej.version}</version> 
    5348    </dependency> 
  • trunk/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

    r7605 r7616  
    4242import ij.process.ColorProcessor; 
    4343import ij.process.ImageProcessor; 
    44  
    45 import imagej.imglib.process.ImageUtils; 
     44import imagej.imglib.process.OldImageUtils; 
    4645 
    4746import java.awt.Canvas; 
     
    5352import javax.swing.JFrame; 
    5453 
    55 import loci.slim.colorizer.DataColorizer; 
    56 import loci.slim.ui.IStartStopListener; 
    57 import loci.slim.ui.IUserInterfacePanel; 
    58 import loci.slim.ui.IUserInterfacePanel.FitAlgorithm; 
    59 import loci.slim.ui.IUserInterfacePanel.FitFunction; 
    60 import loci.slim.ui.IUserInterfacePanel.FitRegion; 
    61 import loci.slim.ui.IUserInterfacePanelListener; 
    62 import loci.slim.ui.UserInterfacePanel; 
    6354import loci.curvefitter.CurveFitData; 
    6455import loci.curvefitter.GrayCurveFitter; 
     
    7364import loci.slim.analysis.SLIMAnalysis; 
    7465import loci.slim.binning.SLIMBinning; 
    75  
     66import loci.slim.colorizer.DataColorizer; 
     67import loci.slim.ui.IStartStopListener; 
     68import loci.slim.ui.IUserInterfacePanel; 
     69import loci.slim.ui.IUserInterfacePanel.FitAlgorithm; 
     70import loci.slim.ui.IUserInterfacePanel.FitFunction; 
     71import loci.slim.ui.IUserInterfacePanel.FitRegion; 
     72import loci.slim.ui.IUserInterfacePanelListener; 
     73import loci.slim.ui.UserInterfacePanel; 
    7674import mpicbg.imglib.container.planar.PlanarContainerFactory; 
    7775import mpicbg.imglib.cursor.Cursor; 
     
    387385        System.out.println("dimensions size is " + dimensions.length); 
    388386        Integer xIndex, yIndex, lifetimeIndex, channelIndex; 
    389         m_width = ImageUtils.getWidth(image); 
    390         m_height = ImageUtils.getHeight(image); 
    391         m_channels = ImageUtils.getNChannels(image); 
     387        m_width = OldImageUtils.getWidth(image); 
     388        m_height = OldImageUtils.getHeight(image); 
     389        m_channels = OldImageUtils.getNChannels(image); 
    392390        //TODO this is broken; returns 1 when there are 16 channels; corrected below 
    393391        System.out.println("ImageUtils.getNChannels returns " + m_channels); 
     
    398396        } 
    399397        System.out.println("corrected to " + m_channels); 
    400         m_timeBins = ImageUtils.getDimSize(image, FormatTools.LIFETIME); 
     398        m_timeBins = OldImageUtils.getDimSize(image, FormatTools.LIFETIME); 
    401399        System.out.println("width " + m_width + " height " + m_height + " timeBins " + m_timeBins + " channels " + m_channels); 
    402400        m_cursor = image.createLocalizableByDimCursor(); 
  • trunk/projects/slim-plugin/src/main/java/loci/slim/analysis/plugins/VisADAnalysisPlugin.java

    r7398 r7616  
    1010 
    1111// CTR FIXME: remove dependency on ij1bridge 
    12 import imagej.ij1bridge.process.ImageUtils; 
     12import imagej.ij1bridge.process.OldLegacyImageUtils; 
    1313 
    1414import loci.slim.ui.IUserInterfacePanel.FitFunction; 
     
    3030public class VisADAnalysisPlugin implements ISLIMAnalyzer { 
    3131    public void analyze(Image<DoubleType> image, FitRegion region, FitFunction function) { 
    32         ImagePlus imp = ImageUtils.createImagePlus(image, "Fitted results"); 
     32        ImagePlus imp = OldLegacyImageUtils.createImagePlus(image, "Fitted results"); 
    3333        IJ.runPlugIn(imp, "imagej.visad.VisADPlugin", ""); 
    3434    } 
Note: See TracChangeset for help on using the changeset viewer.