Skip to content

Commit e8f6c10

Browse files
owlangowlang
committed
reorganize ShiftIntervalWindow UI for clarity
Layout of UI was reorganized for clarity in describing *Directional* shift and renaming tool in main GUI window to use generalized "Coordinate" over BED since this tool is generalized. #92
1 parent 4f07769 commit e8f6c10

2 files changed

Lines changed: 19 additions & 15 deletions

File tree

‎src/main/ScriptManagerGUI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ public void run() {
976976
});
977977
splitPaneSort.setRightComponent(btnSortGffFile);
978978

979-
JButton btnShiftInterval = new JButton("Shift BED Interval");
979+
JButton btnShiftInterval = new JButton("Shift Coordinate Interval");
980980
btnSortGffFile.setToolTipText(ToolDescriptions.shift_coordinate_description);
981981
btnShiftInterval.addActionListener(new ActionListener() {
982982
public void actionPerformed(ActionEvent e) {

‎src/window_interface/Coordinate_Manipulation/ShiftIntervalWindow.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public ShiftIntervalWindow() {
135135
setTitle("Shift Coordinate Interval");
136136
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
137137

138-
setBounds(125, 125, 450, 345);
138+
setBounds(125, 125, 450, 375);
139139
contentPane = new JPanel();
140140
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
141141
setContentPane(contentPane);
@@ -161,13 +161,12 @@ public ShiftIntervalWindow() {
161161
sl_contentPane.putConstraint(SpringLayout.NORTH, inputCards, 0, SpringLayout.SOUTH, rdbtnBed);
162162
sl_contentPane.putConstraint(SpringLayout.WEST, inputCards, 0, SpringLayout.WEST, contentPane);
163163
sl_contentPane.putConstraint(SpringLayout.EAST, inputCards, 0, SpringLayout.EAST, contentPane);
164-
sl_contentPane.putConstraint(SpringLayout.SOUTH, inputCards, -110, SpringLayout.SOUTH, contentPane);
164+
sl_contentPane.putConstraint(SpringLayout.SOUTH, inputCards, -125, SpringLayout.SOUTH, contentPane);
165165
contentPane.add(inputCards);
166166

167167
JPanel bedInputPane = new JPanel();
168168
SpringLayout sl_bedInputPane = new SpringLayout();
169169
bedInputPane.setLayout(sl_bedInputPane);
170-
bedInputPane.setBackground(Color.BLUE);
171170
inputCards.add(bedInputPane, "bed");
172171

173172
JScrollPane scrollPaneBED = new JScrollPane();
@@ -215,14 +214,13 @@ public void actionPerformed(ActionEvent arg0) {
215214
JPanel gffInputPane = new JPanel();
216215
SpringLayout sl_gffInputPane = new SpringLayout();
217216
gffInputPane.setLayout(sl_gffInputPane);
218-
gffInputPane.setBackground(Color.CYAN);
219217
inputCards.add(gffInputPane, "gff");
220218

221219
JScrollPane scrollPaneGFF = new JScrollPane();
222220
sl_gffInputPane.putConstraint(SpringLayout.NORTH, scrollPaneGFF, 36, SpringLayout.NORTH, gffInputPane);
223221
sl_gffInputPane.putConstraint(SpringLayout.WEST, scrollPaneGFF, 10, SpringLayout.WEST, gffInputPane);
224222
sl_gffInputPane.putConstraint(SpringLayout.EAST, scrollPaneGFF, -10, SpringLayout.EAST, gffInputPane);
225-
sl_bedInputPane.putConstraint(SpringLayout.SOUTH, scrollPaneGFF, -3, SpringLayout.SOUTH, gffInputPane);
223+
sl_gffInputPane.putConstraint(SpringLayout.SOUTH, scrollPaneGFF, -3, SpringLayout.SOUTH, gffInputPane);
226224
gffInputPane.add(scrollPaneGFF);
227225

228226
expGFFList = new DefaultListModel<String>();
@@ -259,7 +257,7 @@ public void actionPerformed(ActionEvent arg0) {
259257
});
260258
gffInputPane.add(btnRemoveGFF);
261259

262-
btnExecute = new JButton("Transform");
260+
btnExecute = new JButton("Execute");
263261
sl_contentPane.putConstraint(SpringLayout.WEST, btnExecute, 160, SpringLayout.WEST, contentPane);
264262
sl_contentPane.putConstraint(SpringLayout.SOUTH, btnExecute, 0, SpringLayout.SOUTH, contentPane);
265263
sl_contentPane.putConstraint(SpringLayout.EAST, btnExecute, -160, SpringLayout.EAST, contentPane);
@@ -273,22 +271,28 @@ public void actionPerformed(ActionEvent arg0) {
273271

274272
btnExecute.setActionCommand("start");
275273

276-
JLabel lblSizeOfShift = new JLabel("Size of Shift (bp):");
277-
sl_contentPane.putConstraint(SpringLayout.NORTH, lblSizeOfShift, 6, SpringLayout.SOUTH, inputCards);
278-
sl_contentPane.putConstraint(SpringLayout.WEST, lblSizeOfShift, 10, SpringLayout.WEST, contentPane);
279-
contentPane.add(lblSizeOfShift);
274+
JLabel lblDirectionalShift = new JLabel("Directional Shift (bp):");
275+
sl_contentPane.putConstraint(SpringLayout.NORTH, lblDirectionalShift, 6, SpringLayout.SOUTH, inputCards);
276+
sl_contentPane.putConstraint(SpringLayout.WEST, lblDirectionalShift, 10, SpringLayout.WEST, contentPane);
277+
contentPane.add(lblDirectionalShift);
278+
279+
JLabel lblSizeAdmonishment = new JLabel("upstream(-) and downstream(+)");
280+
sl_contentPane.putConstraint(SpringLayout.NORTH, lblSizeAdmonishment, 6, SpringLayout.SOUTH, lblDirectionalShift);
281+
sl_contentPane.putConstraint(SpringLayout.WEST, lblSizeAdmonishment, 10, SpringLayout.WEST, contentPane);
282+
lblSizeAdmonishment.setFont(new Font("Dialog", Font.ITALIC, 12));
283+
contentPane.add(lblSizeAdmonishment);
280284

281285
txtShift = new JTextField();
282-
sl_contentPane.putConstraint(SpringLayout.NORTH, txtShift, -3, SpringLayout.NORTH, lblSizeOfShift);
283-
sl_contentPane.putConstraint(SpringLayout.WEST, txtShift, 10, SpringLayout.EAST, lblSizeOfShift);
286+
sl_contentPane.putConstraint(SpringLayout.NORTH, txtShift, -3, SpringLayout.NORTH, lblDirectionalShift);
287+
sl_contentPane.putConstraint(SpringLayout.WEST, txtShift, 10, SpringLayout.EAST, lblDirectionalShift);
284288
txtShift.setToolTipText("Must be integer. Negative values for upstream shift, positive values for downstream shift");
285289
txtShift.setHorizontalAlignment(SwingConstants.CENTER);
286290
txtShift.setColumns(10);
287291
txtShift.setText("0");
288292
contentPane.add(txtShift);
289293

290294
chckbxStranded = new JCheckBox("Use stranded info");
291-
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxStranded, 0, SpringLayout.NORTH, lblSizeOfShift);
295+
sl_contentPane.putConstraint(SpringLayout.NORTH, chckbxStranded, 0, SpringLayout.NORTH, lblDirectionalShift);
292296
sl_contentPane.putConstraint(SpringLayout.EAST, chckbxStranded, -20, SpringLayout.EAST, contentPane);
293297
chckbxStranded.setSelected(true);
294298
contentPane.add(chckbxStranded);
@@ -299,7 +303,7 @@ public void actionPerformed(ActionEvent arg0) {
299303
contentPane.add(chckbxGzipOutput);
300304

301305
btnOutput = new JButton("Output Directory");
302-
sl_contentPane.putConstraint(SpringLayout.NORTH, btnOutput, 30, SpringLayout.SOUTH, inputCards);
306+
sl_contentPane.putConstraint(SpringLayout.NORTH, btnOutput, 50, SpringLayout.SOUTH, inputCards);
303307
sl_contentPane.putConstraint(SpringLayout.WEST, btnOutput, 10, SpringLayout.WEST, contentPane);
304308
btnOutput.addActionListener(new ActionListener() {
305309
public void actionPerformed(ActionEvent e) {

0 commit comments

Comments
 (0)