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
src/main/java/ch/psi/mxsc/PuckLoadingDialog.java
+42 -16
View File
@@ -4,6 +4,7 @@ import ch.psi.pshell.core.Context;
import ch.psi.pshell.swing.DataPanel;
import ch.psi.utils.swing.MainFrame;
import ch.psi.utils.swing.SwingUtils;
import java.awt.Dimension;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
@@ -26,7 +27,7 @@ public class PuckLoadingDialog extends JDialog {
* Creates new form PuckLoadingDialog
*/
public PuckLoadingDialog(java.awt.Frame parent, boolean modal) {
super(parent, "Puck Loading", modal);
super(parent, "Puck Loading", modal);
initComponents();
this.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
this.setName("PuckLoadingDialog");
@@ -34,7 +35,8 @@ public class PuckLoadingDialog extends JDialog {
setStatusLabel(null,-1);
setSugestionLabel(null,-1);
model = (DefaultTableModel) table.getModel();
table.getTableHeader().setFont(table.getTableHeader().getFont().deriveFont(20.0f));
table.getTableHeader().setFont(table.getTableHeader().getFont().deriveFont(22.0f));
panelTable.getVerticalScrollBar().setPreferredSize(new Dimension(30, 0));
}
@Override
@@ -214,31 +216,32 @@ public class PuckLoadingDialog extends JDialog {
jLabel1 = new javax.swing.JLabel();
textScannedDatamatrix = new javax.swing.JTextField();
jScrollPane1 = new javax.swing.JScrollPane();
panelTable = new javax.swing.JScrollPane();
table = new javax.swing.JTable();
buttonSet = new javax.swing.JButton();
labelSuggestion = new javax.swing.JLabel();
labelStatus = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
textDetectedPuck = new javax.swing.JTextField();
buttonClearDatamatrix = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
jLabel1.setFont(new java.awt.Font("Lucida Grande", 0, 18)); // NOI18N
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("Scanned Dartamatrix:");
jLabel1.setText("Scanned Datamatrix:");
textScannedDatamatrix.setEditable(false);
textScannedDatamatrix.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N
textScannedDatamatrix.setFont(new java.awt.Font("Lucida Grande", 0, 30)); // NOI18N
textScannedDatamatrix.setHorizontalAlignment(javax.swing.JTextField.CENTER);
table.setFont(new java.awt.Font("Lucida Grande", 0, 28)); // NOI18N
table.setFont(new java.awt.Font("Lucida Grande", 0, 30)); // NOI18N
table.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
},
new String [] {
"Datamatrix", "Puck Position"
"Datamatrix / Puck Id", "Puck Position"
}
) {
Class[] types = new Class [] {
@@ -260,7 +263,7 @@ public class PuckLoadingDialog extends JDialog {
table.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
table.getTableHeader().setResizingAllowed(false);
table.getTableHeader().setReorderingAllowed(false);
jScrollPane1.setViewportView(table);
panelTable.setViewportView(table);
buttonSet.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N
buttonSet.setText("Set");
@@ -285,9 +288,17 @@ public class PuckLoadingDialog extends JDialog {
jLabel2.setText("Detected Puck:");
textDetectedPuck.setEditable(false);
textDetectedPuck.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N
textDetectedPuck.setFont(new java.awt.Font("Lucida Grande", 0, 30)); // NOI18N
textDetectedPuck.setHorizontalAlignment(javax.swing.JTextField.CENTER);
buttonClearDatamatrix.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
buttonClearDatamatrix.setText("Clear");
buttonClearDatamatrix.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonClearDatamatrixActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@@ -300,11 +311,13 @@ public class PuckLoadingDialog extends JDialog {
.addComponent(buttonSet, javax.swing.GroupLayout.PREFERRED_SIZE, 201, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE))
.addComponent(labelSuggestion, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 484, Short.MAX_VALUE)
.addComponent(panelTable, javax.swing.GroupLayout.DEFAULT_SIZE, 484, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(textScannedDatamatrix))
.addComponent(textScannedDatamatrix)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonClearDatamatrix))
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
@@ -321,21 +334,25 @@ public class PuckLoadingDialog extends JDialog {
.addContainerGap()
.addComponent(labelSuggestion)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1)
.addComponent(textScannedDatamatrix, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1)
.addComponent(textScannedDatamatrix, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(buttonClearDatamatrix))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2)
.addComponent(textDetectedPuck, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 249, Short.MAX_VALUE)
.addComponent(panelTable, javax.swing.GroupLayout.DEFAULT_SIZE, 235, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(buttonSet)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(labelStatus))
);
layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {buttonClearDatamatrix, textScannedDatamatrix});
pack();
}// </editor-fold>//GEN-END:initComponents
@@ -351,6 +368,14 @@ public class PuckLoadingDialog extends JDialog {
}
}//GEN-LAST:event_buttonSetActionPerformed
private void buttonClearDatamatrixActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonClearDatamatrixActionPerformed
try {
Controller.getInstance().onPuckScanned(null);
} catch (Exception ex) {
SwingUtils.showException(this, ex);
}
}//GEN-LAST:event_buttonClearDatamatrixActionPerformed
/**
* @param args the command line arguments
*/
@@ -394,12 +419,13 @@ public class PuckLoadingDialog extends JDialog {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonClearDatamatrix;
javax.swing.JButton buttonSet;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JLabel labelStatus;
private javax.swing.JLabel labelSuggestion;
private javax.swing.JScrollPane panelTable;
javax.swing.JTable table;
javax.swing.JTextField textDetectedPuck;
javax.swing.JTextField textScannedDatamatrix;