From 8cc174badd0d579e1eb3a4b2014dab143407a63c Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sun, 14 Oct 2018 12:34:46 -0400 Subject: Formatting --- src/bjc/imgchain/ImgChain.java | 2 +- src/bjc/imgchain/ImgPicker.java | 2 - src/bjc/imgchain/ImgPickerPanel.java | 6 +-- src/bjc/imgchain/ImgPipeline.java | 10 ++--- src/bjc/imgchain/ImgViewer.java | 24 ++++++----- src/bjc/imgchain/pipeline/MutablePipeline.java | 7 ---- src/bjc/imgchain/pipeline/PipelineStage.java | 1 - src/bjc/imgchain/pipeline/StageType.java | 1 + src/bjc/imgchain/pipeline/stages/AddMaskStage.java | 8 ++-- .../imgchain/pipeline/stages/BrightnessStage.java | 36 ++++++++--------- .../imgchain/pipeline/stages/ColorSkewStage.java | 47 ++++++++++------------ src/bjc/imgchain/pipeline/stages/GaussStage.java | 10 ++--- .../imgchain/pipeline/stages/GreyscaleStage.java | 9 ++--- src/bjc/imgchain/pipeline/stages/LoadStage.java | 4 +- .../imgchain/pipeline/stages/NegativeStage.java | 2 +- src/bjc/imgchain/pipeline/stages/PipeStage.java | 2 +- src/bjc/imgchain/pipeline/stages/RecallStage.java | 5 --- src/bjc/imgchain/pipeline/stages/SaveStage.java | 1 - src/bjc/imgchain/pipeline/stages/StashStage.java | 10 ++--- src/bjc/imgchain/pipeline/stages/SubMaskStage.java | 2 +- .../imgchain/pipeline/stages/ThresholdStage.java | 7 ++-- src/bjc/imgchain/utils/ImmutableTableModel.java | 1 - src/bjc/imgchain/utils/LabeledInputPanel.java | 4 +- src/bjc/imgchain/utils/Utils.java | 8 ++-- 24 files changed, 94 insertions(+), 115 deletions(-) (limited to 'src') diff --git a/src/bjc/imgchain/ImgChain.java b/src/bjc/imgchain/ImgChain.java index 8fb8331..a3a9712 100644 --- a/src/bjc/imgchain/ImgChain.java +++ b/src/bjc/imgchain/ImgChain.java @@ -94,7 +94,7 @@ public class ImgChain { | UnsupportedLookAndFeelException e) { e.printStackTrace(); } - + chan = new ImgChain(); chan.setupGUI(); diff --git a/src/bjc/imgchain/ImgPicker.java b/src/bjc/imgchain/ImgPicker.java index bc93089..3113487 100644 --- a/src/bjc/imgchain/ImgPicker.java +++ b/src/bjc/imgchain/ImgPicker.java @@ -10,8 +10,6 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; -import bjc.imgchain.ImgChain; - public class ImgPicker extends JDialog { private static final long serialVersionUID = 1L; diff --git a/src/bjc/imgchain/ImgPickerPanel.java b/src/bjc/imgchain/ImgPickerPanel.java index 6db6d69..d0e7c7d 100644 --- a/src/bjc/imgchain/ImgPickerPanel.java +++ b/src/bjc/imgchain/ImgPickerPanel.java @@ -8,15 +8,15 @@ import javax.swing.JPanel; import bjc.imgchain.utils.LabeledInputPanel; public class ImgPickerPanel extends JPanel { - public String stashName; - public LabeledInputPanel imgField; + public String stashName; + public LabeledInputPanel imgField; public ImgPickerPanel() { setLayout(new BorderLayout()); setupGUI("Image name"); } - + public ImgPickerPanel(String lab) { setLayout(new BorderLayout()); diff --git a/src/bjc/imgchain/ImgPipeline.java b/src/bjc/imgchain/ImgPipeline.java index ff67679..d009ecc 100644 --- a/src/bjc/imgchain/ImgPipeline.java +++ b/src/bjc/imgchain/ImgPipeline.java @@ -4,7 +4,6 @@ import java.awt.BorderLayout; import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.text.MessageFormat; import javax.swing.DefaultListModel; import javax.swing.JButton; @@ -15,7 +14,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.border.BevelBorder; -import javax.swing.border.CompoundBorder; import javax.swing.border.TitledBorder; import bjc.imgchain.pipeline.MutablePipeline; @@ -86,8 +84,7 @@ public class ImgPipeline extends JInternalFrame { JList stageList = new JList<>(mod); stageList.addListSelectionListener(e -> { - if (e.getValueIsAdjusting()) - return; + if (e.getValueIsAdjusting()) return; PipelineStage stag = stageList.getSelectedValue(); @@ -145,8 +142,9 @@ public class ImgPipeline extends JInternalFrame { break; case "Sepia": { /* - * NOTE: these values were pulled from somewhere on the internet, and tweaked - * slightly to work better. + * NOTE: these values were pulled from + * somewhere on the internet, and + * tweaked slightly to work better. */ stag = new ColorSkewStage(.393, .769, .189, .349, .686, .168, .272, .534, .131); } diff --git a/src/bjc/imgchain/ImgViewer.java b/src/bjc/imgchain/ImgViewer.java index 30e267b..e9e3278 100644 --- a/src/bjc/imgchain/ImgViewer.java +++ b/src/bjc/imgchain/ImgViewer.java @@ -4,8 +4,6 @@ import java.awt.GridLayout; import java.awt.Image; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.geom.AffineTransform; -import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -13,11 +11,17 @@ import java.net.MalformedURLException; import java.net.URL; import javax.imageio.ImageIO; -import javax.swing.*; +import javax.swing.ImageIcon; +import javax.swing.JFileChooser; +import javax.swing.JInternalFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import bjc.imgchain.pipeline.Pipeline; import bjc.imgchain.pipeline.PipelinePicker; -import bjc.imgchain.utils.SimpleInputPanel; import bjc.imgchain.utils.Utils; public class ImgViewer extends JInternalFrame { @@ -76,7 +80,8 @@ public class ImgViewer extends JInternalFrame { e.printStackTrace(); - JOptionPane.showInternalMessageDialog(null, msg, "Error loading image", JOptionPane.ERROR_MESSAGE); + JOptionPane.showInternalMessageDialog(null, msg, "Error loading image", + JOptionPane.ERROR_MESSAGE); } } } @@ -158,7 +163,8 @@ public class ImgViewer extends JInternalFrame { e.printStackTrace(); - JOptionPane.showInternalMessageDialog(null, msg, "Error saving image", JOptionPane.ERROR_MESSAGE); + JOptionPane.showInternalMessageDialog(null, msg, "Error saving image", + JOptionPane.ERROR_MESSAGE); } }); @@ -167,8 +173,7 @@ public class ImgViewer extends JInternalFrame { storeImage.addActionListener((ev) -> { String inp = JOptionPane.showInternalInputDialog(this, "Enter name to store image under"); - if (inp == null) - return; + if (inp == null) return; inp = inp.trim(); @@ -256,7 +261,8 @@ public class ImgViewer extends JInternalFrame { e.printStackTrace(); - JOptionPane.showInternalMessageDialog(this, msg, "Error loading image", JOptionPane.ERROR_MESSAGE); + JOptionPane.showInternalMessageDialog(this, msg, "Error loading image", + JOptionPane.ERROR_MESSAGE); } return lab; diff --git a/src/bjc/imgchain/pipeline/MutablePipeline.java b/src/bjc/imgchain/pipeline/MutablePipeline.java index 98b4ff9..66c343c 100644 --- a/src/bjc/imgchain/pipeline/MutablePipeline.java +++ b/src/bjc/imgchain/pipeline/MutablePipeline.java @@ -1,16 +1,9 @@ package bjc.imgchain.pipeline; -import java.awt.GridLayout; import java.awt.Image; -import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; -import javax.swing.ImageIcon; -import javax.swing.JInternalFrame; -import javax.swing.JLabel; - -import bjc.imgchain.ImgChain; import bjc.imgchain.utils.Utils; /** diff --git a/src/bjc/imgchain/pipeline/PipelineStage.java b/src/bjc/imgchain/pipeline/PipelineStage.java index 298c9b4..cbb8ccf 100644 --- a/src/bjc/imgchain/pipeline/PipelineStage.java +++ b/src/bjc/imgchain/pipeline/PipelineStage.java @@ -3,7 +3,6 @@ package bjc.imgchain.pipeline; import java.awt.Image; import javax.swing.JComponent; -import javax.swing.JPanel; /** * A stage in an image processing pipeline. diff --git a/src/bjc/imgchain/pipeline/StageType.java b/src/bjc/imgchain/pipeline/StageType.java index f54588d..0b930e5 100644 --- a/src/bjc/imgchain/pipeline/StageType.java +++ b/src/bjc/imgchain/pipeline/StageType.java @@ -2,6 +2,7 @@ package bjc.imgchain.pipeline; /** * The type of stage a given {@link PipelineStage} is. + * * @author acm * */ diff --git a/src/bjc/imgchain/pipeline/stages/AddMaskStage.java b/src/bjc/imgchain/pipeline/stages/AddMaskStage.java index f2370a9..fbfca23 100644 --- a/src/bjc/imgchain/pipeline/stages/AddMaskStage.java +++ b/src/bjc/imgchain/pipeline/stages/AddMaskStage.java @@ -26,11 +26,11 @@ public class AddMaskStage extends AbstractPipelineStage { for (int x = 0; x < buf.getWidth(); x++) { int[] pix = Utils.toARGBQuad(buf.getRGB(x, y)); int[] msq = Utils.toARGBQuad(masque.getRGB(x, y)); - + pix[1] += msq[1]; pix[2] += msq[2]; pix[3] += msq[3]; - + buf.setRGB(x, y, Utils.fromARGBQuad(pix)); } } @@ -47,11 +47,11 @@ public class AddMaskStage extends AbstractPipelineStage { public String description() { return "Add two images togethers"; } - + @Override public JComponent getEditor() { ImgPickerPanel pan = new ImgPickerPanel("Mask name"); - + pan.imgField.field.addPropertyChangeListener("value", (ev) -> { masqueName = pan.imgField.field.getText(); }); diff --git a/src/bjc/imgchain/pipeline/stages/BrightnessStage.java b/src/bjc/imgchain/pipeline/stages/BrightnessStage.java index 5a72a23..2cb1ef5 100644 --- a/src/bjc/imgchain/pipeline/stages/BrightnessStage.java +++ b/src/bjc/imgchain/pipeline/stages/BrightnessStage.java @@ -1,7 +1,6 @@ package bjc.imgchain.pipeline.stages; import java.awt.GridLayout; -import java.awt.Image; import javax.swing.JComponent; import javax.swing.JPanel; @@ -18,16 +17,15 @@ public class BrightnessStage extends AbstractPixelStage { public BrightnessStage(int rr, int gg, int bb) { super(StageType.IMGTRANS); - + this.rr = rr; this.gg = gg; this.bb = bb; } - - private int rr; - private int gg; - private int bb; + private int rr; + private int gg; + private int bb; @Override public int[] processPixel(int[] pix) { @@ -37,11 +35,11 @@ public class BrightnessStage extends AbstractPixelStage { ret[1] = pix[1] + rr; ret[2] = pix[2] + gg; ret[3] = pix[3] + bb; - + ret[1] = Math.max(0, Math.min(255, ret[1])); ret[2] = Math.max(0, Math.min(255, ret[2])); ret[3] = Math.max(0, Math.min(255, ret[3])); - + return ret; } @@ -63,18 +61,18 @@ public class BrightnessStage extends AbstractPixelStage { JPanel rSkew = new JPanel(); rSkew.setLayout(new GridLayout(1, 3)); rSkew.setBorder(new TitledBorder(new BevelBorder(BevelBorder.LOWERED), "Red Balance")); - + JPanel gSkew = new JPanel(); gSkew.setLayout(new GridLayout(1, 3)); gSkew.setBorder(new TitledBorder(new BevelBorder(BevelBorder.LOWERED), "Green Balance")); - + JPanel bSkew = new JPanel(); bSkew.setLayout(new GridLayout(1, 3)); bSkew.setBorder(new TitledBorder(new BevelBorder(BevelBorder.LOWERED), "Blue Balance")); - LabeledInputPanel rpercRed = new LabeledInputPanel("+/- Red", rr); - rSkew.add(rpercRed);; + rSkew.add(rpercRed); + ; LabeledInputPanel gpercGreen = new LabeledInputPanel("+/- Green", gg); gSkew.add(gpercGreen); @@ -83,21 +81,21 @@ public class BrightnessStage extends AbstractPixelStage { bSkew.add(bpercBlue); rpercRed.field.addPropertyChangeListener("value", (ev) -> { - rr = (Integer)rpercRed.field.getValue(); + rr = (Integer) rpercRed.field.getValue(); }); - + gpercGreen.field.addPropertyChangeListener("value", (ev) -> { - gg = (Integer)gpercGreen.field.getValue(); + gg = (Integer) gpercGreen.field.getValue(); }); - + bpercBlue.field.addPropertyChangeListener("value", (ev) -> { - bb = (Integer)bpercBlue.field.getValue(); + bb = (Integer) bpercBlue.field.getValue(); }); - + holder.add(rSkew); holder.add(gSkew); holder.add(bSkew); - + return holder; } } \ No newline at end of file diff --git a/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java b/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java index 9f17eee..c61e96a 100644 --- a/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java +++ b/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java @@ -1,7 +1,6 @@ package bjc.imgchain.pipeline.stages; import java.awt.GridLayout; -import java.awt.Image; import javax.swing.JComponent; import javax.swing.JPanel; @@ -16,10 +15,10 @@ public class ColorSkewStage extends AbstractPixelStage { this(1, 0, 0, 0, 1, 0, 0, 0, 1); } - public ColorSkewStage(double rr, double rg, double rb, double gr, double gg, double gb, - double br, double bg, double bb) { + public ColorSkewStage(double rr, double rg, double rb, double gr, double gg, double gb, double br, double bg, + double bb) { super(StageType.IMGTRANS); - + this.rr = rr; this.rg = rg; this.rb = rb; @@ -31,10 +30,9 @@ public class ColorSkewStage extends AbstractPixelStage { this.bb = bb; } - - private double rr, rg, rb; - private double gr, gg, gb; - private double br, bg, bb; + private double rr, rg, rb; + private double gr, gg, gb; + private double br, bg, bb; @Override public int[] processPixel(int[] pix) { @@ -48,7 +46,7 @@ public class ColorSkewStage extends AbstractPixelStage { ret[1] = Math.max(Math.min(255, ret[1]), 0); ret[2] = Math.max(Math.min(255, ret[2]), 0); ret[3] = Math.max(Math.min(255, ret[3]), 0); - + return ret; } @@ -70,15 +68,14 @@ public class ColorSkewStage extends AbstractPixelStage { JPanel rSkew = new JPanel(); rSkew.setLayout(new GridLayout(1, 3)); rSkew.setBorder(new TitledBorder(new BevelBorder(BevelBorder.LOWERED), "Red Balance")); - + JPanel gSkew = new JPanel(); gSkew.setLayout(new GridLayout(1, 3)); gSkew.setBorder(new TitledBorder(new BevelBorder(BevelBorder.LOWERED), "Green Balance")); - + JPanel bSkew = new JPanel(); bSkew.setLayout(new GridLayout(1, 3)); bSkew.setBorder(new TitledBorder(new BevelBorder(BevelBorder.LOWERED), "Blue Balance")); - LabeledInputPanel rpercRed = new LabeledInputPanel("% Red", rr); LabeledInputPanel rpercGreen = new LabeledInputPanel("% Green", rg); @@ -103,47 +100,47 @@ public class ColorSkewStage extends AbstractPixelStage { rpercRed.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - rr = (Double)rpercRed.field.getValue(); + rr = (Double) rpercRed.field.getValue(); }); gpercRed.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - gr = (Double)gpercRed.field.getValue(); + gr = (Double) gpercRed.field.getValue(); }); bpercRed.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - br = (Double)bpercRed.field.getValue(); + br = (Double) bpercRed.field.getValue(); }); - + rpercGreen.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - rg = (Double)rpercGreen.field.getValue(); + rg = (Double) rpercGreen.field.getValue(); }); gpercGreen.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - gg = (Double)gpercGreen.field.getValue(); + gg = (Double) gpercGreen.field.getValue(); }); bpercGreen.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - bg = (Double)bpercGreen.field.getValue(); + bg = (Double) bpercGreen.field.getValue(); }); - + rpercBlue.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - rb = (Double)rpercBlue.field.getValue(); + rb = (Double) rpercBlue.field.getValue(); }); gpercBlue.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - gb = (Double)gpercBlue.field.getValue(); + gb = (Double) gpercBlue.field.getValue(); }); bpercBlue.field.addPropertyChangeListener("value", (ev) -> { System.out.println("TRIGGERED rr"); - bb = (Double)bpercBlue.field.getValue(); + bb = (Double) bpercBlue.field.getValue(); }); - + holder.add(rSkew); holder.add(gSkew); holder.add(bSkew); - + return holder; } } diff --git a/src/bjc/imgchain/pipeline/stages/GaussStage.java b/src/bjc/imgchain/pipeline/stages/GaussStage.java index 6460062..946b20d 100644 --- a/src/bjc/imgchain/pipeline/stages/GaussStage.java +++ b/src/bjc/imgchain/pipeline/stages/GaussStage.java @@ -13,8 +13,8 @@ import bjc.imgchain.pipeline.StageType; import bjc.imgchain.utils.LabeledInputPanel; public class GaussStage extends AbstractPipelineStage { - private int m; - private double sig, k; + private int m; + private double sig, k; public GaussStage() { super(StageType.IMGTRANS); @@ -86,7 +86,7 @@ public class GaussStage extends AbstractPipelineStage { public JComponent getEditor() { JPanel holder = new JPanel(); holder.setLayout(new GridLayout(3, 1)); - + LabeledInputPanel mField = new LabeledInputPanel("Size of kernel", 3); mField.field.addPropertyChangeListener("value", (ev) -> { m = (Integer) mField.field.getValue(); @@ -99,11 +99,11 @@ public class GaussStage extends AbstractPipelineStage { kField.field.addPropertyChangeListener("value", (ev) -> { k = (Double) kField.field.getValue(); }); - + holder.add(mField); holder.add(sigField); holder.add(kField); - + return holder; } } diff --git a/src/bjc/imgchain/pipeline/stages/GreyscaleStage.java b/src/bjc/imgchain/pipeline/stages/GreyscaleStage.java index 5997d57..4cc227b 100644 --- a/src/bjc/imgchain/pipeline/stages/GreyscaleStage.java +++ b/src/bjc/imgchain/pipeline/stages/GreyscaleStage.java @@ -1,13 +1,9 @@ package bjc.imgchain.pipeline.stages; -import java.awt.Image; -import java.awt.image.BufferedImage; - import javax.swing.JComponent; import javax.swing.JLabel; import bjc.imgchain.pipeline.StageType; -import bjc.imgchain.utils.Utils; public class GreyscaleStage extends AbstractPixelStage { @@ -17,16 +13,17 @@ public class GreyscaleStage extends AbstractPixelStage { public int[] processPixel(int[] pix) { int[] ret = new int[4]; - + int avg = (pix[1] + pix[2] + pix[3]) / 3; ret[0] = pix[0]; ret[1] = avg; ret[2] = avg; ret[3] = avg; - + return ret; } + @Override public String name() { return "Greyscale"; diff --git a/src/bjc/imgchain/pipeline/stages/LoadStage.java b/src/bjc/imgchain/pipeline/stages/LoadStage.java index 5b5c00f..ddf7939 100644 --- a/src/bjc/imgchain/pipeline/stages/LoadStage.java +++ b/src/bjc/imgchain/pipeline/stages/LoadStage.java @@ -22,7 +22,7 @@ public class LoadStage extends AbstractPipelineStage { public LoadStage() { super(StageType.IMGSOURCE); } - + @Override public Image process(Image inp) { try { @@ -37,7 +37,7 @@ public class LoadStage extends AbstractPipelineStage { JOptionPane.showInternalMessageDialog(null, msg, "Error loading image", JOptionPane.ERROR_MESSAGE); } - + return inp; } diff --git a/src/bjc/imgchain/pipeline/stages/NegativeStage.java b/src/bjc/imgchain/pipeline/stages/NegativeStage.java index b1f6dfa..5157736 100644 --- a/src/bjc/imgchain/pipeline/stages/NegativeStage.java +++ b/src/bjc/imgchain/pipeline/stages/NegativeStage.java @@ -28,5 +28,5 @@ public class NegativeStage extends AbstractPixelStage { @Override public int[] processPixel(int[] pix) { return new int[] { pix[0], 255 - pix[1], 255 - pix[2], 255 - pix[3] }; - } + } } diff --git a/src/bjc/imgchain/pipeline/stages/PipeStage.java b/src/bjc/imgchain/pipeline/stages/PipeStage.java index a38717f..3b06b4f 100644 --- a/src/bjc/imgchain/pipeline/stages/PipeStage.java +++ b/src/bjc/imgchain/pipeline/stages/PipeStage.java @@ -68,7 +68,7 @@ public class PipeStage extends AbstractPipelineStage { holder.add(pipeLabel, BorderLayout.LINE_START); holder.add(pipeField, BorderLayout.CENTER); holder.add(pipeButton, BorderLayout.LINE_END); - + return holder; } } diff --git a/src/bjc/imgchain/pipeline/stages/RecallStage.java b/src/bjc/imgchain/pipeline/stages/RecallStage.java index b7b82ba..bcbbddb 100644 --- a/src/bjc/imgchain/pipeline/stages/RecallStage.java +++ b/src/bjc/imgchain/pipeline/stages/RecallStage.java @@ -1,17 +1,12 @@ package bjc.imgchain.pipeline.stages; -import java.awt.BorderLayout; import java.awt.Image; -import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JPanel; import bjc.imgchain.ImgChain; -import bjc.imgchain.ImgPicker; import bjc.imgchain.ImgPickerPanel; import bjc.imgchain.pipeline.StageType; -import bjc.imgchain.utils.LabeledInputPanel; public class RecallStage extends AbstractPipelineStage { private String stashName; diff --git a/src/bjc/imgchain/pipeline/stages/SaveStage.java b/src/bjc/imgchain/pipeline/stages/SaveStage.java index aba875f..e38e403 100644 --- a/src/bjc/imgchain/pipeline/stages/SaveStage.java +++ b/src/bjc/imgchain/pipeline/stages/SaveStage.java @@ -4,7 +4,6 @@ import java.awt.BorderLayout; import java.awt.Image; import java.io.File; import java.io.IOException; -import java.net.URL; import javax.imageio.ImageIO; import javax.swing.JButton; diff --git a/src/bjc/imgchain/pipeline/stages/StashStage.java b/src/bjc/imgchain/pipeline/stages/StashStage.java index 67c343e..47689f5 100644 --- a/src/bjc/imgchain/pipeline/stages/StashStage.java +++ b/src/bjc/imgchain/pipeline/stages/StashStage.java @@ -10,15 +10,15 @@ import bjc.imgchain.utils.LabeledInputPanel; public class StashStage extends AbstractPipelineStage { private String stashName; - + public StashStage() { super(StageType.IMGSOURCE); } - + @Override public Image process(Image inp) { ImgChain.chan.addImage(stashName, inp); - + return inp; } @@ -31,14 +31,14 @@ public class StashStage extends AbstractPipelineStage { public String description() { return "Stash image to memory"; } - + @Override public JComponent getEditor() { LabeledInputPanel imgName = new LabeledInputPanel("Image name", ""); imgName.field.addPropertyChangeListener("value", (ev) -> { stashName = imgName.field.getText(); }); - + return imgName; } } diff --git a/src/bjc/imgchain/pipeline/stages/SubMaskStage.java b/src/bjc/imgchain/pipeline/stages/SubMaskStage.java index 1503934..594c97f 100644 --- a/src/bjc/imgchain/pipeline/stages/SubMaskStage.java +++ b/src/bjc/imgchain/pipeline/stages/SubMaskStage.java @@ -57,5 +57,5 @@ public class SubMaskStage extends AbstractPipelineStage { }); return pan; - } + } } diff --git a/src/bjc/imgchain/pipeline/stages/ThresholdStage.java b/src/bjc/imgchain/pipeline/stages/ThresholdStage.java index ec00bcc..dfcbfaf 100644 --- a/src/bjc/imgchain/pipeline/stages/ThresholdStage.java +++ b/src/bjc/imgchain/pipeline/stages/ThresholdStage.java @@ -1,7 +1,6 @@ package bjc.imgchain.pipeline.stages; import java.awt.GridLayout; -import java.awt.Image; import javax.swing.JComponent; import javax.swing.JPanel; @@ -24,9 +23,9 @@ public class ThresholdStage extends AbstractPixelStage { this.blueThreshold = bb; } - private int redThreshold; - private int greenThreshold; - private int blueThreshold; + private int redThreshold; + private int greenThreshold; + private int blueThreshold; @Override public int[] processPixel(int[] pix) { diff --git a/src/bjc/imgchain/utils/ImmutableTableModel.java b/src/bjc/imgchain/utils/ImmutableTableModel.java index 515f0a0..d5e8027 100644 --- a/src/bjc/imgchain/utils/ImmutableTableModel.java +++ b/src/bjc/imgchain/utils/ImmutableTableModel.java @@ -9,7 +9,6 @@ public class ImmutableTableModel extends DefaultTableModel { super(data, columnNames); } - @Override public boolean isCellEditable(int row, int column) { return false; diff --git a/src/bjc/imgchain/utils/LabeledInputPanel.java b/src/bjc/imgchain/utils/LabeledInputPanel.java index 7eed8b0..6f16e28 100644 --- a/src/bjc/imgchain/utils/LabeledInputPanel.java +++ b/src/bjc/imgchain/utils/LabeledInputPanel.java @@ -24,9 +24,9 @@ public class LabeledInputPanel extends JPanel { * Create a new labeled input component. * * @param label - * The label for the component. + * The label for the component. * @param val - * The initial value for the field. + * The initial value for the field. */ public LabeledInputPanel(String label, Object val) { super(); diff --git a/src/bjc/imgchain/utils/Utils.java b/src/bjc/imgchain/utils/Utils.java index a4df9de..86daa0d 100644 --- a/src/bjc/imgchain/utils/Utils.java +++ b/src/bjc/imgchain/utils/Utils.java @@ -62,15 +62,15 @@ public class Utils { public static void displayImage(Image processed, String title) { { BufferedImage resimg = toBuffered(processed); - + JInternalFrame displayFrame = new JInternalFrame(title, false, true, true); displayFrame.setSize(resimg.getWidth(), resimg.getHeight()); displayFrame.setLayout(new GridLayout(1, 1)); - + JLabel displayLabel = new JLabel(new ImageIcon(resimg)); - + displayFrame.add(displayLabel); - + ImgChain.chan.desktop.add(displayFrame); displayFrame.setVisible(true); } -- cgit v1.2.3