src/main/java/ch/psi/mxsc/Sample.java

@@ -23,7 +23,7 @@ public class Sample extends DeviceBase {
     final int index;    
 
     public Sample(Puck puck, int index){
-        super((puck.getIndex()+1) + ":" + (index+1));
+        super(puck.getName() + ":" + (index+1));
         setParent(puck);
         this.index = index;
     }
@@ -55,7 +55,7 @@ public class Sample extends DeviceBase {
     boolean selected;
 
     public boolean isSelected() {
-        return selected;
+        return selected  && getPuck().getBasePlate().isSelectable();
     }
 
     public void setSelected(boolean value) {
@@ -112,7 +112,7 @@ public class Sample extends DeviceBase {
             ret = Color.CYAN.darker().darker();
         }
 
-        if (selected) {
+        if (isSelected()) {
             ret = ret.brighter();
         }
         return ret;
@@ -141,7 +141,7 @@ public class Sample extends DeviceBase {
 
     
     Color getLabelColor(boolean drawBackground) {
-        return drawBackground ? Color.DARK_GRAY : new Color (0,128,0);
+        return drawBackground ? Color.DARK_GRAY : new Color (0,96,0);
     }
     
     Font getLabelFont() {