SEADAS: Reprojection Tool Modifications

ceres-ui/src/main/java/com/bc/ceres/swing/binding/BindingContext.java

@@ -58,6 +58,8 @@
  * @version $Revision$ $Date$
  * @since Ceres 0.6
  */
+// MAR2020 - Daniel Knowles - Added setEnabled so that some properties can be initially enabled/disabled
+
 public class BindingContext {
 
     private final PropertySet propertySet;
@@ -478,6 +480,22 @@ private static void configureComponent(JComponent component, String name, String
         component.setEnabled(enabled);
     }
 
+
+    /**
+     * Sets the <i>enabled</i> state of the components associated with {@code targetProperty}.
+     * Enablement of the target property matches that of the source property.
+     *
+     * @param targetPropertyName  The name of the target property.
+     * @param sourcePropertyName  The name of the source property.
+     */
+    public Enablement bindEnabledState(final String targetPropertyName,
+                                       final String sourcePropertyName) {
+        return bindEnabledState(targetPropertyName, true,
+                new EqualValuesCondition(sourcePropertyName, true));
+    }
+
+
+
     /**
      * Sets the <i>enabled</i> state of the components associated with {@code targetProperty}.
      * If the current value of {@code sourceProperty} equals {@code sourcePropertyValue} then

snap-core/src/main/java/org/esa/snap/core/dataio/ProductFlipper.java

@@ -323,7 +323,12 @@ private void addBandsToProduct(Product product) {
                 }
                 destBand.setSpectralBandIndex(sourceBand.getSpectralBandIndex());
                 destBand.setSpectralWavelength(sourceBand.getSpectralWavelength());
+                destBand.setAngularValue(sourceBand.getAngularValue());
+                destBand.setAngularBandIndex(sourceBand.getAngularBandIndex());
                 destBand.setSpectralBandwidth(sourceBand.getSpectralBandwidth());
+                destBand.setValidPixelExpression(sourceBand.getValidPixelExpression());
+                destBand.setNoDataValueUsed(sourceBand.isNoDataValueUsed());
+                destBand.setNoDataValue(sourceBand.getNoDataValue());
                 destBand.setSolarFlux(sourceBand.getSolarFlux());
                 FlagCoding sourceFlagCoding = sourceBand.getFlagCoding();
                 IndexCoding sourceIndexCoding = sourceBand.getIndexCoding();

snap-core/src/main/java/org/esa/snap/core/dataio/ProductSubsetBuilder.java

@@ -146,6 +146,10 @@ private static void updateMetadata(
                 totalSize.getData().setElemUInt(targetProduct.getRawStorageSize());
             }
 
+
+//            ProductUtils.markProductMetaDataFieldAsDerivedFrom(targetProduct);
+
+
             if (nearRangeOnLeft) {
                 setLatLongMetadata(targetProduct, trgAbsRoot, "first_near_lat", "first_near_long", 0.5f, 0.5f);
                 setLatLongMetadata(targetProduct, trgAbsRoot, "first_far_lat", "first_far_long",
@@ -534,6 +538,9 @@ private Product createProduct() {
         if (!isMetadataIgnored()) {
             ProductUtils.copyMetadata(sourceProduct, product);
         }
+
+        ProductUtils.markProductMetaDataFieldAsDerivedFrom(product);
+
         addTiePointGridsToProduct(product);
         addBandsToProduct(product);
         ProductUtils.copyMasks(sourceProduct, product);
@@ -668,6 +675,8 @@ protected void addBandsToProduct(Product product) {
                 destBand.setSpectralBandIndex(sourceBand.getSpectralBandIndex());
                 destBand.setSpectralWavelength(sourceBand.getSpectralWavelength());
                 destBand.setSpectralBandwidth(sourceBand.getSpectralBandwidth());
+                destBand.setAngularValue(sourceBand.getAngularValue());
+                destBand.setAngularBandIndex(sourceBand.getAngularBandIndex());
                 destBand.setSolarFlux(sourceBand.getSolarFlux());
                 if (sourceBand.isNoDataValueSet()) {
                     destBand.setNoDataValue(sourceBand.getNoDataValue());

snap-core/src/main/java/org/esa/snap/core/dataio/dimap/DimapHeaderWriter.java

@@ -219,7 +219,12 @@ protected void writeImageInterpretationElements(int indent) {
                         printLine(indent + 2, DimapProductConstants.TAG_SPECTRAL_BAND_INDEX,
                                   band.getSpectralBandIndex());
                     }
+                    if (band.getAngularBandIndex() > -1) {
+                        printLine(indent + 2, DimapProductConstants.TAG_ANGULAR_BAND_INDEX,
+                                band.getAngularBandIndex());
+                    }
                     printLine(indent + 2, DimapProductConstants.TAG_BAND_WAVELEN, band.getSpectralWavelength());
+                    printLine(indent + 2, DimapProductConstants.TAG_BAND_ANGULAR_VALUE, band.getAngularValue());
                     printLine(indent + 2, DimapProductConstants.TAG_BANDWIDTH, band.getSpectralBandwidth());
                     final FlagCoding flagCoding = band.getFlagCoding();
                     if (flagCoding != null) {

snap-core/src/main/java/org/esa/snap/core/dataio/dimap/DimapProductConstants.java

@@ -279,9 +279,11 @@ public final class DimapProductConstants {
     public static final String TAG_DATA_TYPE = "DATA_TYPE";
     public static final String TAG_SOLAR_FLUX = "SOLAR_FLUX";
     public static final String TAG_SPECTRAL_BAND_INDEX = "SPECTRAL_BAND_INDEX";
+    public static final String TAG_ANGULAR_BAND_INDEX = "ANGULAR_BAND_INDEX";
     public static final String TAG_SOLAR_FLUX_UNIT = "SOLAR_FLUX_UNIT";
     public static final String TAG_BANDWIDTH = "BANDWIDTH";
     public static final String TAG_BAND_WAVELEN = "BAND_WAVELEN";
+    public static final String TAG_BAND_ANGULAR_VALUE = "BAND_ANGULAR_VALUE";
     public static final String TAG_WAVELEN_UNIT = "WAVELEN_UNIT";
     public static final String TAG_FLAG_CODING_NAME = "FLAG_CODING_NAME";
     public static final String TAG_INDEX_CODING_NAME = "INDEX_CODING_NAME";

snap-core/src/main/java/org/esa/snap/core/dataio/dimap/DimapProductHelpers.java

@@ -1644,8 +1644,10 @@ private static void setGeneralBandProperties(Band band, Element element, Product
                 setUnit(element, band);
                 setSpectralWaveLength(element, band);
                 setSpectralBandWidth(element, band);
+                setAngularValue(element, band);
                 setSolarFlux(element, band);
                 setSpectralBandIndex(element, band);
+                setAngularBandIndex(element, band);
                 setScaling(element, band);
                 setFlagCoding(element, band, product);
                 setIndexCoding(element, band, product);
@@ -1696,6 +1698,15 @@ private static void setSpectralBandIndex(final Element element, final Band band)
             }
         }
 
+        private static void setAngularBandIndex(final Element element, final Band band) {
+            final String angularBandIndex = element.getChildTextTrim(DimapProductConstants.TAG_ANGULAR_BAND_INDEX);
+            if (angularBandIndex != null) {
+                band.setAngularBandIndex(Integer.parseInt(angularBandIndex));
+            } else {
+                band.setAngularBandIndex(-1);
+            }
+        }
+
         private static void setScaling(final Element element, final Band band) {
             final String scalingFactorString = element.getChildTextTrim(DimapProductConstants.TAG_SCALING_FACTOR);
             if (scalingFactorString != null) {
@@ -1828,6 +1839,14 @@ private static void setSpectralBandWidth(final Element element, final Band band)
             }
         }
 
+        private static void setAngularValue(final Element element, final Band band) {
+            final String angularValue = element.getChildTextTrim(DimapProductConstants.TAG_BAND_ANGULAR_VALUE);
+            if (angularValue != null) {
+                band.setAngularValue(Float.parseFloat(angularValue));
+            }
+        }
+
+
         private void addCollectedAncillaryVariables() {
             Set<Map.Entry<RasterDataNode, List<String>>> entries = ancillaryVariables.entrySet();
             for (Map.Entry<RasterDataNode, List<String>> entry : entries) {

snap-core/src/main/java/org/esa/snap/core/datamodel/Band.java

@@ -64,15 +64,24 @@ public class Band extends AbstractBand {
     public static final String PROPERTY_NAME_SPECTRAL_BAND_INDEX = "spectralBandIndex";
     public static final String PROPERTY_NAME_SPECTRAL_BANDWIDTH = "spectralBandwidth";
     public static final String PROPERTY_NAME_SPECTRAL_WAVELENGTH = "spectralWavelength";
+    public static final String PROPERTY_NAME_DATE_BAND_INDEX = "dateBandIndex";
+    public static final String PROPERTY_NAME_DATE = "date";
+    public static final String PROPERTY_NAME_ANGULAR_BAND_INDEX = "angularBandIndex";
+    public static final String PROPERTY_NAME_ANGULAR_VALUE = "angularValue";
 
     /**
      * If this band contains flag data, this is the flag coding.
      */
     private SampleCoding sampleCoding;
 
+    private int angularBandIndex;
+    private float angularValue;
     private int spectralBandIndex;
     private float spectralWavelength;
     private float spectralBandwidth;
+    private int dateBandIndex;
+    private String date;
+    //    private float spectralBandwidth;
     private float solarFlux;
 
     /**
@@ -88,7 +97,9 @@ public Band(String name, int dataType, int width, int height) {
         super(name, dataType, width, height);
         // By default a band is not a spectral band,
         // so spectral band index must be -1
+        setAngularBandIndex(-1);
         setSpectralBandIndex(-1);
+        setDateBandIndex(-1);
         setModified(false);
     }
 
@@ -156,6 +167,30 @@ public void setSampleCoding(SampleCoding sampleCoding) {
         }
     }
 
+    public float getAngularValue() {
+        return angularValue;
+    }
+
+    public void setAngularValue(float angularValue) {
+        if (this.angularValue != angularValue) {
+            this.angularValue = angularValue;
+            fireProductNodeChanged(PROPERTY_NAME_ANGULAR_VALUE);
+            setModified(true);
+        }
+    }
+
+    public int getAngularBandIndex() {
+        return angularBandIndex;
+    }
+
+    public void setAngularBandIndex(int angularBandIndex) {
+        if (this.angularBandIndex != angularBandIndex) {
+            this.angularBandIndex = angularBandIndex;
+            fireProductNodeChanged(PROPERTY_NAME_ANGULAR_BAND_INDEX);
+            setModified(true);
+        }
+    }
+
     /**
      * Gets the (zero-based) spectral band index.
      *
@@ -202,6 +237,52 @@ public void setSpectralWavelength(float spectralWavelength) {
         }
     }
 
+    /**
+     * Gets the (zero-based) date band index.
+     *
+     * @return the (zero-based) date band index or <code>-1</code> if it is unknown
+     */
+    public int getDateBandIndex() {
+        return dateBandIndex;
+    }
+
+    /**
+     * Sets the (zero-based) date band index.
+     *
+     * @param dateBandIndex the (zero-based) spectral band index or <code>-1</code> if it is unknown
+     */
+    public void setDateBandIndex(int dateBandIndex) {
+        if (this.dateBandIndex != dateBandIndex) {
+            this.dateBandIndex = dateBandIndex;
+            fireProductNodeChanged(PROPERTY_NAME_DATE_BAND_INDEX);
+            setModified(true);
+        }
+    }
+
+    /**
+     * Gets the date.
+     *
+     * @return the date for this band, or zero if this is not a date band or the date is
+     *         not known.
+     */
+    public String getDate() {
+        return date;
+    }
+
+    /**
+     * Sets the date.
+     *
+     * @param date YYYY-MM-DD of this band, or 1601-01-01 if this is not a date band or
+     *                           the date is not known.
+     */
+    public void setDate(String date) {
+        if (this.date != date) {
+            this.date = date;
+            fireProductNodeChanged(PROPERTY_NAME_DATE);
+            setModified(true);
+        }
+    }
+
     /**
      * Gets the spectral bandwidth in <code>nm</code> (nanomater) units.
      *
@@ -454,6 +535,8 @@ public String toString() {
                 + ProductData.getTypeString(getDataType()) + "," +
                 +getRasterWidth() + "," +
                 +getRasterHeight() + "," +
+                +getAngularBandIndex() + "," +
+                +getAngularValue() + "," +
                 +getSpectralBandIndex() + "," +
                 +getSpectralWavelength() + "," +
                 +getSpectralBandwidth() + "," +