pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2022-07-05 11:23:28 +02:00
parent 13c53436ae
commit ca00a414ff
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/XPSSpectrum.java
View File

@@ -56,7 +56,7 @@ public class XPSSpectrum extends Panel {
rangeSelectionPanel.setDuplicateAllowed(true);
rangeSelectionPanel.setShowMiddle(showMiddle);
buttonSkip.setVisible(false);
rangeSelectionPanel.setAditionalColumns(new String[]{"Time", "Size", "Iter", "Eph"}, new Class[]{Double.class, Double.class, Integer.class, Double.class});
rangeSelectionPanel.setAditionalColumns(new String[]{"Time", "Size", "Iter", "Eph", "Name"}, new Class[]{Double.class, Double.class, Integer.class, Double.class, String.class});
final DefaultTableModel model = (DefaultTableModel) rangeSelectionPanel.getTable().getModel();
model.addTableModelListener(new TableModelListener() {
@Override
@@ -748,8 +748,17 @@ public class XPSSpectrum extends Panel {
rangeSelectionPanel.setSeries(series);
series.setData(x, y);
}
int indexUpper = ((table.length>0) && (table[0].length == 6)) ? 1 : 2;
System.out.println(indexUpper);
int indexUpper;
int varCols;
if (table.length>0){
boolean hasName = (table[0].length > 6) && (table[0][table[0].length-1] instanceof String);
int size_with_center = hasName?8:7;
indexUpper = (table[0].length >=size_with_center) ? 2 : 1;
varCols = table[0].length - indexUpper-1;
} else {
indexUpper=1;
varCols = 0;
}
for (Object[] row : table) {
rangeSelectionPanel.getPlot().addRange((Double) row[0], (Double) row[indexUpper]);
}
@@ -758,7 +767,7 @@ public class XPSSpectrum extends Panel {
@Override
public void run() {
for (int row = 0; row < table.length; row++) {
for (int col = 0; col < 4; col++) {
for (int col = 0; col < varCols; col++) {
rangeSelectionPanel.getTable().setValueAt(table[row][col + indexUpper + 1], row, col + indexTime);
}
}