This commit is contained in:
2018-04-19 17:35:54 +02:00
parent 1e2fee44d0
commit 109e81aecb
12 changed files with 315 additions and 181 deletions

View File

@@ -65,7 +65,7 @@ public class BasePlate extends DeviceBase {
for (int i = 0; i < numberOfPucks; i++) {
new Puck(this, i);
}
getPucks()[0].setSelected(true);
getPucks()[0].setSelected(true);
}
@Override
@@ -78,7 +78,15 @@ public class BasePlate extends DeviceBase {
return (BasePlateConfig) super.getConfig();
}
boolean selectable;
public boolean isSelectable() {
return selectable;
}
public void setSelectable(boolean selectable) {
this.selectable = selectable;
}
public Puck[] getPucks() {
ArrayList<Puck> ret = new ArrayList<>();
for (Device d : getChildren()) {
@@ -89,20 +97,24 @@ public class BasePlate extends DeviceBase {
Puck getSelectedPuck(){
for (Puck p:getPucks()){
if (p.isSelected()){
return p;
if (selectable){
for (Puck p:getPucks()){
if (p.isSelected()){
return p;
}
}
}
return null;
}
Sample getSelectedSample(){
Puck puck = getSelectedPuck();
if (puck != null){
for (Sample s: puck.getSamples()){
if (s.isSelected()){
return s;
if (selectable){
Puck puck = getSelectedPuck();
if (puck != null){
for (Sample s: puck.getSamples()){
if (s.isSelected()){
return s;
}
}
}
}