Merge "Issue #1560 - Additional fix to HTS page up/down reload problem." into development

Former-commit-id: 80311cbba3 [formerly 56ec704522] [formerly 8d7c0e3b6a] [formerly 80311cbba3 [formerly 56ec704522] [formerly 8d7c0e3b6a] [formerly 1f1b171862 [formerly 8d7c0e3b6a [formerly d36aa52d8d212aaef3bc68c96a24956696fef513]]]]
Former-commit-id: 1f1b171862
Former-commit-id: e341f9bc06 [formerly c8ddcf394b] [formerly 515ebc187374550f3e7fb56ecf8f2b38f34dd615 [formerly e70a758f63]]
Former-commit-id: 8c7450dfcb72b65abe178458cf2d020159ac2ddb [formerly e92666cc43]
Former-commit-id: dc5ba802ec
This commit is contained in:
Lee Venable 2013-02-07 13:06:09 -06:00 committed by Gerrit Code Review
commit d28d5e2d37

View file

@ -1739,13 +1739,10 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
} else {
currentPage--;
}
updateCanvases();
for (int i = 0; i < pageCompList.size(); i++) {
if (currentPage == i) {
((GridData) pageCompList.get(i).getLayoutData()).exclude = false;
canvasList.get(i).setGetAgain(true);
canvasList.get(i).redraw();
canvasList.get(i).update();
pageCompList.get(i).setVisible(true);
} else {
((GridData) pageCompList.get(i).getLayoutData()).exclude = true;
@ -1765,6 +1762,7 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
} else {
currentPage++;
}
updateCanvases();
for (int i = 0; i < pageCompList.size(); i++) {
if (currentPage == i) {
((GridData) pageCompList.get(i).getLayoutData()).exclude = false;
@ -1778,6 +1776,17 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
}
}
/**
* Update the canvases with new data.
*/
private void updateCanvases() {
for (int i = 0; i < canvasList.size(); i++) {
TimeSeriesDisplayCanvas canvas = canvasList.get(i);
canvas.setGetAgain(true);
canvas.redraw();
}
}
/**
* Redraw each Canvas in the list.
*