Skip to content

GitHub Issue #1434 Add visual padding to automatically generated X and Y axis ranges in charts#3166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnathe merged 6 commits into from
Aug 25, 2026
Merged

GitHub Issue #1434 Add visual padding to automatically generated X and Y axis ranges in charts #3166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bba786b
Selenium test updates to expected chart numeric tick labels
cnathe Aug 20, 2026
1133164
Merge remote-tracking branch 'origin/develop' into fb_chartPadding1434
cnathe Aug 21, 2026
2936992
Selenium test updates to expected chart numeric tick labels
cnathe Aug 21, 2026
274a0d5
Merge remote-tracking branch 'origin/develop' into fb_chartPadding1434
cnathe Aug 24, 2026
84e0945
Selenium test updates to expected chart numeric tick labels
cnathe Aug 24, 2026
6a8ee81
Selenium test updates to expected chart numeric tick labels
cnathe Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/chartingapi/resources/views/interactivityTest.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,8 +84,8 @@
}
},
scales: {
x: {scaleType: 'continuous', trans: 'linear', domain: [0, null]},
yLeft: {scaleType: 'continuous', trans: 'linear', domain: [0, null]},
x: {scaleType: 'continuous', trans: 'linear', domain: [0, 630]},
yLeft: {scaleType: 'continuous', trans: 'linear', domain: [0, 930]},
color: {scaleType: 'discrete', range: LABKEY.vis.Scale.DataspaceColor()},
shape: {scaleType: 'discrete', range: LABKEY.vis.Scale.DataspaceShape()}
},
Expand Down
20 changes: 10 additions & 10 deletions src/org/labkey/test/tests/ChartingAPITest.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/TimeChartDateBasedTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -122,7 +122,7 @@ public void doVerifySteps()

private static final String SVG_AXIS_X = "0\n50\n100\n150\n200\n0\n50000\n1e+5\n1.5e+5\n2e+5\n2.5e+5\n3e+5\n3.5e+5\n4e+5\n4.5e+5\n5e+5\n5.5e+5\n6e+5\n6.5e+5\n200\n300\n400\n500\n600\n700\n800\n900\n1000\n1100\n1200\n1300\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
private static final String SVG_AXIS_X_LEFT = "0\n50\n100\n150\n200\n2e+5\n2.1e+5\n2.2e+5\n2.3e+5\n2.4e+5\n2.5e+5\n2.6e+5\n2.7e+5\n200\n300\n400\n500\n600\n700\n800\n900\n1000\n1100\n1200\n1300\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
private static final String SVG_AXIS_X_LEFT_RIGHT = "0\n50\n100\n150\n200\n2e+5\n2.1e+5\n2.2e+5\n2.3e+5\n2.4e+5\n2.5e+5\n2.6e+5\n2.7e+5\n250\n300\n350\n400\n450\n500\n550\n600\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
private static final String SVG_AXIS_X_LEFT_RIGHT = "0\n50\n100\n150\n200\n2e+5\n2.1e+5\n2.2e+5\n2.3e+5\n2.4e+5\n2.5e+5\n2.6e+5\n2.7e+5\n250\n300\n350\n400\n450\n500\n550\n600\n650\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
private static final String AXIS_TIME_CHART = "Axis Time Chart";
@LogMethod private void axisRangeTest()
{
Expand Down
16 changes: 8 additions & 8 deletions src/org/labkey/test/tests/TimeChartImportTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,14 +88,14 @@ private void populateChartConfigs()
"One Measure: visit based plot per participant", 17, 47, false,
new String[]{
"1 week Post-V#1\nInt. Vis. %{S.1.1} .%{S.2.1}\nGrp1:F/U/Grp2:V#2\nG1: 6wk/G2: 2wk\n6 week Post-V#2\nG1: V#2/G2: V#3\nInt. Vis. %{S.1.1} .%{S.2.1}\nInt. Vis. %{S.1.1} .%{S.2.1}\n6 wk Post-V#2/V#3\n32.0\n32.5\n33.0\n33.5\n34.0\n34.5\n35.0\n35.5\n36.0\n36.5\n37.0\nAbbr Phy Exam\n999320016\nVisit Label\nTemperature: body\n999320016",
"1 week Post-V#1\nInt. Vis. %{S.1.1} .%{S.2.1}\nGrp1:F/U/Grp2:V#2\nG1: 6wk/G2: 2wk\n6 week Post-V#2\nG1: V#2/G2: V#3\nInt. Vis. %{S.1.1} .%{S.2.1}\nInt. Vis. %{S.1.1} .%{S.2.1}\n6 wk Post-V#2/V#3\n37.0\n37.5\n38.0\n38.5\n39.0\n39.5\nAbbr Phy Exam\n999320518\nVisit Label\nTemperature: body\n999320518"
"1 week Post-V#1\nInt. Vis. %{S.1.1} .%{S.2.1}\nGrp1:F/U/Grp2:V#2\nG1: 6wk/G2: 2wk\n6 week Post-V#2\nG1: V#2/G2: V#3\nInt. Vis. %{S.1.1} .%{S.2.1}\nInt. Vis. %{S.1.1} .%{S.2.1}\n6 wk Post-V#2/V#3\n37.0\n37.5\n38.0\n38.5\n39.0\n39.5\n40.0\nAbbr Phy Exam\n999320518\nVisit Label\nTemperature: body\n999320518"
}
));

VISIT_CHARTS.add(new TimeChartInfo(
"Two Measure: group mean with one plot per dimension", 2, 38, false,
new String[]{
"1 week Post-V#1\nInt. Vis. %{S.1.1} .%{S.2.1}\nGrp1:F/U/Grp2:V#2\nG1: 6wk/G2: 2wk\n6 week Post-V#2\n1 wk Post-V#2/V#3\n2 wk Post-V#2/V#3\n4 wk Post-V#2/V#3\n80\n100\n120\n140\n160\n180\n200\nAPX-1: Abbreviated Physical Exam\n1. Weight\nVisit\n1. Weight\nGroup 1\nFemale\nMale",
"1 week Post-V#1\nInt. Vis. %{S.1.1} .%{S.2.1}\nGrp1:F/U/Grp2:V#2\nG1: 6wk/G2: 2wk\n6 week Post-V#2\n1 wk Post-V#2/V#3\n2 wk Post-V#2/V#3\n4 wk Post-V#2/V#3\n60\n80\n100\n120\n140\n160\n180\n200\nAPX-1: Abbreviated Physical Exam\n1. Weight\nVisit\n1. Weight\nGroup 1\nFemale\nMale",
"1 week Post-V#1\nInt. Vis. %{S.1.1} .%{S.2.1}\nGrp1:F/U/Grp2:V#2\nG1: 6wk/G2: 2wk\n6 week Post-V#2\n1 wk Post-V#2/V#3\n2 wk Post-V#2/V#3\n4 wk Post-V#2/V#3\n32\n33\n34\n35\n36\n37\n38\n39\n40\nAPX-1: Abbreviated Physical Exam\n2. Body Temp\nVisit\n2. Body Temp\nGroup 1\nFemale\nMale"
}
));
Expand All@@ -110,7 +110,7 @@ private void populateChartConfigs()
DATE_CHARTS.add(new TimeChartInfo(
"Four Measures: one axis with point click fn enabled", 1, 17, true,
new String[]{
"50\n100\n150\n200\n250\n300\n350\n200\n400\n600\n800\n1000\n1200\n1400\nLuminexAssay, Lab Results, GenericAssay, Physical Exam\nDays Since Start Date\nFI, CD4+ (cells/mm3), M1, Weight (kg)\n249318596 ABI-QSTAR\n249318596 CD4+ (cells/mm3)\n249318596 TNF-alpha (40)\n249318596 Weight (kg)"
"50\n100\n150\n200\n250\n300\n350\n400\n200\n400\n600\n800\n1000\n1200\n1400\nLuminexAssay, Lab Results, GenericAssay, Physical Exam\nDays Since Start Date\nFI, CD4+ (cells/mm3), M1, Weight (kg)\n249318596 ABI-QSTAR\n249318596 CD4+ (cells/mm3)\n249318596 TNF-alpha (40)\n249318596 Weight (kg)"
}
));

Expand All@@ -124,29 +124,29 @@ private void populateChartConfigs()
DATE_CHARTS.add(new TimeChartInfo(
"One Measure: FI luminex IL-10 and IL-2 data by Analyte dimension", 2, 30, false,
new String[]{
"0\n50\n100\n150\n200\n80\n800\nLuminex\nIL-10 (23)\nDays Since Start Date\nFI\n249318596\n249320107\n249320127\n249320489\n249320897\n249325717",
"0\n50\n100\n150\n200\n60\n600\nLuminex\nIL-2 (3)\nDays Since Start Date\nFI\n249318596\n249320107\n249320127\n249320489\n249320897\n249325717"
"0\n50\n100\n150\n200\n70\n700\nLuminex\nIL-10 (23)\nDays Since Start Date\nFI\n249318596\n249320107\n249320127\n249320489\n249320897\n249325717",
"0\n50\n100\n150\n200\n50\n500\nLuminex\nIL-2 (3)\nDays Since Start Date\nFI\n249318596\n249320107\n249320127\n249320489\n249320897\n249325717"
}
));

DATE_CHARTS.add(new TimeChartInfo(
"One Measure: FI luminex with thin lines and no data points", 1, 5, false,
new String[]{
"50\n100\n150\n200\n70\n700\nLuminex\nDays Since Start Date\nFI\n249318596 TNF-alpha (40)\n249318596 IL-2 (3)\n249318596 IL-10 (23)"
"50\n100\n150\n200\n250\n70\n700\nLuminex\nDays Since Start Date\nFI\n249318596 TNF-alpha (40)\n249318596 IL-2 (3)\n249318596 IL-10 (23)"
}
));

DATE_CHARTS.add(new TimeChartInfo(
"One Measure: y-axis log scale and manual range on right side", 1, 33, false,
new String[]{
"0\n50\n100\n150\n200\n250\n300\n350\n10\n100\n1000\n10000\n1e+5\n1e+6\n1e+7\nHIV Test Results\nDays Since Start Date\nViral Load Quantified (copies/ml)\n249318596\n249320107\n249320127\n249320489\n249320897"
"0\n50\n100\n150\n200\n250\n300\n350\n400\n10\n100\n1000\n10000\n1e+5\n1e+6\n1e+7\nHIV Test Results\nDays Since Start Date\nViral Load Quantified (copies/ml)\n249318596\n249320107\n249320127\n249320489\n249320897"
}
));

DATE_CHARTS.add(new TimeChartInfo(
"One Measure: y-axis log scale and manual range", 1, 33, false,
new String[]{
"0\n50\n100\n150\n200\n250\n300\n350\n10\n100\n1000\n10000\n1e+5\n1e+6\n1e+7\nHIV Test Results\nDays Since Start Date\nViral Load Quantified (copies/ml)\n249318596\n249320107\n249320127\n249320489\n249320897"
"0\n50\n100\n150\n200\n250\n300\n350\n400\n10\n100\n1000\n10000\n1e+5\n1e+6\n1e+7\nHIV Test Results\nDays Since Start Date\nViral Load Quantified (copies/ml)\n249318596\n249320107\n249320127\n249320489\n249320897"
}
));

Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/visualization/LinePlotTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -245,7 +245,7 @@ private void doMultiYAxisLinePlotTest()
checker().verifyEquals("Point count in line plot not as expected", 19, Locator.css("svg g.error-bar").findElements(getDriver()).size());
}

private static final String LINE_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100\n105\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
private static final String LINE_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n60\n70\n80\n90\n100\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
private static final String LINE_PLOT_DR_2 = "60\n70\n80\n90\n100\n110\n60\n80\n100\n120\n140\n160\n180\n200\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
private static final String LINE_PLOT_NAME_DR = "DataRegionLinePlot";
private static final String LINE_PLOT_DESC_DR = "This line plot was created through a data region's 'Views' menu";
Expand DownExpand Up@@ -281,7 +281,7 @@ private void doDataRegionLinePlotTest()
savePlot(LINE_PLOT_NAME_DR, LINE_PLOT_DESC_DR);
}

private static final String LINE_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n1e+7\n2e+7\n3e+7\n4e+7\n5e+7\n6e+7\n7e+7\n8e+7\n9e+7\n1e+8\n1.1e+8\n1.2e+8\nTypes\nInteger\nDouble";
private static final String LINE_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n2e+7\n4e+7\n6e+7\n8e+7\n1e+8\n1.2e+8\nTypes\nInteger\nDouble";
private static final String LINE_PLOT_NAME_QC = "QuickChartLinePlot";
private static final String LINE_PLOT_DESC_QC = "This line plot was created through the 'Quick Chart' column header menu option";
@LogMethod
Expand Down
8 changes: 4 additions & 4 deletions src/org/labkey/test/tests/visualization/ScatterPlotTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,7 +170,7 @@ public void testAssayRunFilters() throws Exception

// now filter on the other run and verify expected results
dataPage = AssayRunsPage.beginAt(this, getProjectName(), protocolId).clickAssayIdLink("secondRun");
String secondRunExpected = "63.56464.56565.56666.567171172173174175176177178Dataweightheight";
String secondRunExpected = "6363.56464.56565.56666.567171172173174175176177178Dataweightheight";
dataPage.getDataTable().clickReportMenu(false,"HeightWeightAll");
assertSVG(secondRunExpected);

Expand DownExpand Up@@ -420,7 +420,7 @@ private void doMultiYAxisScatterPlotTest()
export(EXPORTED_SCRIPT_CHECK_TYPE, MEASURE_1_WEIGHT, MEASURE_5_RESPIRATIONS);
}

private static final String SCATTER_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100\n105\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
private static final String SCATTER_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n60\n70\n80\n90\n100\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
private static final String SCATTER_PLOT_DR_2 = "60\n70\n80\n90\n100\n110\n60\n80\n100\n120\n140\n160\n180\n200\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
private static final String SCATTER_PLOT_NAME_DR = "DataRegionScatterPlot";
private static final String SCATTER_PLOT_DESC_DR = "This scatter plot was created through a data region's 'Views' menu";
Expand DownExpand Up@@ -457,7 +457,7 @@ private void doDataRegionScatterPlotTest()
savePlot(SCATTER_PLOT_NAME_DR, SCATTER_PLOT_DESC_DR);
}

private static final String SCATTER_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n1e+7\n2e+7\n3e+7\n4e+7\n5e+7\n6e+7\n7e+7\n8e+7\n9e+7\n1e+8\n1.1e+8\n1.2e+8\nTypes\nInteger\nDouble";
private static final String SCATTER_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n2e+7\n4e+7\n6e+7\n8e+7\n1e+8\n1.2e+8\nTypes\nInteger\nDouble";
private static final String SCATTER_PLOT_NAME_QC = "QuickChartScatterPlot";
private static final String SCATTER_PLOT_DESC_QC = "This scatter plot was created through the 'Quick Chart' column header menu option";
@LogMethod
Expand DownExpand Up@@ -829,7 +829,7 @@ private void doPointClickScatterPlotTest()
stopImpersonating();
}

private static final String SCATTER_PLOT_CPF_1 = "0.5\n1.0\n1.5\n2.0\n2.5\n3.0\n3.5\n50\n100\n150\n200\n250\n300\n350\n400\nCPF-1: Follow-up Chemistry Panel\n2a. Creatinine\n1a. ALT (SGPT)";
private static final String SCATTER_PLOT_CPF_1 = "0.5\n1.0\n1.5\n2.0\n2.5\n3.0\n3.5\n0\n50\n100\n150\n200\n250\n300\n350\n400\n450\nCPF-1: Follow-up Chemistry Panel\n2a. Creatinine\n1a. ALT (SGPT)";
private static final String SCATTER_PLOT_NAME_BIN = "BinnedScatterPlotTest";
private static final String SCATTER_PLOT_DESC_BIN = "This scatter plot was created with the binning threshold set to a number smaller than the data point count.";

Expand Down