[JPP-Devel] SVN: [6681] core/trunk/src/org/openjump/core/rasterimage/ RasterImageLayer.java
Revision: 6681 http://sourceforge.net/p/jump-pilot/code/6681 Author: ma15569 Date: 2021-12-08 05:39:14 + (Wed, 08 Dec 2021) Log Message: --- Added methods to map values and classes of values Modified Paths: -- core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java === --- core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java 2021-12-03 05:10:19 UTC (rev 6680) +++ core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java 2021-12-08 05:39:14 UTC (rev 6681) @@ -9,22 +9,35 @@ */ package org.openjump.core.rasterimage; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Point; +import java.awt.Rectangle; import java.awt.geom.NoninvertibleTransformException; import java.awt.geom.Point2D; import java.awt.image.BufferedImage; import java.awt.image.ColorModel; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferDouble; +import java.awt.image.DataBufferFloat; +import java.awt.image.DataBufferInt; +import java.awt.image.DataBufferShort; import java.awt.image.IndexColorModel; import java.awt.image.Raster; import java.awt.image.renderable.ParameterBlock; import java.io.File; import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; import java.util.Objects; +import java.util.TreeMap; import java.util.UUID; import javax.media.jai.JAI; -import com.vividsolutions.jump.workbench.model.Disposable; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; import org.openjump.core.ccordsys.utils.SRSInfo; @@ -41,6 +54,7 @@ import com.vividsolutions.jump.workbench.Logger; import com.vividsolutions.jump.workbench.WorkbenchContext; import com.vividsolutions.jump.workbench.model.AbstractLayerable; +import com.vividsolutions.jump.workbench.model.Disposable; import com.vividsolutions.jump.workbench.model.LayerManager; import com.vividsolutions.jump.workbench.model.Layerable; import com.vividsolutions.jump.workbench.plugin.PlugInContext; @@ -49,1323 +63,1421 @@ import com.vividsolutions.jump.workbench.ui.Viewport; /** - * Layer representing a georeferenced raster image (e.g. an areal photography) in OpenJump. + * Layer representing a georeferenced raster image (e.g. an areal photography) + * in OpenJump. * - * @author Ole Rahn - * - * FH Osnabrück - University of Applied Sciences Osnabrück, - * Project: PIROL (2006), - * Subproject: Daten- und Wissensmanagement - * - * @version $Rev: 2509 $ - * modified: [sstein]: 16.Feb.2009 changed logger-entries to comments, used frame.warnUser + * @author Ole Rahn + * + * FH Osnabrück - University of Applied Sciences Osnabrück, + * + * Project: PIROL (2006), + * Subproject: Daten- und Wissensmanagement + * + * @version $Rev: 2509 $ modified: [sstein]: 16.Feb.2009 changed logger-entries + * to comments, used frame.warnUser */ -public final class RasterImageLayer extends AbstractLayerable -implements ObjectContainingMetaInformation, Disposable { - -protected static Blackboard blackboard = null; - -protected final static String BLACKBOARD_KEY_PLUGINCONTEXT = PlugInContext.class.getName(); -protected final static String BLACKBOARD_KEY_WORKBENCHCONTEXT = PlugInContext.class.getName(); - -protected int lastImgProcessingMode = 0; - -protected final static int MODE_NONE = 0; -protected final static int MODE_SCALINGFIRST = 1; -protected final static int MODE_CLIPPINGFIRST = 2; -protected final static int MODE_FASTDISPLAY = 3; - -protected Rectangle imagePart, visibleRect = null; - -protected double oldScaleXImg2Canvas; - -protected int xOffset, yOffset; +public final class RasterImageLayer extends AbstractLayerable implements ObjectContainingMetaInformation, Disposable { -protected double transparencyLevel = .0f; - -protected static long availRAM = Runtime.getRuntime().maxMemory(); -protected static double freeRamFactor = 0.5; -protected static double minRamToKeepFree = availRAM * freeRamFactor; -//[sstein 9.Aug.2010] -// The value below is set dynamically based on available memory -// now its 200x200px as min (originally it was 500x500) -//protected static int maxPixelsForFastDisplayMode = 4; -protected static int maxPixelsForFastDisplayMode = 25; + protected static Blackboard blackboard = null; -protected String imageFileName = null; -protected int origImageWidth, origImageHeight; -protected boolean imageSet = false; -protected BufferedImage image = null; -protected int numBands = 0; - -//-- [sstein 2nd Aug 2010] new, since we scal
[JPP-Devel] SVN: [6682] core/trunk/src/org/openjump/core/rasterimage/styler/ui
Revision: 6682 http://sourceforge.net/p/jump-pilot/code/6682 Author: ma15569 Date: 2021-12-08 05:43:53 + (Wed, 08 Dec 2021) Log Message: --- Substituded Utils.purgenoData methodwith rasterImageLayer.getValues method Modified Paths: -- core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java core/trunk/src/org/openjump/core/rasterimage/styler/ui/RasterStylesDialog.java Modified: core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java === --- core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java 2021-12-08 05:39:14 UTC (rev 6681) +++ core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java 2021-12-08 05:43:53 UTC (rev 6682) @@ -21,7 +21,6 @@ import org.openjump.core.rasterimage.styler.ColorUtils; import org.openjump.core.rasterimage.styler.RasterClassifier1D; import org.openjump.core.rasterimage.styler.RasterStylesExtension; -import org.openjump.core.rasterimage.styler.Utils; import org.openjump.core.rasterimage.styler.ui.ColorsTablePanel.TableType; import com.vividsolutions.jump.util.Range; @@ -33,418 +32,438 @@ */ public class IntervalPanel extends javax.swing.JPanel { -/** - * Creates new form IntervalPanel - * @param parent parent Component - * @param rasterImageLayer rasterImageLayer to symbolize - * @param minMaxValues min and max pixel values for this image - */ -public IntervalPanel(Component parent, RasterImageLayer rasterImageLayer, Range minMaxValues) { + /** +* Creates new form IntervalPanel +* +* @param parent parent Component +* @param rasterImageLayer rasterImageLayer to symbolize +* @param minMaxValues min and max pixel values for this image +*/ + public IntervalPanel(Component parent, RasterImageLayer rasterImageLayer, Range minMaxValues) { -initComponents(); -this.parent = parent; -this.rasterImageLayer = rasterImageLayer; -this.minMaxValues = minMaxValues; - -fixComponents(); -} + initComponents(); + this.parent = parent; + this.rasterImageLayer = rasterImageLayer; + this.minMaxValues = minMaxValues; -public void reset() { -try { - jComboBox_Method.setSelectedItem(classMethods_m.get(ClassificationMethod.JENKS)); -jTextField_Classes.setText("5"); -jComboBox_Gradient.setSelectedIndex(0); -rampAll(); -} catch (Exception ex) { -Logger.error(ex); -} -} + fixComponents(); + } -/** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ -private void initComponents() { -java.awt.GridBagConstraints gridBagConstraints; + public void reset() { + try { + jComboBox_Method.setSelectedItem(classMethods_m.get(ClassificationMethod.JENKS)); + jTextField_Classes.setText("5"); + jComboBox_Gradient.setSelectedIndex(0); + rampAll(); + } catch (final Exception ex) { + Logger.error(ex); + } + } -jLabel_Method = new javax.swing.JLabel(); -jComboBox_Method = new javax.swing.JComboBox(); -jButton_Values = new javax.swing.JButton(); -jLabel_Classes = new javax.swing.JLabel(); -jTextField_Classes = new javax.swing.JTextField(); -jPanel_Table = new javax.swing.JPanel(); -jButton_AddRow = new javax.swing.JButton(); -jButton_RemoveRow = new javax.swing.JButton(); -jButton_Ramp = new javax.swing.JButton(); + /** +* This method is called from within the constructor to initialize the form. +* WARNING: Do NOT modify this code. The content of this method is always +* regenerated by the Form Editor. +*/ + private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; -setMinimumSize(new java.awt.Dimension(365, 160)); -setPreferredSize(new java.awt.Dimension(365, 160)); -addComponentListener(new java.awt.event.ComponentAdapter() { -public void componentShown(java.awt.event.ComponentEvent evt) { -formComponentShown(evt); -} -}); -java.awt.GridBagLayout layout = new java.awt.GridBagLayout(); -layout.columnWidths = new int[] {0, 5, 0, 5, 0}; -layout.rowHeights = new int[] {0, 5, 0, 5, 0, 5, 0, 5, 0}; -setLayout(layout); + jLabel_Method = new javax.swing.JLabel(); + jComboBox_Method = new java
[JPP-Devel] SVN: [6683] core/trunk/ChangeLog
Revision: 6683 http://sourceforge.net/p/jump-pilot/code/6683 Author: ma15569 Date: 2021-12-08 05:47:01 + (Wed, 08 Dec 2021) Log Message: --- Updated ChangeLog file Modified Paths: -- core/trunk/ChangeLog Modified: core/trunk/ChangeLog === --- core/trunk/ChangeLog2021-12-08 05:43:53 UTC (rev 6682) +++ core/trunk/ChangeLog2021-12-08 05:47:01 UTC (rev 6683) @@ -4,6 +4,11 @@ # 3. be concise but convey the change in a way that ordinary users understand #< 80 chars --> +2021-12-08 -ver 6679- Giuseppe Aruta + Add method to map classes of values in RasterImageLayer class + Substituded this method in Raster Style classes + TODO: to implement into OpenJUMP2 (instead of er 6678) + 2021-12-02 -ver 6679- Giuseppe Aruta Test class to import JPG. GIF, PNG, BMP and (some) JPG2000 as RasterImageLayes. It is build using TifUtilsV2 as sample ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
[JPP-Devel] SVN: [6684] core/trunk/ChangeLog
Revision: 6684 http://sourceforge.net/p/jump-pilot/code/6684 Author: ma15569 Date: 2021-12-08 06:33:56 + (Wed, 08 Dec 2021) Log Message: --- correct ChangeLog file Modified Paths: -- core/trunk/ChangeLog Modified: core/trunk/ChangeLog === --- core/trunk/ChangeLog2021-12-08 05:47:01 UTC (rev 6683) +++ core/trunk/ChangeLog2021-12-08 06:33:56 UTC (rev 6684) @@ -4,7 +4,7 @@ # 3. be concise but convey the change in a way that ordinary users understand #< 80 chars --> -2021-12-08 -ver 6679- Giuseppe Aruta +2021-12-08 -ver 6683- Giuseppe Aruta Add method to map classes of values in RasterImageLayer class Substituded this method in Raster Style classes TODO: to implement into OpenJUMP2 (instead of er 6678) ___ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel