Skip to content

Commit

Permalink
hide decimals
Browse files Browse the repository at this point in the history 
- Added the ability to change the formatting on the YAXIS (default is now #.##).
- Changed version to match the core.
  • Loading branch information
Kostas Manios committed Jan 21, 2021
1 parent 06bd80c commit bc4d48b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
5 changes: 5 additions & 0 deletions microsim-gui/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<linkedResources>
<link>
<name>src/main/java/microsim/gui/plot/Weighted_PyramidDataset.java</name>
</link>
</linkedResources>
</projectDescription>
2 changes: 1 addition & 1 deletion microsim-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</properties>
<groupId>com.github.jasmineRepo</groupId>
<artifactId>JAS-mine-gui</artifactId>
<version>4.0.9</version>
<version>4.0.10</version>
<build>
<plugins>
<plugin>
Expand Down
23 changes: 14 additions & 9 deletions microsim-gui/src/main/java/microsim/gui/plot/Weighted_PyramidPlotter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public class Weighted_PyramidPlotter extends JInternalFrame implements EventList
public static String DEFAULT_LEFT_CAT = "Males";
public static String DEFAULT_RIGHT_CAT = "Females";
public static Boolean DEFAULT_REVERSE_ORDER = false;
public static String DEFAULT_YAXIS_FORMAT = "#.##";
private static int MAXIMUM_VISIBLE_CATEGORIES = 20;

/**
Expand All @@ -93,6 +94,8 @@ public class Weighted_PyramidPlotter extends JInternalFrame implements EventList

private String yaxis;

private String yaxisFormat = DEFAULT_YAXIS_FORMAT;

private final String[] catNames = new String[2];

private GroupName[] groupNames;
Expand Down Expand Up @@ -168,7 +171,7 @@ public Weighted_PyramidPlotter(String title, String xaxis, String yaxis, String
*
*/
public Weighted_PyramidPlotter(int start, int end, int step) {
this(DEFAULT_TITLE, DEFAULT_XAXIS, DEFAULT_YAXIS, DEFAULT_LEFT_CAT, DEFAULT_RIGHT_CAT, start, end, step, DEFAULT_REVERSE_ORDER);
this(DEFAULT_TITLE, DEFAULT_XAXIS, DEFAULT_YAXIS, DEFAULT_LEFT_CAT, DEFAULT_RIGHT_CAT, start, end, step, DEFAULT_REVERSE_ORDER, DEFAULT_YAXIS_FORMAT);
}

/**
Expand All @@ -183,7 +186,7 @@ public Weighted_PyramidPlotter(int start, int end, int step) {
*
*/
public Weighted_PyramidPlotter(int start, int end, int step, Boolean reverseOrder) {
this(DEFAULT_TITLE, DEFAULT_XAXIS, DEFAULT_YAXIS, DEFAULT_LEFT_CAT, DEFAULT_RIGHT_CAT, start, end, step, reverseOrder);
this(DEFAULT_TITLE, DEFAULT_XAXIS, DEFAULT_YAXIS, DEFAULT_LEFT_CAT, DEFAULT_RIGHT_CAT, start, end, step, reverseOrder, DEFAULT_YAXIS_FORMAT);
}

/**
Expand All @@ -202,12 +205,13 @@ public Weighted_PyramidPlotter(int start, int end, int step, Boolean reverseOrde
* @param reverseOrder - if true, it will reverse the groups
*
*/
public Weighted_PyramidPlotter(String title, String xaxis, String yaxis, String leftCat, String rightCat, int start, int end, int step, Boolean reverseOrder) {
public Weighted_PyramidPlotter(String title, String xaxis, String yaxis, String leftCat, String rightCat, int start, int end, int step, Boolean reverseOrder, String format) {
if (step == 0) return;
fixTitles(title, xaxis, yaxis, leftCat, rightCat);
yaxisFormat = format;

// Create the groups based on the range, and save them to "this"
GroupDetails gd = makeGroupsFromRange(start, end, step, reverseOrder);
GroupDetails gd = makeGroupsFromRange(start, end, step, reverseOrder, format);
this.groupNames = gd.groupNames;
this.groupRanges = gd.groupRanges;

Expand All @@ -224,7 +228,7 @@ public Weighted_PyramidPlotter(String title, String xaxis, String yaxis, String
*
*/
public Weighted_PyramidPlotter(String[] groupNames, double[][] groupRanges) {
this(DEFAULT_TITLE, DEFAULT_XAXIS, DEFAULT_YAXIS, DEFAULT_LEFT_CAT, DEFAULT_RIGHT_CAT, groupNames, groupRanges);
this(DEFAULT_TITLE, DEFAULT_XAXIS, DEFAULT_YAXIS, DEFAULT_LEFT_CAT, DEFAULT_RIGHT_CAT, groupNames, groupRanges, DEFAULT_YAXIS_FORMAT);
}

/**
Expand All @@ -240,8 +244,9 @@ public Weighted_PyramidPlotter(String[] groupNames, double[][] groupRanges) {
* @param groupRanges - an array of the min/max values of each group
*
*/
public Weighted_PyramidPlotter(String title, String xaxis, String yaxis, String leftCat, String rightCat, String[] groupNames, double[][] groupRanges) {
public Weighted_PyramidPlotter(String title, String xaxis, String yaxis, String leftCat, String rightCat, String[] groupNames, double[][] groupRanges, String format) {
fixTitles(title, xaxis, yaxis, leftCat, rightCat);
yaxisFormat = format;

// Fix names
this.groupNames = groupNames==null ? null : getGroupNamesFromStrings(groupNames);
Expand All @@ -260,7 +265,7 @@ private void fixTitles(String title, String xaxis, String yaxis, String leftCat,
}

// the function that calculates groups from a range
private GroupDetails makeGroupsFromRange(int start, int end, int step, Boolean reverseOrder) {
private GroupDetails makeGroupsFromRange(int start, int end, int step, Boolean reverseOrder, String format) {
// First we calculate the optimal (visually at least!) number of groups, so that
// the last group ends with "max" and its size is "(0.5 * step) < size < (1.5*step)"
int noOfGroups = (int)Math.max(Math.round((double)(end - start) / (double)step) + (Math.abs(step)==1?1:0), 1);
Expand All @@ -287,7 +292,7 @@ private GroupDetails makeGroupsFromRange(int start, int end, int step, Boolean r
// <to> is equal to the next group's "<from> - 1", but for the last group it is equal to "end"
groupRanges[i][asc?1:0] = (i == noOfGroups-1) ? end : (start + (i+1) * step) - (asc?1:-1);
// for the name, if step=1 use the step value, else show as "from - to" (inclusive)
groupNames[i] = groupRanges[i][0]==groupRanges[i][1] ? String.valueOf(groupRanges[i][0]) : groupRanges[i][asc?0:1] + " - " + groupRanges[i][asc?1:0];
groupNames[i] = groupRanges[i][0]==groupRanges[i][1] ? new DecimalFormat(format).format(groupRanges[i][0]) : new DecimalFormat(format).format(groupRanges[i][asc?0:1]) + " - " + new DecimalFormat(format).format(groupRanges[i][asc?1:0]);

}

Expand Down Expand Up @@ -361,7 +366,7 @@ public void update() {
int min = (int)Math.min(Arrays.stream(vals[0]).min().orElse(0), Arrays.stream(vals[1]).min().orElse(0)); // if there is no data, set min to 0
int max = (int)Math.min(Arrays.stream(vals[0]).max().orElse(100), Arrays.stream(vals[1]).max().orElse(100)); // if there is no data, set max to 100
// Create the groups based on the range, and save them to the local variables
GroupDetails gd = makeGroupsFromRange(min, max, 1, true);
GroupDetails gd = makeGroupsFromRange(min, max, 1, true, yaxisFormat);
groupNames = gd.groupNames;
groupRanges = gd.groupRanges;
}
Expand Down

0 comments on commit bc4d48b

Please sign in to comment.