pshell_config/mxsc
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-S_Changer
2018-10-16 18:05:43 +02:00
parent cfc4b3a0da
commit 3d86c27140
19 changed files with 333 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/Commands.form
View File

@@ -381,13 +381,14 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonMovePark" linkSize="10" alignment="0" min="-2" pref="114" max="-2" attributes="0"/>
<Component id="buttonHomingHexiposi" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonMoveAux" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonMoveCold" linkSize="10" alignment="0" min="-2" pref="114" max="-2" attributes="0"/>
<Component id="buttonMoveHeater" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonGetGonio" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonGetDewar" linkSize="10" alignment="0" min="-2" pref="114" max="-2" attributes="0"/>
<Component id="buttonGetAux" linkSize="10" alignment="0" min="-2" pref="114" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="54" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonPutDewar" linkSize="10" alignment="0" min="-2" pref="101" max="-2" attributes="0"/>
<Component id="buttonPutGonio" linkSize="10" alignment="0" min="-2" pref="101" max="-2" attributes="0"/>
@@ -395,8 +396,9 @@
<Component id="buttonMoveHome" linkSize="10" alignment="0" min="-2" pref="101" max="-2" attributes="0"/>
<Component id="buttonMoveDewar" linkSize="10" alignment="0" min="-2" pref="101" max="-2" attributes="0"/>
<Component id="buttonMoveScanner" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonPutAux" linkSize="10" min="-2" pref="101" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -410,15 +412,20 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="buttonGetGonio" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonPutGonio" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonGetAux" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonPutAux" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="buttonMoveGonio" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonHomingHexiposi" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonGetGonio" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonPutGonio" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="buttonMoveGonio" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonMoveAux" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="buttonMovePark" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonMoveHome" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -527,12 +534,28 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonPutDewarActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="buttonHomingHexiposi">
<Component class="javax.swing.JButton" name="buttonMoveAux">
<Properties>
<Property name="text" type="java.lang.String" value="Homing Hexiposi"/>
<Property name="text" type="java.lang.String" value="Move Aux"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonHomingHexiposiActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonMoveAuxActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="buttonGetAux">
<Properties>
<Property name="text" type="java.lang.String" value="Get Aux"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonGetAuxActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="buttonPutAux">
<Properties>
<Property name="text" type="java.lang.String" value="Put Aux"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonPutAuxActionPerformed"/>
</Events>
</Component>
</SubComponents>

70
plugins/Commands.java
View File

@@ -53,7 +53,7 @@ public class Commands extends Panel {
for (Component c: SwingUtils.getComponentsByType(this, JComponent.class)){
c.setEnabled(state == State.Ready);
}
buttonHomingHexiposi.setEnabled(state == State.Ready);
buttonMoveAux.setEnabled(state == State.Ready);
}
@Override
@@ -148,7 +148,9 @@ public class Commands extends Panel {
buttonMoveScanner = new javax.swing.JButton();
buttonGetDewar = new javax.swing.JButton();
buttonPutDewar = new javax.swing.JButton();
buttonHomingHexiposi = new javax.swing.JButton();
buttonMoveAux = new javax.swing.JButton();
buttonGetAux = new javax.swing.JButton();
buttonPutAux = new javax.swing.JButton();
pnDatabase = new javax.swing.JPanel();
buttonClearSampleDb = new javax.swing.JButton();
buttonResetPuckIds = new javax.swing.JButton();
@@ -437,10 +439,24 @@ public class Commands extends Panel {
}
});
buttonHomingHexiposi.setText("Homing Hexiposi");
buttonHomingHexiposi.addActionListener(new java.awt.event.ActionListener() {
buttonMoveAux.setText("Move Aux");
buttonMoveAux.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonHomingHexiposiActionPerformed(evt);
buttonMoveAuxActionPerformed(evt);
}
});
buttonGetAux.setText("Get Aux");
buttonGetAux.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonGetAuxActionPerformed(evt);
}
});
buttonPutAux.setText("Put Aux");
buttonPutAux.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonPutAuxActionPerformed(evt);
}
});
@@ -452,23 +468,25 @@ public class Commands extends Panel {
.addContainerGap()
.addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonMovePark, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonHomingHexiposi)
.addComponent(buttonMoveAux)
.addComponent(buttonMoveCold, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonMoveHeater)
.addComponent(buttonGetGonio)
.addComponent(buttonGetDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonGetDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonGetAux, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 54, Short.MAX_VALUE)
.addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonPutDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonPutGonio, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonMoveGonio, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonMoveHome, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonMoveDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(buttonMoveScanner))
.addComponent(buttonMoveScanner)
.addComponent(buttonPutAux, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap())
);
pnLowLevelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonGetDewar, buttonGetGonio, buttonHomingHexiposi, buttonMoveCold, buttonMoveDewar, buttonMoveGonio, buttonMoveHeater, buttonMoveHome, buttonMovePark, buttonMoveScanner, buttonPutDewar, buttonPutGonio});
pnLowLevelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonGetAux, buttonGetDewar, buttonGetGonio, buttonMoveAux, buttonMoveCold, buttonMoveDewar, buttonMoveGonio, buttonMoveHeater, buttonMoveHome, buttonMovePark, buttonMoveScanner, buttonPutAux, buttonPutDewar, buttonPutGonio});
pnLowLevelLayout.setVerticalGroup(
pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -479,13 +497,17 @@ public class Commands extends Panel {
.addComponent(buttonPutDewar))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonGetGonio)
.addComponent(buttonPutGonio))
.addComponent(buttonGetAux)
.addComponent(buttonPutAux))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonMoveGonio)
.addComponent(buttonHomingHexiposi))
.addComponent(buttonGetGonio)
.addComponent(buttonPutGonio))
.addGap(18, 18, 18)
.addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonMoveGonio)
.addComponent(buttonMoveAux))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonMovePark)
.addComponent(buttonMoveHome))
@@ -620,9 +642,9 @@ public class Commands extends Panel {
}//GEN-LAST:event_buttonMountActionPerformed
private void buttonHomingHexiposiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonHomingHexiposiActionPerformed
execute("homing_hexiposi()");
}//GEN-LAST:event_buttonHomingHexiposiActionPerformed
private void buttonMoveAuxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMoveAuxActionPerformed
execute("move_aux()");
}//GEN-LAST:event_buttonMoveAuxActionPerformed
private void buttonUnmountActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonUnmountActionPerformed
String segment = (String) spinnerSegment.getValue();
@@ -721,14 +743,25 @@ public class Commands extends Panel {
execute("scan_puck('" + segment + "'," + puck + ", force=" + force + ")", false, true);
}//GEN-LAST:event_buttonScanPin1ActionPerformed
private void buttonGetAuxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGetAuxActionPerformed
int sample = (Integer) spinnerSample.getValue();
execute("get_aux('" + sample + ")");
}//GEN-LAST:event_buttonGetAuxActionPerformed
private void buttonPutAuxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPutAuxActionPerformed
int sample = (Integer) spinnerSample.getValue();
execute("put_aux('" + sample + ")");
}//GEN-LAST:event_buttonPutAuxActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonClearSampleDb;
private javax.swing.JButton buttonDry;
private javax.swing.JButton buttonEnableAll;
private javax.swing.JButton buttonGetAux;
private javax.swing.JButton buttonGetDewar;
private javax.swing.JButton buttonGetGonio;
private javax.swing.JButton buttonHomingHexiposi;
private javax.swing.JButton buttonMount;
private javax.swing.JButton buttonMoveAux;
private javax.swing.JButton buttonMoveCold;
private javax.swing.JButton buttonMoveDewar;
private javax.swing.JButton buttonMoveGonio;
@@ -736,6 +769,7 @@ public class Commands extends Panel {
private javax.swing.JButton buttonMoveHome;
private javax.swing.JButton buttonMovePark;
private javax.swing.JButton buttonMoveScanner;
private javax.swing.JButton buttonPutAux;
private javax.swing.JButton buttonPutDewar;
private javax.swing.JButton buttonPutGonio;
private javax.swing.JButton buttonRecover;

3
plugins/HexiposiPanel.java
View File

@@ -87,7 +87,8 @@ public class HexiposiPanel extends DevicePanel {
private void buttonHomingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonHomingActionPerformed
try {
Context.getInstance().evalLineAsync("hexiposi.move_home()").handle((ret, ex) -> {
//Context.getInstance().evalLineAsync("hexiposi.move_home()").handle((ret, ex) -> {
Context.getInstance().evalLineAsync("homing_hexiposi()").handle((ret, ex) -> {
if (ex != null){
showException((Exception)ex);
}