hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More elegant way of getting the unit for the tooltip

Browse Source
This commit is contained in:
SiboVG 2024-08-23 23:01:18 +02:00
parent 8ed6370e24
commit 33fe5bf9c6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
swing/src/main/java/info/openrocket/swing/gui/plot/Plot.java
View File

@ -200,15 +200,9 @@ public abstract class Plot<T extends DataType, B extends DataBranch<T>, C extend
if (collection.getSeriesCount() == 0) { if (collection.getSeriesCount() == 0) {
return null; return null;
} }
XYSeries ser = collection.getSeries(series); MetadataXYSeries ser = (MetadataXYSeries) collection.getSeries(series);
String name = ser.getDescription(); String name = ser.getDescription();
String unitY = ser.getUnit();
// Extract the unit from the last part of the series description, between parenthesis
Matcher m = Pattern.compile(".*\\((.*?)\\)").matcher(name);
String unitY = "";
if (m.find()) {
unitY = m.group(1);
}
String unitX = domainUnit.getUnit(); String unitX = domainUnit.getUnit();
double dataY = dataset.getYValue(series, item); double dataY = dataset.getYValue(series, item);
@ -277,7 +271,7 @@ public abstract class Plot<T extends DataType, B extends DataBranch<T>, C extend
protected List<XYSeries> createSeriesForType(int dataIndex, int startIndex, T type, Unit unit, B branch, protected List<XYSeries> createSeriesForType(int dataIndex, int startIndex, T type, Unit unit, B branch,
String baseName) { String baseName) {
// Default implementation for regular DataBranch // Default implementation for regular DataBranch
XYSeries series = new XYSeries(startIndex, false, true); MetadataXYSeries series = new MetadataXYSeries(startIndex, false, true, unit.getUnit());
series.setDescription(baseName); series.setDescription(baseName);
List<Double> plotx = branch.get(filledConfig.getDomainAxisType()); List<Double> plotx = branch.get(filledConfig.getDomainAxisType());
@ -532,6 +526,18 @@ public abstract class Plot<T extends DataType, B extends DataBranch<T>, C extend
} }
super.setRange(new Range(lowerValue, upperValue)); super.setRange(new Range(lowerValue, upperValue));
} }
}
protected class MetadataXYSeries extends XYSeries {
private final String unit;
public MetadataXYSeries(Comparable key, boolean autoSort, boolean allowDuplicateXValues, String unit) {
super(key, autoSort, allowDuplicateXValues);
this.unit = unit;
}
public String getUnit() {
return unit;
}
} }
} }