Skip to content
Merged
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
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [Unreleased] — v1.0.0

### Planned
### added
- #232 dynamic hiding of benchmark progress bar

### Planned/Proposed
- [#118](https://github.com/JDiskMark/jdm-java/issues/118) test interlock or OAuth upload
- refactor package classes

## [0.9.0] - in development
## [0.9.0]
- #205 drive dropdown linux
- #209 usb support linux
- #213 usb support macos
Expand Down
1 change: 1 addition & 0 deletions jdm-core/docs/design.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- the top-left section of the benchmark tab is called the settings controls
- the top-right section of the benchmark is the chart
- the bottom section is the historical list of runs and common status output
- the Total Tx progress bar below the bottom tabs is visible only on the Benchmark tab or while a non-batch benchmark is running; batch runs use their own progress view. Otherwise it is hidden and its space goes to the bottom tabs (`MainFrame.updateProgressPanelVisibility`)

# Active design trades

Expand Down
23 changes: 23 additions & 0 deletions jdm-core/src/main/java/jdiskmark/MainFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ public MainFrame() {
}
});

mainTabPane.addChangeListener(e -> updateProgressPanelVisibility());

// Rebuild the content pane: mainTabPane (top) and the bottom panel (tabbedPane +
// progress bar) are separated by a draggable vertical JSplitPane divider.
getContentPane().removeAll();
Expand Down Expand Up @@ -238,6 +240,7 @@ public void componentResized(java.awt.event.ComponentEvent e) {
});

getContentPane().add(splitPane, BorderLayout.CENTER);
updateProgressPanelVisibility();

// Ensure the frame is tall enough to show 5 rows in the bottom table.
// pack() sizes to preferred; we nudge the height up slightly after packing.
Expand Down Expand Up @@ -1194,5 +1197,25 @@ public void adjustSensitivity() {
exportMenu.setEnabled(App.benchmark != null);
}
}
updateProgressPanelVisibility();
}

/**
* The Total Tx progress bar is shown on the Benchmark tab, or on any tab
* while a non batch benchmark is in progress; otherwise its space is given
* to the bottom tabbed pane.
*/
private void updateProgressPanelVisibility() {
boolean busy = App.state == App.State.DISK_TEST_STATE;
boolean onBenchmarkTab = false;
if (Gui.mainTabPane != null) {
int sel = Gui.mainTabPane.getSelectedIndex();
onBenchmarkTab = sel >= 0 && Tabs.TOP_BENCHMARK.equals(Gui.mainTabPane.getTitleAt(sel));
}
boolean visible = busy || onBenchmarkTab;
if (progressPanel.isVisible() != visible) {
progressPanel.setVisible(visible);
if (progressPanel.getParent() != null) progressPanel.getParent().revalidate();
}
}
}
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- CI-friendly version placeholder. Override with -Drevision=<value> at build time.
Default produces the current release build used by NetBeans and plain mvn.
CI workflows set this to a labelled version (e.g. 0.8.0-ci.d.47). -->
<revision>0.9.0</revision>
<revision>0.10.0-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>25</maven.compiler.release>
<exec.mainClass>jdiskmark.App</exec.mainClass>
Expand All @@ -41,7 +41,7 @@
format — no letters, no -SNAPSHOT. This is an MSI format restriction, not
jpackage itself. Linux packages (DEB/RPM) can use the full project.version.
Update this alongside project.version when cutting a release. -->
<msi.version>0.9.0</msi.version>
<msi.version>0.10.0</msi.version>
<app.title>${app.name} ${project.version}</app.title>
<release.dir>${pkg.name}-${msi.version}</release.dir>

Expand Down
Loading