Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# If we link MSVC CRT statically then it conflicts with HDF5's MSVC CRT
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
rustflags = ["-C", "target-feature=-crt-static"]
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ web-sys = "0.3.70"
elevated-command.workspace = true

[features]
default = ["selfupdater"]
default = ["selfupdater", "hdf"]
hdf = ["dep:skytem_hdf"]
selfupdater = ["dep:axoupdater"]
profiling = ["dep:profiling", "dep:puffin", "dep:puffin_http"]
Expand Down
2 changes: 1 addition & 1 deletion crates/skytem_hdf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ toml.workspace = true
ndarray = "0.16.1"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
hdf5 = { package = "hdf5-metno", version = "0.9", features = ["static"] }
hdf5 = { package = "hdf5-metno", version = "0.10", features = ["static"] }

[dev-dependencies]
testresult.workspace = true
2 changes: 2 additions & 0 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ install-path = "CARGO_HOME"
install-updater = false
# Which actions to run on pull requests
pr-run-mode = "upload"
# Whether +crt-static should be used on msvc
msvc-crt-static = false
17 changes: 11 additions & 6 deletions src/app/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,18 @@ fn list_supported_hdf_formats(ui: &mut egui::Ui) {
ui.label(RichText::new("⚠ No HDF support on web ⚠"));
#[cfg(not(target_arch = "wasm32"))]
{
ui.label(RichText::new("⚠ Coming soon: Bifrost TX Loop Current ⚠"));
ui.label("Loop Current measurements");
if cfg!(feature = "hdf") {
{
ui.label("Loop Current measurements");

ui.add(Hyperlink::from_label_and_url(
"https://github.com/luftkode/bifrost-app",
"https://github.com/luftkode/bifrost-app",
));
ui.add(Hyperlink::from_label_and_url(
"https://github.com/luftkode/bifrost-app",
"https://github.com/luftkode/bifrost-app",
));
}
} else {
ui.label(RichText::new("⚠ Coming soon: Bifrost TX Loop Current ⚠"));
}
ui.end_row();
}
}
Loading