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

Manage {config} token in -setp option

Browse Source
This commit is contained in:
gobbo_a
2018-08-23 09:53:19 +02:00
parent 52a8daf5c0
commit 810740ddca
12 changed files with 624 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ch/psi/mxsc/MainPanel.java
View File

@@ -3,6 +3,7 @@
*/
package ch.psi.mxsc;
import ch.psi.mxsc.BasePlatePanel.SelectionMode;
import ch.psi.pshell.core.Context;
import ch.psi.pshell.core.JsonSerializer;
import ch.psi.pshell.core.Plugin;
@@ -15,7 +16,6 @@ import ch.psi.pshell.ui.App;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
import ch.psi.mxsc.BasePlate.SelectionMode;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -88,8 +88,8 @@ public class MainPanel extends Panel {
Image img = new ImageIcon(this.getClass().getResource("/apple_transparent_white_100x50.png")).getImage();
SwingUtils.getWindow(this).setIconImage(img);
}
basePlatePanel.setSelectionMode(SelectionMode.Pucks);
basePlatePanel.setDevice(Controller.getInstance().basePlate);
basePlatePanel.getDevice().setSelectionMode(SelectionMode.Pucks);
}
@Override
@@ -98,7 +98,6 @@ public class MainPanel extends Panel {
Controller.getInstance().onInitialize(runCount);
if (basePlatePanel.getDevice() != (Device) getDevice("BasePlate")){
basePlatePanel.setDevice((Device) getDevice("BasePlate"));
basePlatePanel.getDevice().setSelectionMode(SelectionMode.Pucks);
}
try {
devicesPanel.initialize();