Revision: 6632
http://sourceforge.net/p/jump-pilot/code/6632
Author: michaudm
Date: 2020-11-22 10:08:22 +0000 (Sun, 22 Nov 2020)
Log Message:
-----------
Some cleaning in CropWarpPlugIn : move class variable to local variable when
possible
Modified Paths:
--------------
core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
core/trunk/src/org/openjump/core/ui/plugin/raster/CropWarpPlugIn.java
Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-11-22 09:04:06 UTC (rev 6631)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-11-22 10:08:22 UTC (rev 6632)
@@ -205,16 +205,6 @@
}
else if (filenameOrURL.toLowerCase().endsWith(".tif")
||
filenameOrURL.toLowerCase().endsWith(".tiff")) {
-// GeoReferencedRaster geoRaster;
-// RenderedOp renderedOp;
-// try {
-// geoRaster = new GeoReferencedRaster(new
File(filenameOrURL).toURI().toString());
-// renderedOp = geoRaster.getImage();
-// } catch (ReferencedImageException e) {
-// // TODO Auto-generated catch block
-// renderedOp = JAI.create("fileload", filenameOrURL);
-// }
-// return renderedOp.getAsBufferedImage(subset,
null).getData();
return TiffUtilsV2.getRenderedOp(new
File(filenameOrURL)).getAsBufferedImage(subset, null).getData();
Modified: core/trunk/src/org/openjump/core/ui/plugin/raster/CropWarpPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/raster/CropWarpPlugIn.java
2020-11-22 09:04:06 UTC (rev 6631)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/CropWarpPlugIn.java
2020-11-22 10:08:22 UTC (rev 6632)
@@ -80,18 +80,15 @@
JTextField jTextField_RasterOut = new JTextField();
JTextField jTextField_RasterIn = new JTextField();
private JPanel cropPanel;
- private RasterImageLayer rLayer;
- private JComboBox<String> comboBox = new JComboBox<String>();
- private JComboBox<String> cropComboBox = new JComboBox<String>();
- private JComboBox<Object> layerComboBox = new JComboBox<Object>();
- private JComboBox<RasterImageLayer> layerableComboBox = new
JComboBox<RasterImageLayer>();
+ private String rLayerName;
+ private JComboBox<String> comboBox = new JComboBox<>();
+ private JComboBox<String> cropComboBox = new JComboBox<>();
+ private JComboBox<Object> layerComboBox = new JComboBox<>();
private String ACTION;
private String CROP;
private String path;
Envelope envWanted = new Envelope();
Envelope fix = new Envelope();
- GenericRasterAlgorithm IO = new GenericRasterAlgorithm();
- List<RasterImageLayer> fLayers = new ArrayList<RasterImageLayer>();
private MultiInputDialog dialog;
public static WorkbenchFrame frame =
JUMPWorkbench.getInstance().getFrame();
private JPanel coordsPanel;
@@ -165,17 +162,24 @@
private void setDialogValues(PlugInContext context) throws IOException {
dialog.setSideBarDescription(CROP_RASTER_TIP);
- if (!context.getLayerNamePanel().selectedNodes(RasterImageLayer.class)
+ List<RasterImageLayer> imageLayers =
context.getLayerManager().getRasterImageLayers();
+ RasterImageLayer rLayer;
+ if (imageLayers.contains(rLayerName)) {
+ rLayer = imageLayers.get(imageLayers.indexOf(rLayerName));
+ }
+ else if
(!context.getLayerNamePanel().selectedNodes(RasterImageLayer.class)
.isEmpty()) {
rLayer = (RasterImageLayer) LayerTools.getSelectedLayerable(
context, RasterImageLayer.class);
- } else {
+ }
+ else {
rLayer = context.getTask().getLayerManager()
.getLayerables(RasterImageLayer.class).get(0);
}
- fLayers = context.getTask().getLayerManager()
+ List<RasterImageLayer> fLayers = context.getTask().getLayerManager()
.getLayerables(RasterImageLayer.class);
- layerableComboBox = dialog.addLayerableComboBox(CLAYER, rLayer, "",
+ JComboBox<RasterImageLayer> layerableComboBox =
+ dialog.addLayerableComboBox(CLAYER, rLayer, "",
fLayers);
layerableComboBox.setSize(200,
layerableComboBox.getPreferredSize().height);
@@ -186,7 +190,7 @@
dialog.repaint();
}
});
- final ArrayList<String> srsArray = new ArrayList<String>();
+ final ArrayList<String> srsArray = new ArrayList<>();
srsArray.add(CROP_RASTER);
srsArray.add(WARP_RASTER);
comboBox = dialog.addComboBox(ACTION_LABEL, srsArray.get(0), srsArray,
@@ -223,7 +227,7 @@
} };
private void getDialogValues(MultiInputDialog dialog) {
- rLayer = (RasterImageLayer) dialog.getLayerable(CLAYER);
+ rLayerName = dialog.getLayerable(CLAYER).getName();
ACTION = dialog.getText(ACTION_LABEL);
CROP = cropComboBox.getSelectedItem().toString();
getCroppedEnvelope();
@@ -230,7 +234,7 @@
path = getOutputFilePath();
final int i = path.lastIndexOf('.');
if (i > 0) {
- path = path.substring(0, path.length() - path.length() + i);
+ path = path.substring(0, i);
}
}
@@ -257,6 +261,8 @@
monitor.report(PROCESSING);
reportNothingToUndoYet(context);
final File outFile = FileUtil.addExtensionIfNone(new File(path),
"tif");
+ RasterImageLayer rLayer = (RasterImageLayer)
dialog.getLayerable(CLAYER);
+ GenericRasterAlgorithm IO = new GenericRasterAlgorithm();
if (ACTION.equals(CROP_RASTER)) {
IO.save_CropToEnvelope(outFile, rLayer, fix);
@@ -271,12 +277,12 @@
} catch (final RuntimeException e1) {
}
IO.load(outFile, catName);
- return;
}
private void getCroppedEnvelope() {
envWanted = new Envelope();
fix = new Envelope();
+ RasterImageLayer rLayer = (RasterImageLayer)
dialog.getLayerable(CLAYER);
if (CROP.equals(LAYER)) {
final Layerable slayer = (Layerable) layerComboBox
.getSelectedItem();
@@ -327,8 +333,7 @@
}
public JPanel createOutputFilePanel(FileNameExtensionFilter filter) {
- JPanel jPanel = new JPanel(new GridBagLayout());
- jPanel = new javax.swing.JPanel();
+ JPanel jPanel = new javax.swing.JPanel();
jTextField_RasterOut = new JTextField();
final JButton jButton_Dir = new JButton();
jTextField_RasterOut.setText("");
@@ -335,7 +340,7 @@
jButton_Dir.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {
- File outputPathFile = null;
+ File outputPathFile;
final JFileChooser chooser = new
GUIUtil.FileChooserWithOverwritePrompting();
chooser.setDialogTitle(getName());
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
@@ -367,8 +372,7 @@
"asc", "bil", "bip", "bsq", "bmp", "ecw", "flt", "gif", "gis",
"grd", "img", "jpg", "jpeg", "jp2", "j2k", "lan", "map", "mpr",
"mpl", "pdf", "sid", "raw", "xyz", "sid", "tiff", "tif" });
- JPanel jPanel = new JPanel(new GridBagLayout());
- jPanel = new javax.swing.JPanel();
+ JPanel jPanel = new javax.swing.JPanel();
jTextField_RasterIn = new JTextField();
final JButton jButton_Dir = new JButton();
jTextField_RasterIn.setText("");
@@ -375,7 +379,7 @@
jButton_Dir.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {
- File outputPathFile = null;
+ File outputPathFile;
final JFileChooser chooser = new
GUIUtil.FileChooserWithOverwritePrompting();
chooser.setDialogTitle(getName());
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
