Skip to content

ToolsUI bug fixes #1438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lesserwhirls merged 4 commits into from
Apr 16, 2025
Merged

ToolsUI bug fixes #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6221d3
Fix coverage name display
lesserwhirls Apr 16, 2025
8e74752
Upgrade slf4j and logback
lesserwhirls Apr 16, 2025
4c64d1e
Fix netCDF file writing in ToolsUI
lesserwhirls Apr 16, 2025
c45b5d8
Include zarr iosp in toolsUI
lesserwhirls Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/any/shared-mvn-coords.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ext {
// best we can do is define the version here, which can then be applied in all of the places we need the full maven
// coords.
depVersion = [:]
depVersion.slf4j = '1.7.28'
depVersion.slf4j = '2.0.17'
depVersion.protobuf = '3.25.5'
depVersion.grpc = '1.60.0'
}
2 changes: 1 addition & 1 deletion netcdf-java-platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies {

// netcdf-java logging
api "org.slf4j:slf4j-api:${depVersion.slf4j}"
runtime 'ch.qos.logback:logback-classic:1.5.14'
runtime 'ch.qos.logback:logback-classic:1.3.15'

// legacy gradle module
// todo: remove with legacy in 6
Expand Down
1 change: 1 addition & 0 deletions uicdm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies {
testImplementation 'junit:junit'

runtimeOnly project(':cdm:cdm-s3')
runtimeOnly project(':cdm:cdm-zarr')

// constrained by netcdf-java-platform
runtimeOnly 'ch.qos.logback:logback-classic'
Expand Down
3 changes: 1 addition & 2 deletions uicdm/src/main/java/ucar/nc2/ui/coverage2/CoverageTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
import ucar.nc2.ft2.coverage.*;
import ucar.ui.widget.*;
import ucar.ui.widget.PopupMenu;
import ucar.nc2.util.Misc;
import ucar.nc2.util.NamedObject;
import ucar.util.NamedObject;
import ucar.util.prefs.PreferencesExt;
import ucar.ui.prefs.BeanTable;
import javax.swing.*;
Expand Down
14 changes: 9 additions & 5 deletions uicdm/src/main/java/ucar/nc2/ui/dialog/NetcdfOutputChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/*
* Copyright (c) 1998-2025 John Caron and University Corporation for Atmospheric Research/Unidata
* See LICENSE for license information.
*
* Created by JFormDesigner on Thu Nov 15 14:02:02 MST 2012
*/

package ucar.nc2.ui.dialog;

import ucar.nc2.NetcdfFileWriter;
import java.util.Arrays;
import ucar.nc2.util.ListenerManager;
import ucar.nc2.write.Nc4Chunking;
import javax.swing.*;
Expand Down Expand Up @@ -44,8 +47,8 @@ public void setOutputFilename(String filename) {
location = location.substring(0, pos);

// change suffix
NetcdfFileWriter.Version version = (NetcdfFileWriter.Version) netcdfVersion.getSelectedItem();
String suffix = (version == null) ? ".nc" : version.getSuffix();
NetcdfFileFormat version = (NetcdfFileFormat) netcdfVersion.getSelectedItem();
String suffix = (version != null && version.isNetcdf4Format()) ? ".nc4" : ".nc";
if (filename.endsWith(".nc") && suffix.equals(".nc"))
suffix = ".sub.nc";
location += suffix;
Expand Down Expand Up @@ -105,10 +108,11 @@ private void initComponents() {
label1 = new JLabel();
outputFilename = new JTextField();
label2 = new JLabel();
netcdfVersion = new JComboBox(NetcdfFileWriter.Version.values());
netcdfVersion = new JComboBox<>(
Arrays.stream(NetcdfFileFormat.values()).filter(format -> format != NetcdfFileFormat.INVALID).toArray());
panel1 = new JPanel();
label3 = new JLabel();
chunking = new JComboBox(Nc4Chunking.Strategy.values());
chunking = new JComboBox<>(Nc4Chunking.Strategy.values());
deflate = new JCheckBox();
shuffle = new JCheckBox();
buttonBar = new JPanel();
Expand Down