This commit is contained in:
gac-S_Changer
2018-09-26 16:49:28 +02:00
parent ea1b2bad2a
commit e59582ad02
9 changed files with 36 additions and 14 deletions

Binary file not shown.

View File

@@ -141,8 +141,8 @@
<Table columnCount="6" rowCount="30">
<Column editable="false" title="Puck" type="java.lang.String"/>
<Column editable="false" title="Online" type="java.lang.Boolean"/>
<Column editable="false" title="Mechanical" type="java.lang.Boolean"/>
<Column editable="false" title="Inductive" type="java.lang.Boolean"/>
<Column editable="false" title="Mechanical" type="java.lang.String"/>
<Column editable="false" title="Inductive" type="java.lang.String"/>
<Column editable="false" title="Detection" type="java.lang.String"/>
<Column editable="false" title="Image" type="java.lang.String"/>
</Table>

View File

@@ -1,6 +1,7 @@
import ch.psi.mxsc.Puck;
import ch.psi.mxsc.PuckDetection;
import ch.psi.mxsc.PuckState;
import ch.psi.mxsc.PuckState.SwitchState;
import ch.psi.pshell.core.Context;
import ch.psi.pshell.swing.DevicePanel;
import ch.psi.utils.swing.SwingUtils;
@@ -36,8 +37,8 @@ public class PuckDetectionPanel extends DevicePanel {
int id = puck.getIndex() + 1;
PuckState state = getDevice().getPuckState(id);
table.getModel().setValueAt(state.online, row, 1);
table.getModel().setValueAt(state.mecSwitch, row, 2);
table.getModel().setValueAt(state.indSwitch, row, 3);
table.getModel().setValueAt((SwitchState.Off == state.mecSwitch) ? "" : String.valueOf(state.mecSwitch), row, 2);
table.getModel().setValueAt((SwitchState.Off == state.indSwitch) ? "" : String.valueOf(state.indSwitch), row, 3);
table.getModel().setValueAt(puck.getDetection() == null ? "" : puck.getDetection(), row, 4);
table.getModel().setValueAt(puck.getPuckType() == null ? "" : puck.getPuckType(), row, 5);
} catch (Exception ex) {
@@ -169,7 +170,7 @@ public class PuckDetectionPanel extends DevicePanel {
}
) {
Class[] types = new Class [] {
java.lang.String.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.String.class, java.lang.String.class
java.lang.String.class, java.lang.Boolean.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class
};
boolean[] canEdit = new boolean [] {
false, false, false, false, false, false