From 051d00447b5b37a191611016842ee5e3523e0ae0 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sun, 28 Oct 2018 12:23:23 -0400 Subject: General cleanup --- src/bjc/imgchain/ImgPickerPanel.java | 18 ++++++++++++++++-- .../imgchain/pipeline/stages/AbstractPixelStage.java | 10 ++++++++++ src/bjc/imgchain/pipeline/stages/AddMaskStage.java | 8 ++++++++ src/bjc/imgchain/pipeline/stages/BrightnessStage.java | 6 +++--- src/bjc/imgchain/pipeline/stages/ColorSkewStage.java | 6 +++--- src/bjc/imgchain/pipeline/stages/GaussStage.java | 6 ++++-- src/bjc/imgchain/pipeline/stages/ThresholdStage.java | 6 +++--- 7 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/bjc/imgchain/ImgPickerPanel.java b/src/bjc/imgchain/ImgPickerPanel.java index d0e7c7d..61e2c8d 100644 --- a/src/bjc/imgchain/ImgPickerPanel.java +++ b/src/bjc/imgchain/ImgPickerPanel.java @@ -7,9 +7,23 @@ import javax.swing.JPanel; import bjc.imgchain.utils.LabeledInputPanel; +/** + * Panel for picking an image. + * + * @author bjculkin + * + */ public class ImgPickerPanel extends JPanel { - public String stashName; - public LabeledInputPanel imgField; + private static final long serialVersionUID = 4567876787110596208L; + + /** + * The place to stash the image. + */ + public String stashName; + /** + * The field to get the image from. + */ + public LabeledInputPanel imgField; public ImgPickerPanel() { setLayout(new BorderLayout()); diff --git a/src/bjc/imgchain/pipeline/stages/AbstractPixelStage.java b/src/bjc/imgchain/pipeline/stages/AbstractPixelStage.java index 4b65c85..8b161d6 100644 --- a/src/bjc/imgchain/pipeline/stages/AbstractPixelStage.java +++ b/src/bjc/imgchain/pipeline/stages/AbstractPixelStage.java @@ -6,6 +6,11 @@ import java.awt.image.BufferedImage; import bjc.imgchain.pipeline.StageType; import bjc.imgchain.utils.Utils; +/** + * An abstract stage that processes images pixel-by-pixel. + * @author bjculkin + * + */ public abstract class AbstractPixelStage extends AbstractPipelineStage { protected AbstractPixelStage(StageType type) { @@ -31,5 +36,10 @@ public abstract class AbstractPixelStage extends AbstractPipelineStage { return res; } + /** + * Process a pixel of data. + * @param pix The pixel, as an array in the form (A, R, G, B) + * @return The new pixel, as an array in the form (A, R, G, B) + */ public abstract int[] processPixel(int[] pix); } diff --git a/src/bjc/imgchain/pipeline/stages/AddMaskStage.java b/src/bjc/imgchain/pipeline/stages/AddMaskStage.java index fbfca23..0a62856 100644 --- a/src/bjc/imgchain/pipeline/stages/AddMaskStage.java +++ b/src/bjc/imgchain/pipeline/stages/AddMaskStage.java @@ -10,9 +10,17 @@ import bjc.imgchain.ImgPickerPanel; import bjc.imgchain.pipeline.StageType; import bjc.imgchain.utils.Utils; +/** + * Mask an image onto another one. + * @author bjculkin + * + */ public class AddMaskStage extends AbstractPipelineStage { private String masqueName; + /** + * Create a masking stage. + */ public AddMaskStage() { super(StageType.IMGTRANS); } diff --git a/src/bjc/imgchain/pipeline/stages/BrightnessStage.java b/src/bjc/imgchain/pipeline/stages/BrightnessStage.java index 2cb1ef5..cca914a 100644 --- a/src/bjc/imgchain/pipeline/stages/BrightnessStage.java +++ b/src/bjc/imgchain/pipeline/stages/BrightnessStage.java @@ -23,9 +23,9 @@ public class BrightnessStage extends AbstractPixelStage { 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) { diff --git a/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java b/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java index c61e96a..92ef0d4 100644 --- a/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java +++ b/src/bjc/imgchain/pipeline/stages/ColorSkewStage.java @@ -30,9 +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) { diff --git a/src/bjc/imgchain/pipeline/stages/GaussStage.java b/src/bjc/imgchain/pipeline/stages/GaussStage.java index 946b20d..5f5d919 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); @@ -59,6 +59,8 @@ public class GaussStage extends AbstractPipelineStage { } } + // Shouldn't we be doing something with this? + @SuppressWarnings("unused") float invsum = 1 / sum; float[] dat = new float[m * m]; diff --git a/src/bjc/imgchain/pipeline/stages/ThresholdStage.java b/src/bjc/imgchain/pipeline/stages/ThresholdStage.java index dfcbfaf..55a4dd3 100644 --- a/src/bjc/imgchain/pipeline/stages/ThresholdStage.java +++ b/src/bjc/imgchain/pipeline/stages/ThresholdStage.java @@ -23,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) { -- cgit v1.2.3