From 3090bdab67b1a6d9a52e7aeb28dde0e2d766a0d9 Mon Sep 17 00:00:00 2001 From: Jamie Mac Date: Fri, 22 Apr 2022 11:37:15 +0100 Subject: [PATCH] Updates to FX GUI --- .../layoutFX/CheckWavHeadersPane.java | 50 +++++++++++++++++++ src/Acquisition/layoutFX/FixWavPane.java | 19 ------- src/Acquisition/layoutFX/FolderInputPane.java | 4 +- 3 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 src/Acquisition/layoutFX/CheckWavHeadersPane.java delete mode 100644 src/Acquisition/layoutFX/FixWavPane.java diff --git a/src/Acquisition/layoutFX/CheckWavHeadersPane.java b/src/Acquisition/layoutFX/CheckWavHeadersPane.java new file mode 100644 index 00000000..aa3b2689 --- /dev/null +++ b/src/Acquisition/layoutFX/CheckWavHeadersPane.java @@ -0,0 +1,50 @@ +package Acquisition.layoutFX; + +import Acquisition.FolderInputSystem; +import javafx.scene.control.Label; +import javafx.scene.control.ProgressBar; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextArea; +import pamViewFX.fxNodes.PamBorderPane; + + +/** + * Pane with controls to fix wave file headers. + * @author Jamie Macaulay + * + */ +public class CheckWavHeadersPane extends PamBorderPane { + + + /** + * The text area. + */ + private TextArea textArea; + + /** + * The nma eo fhte label + */ + private Label folderName; + + /** + * Progress bar showing progress of file write + */ + private ProgressBar progressBar; + + public CheckWavHeadersPane(FolderInputSystem folderInputSystem) { + this.setCenter(new Label("Hello fix wav pane")); + + + folderName = new Label(" "); + textArea = new TextArea(); + textArea.setEditable(false); + ScrollPane scrollPane = new ScrollPane(textArea); + scrollPane.setPrefSize(322, 300); + this.setCenter(scrollPane); + + progressBar = new ProgressBar(); + this.setBottom(progressBar); + + } + +} diff --git a/src/Acquisition/layoutFX/FixWavPane.java b/src/Acquisition/layoutFX/FixWavPane.java deleted file mode 100644 index 52445b47..00000000 --- a/src/Acquisition/layoutFX/FixWavPane.java +++ /dev/null @@ -1,19 +0,0 @@ -package Acquisition.layoutFX; - -import Acquisition.FolderInputSystem; -import javafx.scene.control.Label; -import pamViewFX.fxNodes.PamBorderPane; - - -/** - * Pane with controls to fix wave file headers. - * @author Jamie Macaulay - * - */ -public class FixWavPane extends PamBorderPane { - - public FixWavPane(FolderInputSystem folderInputSystem) { - this.setCenter(new Label("Hello fix wav pane")); - } - -} diff --git a/src/Acquisition/layoutFX/FolderInputPane.java b/src/Acquisition/layoutFX/FolderInputPane.java index cc9331e2..f7194edd 100644 --- a/src/Acquisition/layoutFX/FolderInputPane.java +++ b/src/Acquisition/layoutFX/FolderInputPane.java @@ -143,7 +143,7 @@ public class FolderInputPane extends DAQSettingsPane{ /** * Pane to fix the headers of wave files. */ - private FixWavPane fixWavPane; + private CheckWavHeadersPane fixWavPane; /** * Toggle button for merging contigious files @@ -244,7 +244,7 @@ public class FolderInputPane extends DAQSettingsPane{ fileDateStrip.prefWidthProperty().bind(pamVBox.widthProperty()); - fixWavPane = new FixWavPane(folderInputSystem); + fixWavPane = new CheckWavHeadersPane(folderInputSystem); Label utilsLabel=new Label("Sound file utilities"); PamGuiManagerFX.titleFont2style(utilsLabel);