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

Link samples table to GUI events

Browse Source
This commit is contained in:
gobbo_a
2018-09-12 11:49:22 +02:00
parent e2e7a7e872
commit f32260086f
4 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,8 +365,8 @@ public class BasePlatePanel extends DevicePanel {
void selectSample(Sample sample){
if (getSelectionMode()==SelectionMode.Samples){
sample.setSelected(true);
repaint();
Controller.getInstance().onSamplePressed(sample);
repaint();
}
}
@@ -389,7 +389,6 @@ public class BasePlatePanel extends DevicePanel {
}
void onSamplePopupMenu(MouseEvent e,Sample sample){
System.out.println(sample);
menuLoadSample.setEnabled(sample.isPresent() && getDevice().getLoadedSample()==null);
menuUnloadSample.setEnabled(!sample.isPresent() && getDevice().getLoadedSample()!=null);
samplePopupMenu.show(e.getComponent(), e.getX(), e.getY());
@@ -406,8 +405,8 @@ public class BasePlatePanel extends DevicePanel {
void selectPuck(Puck puck){
if (getSelectionMode()!=SelectionMode.None){
puck.setSelected(true);
repaint();
Controller.getInstance().onPuckPressed(puck);
repaint();
}
}
@@ -440,7 +439,6 @@ public class BasePlatePanel extends DevicePanel {
void onPuckPopupMenu(MouseEvent e, Puck puck){
System.out.println(puck);
}
void onPuckDoubleClicked(MouseEvent e, Puck puck){