Closedown
This commit is contained in:
@@ -26,23 +26,6 @@ public class Microscope extends Panel {
|
||||
@Override
|
||||
public void onInitialize(int runCount) {
|
||||
|
||||
final Overlay overlay = new Overlays.Rect(new Pen(Color.RED), new Point(10,10), new Point(50,50));
|
||||
renderer.addOverlay(overlay);
|
||||
overlay.setMovable(true);
|
||||
overlay.setSolid(false);
|
||||
|
||||
renderer.addListener(new RendererListener() {
|
||||
public void onMouseDragged(Renderer renderer, Point p) {
|
||||
//sendOutput(p.toString());
|
||||
System.out.println((p.x - renderer.getImageSize().width/2) + " - " + (p.y - renderer.getImageSize().height/2));
|
||||
}
|
||||
|
||||
public void onMoveFinished(Renderer renderer, Overlay ov) {
|
||||
if (ov == overlay){
|
||||
System.out.println(ov.getPosition().toString());
|
||||
}
|
||||
}
|
||||
} );
|
||||
|
||||
}
|
||||
|
||||
@@ -66,28 +49,26 @@ public class Microscope extends Panel {
|
||||
private void initComponents() {
|
||||
|
||||
renderer = new ch.psi.pshell.imaging.Renderer();
|
||||
jButton1 = new javax.swing.JButton();
|
||||
motorPanel1 = new ch.psi.pshell.swing.MotorPanel();
|
||||
processVariablePanel1 = new ch.psi.pshell.swing.ProcessVariablePanel();
|
||||
buttonDefineBeam = new javax.swing.JButton();
|
||||
motorPanel2 = new ch.psi.pshell.swing.MotorPanel();
|
||||
processVariablePanel2 = new ch.psi.pshell.swing.ProcessVariablePanel();
|
||||
|
||||
renderer.setAutoscrolls(true);
|
||||
renderer.setDeviceName("mic-low");
|
||||
renderer.setMode(ch.psi.pshell.imaging.RendererMode.Fixed);
|
||||
renderer.setShowStatus(false);
|
||||
|
||||
jButton1.setText("Wait click");
|
||||
jButton1.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
jButton1ActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
motorPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("cy"));
|
||||
motorPanel1.setDeviceName("cy");
|
||||
motorPanel1.setShowAdvanced(false);
|
||||
motorPanel1.setShowStatus(false);
|
||||
motorPanel1.setShowTitle(true);
|
||||
|
||||
processVariablePanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
|
||||
processVariablePanel1.setDeviceName("omega");
|
||||
processVariablePanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("x"));
|
||||
processVariablePanel1.setDeviceName("x");
|
||||
processVariablePanel1.setShowSlider(false);
|
||||
processVariablePanel1.setShowTitle(true);
|
||||
|
||||
buttonDefineBeam.setText("Define Beam");
|
||||
@@ -97,58 +78,58 @@ public class Microscope extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
motorPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("cz"));
|
||||
motorPanel2.setDeviceName("cz");
|
||||
motorPanel2.setShowAdvanced(false);
|
||||
motorPanel2.setShowStatus(false);
|
||||
motorPanel2.setShowTitle(true);
|
||||
|
||||
processVariablePanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("omega"));
|
||||
processVariablePanel2.setDeviceName("omega");
|
||||
processVariablePanel2.setShowSlider(false);
|
||||
processVariablePanel2.setShowTitle(true);
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||
this.setLayout(layout);
|
||||
layout.setHorizontalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, 108, Short.MAX_VALUE)
|
||||
.addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 113, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(motorPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(processVariablePanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addGap(123, 123, 123)
|
||||
.addComponent(buttonDefineBeam)))
|
||||
.addComponent(buttonDefineBeam))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
.addComponent(motorPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(motorPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(processVariablePanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(processVariablePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {motorPanel1, motorPanel2, processVariablePanel1, processVariablePanel2});
|
||||
|
||||
layout.setVerticalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGap(5, 5, 5))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(jButton1)
|
||||
.addGap(42, 42, 42)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(motorPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(111, 111, 111)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(motorPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(processVariablePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 93, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(processVariablePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 159, Short.MAX_VALUE)
|
||||
.addComponent(buttonDefineBeam)
|
||||
.addGap(26, 26, 26))
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||
try{
|
||||
new Thread(()->{
|
||||
try {
|
||||
Point p = renderer.waitClick(10000);
|
||||
System.out.println(p);
|
||||
} catch (Exception ex) {
|
||||
}
|
||||
jButton1.setEnabled(true);
|
||||
|
||||
}).start();
|
||||
jButton1.setEnabled(false);
|
||||
} catch (Exception ex){
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_jButton1ActionPerformed
|
||||
|
||||
Overlay beam;
|
||||
|
||||
@@ -160,6 +141,7 @@ public class Microscope extends Panel {
|
||||
renderer.addListener(new RendererListener() {
|
||||
@Override
|
||||
public void onSelectionFinished(Renderer renderer, Overlay overlay) {
|
||||
System.out.println(overlay + " - " + selection + " - " + (overlay == selection));
|
||||
if (overlay == selection){
|
||||
try {
|
||||
if (overlay.getLength() > 0) {
|
||||
@@ -167,7 +149,7 @@ public class Microscope extends Panel {
|
||||
beam.setPen(pen);
|
||||
beam.setSolid(false);
|
||||
beam.setMovable(true);
|
||||
//renderer.addOverlay(beam);
|
||||
renderer.addOverlay(beam);
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
getLogger().log(Level.WARNING, null, ex);
|
||||
@@ -194,9 +176,10 @@ public class Microscope extends Panel {
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JButton buttonDefineBeam;
|
||||
private javax.swing.JButton jButton1;
|
||||
private ch.psi.pshell.swing.MotorPanel motorPanel1;
|
||||
private ch.psi.pshell.swing.MotorPanel motorPanel2;
|
||||
private ch.psi.pshell.swing.ProcessVariablePanel processVariablePanel1;
|
||||
private ch.psi.pshell.swing.ProcessVariablePanel processVariablePanel2;
|
||||
private ch.psi.pshell.imaging.Renderer renderer;
|
||||
// End of variables declaration//GEN-END:variables
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user