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

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

@@ -68,14 +68,16 @@ public class MainPanel extends Panel {
@Override
public void valueChanged(ListSelectionEvent e) {
try {
String add = String.valueOf(tablePucks.getModel().getValueAt(tablePucks.getSelectedRow(), 0));
String cur = Controller.getInstance().getCurrentSelection();
if (cur != null) {
cur = cur.substring(0, 2);
}
if (!add.equals(cur)) {
Puck puck = Controller.getInstance().getPuck(add);
Controller.getInstance().selectPuck(puck);
if (e.getValueIsAdjusting() == false) {
String add = String.valueOf(tablePucks.getModel().getValueAt(tablePucks.getSelectedRow(), 0));
String cur = Controller.getInstance().getCurrentSelection();
if (cur != null) {
cur = cur.substring(0, 2);
}
if (!add.equals(cur)) {
Puck puck = Controller.getInstance().getPuck(add);
Controller.getInstance().selectPuck(puck);
}
}
} catch (Exception ex) {
showException(ex);
@@ -87,18 +89,30 @@ public class MainPanel extends Panel {
@Override
public void valueChanged(ListSelectionEvent e) {
try {
if (e.getValueIsAdjusting() == false) {
int selection = tableSamples.getSelectedRow();
if (selection>=0){
String add = String.valueOf(tableSamples.getModel().getValueAt(selection, 3));
if (!add.trim().isEmpty()) {
String cur = Controller.getInstance().getCurrentSelection();
if (cur != null) {
cur = cur.substring(0, 2);
}
if (!add.equals(cur)) {
Puck puck = Controller.getInstance().getPuck(add);
Controller.getInstance().selectPuck(puck);
}
if (selection>=0){
String add = String.valueOf(tableSamples.getModel().getValueAt(selection, 3));
if (!add.trim().isEmpty()) {
int pos = -1;
try{
pos = Integer.valueOf(String.valueOf(tableSamples.getModel().getValueAt(selection, 7)));
} catch (Exception ex){
}
String curSelection = Controller.getInstance().getCurrentSelection();
String curPuck = (curSelection == null) ? null : curSelection.substring(0, 2);
if (!add.equals(curPuck)) {
Puck puck = Controller.getInstance().getPuck(add);
Controller.getInstance().selectPuck(puck);
}
if (pos>=0){
add += pos;
if (!add.equals(curSelection)) {
Sample sample = Controller.getInstance().getSample(add);
Controller.getInstance().selectSample(sample);
}
}
}
}
}
} catch (Exception ex) {
@@ -482,6 +496,11 @@ public class MainPanel extends Panel {
for (int i = 0; i < tableSamples.getModel().getRowCount(); i++) {
if (add.equals(tableSamples.getModel().getValueAt(i, 3))) {
if (sample!=null){
if (!sample.equals(tableSamples.getModel().getValueAt(i, 7))){
continue;
}
}
if (tableSamples.getSelectedRow() != i) {
tableSamples.setRowSelectionInterval(i, i);
SwingUtils.scrollToVisible(tableSamples, i, 0);