Skip to content

Commit 0e4420a

Browse files
owlangowlang
committed
condense GUI file output parameters
Cosmetic reorganization of file output parameter selection components to take up less space (restrict to lower left section)
1 parent 847e7e8 commit 0e4420a

1 file changed

Lines changed: 30 additions & 41 deletions

File tree

‎src/window_interface/Read_Analysis/TagPileupWindow.java‎

Lines changed: 30 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public void actionPerformed(ActionEvent e) {
597597
sl_contentPane.putConstraint(SpringLayout.WEST, txtTagExtend, 10, SpringLayout.EAST, lblTagExtend);
598598
sl_contentPane.putConstraint(SpringLayout.EAST, txtTagExtend, 70, SpringLayout.EAST, lblTagExtend);
599599
txtTagExtend.setHorizontalAlignment(SwingConstants.CENTER);
600-
txtTagExtend.setText("0");
600+
txtTagExtend.setText("1");
601601
contentPane.add(txtTagExtend);
602602
txtTagExtend.setColumns(10);
603603

@@ -722,39 +722,27 @@ public void actionPerformed(ActionEvent e) {
722722

723723
JSeparator sepOutput = new JSeparator();
724724
sl_contentPane.putConstraint(SpringLayout.NORTH, sepOutput, 15, SpringLayout.SOUTH, scrollPane_BAM);
725-
sl_contentPane.putConstraint(SpringLayout.WEST, sepOutput, 0, SpringLayout.WEST, scrollPane_BAM);
725+
sl_contentPane.putConstraint(SpringLayout.WEST, sepOutput, 10, SpringLayout.EAST, scrollPane_BAM);
726726
sl_contentPane.putConstraint(SpringLayout.EAST, sepOutput, -10, SpringLayout.EAST, contentPane);
727727
sepOutput.setForeground(Color.BLACK);
728728
contentPane.add(sepOutput);
729729

730-
lblCpusToUse = new JLabel("CPU's to Use:");
731-
sl_contentPane.putConstraint(SpringLayout.NORTH, lblCpusToUse, 15, SpringLayout.SOUTH, scrollPane_BAM);
732-
sl_contentPane.putConstraint(SpringLayout.WEST, lblCpusToUse, 0, SpringLayout.WEST, scrollPane_BAM);
733-
lblCpusToUse.setFont(new Font("Lucida Grande", Font.BOLD, 13));
734-
contentPane.add(lblCpusToUse);
735-
736-
txtCPU = new JTextField();
737-
sl_contentPane.putConstraint(SpringLayout.NORTH, txtCPU, -1, SpringLayout.NORTH, lblCpusToUse);
738-
sl_contentPane.putConstraint(SpringLayout.WEST, txtCPU, 10, SpringLayout.EAST, lblCpusToUse);
739-
sl_contentPane.putConstraint(SpringLayout.WEST, txtCPU, 70, SpringLayout.EAST, lblCpusToUse);
740-
txtCPU.setHorizontalAlignment(SwingConstants.CENTER);
741-
txtCPU.setText("1");
742-
contentPane.add(txtCPU);
743-
txtCPU.setColumns(10);
744-
730+
// Output Parameters
745731
chckbxOutputData = new JCheckBox("Output Heatmap Matrix");
746-
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxOutputData, 8, SpringLayout.SOUTH, lblCpusToUse);
732+
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxOutputData, 6, SpringLayout.SOUTH, scrollPane_BAM);
747733
sl_contentPane.putConstraint(SpringLayout.WEST, chckbxOutputData, 0, SpringLayout.WEST, scrollPane_BAM);
748734
chckbxOutputData.setSelected(true);
749735
contentPane.add(chckbxOutputData);
750736

751737
rdbtnTabdelimited = new JRadioButton("TAB-Delimited");
738+
sl_contentPane.putConstraint(SpringLayout.NORTH, rdbtnTabdelimited, 6, SpringLayout.SOUTH, chckbxOutputData);
739+
sl_contentPane.putConstraint(SpringLayout.WEST, rdbtnTabdelimited, 6, SpringLayout.WEST, chckbxOutputData);
752740
contentPane.add(rdbtnTabdelimited);
741+
753742
rdbtnCdt = new JRadioButton("CDT");
743+
sl_contentPane.putConstraint(SpringLayout.NORTH, rdbtnCdt, 0, SpringLayout.NORTH, rdbtnTabdelimited);
754744
sl_contentPane.putConstraint(SpringLayout.WEST, rdbtnCdt, 6, SpringLayout.EAST, rdbtnTabdelimited);
755745
contentPane.add(rdbtnCdt);
756-
sl_contentPane.putConstraint(SpringLayout.NORTH, rdbtnTabdelimited, 0, SpringLayout.NORTH, chckbxOutputData);
757-
sl_contentPane.putConstraint(SpringLayout.NORTH, rdbtnCdt, 0, SpringLayout.NORTH, chckbxOutputData);
758746

759747
ButtonGroup output = new ButtonGroup();
760748
output.add(rdbtnTabdelimited);
@@ -766,37 +754,22 @@ public void actionPerformed(ActionEvent e) {
766754
sl_contentPane.putConstraint(SpringLayout.WEST, chckbxOutputGzip, 10, SpringLayout.EAST, rdbtnCdt);
767755
contentPane.add(chckbxOutputGzip);
768756

769-
lblOutputMatrixFormat = new JLabel("Matrix File Format:");
770-
sl_contentPane.putConstraint(SpringLayout.WEST, rdbtnTabdelimited, 10, SpringLayout.EAST,
771-
lblOutputMatrixFormat);
772-
sl_contentPane.putConstraint(SpringLayout.WEST, lblOutputMatrixFormat, 10, SpringLayout.EAST, chckbxOutputData);
773-
sl_contentPane.putConstraint(SpringLayout.NORTH, lblOutputMatrixFormat, 3, SpringLayout.NORTH,
774-
chckbxOutputData);
775-
lblOutputMatrixFormat.setFont(new Font("Lucida Grande", Font.BOLD, 13));
776-
contentPane.add(lblOutputMatrixFormat);
777-
778757
chckbxOutputCompositeData = new JCheckBox("Output Composite");
779-
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxOutputCompositeData, 6, SpringLayout.SOUTH,
780-
chckbxOutputData);
758+
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxOutputCompositeData, 6, SpringLayout.SOUTH, rdbtnTabdelimited);
759+
sl_contentPane.putConstraint(SpringLayout.WEST, chckbxOutputCompositeData, 0, SpringLayout.WEST, scrollPane_BAM);
781760
chckbxOutputCompositeData.setSelected(true);
782-
sl_contentPane.putConstraint(SpringLayout.WEST, chckbxOutputCompositeData, 0, SpringLayout.WEST,
783-
scrollPane_BAM);
784761
contentPane.add(chckbxOutputCompositeData);
785762

786763
txtCompositeName = new JTextField();
787-
sl_contentPane.putConstraint(SpringLayout.NORTH, txtCompositeName, 2, SpringLayout.NORTH,
788-
chckbxOutputCompositeData);
789-
sl_contentPane.putConstraint(SpringLayout.WEST, txtCompositeName, 10, SpringLayout.EAST,
790-
chckbxOutputCompositeData);
791-
sl_contentPane.putConstraint(SpringLayout.EAST, txtCompositeName, 250, SpringLayout.EAST,
792-
chckbxOutputCompositeData);
764+
sl_contentPane.putConstraint(SpringLayout.NORTH, txtCompositeName, 2, SpringLayout.NORTH, chckbxOutputCompositeData);
765+
sl_contentPane.putConstraint(SpringLayout.WEST, txtCompositeName, 10, SpringLayout.EAST, chckbxOutputCompositeData);
766+
sl_contentPane.putConstraint(SpringLayout.EAST, txtCompositeName, -10, SpringLayout.EAST, scrollPane_BAM);
793767
txtCompositeName.setText("composite_average.out");
794768
contentPane.add(txtCompositeName);
795769
txtCompositeName.setColumns(10);
796770

797771
btnOutputDirectory = new JButton("Output Directory");
798-
sl_contentPane.putConstraint(SpringLayout.NORTH, btnOutputDirectory, 10, SpringLayout.SOUTH,
799-
chckbxOutputCompositeData);
772+
sl_contentPane.putConstraint(SpringLayout.NORTH, btnOutputDirectory, 10, SpringLayout.SOUTH, chckbxOutputCompositeData);
800773
sl_contentPane.putConstraint(SpringLayout.WEST, btnOutputDirectory, 10, SpringLayout.WEST, contentPane);
801774
contentPane.add(btnOutputDirectory);
802775

@@ -814,6 +787,21 @@ public void actionPerformed(ActionEvent e) {
814787
lblCurrentOutput.setFont(new Font("Lucida Grande", Font.BOLD, 13));
815788
contentPane.add(lblCurrentOutput);
816789

790+
lblCpusToUse = new JLabel("CPU's to Use:");
791+
sl_contentPane.putConstraint(SpringLayout.SOUTH, lblCpusToUse, -15, SpringLayout.SOUTH, contentPane);
792+
sl_contentPane.putConstraint(SpringLayout.WEST, lblCpusToUse, 0, SpringLayout.WEST, btnOutputDirectory);
793+
lblCpusToUse.setFont(new Font("Lucida Grande", Font.BOLD, 13));
794+
contentPane.add(lblCpusToUse);
795+
796+
txtCPU = new JTextField();
797+
sl_contentPane.putConstraint(SpringLayout.NORTH, txtCPU, -1, SpringLayout.NORTH, lblCpusToUse);
798+
sl_contentPane.putConstraint(SpringLayout.WEST, txtCPU, 10, SpringLayout.EAST, lblCpusToUse);
799+
sl_contentPane.putConstraint(SpringLayout.WEST, txtCPU, 70, SpringLayout.EAST, lblCpusToUse);
800+
txtCPU.setHorizontalAlignment(SwingConstants.CENTER);
801+
txtCPU.setText("1");
802+
contentPane.add(txtCPU);
803+
txtCPU.setColumns(10);
804+
817805
rdbtnFivePrime.addItemListener(new ItemListener() {
818806
public void itemStateChanged(ItemEvent e) {
819807
if (rdbtnFivePrime.isSelected()) {
@@ -1104,3 +1092,4 @@ public void propertyChange(PropertyChangeEvent evt) {
11041092
}
11051093
}
11061094
}
1095+

0 commit comments

Comments
 (0)