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

Closedown

Browse Source
This commit is contained in:
dworkowski
2015-11-10 15:03:28 +01:00
parent 5b9ebe0e00
commit 1ed373e88d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Microscope.java
View File

@@ -7,11 +7,10 @@ import ch.psi.pshell.imaging.Overlays;
import ch.psi.pshell.imaging.Pen;
import ch.psi.pshell.imaging.Renderer;
import ch.psi.pshell.imaging.RendererListener;
import ch.psi.pshell.imaging.Source;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import java.awt.Color;
import java.awt.Point;
import java.nio.file.Paths;
import java.util.logging.Level;
/**
@@ -25,7 +24,7 @@ public class Microscope extends Panel {
//Overridable callbacks
@Override
public void onInitialize(int runCount) {
renderer.setPersistenceFile(Paths.get(getController().getSetup().getContextPath(), "BeamMarker.bin"));
}
@Override
@@ -119,13 +118,13 @@ public class Microscope extends Panel {
.addGap(5, 5, 5))
.addGroup(layout.createSequentialGroup()
.addComponent(motorPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.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)
.addComponent(processVariablePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 97, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 109, Short.MAX_VALUE)
.addComponent(buttonDefineBeam)
.addGap(26, 26, 26))
);
@@ -149,7 +148,7 @@ public class Microscope extends Panel {
beam.setPen(pen);
beam.setSolid(false);
beam.setMovable(true);
renderer.addOverlay(beam);
renderer.setMarker(beam);
}
} catch (Exception ex) {
getLogger().log(Level.WARNING, null, ex);