From 5777315c8c408f1e64f214aeff2719ecc0bf91bb Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Tue, 12 Nov 2024 14:05:49 -0500 Subject: [PATCH] Update GUI --- .../main/java/org/vcell/N5/UI/ControlButtonsPanel.java | 2 +- .../java/org/vcell/N5/reduction/DataReductionGUI.java | 2 +- .../java/org/vcell/N5/reduction/SelectMeasurements.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/view-simulation-results/src/main/java/org/vcell/N5/UI/ControlButtonsPanel.java b/view-simulation-results/src/main/java/org/vcell/N5/UI/ControlButtonsPanel.java index 4c72ab0..b25b90f 100644 --- a/view-simulation-results/src/main/java/org/vcell/N5/UI/ControlButtonsPanel.java +++ b/view-simulation-results/src/main/java/org/vcell/N5/UI/ControlButtonsPanel.java @@ -30,7 +30,7 @@ public ControlButtonsPanel(){ displayAdvancedFeatures = new JCheckBox("Advanced Features"); - openOrCancel = new JButton("Open Virtually"); + openOrCancel = new JButton("Open Virtual Stack"); dataReduction = new JButton("Run Measurement Script"); questionMark = new JButton("?"); questionMark.setPreferredSize(new Dimension(20, 20)); diff --git a/view-simulation-results/src/main/java/org/vcell/N5/reduction/DataReductionGUI.java b/view-simulation-results/src/main/java/org/vcell/N5/reduction/DataReductionGUI.java index a42fdea..838cefe 100644 --- a/view-simulation-results/src/main/java/org/vcell/N5/reduction/DataReductionGUI.java +++ b/view-simulation-results/src/main/java/org/vcell/N5/reduction/DataReductionGUI.java @@ -43,7 +43,7 @@ public DataReductionGUI(ArrayList filesToOpen, double simCSize setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); pane = new JOptionPane(this, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION); - jDialog = pane.createDialog("Data Reduction"); + jDialog = pane.createDialog("Measurement Script"); jDialog.setResizable(true); selectSimRange = new SelectSimRange(jDialog, simCSize, simZSize, simTSize); diff --git a/view-simulation-results/src/main/java/org/vcell/N5/reduction/SelectMeasurements.java b/view-simulation-results/src/main/java/org/vcell/N5/reduction/SelectMeasurements.java index 1fe534e..019823f 100644 --- a/view-simulation-results/src/main/java/org/vcell/N5/reduction/SelectMeasurements.java +++ b/view-simulation-results/src/main/java/org/vcell/N5/reduction/SelectMeasurements.java @@ -9,10 +9,12 @@ class SelectMeasurements extends JPanel{ private final MeasurementsDataModel measurementsDataModel = new MeasurementsDataModel(); public SelectMeasurements(){ - setLayout(new GridLayout(1, 2)); - this.add(new JLabel("Measurement Type")); + setLayout(new GridLayout(1, 1)); + this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Measurement Type")); chosenMeasurement = new JList<>(measurementsDataModel); - this.add(chosenMeasurement); + chosenMeasurement.setVisibleRowCount(3); + JScrollPane jScrollPane = new JScrollPane(chosenMeasurement); + this.add(jScrollPane); } public ArrayList getChosenMeasurements(){