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

Puck detection dialog is maximized

Browse Source
This commit is contained in:
gac-S_Changer
2026-03-25 11:02:53 +01:00
parent 652ea5352e
commit a31418e0bf
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/psi/mxsc/Controller.java
+11 -1
View File
@@ -58,6 +58,8 @@ import javax.swing.table.DefaultTableModel;
public class Controller { public class Controller {
final boolean DIALOG_PUCK_LOAD_SHOW_BASEPLATE = true; final boolean DIALOG_PUCK_LOAD_SHOW_BASEPLATE = true;
final int REMOVE_PUCK_TIMEOUT = 20000;
static Controller instance; static Controller instance;
final BasePlate basePlate; final BasePlate basePlate;
RoomTemperatureBasePlate roomTemperatureBasePlate; RoomTemperatureBasePlate roomTemperatureBasePlate;
@@ -923,9 +925,15 @@ public class Controller {
playSound("mounted"); playSound("mounted");
logPuckDetectionChange(puck, true); logPuckDetectionChange(puck, true);
onPuckScanned(null); onPuckScanned(null);
//If no new puck is scanned and detected mounted in the same place of the last unmount,
//considers the detection is flickering (up to a timeout)
if ((datamatrix==null) || (datamatrix.isBlank())){ if ((datamatrix==null) || (datamatrix.isBlank())){
if (puck == removedPuck){ if (puck == removedPuck){
datamatrix = insertedPuckDatamatrix; if ((System.currentTimeMillis() - removeTimestamp) < REMOVE_PUCK_TIMEOUT){
datamatrix = insertedPuckDatamatrix;
}
} else {
removedPuck = null;
} }
} }
@@ -945,6 +953,7 @@ public class Controller {
removedPuck = null; removedPuck = null;
} }
long removeTimestamp;
//Called when a puck is detected removed from the the dewar //Called when a puck is detected removed from the the dewar
public void onPuckUnmounted(Puck puck) { public void onPuckUnmounted(Puck puck) {
Logger.getLogger(Controller.class.getName()).info("Unmounted puck: " + puck.getName()); Logger.getLogger(Controller.class.getName()).info("Unmounted puck: " + puck.getName());
@@ -956,6 +965,7 @@ public class Controller {
dialogPuckLoading.onPuckUnmounted(puck); dialogPuckLoading.onPuckUnmounted(puck);
} }
removedPuck = puck; removedPuck = puck;
removeTimestamp = System.currentTimeMillis();
} }
public boolean hasLoadDialog(){ public boolean hasLoadDialog(){
src/main/java/ch/psi/mxsc/PuckLoadingDialog.form
+6 -6
View File
@@ -104,7 +104,7 @@
<Component id="textDetectedPuck" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="textDetectedPuck" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/> <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="panelTable" pref="349" max="32767" attributes="0"/> <Component id="panelTable" pref="338" max="32767" attributes="0"/>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/> <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="buttonSet" min="-2" max="-2" attributes="0"/> <Component id="buttonSet" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
@@ -118,7 +118,7 @@
<Component class="javax.swing.JButton" name="buttonSet"> <Component class="javax.swing.JButton" name="buttonSet">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Lucida Grande" size="24" style="0"/> <Font name="Lucida Grande" size="28" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Set"/> <Property name="text" type="java.lang.String" value="Set"/>
<Property name="enabled" type="boolean" value="false"/> <Property name="enabled" type="boolean" value="false"/>
@@ -145,7 +145,7 @@
<Component class="javax.swing.JButton" name="buttonClearDatamatrix"> <Component class="javax.swing.JButton" name="buttonClearDatamatrix">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="14" style="0"/> <Font name="Tahoma" size="24" style="0"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Clear"/> <Property name="text" type="java.lang.String" value="Clear"/>
</Properties> </Properties>
@@ -220,7 +220,7 @@
<Component class="javax.swing.JLabel" name="jLabel1"> <Component class="javax.swing.JLabel" name="jLabel1">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Lucida Grande" size="18" style="0"/> <Font name="Lucida Grande" size="24" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="11"/> <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Scanned Datamatrix:"/> <Property name="text" type="java.lang.String" value="Scanned Datamatrix:"/>
@@ -229,7 +229,7 @@
<Component class="javax.swing.JLabel" name="labelSuggestion"> <Component class="javax.swing.JLabel" name="labelSuggestion">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Lucida Grande" size="24" style="0"/> <Font name="Lucida Grande" size="30" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="0"/> <Property name="horizontalAlignment" type="int" value="0"/>
<Property name="text" type="java.lang.String" value="Scan, Insert or Remove Pucks"/> <Property name="text" type="java.lang.String" value="Scan, Insert or Remove Pucks"/>
@@ -238,7 +238,7 @@
<Component class="javax.swing.JLabel" name="jLabel2"> <Component class="javax.swing.JLabel" name="jLabel2">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Lucida Grande" size="18" style="0"/> <Font name="Lucida Grande" size="24" style="0"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="11"/> <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Detected Puck:"/> <Property name="text" type="java.lang.String" value="Detected Puck:"/>
src/main/java/ch/psi/mxsc/PuckLoadingDialog.java
+6 -6
View File
@@ -290,7 +290,7 @@ public class PuckLoadingDialog extends JDialog {
splitPanel.setDividerLocation(500); splitPanel.setDividerLocation(500);
splitPanel.setDividerSize(0); splitPanel.setDividerSize(0);
buttonSet.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N buttonSet.setFont(new java.awt.Font("Lucida Grande", 0, 28)); // NOI18N
buttonSet.setText("Set"); buttonSet.setText("Set");
buttonSet.setEnabled(false); buttonSet.setEnabled(false);
buttonSet.addActionListener(new java.awt.event.ActionListener() { buttonSet.addActionListener(new java.awt.event.ActionListener() {
@@ -303,7 +303,7 @@ public class PuckLoadingDialog extends JDialog {
textDetectedPuck.setFont(new java.awt.Font("Lucida Grande", 0, 30)); // NOI18N textDetectedPuck.setFont(new java.awt.Font("Lucida Grande", 0, 30)); // NOI18N
textDetectedPuck.setHorizontalAlignment(javax.swing.JTextField.CENTER); textDetectedPuck.setHorizontalAlignment(javax.swing.JTextField.CENTER);
buttonClearDatamatrix.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N buttonClearDatamatrix.setFont(new java.awt.Font("Tahoma", 0, 24)); // NOI18N
buttonClearDatamatrix.setText("Clear"); buttonClearDatamatrix.setText("Clear");
buttonClearDatamatrix.addActionListener(new java.awt.event.ActionListener() { buttonClearDatamatrix.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -355,15 +355,15 @@ public class PuckLoadingDialog extends JDialog {
labelStatus.setText("Waiting for Puck Detection"); labelStatus.setText("Waiting for Puck Detection");
labelStatus.setBorder(javax.swing.BorderFactory.createEtchedBorder()); labelStatus.setBorder(javax.swing.BorderFactory.createEtchedBorder());
jLabel1.setFont(new java.awt.Font("Lucida Grande", 0, 18)); // NOI18N jLabel1.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("Scanned Datamatrix:"); jLabel1.setText("Scanned Datamatrix:");
labelSuggestion.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N labelSuggestion.setFont(new java.awt.Font("Lucida Grande", 0, 30)); // NOI18N
labelSuggestion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); labelSuggestion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
labelSuggestion.setText("Scan, Insert or Remove Pucks"); labelSuggestion.setText("Scan, Insert or Remove Pucks");
jLabel2.setFont(new java.awt.Font("Lucida Grande", 0, 18)); // NOI18N jLabel2.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel2.setText("Detected Puck:"); jLabel2.setText("Detected Puck:");
@@ -414,7 +414,7 @@ public class PuckLoadingDialog extends JDialog {
.addComponent(jLabel2) .addComponent(jLabel2)
.addComponent(textDetectedPuck, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(textDetectedPuck, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelTable, javax.swing.GroupLayout.DEFAULT_SIZE, 349, Short.MAX_VALUE) .addComponent(panelTable, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(buttonSet) .addComponent(buttonSet)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)