pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bigger font sizes and clearing mounted sample if puck is removed.

Browse Source
This commit is contained in:
gac-S_Changer
2019-06-06 11:14:29 +02:00
parent 075e76fc4e
commit 1969d8253e
5 changed files with 172 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/ch/psi/mxsc/MainPanel.java
View File

@@ -65,6 +65,8 @@ public class MainPanel extends Panel {
basePlatePanel.setMode(BasePlatePanel.Mode.single);
setExpertMode(false);
setDefaultDetail();
panelTablePucks.getVerticalScrollBar().setPreferredSize(new Dimension(20, 0));
panelTableSamples.getVerticalScrollBar().setPreferredSize(new Dimension(20, 0));
int row = 0;
for (String segment : new String[]{"A", "B", "C", "D", "E", "F"}) {
@@ -728,10 +730,10 @@ public class MainPanel extends Panel {
buttonConfig = new javax.swing.JButton();
panelBottom = new javax.swing.JPanel();
jPanel1 = new javax.swing.JPanel();
jScrollPane1 = new javax.swing.JScrollPane();
panelTableSamples = new javax.swing.JScrollPane();
tableSamples = new javax.swing.JTable();
jPanel4 = new javax.swing.JPanel();
jScrollPane3 = new javax.swing.JScrollPane();
panelTablePucks = new javax.swing.JScrollPane();
tablePucks = new javax.swing.JTable();
setPreferredSize(new java.awt.Dimension(1030, 530));
@@ -1449,7 +1451,7 @@ public class MainPanel extends Panel {
}
));
tableSamples.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
jScrollPane1.setViewportView(tableSamples);
panelTableSamples.setViewportView(tableSamples);
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
@@ -1457,14 +1459,14 @@ public class MainPanel extends Panel {
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGap(0, 0, 0)
.addComponent(jScrollPane1)
.addComponent(panelTableSamples)
.addGap(0, 0, 0))
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGap(0, 0, 0)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 50, Short.MAX_VALUE)
.addComponent(panelTableSamples, javax.swing.GroupLayout.DEFAULT_SIZE, 50, Short.MAX_VALUE)
.addGap(0, 0, 0))
);
@@ -1523,7 +1525,7 @@ public class MainPanel extends Panel {
}
});
tablePucks.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
jScrollPane3.setViewportView(tablePucks);
panelTablePucks.setViewportView(tablePucks);
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
jPanel4.setLayout(jPanel4Layout);
@@ -1531,14 +1533,14 @@ public class MainPanel extends Panel {
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel4Layout.createSequentialGroup()
.addGap(0, 0, 0)
.addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE)
.addComponent(panelTablePucks, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE)
.addGap(0, 0, 0))
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel4Layout.createSequentialGroup()
.addGap(0, 0, 0)
.addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(panelTablePucks, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addGap(0, 0, 0))
);
@@ -1775,8 +1777,6 @@ public class MainPanel extends Panel {
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel3;
private javax.swing.JPanel jPanel4;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane3;
private javax.swing.JLabel labelManualMode;
private javax.swing.JLabel labelRoomTemperature;
private ch.psi.pshell.swing.Led led5;
@@ -1809,6 +1809,8 @@ public class MainPanel extends Panel {
private javax.swing.JPanel panelRight;
private javax.swing.JPanel panelStatus;
private javax.swing.JPanel panelSystemStatus;
private javax.swing.JScrollPane panelTablePucks;
private javax.swing.JScrollPane panelTableSamples;
private javax.swing.JPanel panelTop;
private javax.swing.JPanel panelViewType;
private javax.swing.JProgressBar progressLN2;