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

Fix bug clicking sample not assigned to puck

Browse Source
This commit is contained in:
gac-S_Changer
2020-09-01 10:07:24 +02:00
parent 9e34b9fa69
commit c3e7c3f107
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ch/psi/mxsc/BasePlatePanel.java
View File

@@ -364,7 +364,9 @@ public class BasePlatePanel extends DevicePanel {
void selectSample(Sample sample){
if (getSelectionMode()==SelectionMode.Samples){
sample.setSelected(true);
if (sample!=null){
sample.setSelected(true);
}
Controller.getInstance().onSamplePressed(sample);
repaint();
}
@@ -404,7 +406,11 @@ public class BasePlatePanel extends DevicePanel {
void selectPuck(Puck puck){
if (getSelectionMode()!=SelectionMode.None){
puck.setSelected(true);
if (puck != null){
puck.setSelected(true);
} else {
getDevice().resetSelection();
}
Controller.getInstance().onPuckPressed(puck);
repaint();
}