Commit 78aea970 authored by Andrey Filippov's avatar Andrey Filippov

post-merge corrections

parent bcd2b0d1
...@@ -742,7 +742,7 @@ public class EyesisCorrections { ...@@ -742,7 +742,7 @@ public class EyesisCorrections {
if (path!=null){ if (path!=null){
path+=Prefs.getFileSeparator()+imp.getTitle()+".tiff"; path+=Prefs.getFileSeparator()+imp.getTitle()+".tiff";
if (this.debugLevel>0) System.out.println("Saving equirectangular result to "+path); if (this.debugLevel>0) System.out.println("Saving equirectangular result to "+path);
(new EyesisTiff(correctionsParameters.tiffCompression)).saveTiff( (new EyesisTiff()).saveTiff(
imp, imp,
path, path,
correctionsParameters.equirectangularFormat, correctionsParameters.equirectangularFormat,
......
package com.elphel.imagej.correction;
/** /**
** -----------------------------------------------------------------------------** ** -----------------------------------------------------------------------------**
** Eyesis_Correction.java ** Eyesis_Correction.java
...@@ -25,19 +24,24 @@ package com.elphel.imagej.correction; ...@@ -25,19 +24,24 @@ package com.elphel.imagej.correction;
** -----------------------------------------------------------------------------** ** -----------------------------------------------------------------------------**
** **
*/ */
package com.elphel.imagej.correction;
import java.awt.Button; import java.awt.Button;
import java.awt.Color; import java.awt.Color;
import java.awt.Component;
import java.awt.Dialog;
import java.awt.Frame; import java.awt.Frame;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.awt.Label;
import java.awt.MouseInfo;
import java.awt.Panel; import java.awt.Panel;
import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
...@@ -93,7 +97,6 @@ import ij.ImageJ; ...@@ -93,7 +97,6 @@ import ij.ImageJ;
import ij.ImagePlus; import ij.ImagePlus;
import ij.ImageStack; import ij.ImageStack;
import ij.Macro; import ij.Macro;
import ij.Prefs; import ij.Prefs;
import ij.WindowManager; import ij.WindowManager;
import ij.gui.GUI; import ij.gui.GUI;
...@@ -105,9 +108,8 @@ import ij.io.FileInfo; ...@@ -105,9 +108,8 @@ import ij.io.FileInfo;
import ij.io.FileSaver; import ij.io.FileSaver;
import ij.io.OpenDialog; import ij.io.OpenDialog;
import ij.io.Opener; import ij.io.Opener;
import ij.plugin.PlugIn; import ij.plugin.PlugIn;
import ij.plugin.frame.PlugInFrame;
import ij.process.ColorProcessor; import ij.process.ColorProcessor;
import ij.process.FloatProcessor; import ij.process.FloatProcessor;
import ij.process.ImageProcessor; import ij.process.ImageProcessor;
......
...@@ -26,23 +26,30 @@ ...@@ -26,23 +26,30 @@
//from main //from main
package com.elphel.imagej.jp4; package com.elphel.imagej.jp4;
import ij.*; import java.awt.Button;
import ij.io.*; import java.awt.Frame;
import ij.process.*; import java.awt.GraphicsEnvironment;
import ij.gui.*; import java.awt.GridLayout;
import ij.plugin.frame.*; import java.awt.Image;
import ij.text.*; import java.awt.Panel;
import ij.plugin.PlugIn; import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.*; import java.awt.event.ActionEvent;
import java.awt.event.*; import java.awt.event.ActionListener;
import java.net.*; import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.io.*;
import javax.swing.*; import javax.swing.JFileChooser;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
...@@ -52,6 +59,22 @@ import org.w3c.dom.NodeList; ...@@ -52,6 +59,22 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import ij.IJ;
import ij.ImageJ;
import ij.ImagePlus;
import ij.ImageStack;
import ij.Prefs;
import ij.WindowManager;
import ij.gui.GUI;
import ij.gui.GenericDialog;
import ij.io.FileInfo;
import ij.io.OpenDialog;
import ij.plugin.PlugIn;
import ij.plugin.frame.PlugInFrame;
import ij.process.ImageConverter;
import ij.process.ImageProcessor;
import ij.text.TextWindow;
...@@ -82,6 +105,7 @@ public class JP46_Reader_camera implements PlugIn, ActionListener { ...@@ -82,6 +105,7 @@ public class JP46_Reader_camera implements PlugIn, ActionListener {
private int ExifOffset=0x0c; private int ExifOffset=0x0c;
private Boolean headless=GraphicsEnvironment.getLocalGraphicsEnvironment().isHeadlessInstance(); private Boolean headless=GraphicsEnvironment.getLocalGraphicsEnvironment().isHeadlessInstance();
@Override
public void run(String arg) { public void run(String arg) {
} }
...@@ -102,7 +126,7 @@ public class JP46_Reader_camera implements PlugIn, ActionListener { ...@@ -102,7 +126,7 @@ public class JP46_Reader_camera implements PlugIn, ActionListener {
return; return;
} }
plugInFrame=new PlugInFrame("JP46 Reader Camera"); plugInFrame=new PlugInFrame("JP46 Reader Camera");
instance = (Frame)plugInFrame; instance = plugInFrame;
plugInFrame.addKeyListener(IJ.getInstance()); plugInFrame.addKeyListener(IJ.getInstance());
...@@ -131,6 +155,7 @@ public class JP46_Reader_camera implements PlugIn, ActionListener { ...@@ -131,6 +155,7 @@ public class JP46_Reader_camera implements PlugIn, ActionListener {
panel.add(b); panel.add(b);
} }
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String label = e.getActionCommand(); String label = e.getActionCommand();
...@@ -1026,11 +1051,11 @@ public class JP46_Reader_camera implements PlugIn, ActionListener { ...@@ -1026,11 +1051,11 @@ public class JP46_Reader_camera implements PlugIn, ActionListener {
} }
return imp; return imp;
} }
@Override
public void setTitle (String title) { public void setTitle (String title) {
imageTitle=title; imageTitle=title;
} }
@Override
public String getTitle () { public String getTitle () {
return imageTitle; return imageTitle;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment