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

Replaced gripper cam to monitoring cam in main panel

Browse Source
This commit is contained in:
gac-S_Changer
2019-07-02 13:37:32 +02:00
parent 65e6c47aa8
commit 5f4b6792c6
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/ch/psi/mxsc/DevicesPanel.form
View File

@@ -60,12 +60,12 @@
<Component id="labelSmartMagnet" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="ledGripperImage" min="-2" max="-2" attributes="0"/>
<Component id="ledMonitorCamera" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="labelGripperImage" min="-2" max="-2" attributes="0"/>
<Component id="labelMonitorCamera" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -114,8 +114,8 @@
</Group>
<EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="ledGripperImage" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelGripperImage" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="ledMonitorCamera" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelMonitorCamera" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
@@ -167,7 +167,7 @@
</Component>
<Component class="ch.psi.mxsc.HyperlinkLabel" name="labelCamera">
<Properties>
<Property name="text" type="java.lang.String" value="Camera"/>
<Property name="text" type="java.lang.String" value="Dewar Camera"/>
<Property name="active" type="boolean" value="true"/>
</Properties>
<Events>
@@ -235,18 +235,18 @@
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="labelSmartMagnetMouseClicked"/>
</Events>
</Component>
<Component class="ch.psi.pshell.swing.Led" name="ledGripperImage">
<Component class="ch.psi.pshell.swing.Led" name="ledMonitorCamera">
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="labelGripperImageMouseClicked"/>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="labelMonitorCameraMouseClicked"/>
</Events>
</Component>
<Component class="ch.psi.mxsc.HyperlinkLabel" name="labelGripperImage">
<Component class="ch.psi.mxsc.HyperlinkLabel" name="labelMonitorCamera">
<Properties>
<Property name="text" type="java.lang.String" value="Gripper Image"/>
<Property name="text" type="java.lang.String" value="Monitoring Camera"/>
<Property name="active" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="labelGripperImageMouseClicked"/>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="labelMonitorCameraMouseClicked"/>
</Events>
</Component>
</SubComponents>

46
src/main/java/ch/psi/mxsc/DevicesPanel.java
View File

@@ -25,7 +25,7 @@ public class DevicesPanel extends javax.swing.JPanel {
GenericDevice puck_detection;
GenericDevice sm;
GenericDevice img;
GenericDevice gripper_cam;
GenericDevice monitor_cam;
boolean imagingEnabled;
@@ -76,7 +76,7 @@ public class DevicesPanel extends javax.swing.JPanel {
laser = Controller.getInstance().getDevice("ue");
puck_detection = Controller.getInstance().getDevice("puck_detection");
img = imagingEnabled ? Controller.getInstance().getDevice("img") : null;
gripper_cam = Controller.getInstance().getDevice("gripper_cam");
monitor_cam = Controller.getInstance().getDevice("monitoring_cam");
sm = Controller.getInstance().getDevice("smart_magnet");
update();
for (GenericDevice dev : getDevices()){
@@ -93,7 +93,7 @@ public class DevicesPanel extends javax.swing.JPanel {
setLedState(ledBarcodeReader, barcode_reader_puck);
}
setLedState(ledCamera, img);
setLedState(ledGripperImage, gripper_cam);
setLedState(ledMonitorCamera, monitor_cam);
setLedState(ledHexiposi, hexiposi);
setLedState(ledLaser, laser);
setLedState(ledPuckDetection, puck_detection);
@@ -159,7 +159,7 @@ public class DevicesPanel extends javax.swing.JPanel {
public void setActive(boolean value){
active = value;
labelCamera.setActive(value);
labelGripperImage.setActive(value);
labelMonitorCamera.setActive(value);
labelHexiposi.setActive(value);
labelLaser.setActive(value);
labelPuckDetection.setActive(value);
@@ -198,8 +198,8 @@ public class DevicesPanel extends javax.swing.JPanel {
ledPuckDetection = new ch.psi.pshell.swing.Led();
ledSmartMagnet = new ch.psi.pshell.swing.Led();
labelSmartMagnet = new ch.psi.mxsc.HyperlinkLabel();
ledGripperImage = new ch.psi.pshell.swing.Led();
labelGripperImage = new ch.psi.mxsc.HyperlinkLabel();
ledMonitorCamera = new ch.psi.pshell.swing.Led();
labelMonitorCamera = new ch.psi.mxsc.HyperlinkLabel();
labelRobot.setText("Robot");
labelRobot.setActive(true);
@@ -243,7 +243,7 @@ public class DevicesPanel extends javax.swing.JPanel {
}
});
labelCamera.setText("Camera");
labelCamera.setText("Dewar Camera");
labelCamera.setActive(true);
labelCamera.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
@@ -313,17 +313,17 @@ public class DevicesPanel extends javax.swing.JPanel {
}
});
ledGripperImage.addMouseListener(new java.awt.event.MouseAdapter() {
ledMonitorCamera.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
labelGripperImageMouseClicked(evt);
labelMonitorCameraMouseClicked(evt);
}
});
labelGripperImage.setText("Gripper Image");
labelGripperImage.setActive(true);
labelGripperImage.addMouseListener(new java.awt.event.MouseAdapter() {
labelMonitorCamera.setText("Monitoring Camera");
labelMonitorCamera.setActive(true);
labelMonitorCamera.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
labelGripperImageMouseClicked(evt);
labelMonitorCameraMouseClicked(evt);
}
});
@@ -367,10 +367,10 @@ public class DevicesPanel extends javax.swing.JPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(labelSmartMagnet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(ledGripperImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(ledMonitorCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(labelGripperImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(labelMonitorCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGap(0, 0, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -409,8 +409,8 @@ public class DevicesPanel extends javax.swing.JPanel {
.addComponent(labelSmartMagnet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(ledGripperImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelGripperImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(ledMonitorCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelMonitorCamera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
@@ -454,16 +454,16 @@ public class DevicesPanel extends javax.swing.JPanel {
showDevicePanel("puck_detection");
}//GEN-LAST:event_ledPuckDetectionMouseClicked
private void labelGripperImageMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_labelGripperImageMouseClicked
showRenderer("gripper_cam");
}//GEN-LAST:event_labelGripperImageMouseClicked
private void labelMonitorCameraMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_labelMonitorCameraMouseClicked
showRenderer("monitoring_cam");
}//GEN-LAST:event_labelMonitorCameraMouseClicked
// Variables declaration - do not modify//GEN-BEGIN:variables
private ch.psi.mxsc.HyperlinkLabel labelCamera;
private ch.psi.mxsc.HyperlinkLabel labelGripperImage;
private ch.psi.mxsc.HyperlinkLabel labelHexiposi;
private ch.psi.mxsc.HyperlinkLabel labelLaser;
private ch.psi.mxsc.HyperlinkLabel labelMonitorCamera;
private ch.psi.mxsc.HyperlinkLabel labelPuckDetection;
private ch.psi.mxsc.HyperlinkLabel labelReader;
private ch.psi.mxsc.HyperlinkLabel labelRobot;
@@ -471,9 +471,9 @@ public class DevicesPanel extends javax.swing.JPanel {
private ch.psi.mxsc.HyperlinkLabel labelWago;
private ch.psi.pshell.swing.Led ledBarcodeReader;
private ch.psi.pshell.swing.Led ledCamera;
private ch.psi.pshell.swing.Led ledGripperImage;
private ch.psi.pshell.swing.Led ledHexiposi;
private ch.psi.pshell.swing.Led ledLaser;
private ch.psi.pshell.swing.Led ledMonitorCamera;
private ch.psi.pshell.swing.Led ledPuckDetection;
private ch.psi.pshell.swing.Led ledRobot;
private ch.psi.pshell.swing.Led ledSmartMagnet;