Remove Hexiposi

2024-10-30 11:20:36 +01:00
parent 0a50a512b9
commit 611f89bc27
2 changed files with 20 additions and 58 deletions
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -673,8 +673,7 @@ public class MainPanel extends Panel {
            updateCameraView();
        } catch (Exception ex) {
            showException(ex);
-        }
-
+        }     
    }

    boolean viewDewar = true;
@@ -1069,7 +1068,6 @@ public class MainPanel extends Panel {
        buttonExpertCommands = new javax.swing.JButton();
        buttonRecovery = new javax.swing.JButton();
        buttonConfig = new javax.swing.JButton();
-        buttonExpertDetection = new javax.swing.JButton();
        panelBottom = new javax.swing.JPanel();
        panelSamples = new javax.swing.JPanel();
        panelTableSamples = new javax.swing.JScrollPane();
@@ -1166,7 +1164,7 @@ public class MainPanel extends Panel {

        panelDetection.setBorder(javax.swing.BorderFactory.createTitledBorder("Detection"));

-        buttonDetectionExposure.setText("Exposure");
+        buttonDetectionExposure.setText("Detection");
        buttonDetectionExposure.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                buttonDetectionExposureActionPerformed(evt);
@@ -1302,7 +1300,7 @@ public class MainPanel extends Panel {
                .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                    .addComponent(panelLegend, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addComponent(panelDetection, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 254, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 251, Short.MAX_VALUE)
                .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                    .addComponent(panelCover, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addComponent(panelViewType, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
@@ -1659,7 +1657,7 @@ public class MainPanel extends Panel {
            }
        });

-        buttonCalibrateCover.setText("Cover Ref");
+        buttonCalibrateCover.setText("Exposure");
        buttonCalibrateCover.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                buttonCalibrateCoverActionPerformed(evt);
@@ -1687,25 +1685,17 @@ public class MainPanel extends Panel {
            }
        });

-        buttonExpertDetection.setText("Cover Det");
-        buttonExpertDetection.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                buttonExpertDetectionActionPerformed(evt);
-            }
-        });
-
        javax.swing.GroupLayout panelExpertLayout = new javax.swing.GroupLayout(panelExpert);
        panelExpert.setLayout(panelExpertLayout);
        panelExpertLayout.setHorizontalGroup(
            panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(panelExpertLayout.createSequentialGroup()
-                .addGroup(panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                .addGroup(panelExpertLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(buttonExpertCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addComponent(buttonRecovery, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addComponent(buttonCalibrateImage, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addComponent(buttonCalibrateCover, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(buttonConfig, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonExpertDetection, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(buttonConfig, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
            .addGroup(panelExpertLayout.createSequentialGroup()
                .addComponent(checkExpert, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -1720,8 +1710,6 @@ public class MainPanel extends Panel {
                .addGap(0, 0, 0)
                .addComponent(checkExpert)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(buttonExpertDetection)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addComponent(buttonExpertCommands)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addComponent(buttonRecovery)
@@ -1748,11 +1736,11 @@ public class MainPanel extends Panel {
        panelDevicesLayout.setVerticalGroup(
            panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(panelDevicesLayout.createSequentialGroup()
-                .addContainerGap(13, Short.MAX_VALUE)
+                .addContainerGap(8, Short.MAX_VALUE)
                .addGroup(panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(panelExpert, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(devicesPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE))
-                .addContainerGap())
+                    .addComponent(devicesPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 240, Short.MAX_VALUE))
+                .addContainerGap(9, Short.MAX_VALUE))
        );

        javax.swing.GroupLayout panelRightLayout = new javax.swing.GroupLayout(panelRight);
@@ -1948,7 +1936,6 @@ public class MainPanel extends Panel {
    }// </editor-fold>//GEN-END:initComponents

    private void buttonCameraActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCameraActionPerformed
-        buttonDrawing.setSelected(!buttonCamera.isSelected());
        updateViewType();
    }//GEN-LAST:event_buttonCameraActionPerformed

@@ -1969,16 +1956,12 @@ public class MainPanel extends Panel {
    JComponent dlgDetRendererComp;

    private void buttonDetectionCalibrateActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDetectionCalibrateActionPerformed
-        try {
-            this.runAsync("imgproc/CoverCalibration", this, false);
-        } catch (Exception ex) {
-            showException(ex);
-        }
+        execute("imgproc/CoverCalibration", null, false, true);
    }//GEN-LAST:event_buttonDetectionCalibrateActionPerformed

    private void buttonDetectionExposureActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDetectionExposureActionPerformed
-        try {                        
-            this.runAsync("setupCoverDetectionExposureScan.py", this, false);
+        try {
+            this.evalAsync("cover_detection.set_renderer(show_panel(img))",                                                      true);
        } catch (Exception ex) {
            showException(ex);
        }
@@ -2000,7 +1983,6 @@ public class MainPanel extends Panel {
    }//GEN-LAST:event_checkExpertActionPerformed

    private void buttonDrawingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDrawingActionPerformed
-        buttonCamera.setSelected(!buttonDrawing.isSelected());
        updateViewType();
    }//GEN-LAST:event_buttonDrawingActionPerformed

@@ -2036,7 +2018,7 @@ public class MainPanel extends Panel {

    private void buttonCalibrateCoverActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCalibrateCoverActionPerformed
        onExpertCommand(null);
-        execute("imgproc/CoverDetectionCalibration", null, false, true);
+        execute("setup/CoverDetectionExposureScan.py", null, false, true);                
    }//GEN-LAST:event_buttonCalibrateCoverActionPerformed

    private void buttonConfigActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonConfigActionPerformed
@@ -2070,14 +2052,6 @@ public class MainPanel extends Panel {
        execute("release_safety()", true);
    }//GEN-LAST:event_buttonReleaseActionPerformed

-    private void buttonExpertDetectionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExpertDetectionActionPerformed
-        try {
-            this.evalAsync("cover_detection.set_renderer(show_panel(img))", true);
-        } catch (Exception ex) {
-            showException(ex);
-        }
-    }//GEN-LAST:event_buttonExpertDetectionActionPerformed
-

    // Variables declaration - do not modify//GEN-BEGIN:variables
    ch.psi.mxsc.BasePlatePanel basePlatePanel;
@@ -2091,7 +2065,6 @@ public class MainPanel extends Panel {
    private javax.swing.JButton buttonDetectionExposure;
    private javax.swing.JToggleButton buttonDrawing;
    private javax.swing.JButton buttonExpertCommands;
-    private javax.swing.JButton buttonExpertDetection;
    private javax.swing.ButtonGroup buttonGroup1;
    private javax.swing.JButton buttonRecovery;
    private javax.swing.JButton buttonRelease;