2023-08-17 15:16:51 +02:00
parent c545879253
commit 8beeb7dbc7
134 changed files with 3722 additions and 1287 deletions
--- a/plugins/GunEnergyScan.java
+++ b/plugins/GunEnergyScan.java
@@ -41,6 +41,8 @@ public class GunEnergyScan extends Panel {
        spinnerEnergy.setEnabled(enabled);
        buttonPhaseSet.setEnabled(enabled && !textRefPhase.getText().trim().isEmpty());
        buttonSetDelay.setEnabled(enabled && !textOffset.getText().trim().isEmpty());
+        buttonPhaseEdit.setEnabled(enabled);
+        buttonDelayEdit.setEnabled(enabled);
    }

    @Override
@@ -81,10 +83,12 @@ public class GunEnergyScan extends Panel {
        jLabel1 = new javax.swing.JLabel();
        buttonPhaseSet = new javax.swing.JButton();
        textRefPhase = new javax.swing.JTextField();
+        buttonPhaseEdit = new javax.swing.JButton();
        jPanel2 = new javax.swing.JPanel();
        jLabel2 = new javax.swing.JLabel();
        buttonSetDelay = new javax.swing.JButton();
        textOffset = new javax.swing.JTextField();
+        buttonDelayEdit = new javax.swing.JButton();

        setPreferredSize(new java.awt.Dimension(737, 445));

@@ -94,30 +98,24 @@ public class GunEnergyScan extends Panel {

        labelStop.setText("Stop:");

-        spinnerStep.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.05d, 10.0d, 0.05d));
-        spinnerStep.setPreferredSize(new java.awt.Dimension(64, 20));
+        spinnerStep.setModel(new javax.swing.SpinnerNumberModel(0.5d, 0.05d, 10.0d, 0.05d));

        labelStep.setText("Step size:");

-        spinnerStart.setModel(new javax.swing.SpinnerNumberModel(0.0d, -360.0d, 360.0d, 1.0d));
-        spinnerStart.setPreferredSize(new java.awt.Dimension(64, 20));
+        spinnerStart.setModel(new javax.swing.SpinnerNumberModel(86.0d, -360.0d, 360.0d, 1.0d));

        labelSamples.setText("Nb Samples:");

-        spinnerSamples.setModel(new javax.swing.SpinnerNumberModel(1, 1, 50, 1));
-        spinnerSamples.setPreferredSize(new java.awt.Dimension(64, 20));
+        spinnerSamples.setModel(new javax.swing.SpinnerNumberModel(10, 1, 50, 1));

        labelLatency.setText("Latency:");

-        spinnerLatency.setModel(new javax.swing.SpinnerNumberModel(0.1d, 0.0d, 5.0d, 0.01d));
-        spinnerLatency.setPreferredSize(new java.awt.Dimension(64, 20));
+        spinnerLatency.setModel(new javax.swing.SpinnerNumberModel(0.4d, 0.0d, 5.0d, 0.01d));

-        spinnerStop.setModel(new javax.swing.SpinnerNumberModel(180.0d, -360.0d, 360.0d, 1.0d));
+        spinnerStop.setModel(new javax.swing.SpinnerNumberModel(96.0d, -360.0d, 360.0d, 1.0d));
        spinnerStop.setMinimumSize(new java.awt.Dimension(53, 20));
-        spinnerStop.setPreferredSize(new java.awt.Dimension(64, 20));

-        spinnerThreshold.setModel(new javax.swing.SpinnerNumberModel(500.0d, 0.0d, 10000.0d, 100.0d));
-        spinnerThreshold.setPreferredSize(new java.awt.Dimension(64, 20));
+        spinnerThreshold.setModel(new javax.swing.SpinnerNumberModel(400, 0, 10000, 100));

        labelLatency1.setText("Threshold:");

@@ -126,34 +124,27 @@ public class GunEnergyScan extends Panel {
        panelScanParsLayout.setHorizontalGroup(
            panelScanParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(panelScanParsLayout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(panelScanParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addGroup(panelScanParsLayout.createSequentialGroup()
-                        .addComponent(labelLatency)
-                        .addGap(2, 2, 2)
-                        .addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(panelScanParsLayout.createSequentialGroup()
-                        .addComponent(labelStop)
-                        .addGap(2, 2, 2)
-                        .addComponent(spinnerStop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(panelScanParsLayout.createSequentialGroup()
-                        .addComponent(labelStart)
-                        .addGap(2, 2, 2)
-                        .addComponent(spinnerStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(panelScanParsLayout.createSequentialGroup()
-                        .addComponent(labelSamples)
-                        .addGap(2, 2, 2)
-                        .addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(panelScanParsLayout.createSequentialGroup()
-                        .addComponent(labelStep)
-                        .addGap(2, 2, 2)
-                        .addComponent(spinnerStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(panelScanParsLayout.createSequentialGroup()
-                        .addComponent(labelLatency1)
-                        .addGap(2, 2, 2)
-                        .addComponent(spinnerThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGroup(panelScanParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(labelStart, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelStop, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelStep, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelSamples, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelLatency, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelLatency1, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addGap(2, 2, 2)
+                .addGroup(panelScanParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(spinnerStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(spinnerStop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(spinnerStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(spinnerThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );
+
+        panelScanParsLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerLatency, spinnerSamples, spinnerStart, spinnerStep, spinnerStop, spinnerThreshold});
+
        panelScanParsLayout.setVerticalGroup(
            panelScanParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(panelScanParsLayout.createSequentialGroup()
@@ -187,12 +178,10 @@ public class GunEnergyScan extends Panel {
        panelBeamPars.setBorder(javax.swing.BorderFactory.createTitledBorder("Beam Parameters"));

        spinnerDispersion.setModel(new javax.swing.SpinnerNumberModel(-0.387d, -10.0d, 10.0d, 0.001d));
-        spinnerDispersion.setPreferredSize(new java.awt.Dimension(64, 20));

        labelEnergy.setText("p (MeV/c):");

        spinnerEnergy.setModel(new javax.swing.SpinnerNumberModel(7.1d, 0.0d, 10.0d, 0.01d));
-        spinnerEnergy.setPreferredSize(new java.awt.Dimension(64, 20));

        labelDispersion.setText("Disp. (m):");

@@ -201,14 +190,14 @@ public class GunEnergyScan extends Panel {
        panelBeamParsLayout.setHorizontalGroup(
            panelBeamParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelBeamParsLayout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGap(30, 30, 30)
                .addGroup(panelBeamParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(labelDispersion, javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(labelEnergy))
+                    .addComponent(labelEnergy, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(labelDispersion, javax.swing.GroupLayout.Alignment.TRAILING))
                .addGap(4, 4, 4)
-                .addGroup(panelBeamParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
-                    .addComponent(spinnerEnergy, javax.swing.GroupLayout.DEFAULT_SIZE, 73, Short.MAX_VALUE)
-                    .addComponent(spinnerDispersion, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGroup(panelBeamParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(spinnerDispersion)
+                    .addComponent(spinnerEnergy))
                .addContainerGap())
        );
        panelBeamParsLayout.setVerticalGroup(
@@ -255,22 +244,41 @@ public class GunEnergyScan extends Panel {

        textRefPhase.setEditable(false);
        textRefPhase.setHorizontalAlignment(javax.swing.JTextField.CENTER);
+        textRefPhase.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                textRefPhaseActionPerformed(evt);
+            }
+        });
+
+        buttonPhaseEdit.setText("Edit");
+        buttonPhaseEdit.setEnabled(false);
+        buttonPhaseEdit.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                buttonPhaseEditActionPerformed(evt);
+            }
+        });

        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
        jPanel1.setLayout(jPanel1Layout);
        jPanel1Layout.setHorizontalGroup(
            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(jPanel1Layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(buttonPhaseSet)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(jLabel1)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(textRefPhase, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap()
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
+                        .addGap(0, 0, Short.MAX_VALUE)
+                        .addComponent(jLabel1)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(textRefPhase, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
+                        .addComponent(buttonPhaseEdit)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(buttonPhaseSet)))
                .addContainerGap())
        );
+
+        jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonPhaseEdit, buttonPhaseSet});
+
        jPanel1Layout.setVerticalGroup(
            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(jPanel1Layout.createSequentialGroup()
@@ -279,7 +287,9 @@ public class GunEnergyScan extends Panel {
                    .addComponent(jLabel1)
                    .addComponent(textRefPhase, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(buttonPhaseSet)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(buttonPhaseSet)
+                    .addComponent(buttonPhaseEdit))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );

@@ -298,21 +308,35 @@ public class GunEnergyScan extends Panel {
        textOffset.setEditable(false);
        textOffset.setHorizontalAlignment(javax.swing.JTextField.CENTER);

+        buttonDelayEdit.setText("Edit");
+        buttonDelayEdit.setEnabled(false);
+        buttonDelayEdit.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                buttonDelayEditActionPerformed(evt);
+            }
+        });
+
        javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
        jPanel2.setLayout(jPanel2Layout);
        jPanel2Layout.setHorizontalGroup(
            jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(jPanel2Layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(buttonSetDelay)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(jLabel2)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(textOffset, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap()
+                .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+                        .addGap(0, 0, Short.MAX_VALUE)
+                        .addComponent(jLabel2)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(textOffset, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+                        .addComponent(buttonDelayEdit)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(buttonSetDelay)))
                .addContainerGap())
        );
+
+        jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonDelayEdit, buttonSetDelay});
+
        jPanel2Layout.setVerticalGroup(
            jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(jPanel2Layout.createSequentialGroup()
@@ -321,7 +345,9 @@ public class GunEnergyScan extends Panel {
                    .addComponent(jLabel2)
                    .addComponent(textOffset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(buttonSetDelay)
+                .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(buttonSetDelay)
+                    .addComponent(buttonDelayEdit))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );

@@ -344,7 +370,7 @@ public class GunEnergyScan extends Panel {
                            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                            .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)))
-                .addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 528, Short.MAX_VALUE)
+                .addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 523, Short.MAX_VALUE)
                .addContainerGap())
        );
        layout.setVerticalGroup(
@@ -468,8 +494,38 @@ public class GunEnergyScan extends Panel {
        }
    }//GEN-LAST:event_buttonSetDelayActionPerformed

+    private void buttonPhaseEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPhaseEditActionPerformed
+        try{
+            String ret =getString("Enter Ref. Phase:", "");
+            if (ret!=null){
+                textRefPhase.setText(ret.isBlank() ? "" : String.valueOf(Double.valueOf(ret.trim())));
+            }
+            onStateChange(getState(), getState());
+        } catch (Exception ex) {
+            showException(ex);
+        }
+    }//GEN-LAST:event_buttonPhaseEditActionPerformed
+
+    private void buttonDelayEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDelayEditActionPerformed
+        try{
+            String ret =getString("Enter Offset:", "");
+            if (ret!=null){
+                textOffset.setText(ret.isBlank() ? "" : String.valueOf(Double.valueOf(ret.trim())));
+            }
+            onStateChange(getState(), getState());
+        } catch (Exception ex) {
+            showException(ex);
+        }
+    }//GEN-LAST:event_buttonDelayEditActionPerformed
+
+    private void textRefPhaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_textRefPhaseActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_textRefPhaseActionPerformed
+
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton buttonAbort;
+    private javax.swing.JButton buttonDelayEdit;
+    private javax.swing.JButton buttonPhaseEdit;
    private javax.swing.JButton buttonPhaseSet;
    private javax.swing.JButton buttonSetDelay;
    private javax.swing.JButton buttonStart;