From 945248019d0e7ffd8d617edc0f430adbbaa1e5c0 Mon Sep 17 00:00:00 2001 From: Florian1209 Date: Wed, 23 Jun 2021 10:06:09 +0200 Subject: [PATCH 1/2] add tie point grids ui support selection - subset operator --- .../org_esa_snap_core_gpf_common_SubsetOp.html | 7 +++++++ .../snap/graphbuilder/gpf/ui/BaseOperatorUI.java | 16 ++++++++++++++++ .../esa/snap/graphbuilder/gpf/ui/SourceUI.java | 4 ++-- .../esa/snap/graphbuilder/gpf/ui/SubsetUI.java | 14 +++++++++++--- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html b/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html index c05de35d5c..9ac8407fbe 100644 --- a/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html +++ b/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html @@ -54,6 +54,13 @@

Parameters

The list of source bands. + + tiePointGrids + String[] + + The list of source tie-point grids. + + region Rectangle diff --git a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/BaseOperatorUI.java b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/BaseOperatorUI.java index 54f58cca12..6bcbc7d98f 100644 --- a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/BaseOperatorUI.java +++ b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/BaseOperatorUI.java @@ -196,6 +196,22 @@ protected String[] getBandNames() { return bandNames.toArray(new String[bandNames.size()]); } + protected String[] getTiePointGridNames(){ + final ArrayList tiePointGridNames = new ArrayList<>(3); + if (sourceProducts != null) { + for (Product prod : sourceProducts) { + if (sourceProducts.length > 1) { + for (String name : prod.getTiePointGridNames()) { + tiePointGridNames.add(name + "::" + prod.getName()); + } + } else { + tiePointGridNames.addAll(Arrays.asList(prod.getTiePointGridNames())); + } + } + } + return tiePointGridNames.toArray(new String[tiePointGridNames.size()]); + } + protected String[] getGeometries() { final ArrayList geometryNames = new ArrayList<>(5); if (sourceProducts != null) { diff --git a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SourceUI.java b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SourceUI.java index 3fb8575320..84355c4ab7 100644 --- a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SourceUI.java +++ b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SourceUI.java @@ -294,10 +294,10 @@ private JComponent createPanel() { contentPanel.add(formatNameComboBox, gbc); gbc = SwingUtils.buildConstraints(0, 2, GridBagConstraints.NONE, GridBagConstraints.WEST, 1, 1, gapBetweenRows, 0); contentPanel.add(advancedOptionsBtn, gbc); - gbc = SwingUtils.buildConstraints(0, 3, GridBagConstraints.BOTH, GridBagConstraints.WEST, 2, 1, 0, 0); + gbc = SwingUtils.buildConstraints(0, 4, GridBagConstraints.BOTH, GridBagConstraints.WEST, 2, 1, 0, 0); advancedOptionsPanel.setVisible(false); contentPanel.add(advancedOptionsPanel, gbc); - gbc = SwingUtils.buildConstraints(0, 4, GridBagConstraints.BOTH, GridBagConstraints.WEST, 2, 1, 0, 0); + gbc = SwingUtils.buildConstraints(0, 3, GridBagConstraints.BOTH, GridBagConstraints.WEST, 2, 1, 0, 0); contentPanel.add(new JPanel(), gbc); gbc = SwingUtils.buildConstraints(0, 0, GridBagConstraints.NONE, GridBagConstraints.CENTER, 1, 1, gapBetweenRows, 0); diff --git a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SubsetUI.java b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SubsetUI.java index 580249b04f..5c63f24bc1 100644 --- a/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SubsetUI.java +++ b/snap-graph-builder/src/main/java/org/esa/snap/graphbuilder/gpf/ui/SubsetUI.java @@ -44,6 +44,7 @@ public class SubsetUI extends BaseOperatorUI { private final JList bandList = new JList(); + private final JList tiePointGridList = new JList(); private final JComboBox referenceCombo = new JComboBox(); private final JTextField regionX = new JTextField(""); @@ -91,7 +92,8 @@ public void actionPerformed(ActionEvent e) { @Override public void initParameters() { - OperatorUIUtils.initParamList(bandList, getBandNames(), (Object[])paramMap.get("sourceBands")); + OperatorUIUtils.initParamList(bandList, getBandNames(), (Object[])paramMap.get("bandNames")); + OperatorUIUtils.initParamList(tiePointGridList, getTiePointGridNames(), (Object[])paramMap.get("tiePointGridNames")); String _oldSelected = (String) referenceCombo.getSelectedItem(); referenceCombo.removeAllItems(); @@ -102,7 +104,6 @@ public void initParameters() { referenceCombo.setSelectedItem(string); } } - //enable or disable referenceCombo depending on sourceProduct if(sourceProducts == null || sourceProducts.length == 0 || !sourceProducts[0].isMultiSize()) { referenceCombo.setEnabled(false); @@ -110,6 +111,7 @@ public void initParameters() { referenceCombo.setEnabled(true); } + final Rectangle region = (Rectangle)paramMap.get("region"); if(region != null) { regionX.setText(String.valueOf(region.x)); @@ -172,7 +174,7 @@ public void updateParameters() { } } } - + OperatorUIUtils.updateParamList(tiePointGridList, paramMap, "tiePointGridNames"); final String subSamplingXStr = subSamplingX.getText(); if (subSamplingXStr != null && !subSamplingXStr.isEmpty()) @@ -216,6 +218,12 @@ private JComponent createPanel() { gbc.fill = GridBagConstraints.BOTH; gbc.gridx = 1; contentPane.add(new JScrollPane(bandList), gbc); + gbc.gridx = 0; + gbc.gridy++; + contentPane.add(new JLabel("Tie-Point Grids:"), gbc); + gbc.fill = GridBagConstraints.BOTH; + gbc.gridx = 1; + contentPane.add(new JScrollPane(tiePointGridList), gbc); gbc.fill = GridBagConstraints.HORIZONTAL; gbc.gridx = 0; From bec064cfece3d616ef2f63172c4ed094efd719d4 Mon Sep 17 00:00:00 2001 From: Florian Date: Wed, 14 Jul 2021 11:56:41 +0200 Subject: [PATCH 2/2] Remove illegal update of automatic gpt docs --- .../docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html b/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html index 9ac8407fbe..c05de35d5c 100644 --- a/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html +++ b/snap-gpf-ui/src/main/resources/org/esa/snap/core/gpf/docs/gpf/org_esa_snap_core_gpf_common_SubsetOp.html @@ -54,13 +54,6 @@

Parameters

The list of source bands. - - tiePointGrids - String[] - - The list of source tie-point grids. - - region Rectangle