Skip to content

Commit 847e7e8

Browse files
committed
add support for setting TagExtend to GUI
TagExtend support already accounted for in TagPileup script. This commit allows the user to set a value from the GUI. The selection box was put where CPU setting used to be and CPU setting was moved over in the window interface. "Output Parameters" section label was removed. #73
1 parent 80078ec commit 847e7e8

1 file changed

Lines changed: 33 additions & 22 deletions

File tree

src/window_interface/Read_Analysis/TagPileupWindow.java

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public class TagPileupWindow extends JFrame implements ActionListener, PropertyC
8383
private JLabel lblTagShift;
8484
private JLabel lblStdDevSize;
8585
private JLabel lblNumStd;
86+
private JLabel lblTagExtend;
8687
private JLabel lblDefaultToLocal;
8788
private JLabel lblCurrentOutput;
8889
private JLabel lblOutputMatrixFormat;
@@ -94,6 +95,7 @@ public class TagPileupWindow extends JFrame implements ActionListener, PropertyC
9495
private JTextField txtSmooth;
9596
private JTextField txtStdSize;
9697
private JTextField txtNumStd;
98+
private JTextField txtTagExtend;
9799
private JTextField txtCPU;
98100
private JTextField txtCompositeName;
99101
private JCheckBox chckbxOutputData;
@@ -201,6 +203,7 @@ public Void doInBackground() throws IOException, InterruptedException {
201203
param.setSmooth(Integer.parseInt(txtSmooth.getText()));
202204
param.setStdSize(Integer.parseInt(txtStdSize.getText()));
203205
param.setStdNum(Integer.parseInt(txtNumStd.getText()));
206+
param.setTagExtend(Integer.parseInt(txtTagExtend.getText()));
204207
param.setCPU(Integer.parseInt(txtCPU.getText()));
205208

206209
TagPileupOutput pile = new TagPileupOutput(BEDFiles, BAMFiles, param, colors);
@@ -579,27 +582,25 @@ public void actionPerformed(ActionEvent e) {
579582
txtBin.setColumns(10);
580583
contentPane.add(txtBin);
581584

582-
lblCpusToUse = new JLabel("CPU's to Use:");
583-
sl_contentPane.putConstraint(SpringLayout.NORTH, lblCpusToUse, 0, SpringLayout.NORTH, lblTagShift);
584-
sl_contentPane.putConstraint(SpringLayout.WEST, lblCpusToUse, 10, SpringLayout.EAST, txtBin);
585-
lblCpusToUse.setFont(new Font("Lucida Grande", Font.BOLD, 13));
586-
contentPane.add(lblCpusToUse);
587-
588-
txtCPU = new JTextField();
589-
sl_contentPane.putConstraint(SpringLayout.NORTH, txtCPU, -1, SpringLayout.NORTH, lblTagShift);
590-
sl_contentPane.putConstraint(SpringLayout.WEST, txtCPU, 10, SpringLayout.EAST, lblCpusToUse);
591-
sl_contentPane.putConstraint(SpringLayout.EAST, txtCPU, 70, SpringLayout.EAST, lblCpusToUse);
592-
txtCPU.setHorizontalAlignment(SwingConstants.CENTER);
593-
txtCPU.setText("1");
594-
contentPane.add(txtCPU);
595-
txtCPU.setColumns(10);
596-
597585
chckbxTagStandard = new JCheckBox("Set Tags to Be Equal");
598-
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxTagStandard, 40, SpringLayout.SOUTH,
599-
lblReadManipulation);
586+
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxTagStandard, 40, SpringLayout.SOUTH, lblReadManipulation);
600587
sl_contentPane.putConstraint(SpringLayout.WEST, chckbxTagStandard, 10, SpringLayout.EAST, scrollPane_BAM);
601588
contentPane.add(chckbxTagStandard);
602589

590+
lblTagExtend = new JLabel("Tag Extend (bp):");
591+
sl_contentPane.putConstraint(SpringLayout.NORTH, lblTagExtend, 0, SpringLayout.NORTH, lblTagShift);
592+
sl_contentPane.putConstraint(SpringLayout.WEST, lblTagExtend, 10, SpringLayout.EAST, txtBin);
593+
contentPane.add(lblTagExtend);
594+
595+
txtTagExtend = new JTextField();
596+
sl_contentPane.putConstraint(SpringLayout.NORTH, txtTagExtend, -1, SpringLayout.NORTH, lblTagExtend);
597+
sl_contentPane.putConstraint(SpringLayout.WEST, txtTagExtend, 10, SpringLayout.EAST, lblTagExtend);
598+
sl_contentPane.putConstraint(SpringLayout.EAST, txtTagExtend, 70, SpringLayout.EAST, lblTagExtend);
599+
txtTagExtend.setHorizontalAlignment(SwingConstants.CENTER);
600+
txtTagExtend.setText("0");
601+
contentPane.add(txtTagExtend);
602+
txtTagExtend.setColumns(10);
603+
603604
btnLoadBlacklistFilter = new JButton("Load Blacklist Filter");
604605
btnLoadBlacklistFilter.setEnabled(false);
605606
sl_contentPane.putConstraint(SpringLayout.NORTH, btnLoadBlacklistFilter, -1, SpringLayout.NORTH,
@@ -726,13 +727,23 @@ public void actionPerformed(ActionEvent e) {
726727
sepOutput.setForeground(Color.BLACK);
727728
contentPane.add(sepOutput);
728729

729-
JLabel lblOutputParameters = new JLabel("Output Parameters:");
730-
sl_contentPane.putConstraint(SpringLayout.NORTH, lblOutputParameters, 8, SpringLayout.SOUTH, sepOutput);
731-
sl_contentPane.putConstraint(SpringLayout.WEST, lblOutputParameters, 10, SpringLayout.WEST, contentPane);
732-
contentPane.add(lblOutputParameters);
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);
733744

734745
chckbxOutputData = new JCheckBox("Output Heatmap Matrix");
735-
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxOutputData, 8, SpringLayout.SOUTH, lblOutputParameters);
746+
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxOutputData, 8, SpringLayout.SOUTH, lblCpusToUse);
736747
sl_contentPane.putConstraint(SpringLayout.WEST, chckbxOutputData, 0, SpringLayout.WEST, scrollPane_BAM);
737748
chckbxOutputData.setSelected(true);
738749
contentPane.add(chckbxOutputData);

0 commit comments

Comments
 (0)