Skip to content

Commit

Permalink
Fixed #392 - Chart - move selection on double click
Browse files Browse the repository at this point in the history
  • Loading branch information
@eselmeister
eselmeister committed May 3, 2024
1 parent 8c111c8 commit e7c77bb
Showing 1 changed file with 103 additions and 107 deletions.
210 changes: 103 additions & 107 deletions ...eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ScrollableChart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,9 @@ public class ScrollableChart extends Composite implements IScrollableChart, IEve
private Composite compositeChart;
private BaseChart baseChart;
private ExtendedLegendUI extendedLegendUI;
/*
* With enableRangeSelectorHint the gc draws an info
* that the range selector can be activated by using a
* mouse double click. It's implemented and works fine,
* but is a bit crappy when a chart title is used. So, it is
* deactivated for now, but not removed.
*/
private boolean enableRangeSelectorHint = false;
//
private static final int MILLISECONDS_SHOW_RANGE_INFO_HINT = 1000;
private boolean showRangeSelectorHint = enableRangeSelectorHint;
private boolean showRangeSelectorHint = false;
private RangeHintPaintListener rangeHintPaintListener;
/*
* This list contains all scrollable charts
Expand Down Expand Up @@ -1438,50 +1431,6 @@ public void handleEvent(Event event) {
}
});
//
slider.addMouseListener(new MouseAdapter() {

@Override
public void mouseDoubleClick(MouseEvent e) {

IAxis xAxis = baseChart.getAxisSet().getXAxis(BaseChart.ID_PRIMARY_X_AXIS);
IAxis yAxis = baseChart.getAxisSet().getYAxis(BaseChart.ID_PRIMARY_Y_AXIS);
//
if(xAxis != null && yAxis != null) {
/*
* Slide to the previous or next block.
*/
double minY = getBaseChart().getMinX();
double maxY = getBaseChart().getMaxX();
double delta = yAxis.getRange().upper - yAxis.getRange().lower;
double lower;
double upper;
//
if(e.stateMask == SWT.MOD1) {
/*
* Previous
*/
lower = yAxis.getRange().lower + delta;
upper = yAxis.getRange().upper + delta;
upper = (upper > maxY) ? maxY : upper;
} else {
/*
* Next
*/
lower = yAxis.getRange().lower - delta;
upper = yAxis.getRange().upper - delta;
lower = (lower < minY) ? minY : lower;
}
/*
* Validate the range.
*/
if(lower >= minY && upper <= maxY) {
Range range = new Range(lower, upper);
applyVerticalSlide(xAxis, yAxis, range, new Event());
}
}
}
});
//
sliderVerticalControl.set(slider);
}

Expand Down Expand Up @@ -1556,16 +1505,23 @@ public void handleUserSelection(Event event) {
@Override
public void mouseDoubleClick(MouseEvent e) {

IChartSettings chartSettings = baseChart.getChartSettings();
if(chartSettings.isEnableRangeSelector()) {
if(!rangeSelector.isVisible()) {
if(e.y <= 47) {
/*
* Show the range info composite.
*/
showRangeSelectorHint = enableRangeSelectorHint;
showRangeSelector(showRangeSelectorHint);
}
int x = e.x;
int y = e.y;
Rectangle boundsPlotArea = baseChart.getPlotArea().getBounds();
//
if(x >= boundsPlotArea.x && x <= (boundsPlotArea.x + boundsPlotArea.width)) {
if(y >= boundsPlotArea.y + boundsPlotArea.height) {
/*
* Horizontal
*/
applyHorizontalDoubleClick(e);
}
} else if(x < boundsPlotArea.x) {
if(y >= boundsPlotArea.y && y <= (boundsPlotArea.y + boundsPlotArea.height)) {
/*
* Vertical
*/
applyVerticalDoubleClick(e);
}
}
}
Expand All @@ -1592,6 +1548,90 @@ public void mouseDoubleClick(MouseEvent e) {
}
}

private void applyHorizontalDoubleClick(MouseEvent e) {

IAxis xAxis = baseChart.getAxisSet().getXAxis(BaseChart.ID_PRIMARY_X_AXIS);
IAxis yAxis = baseChart.getAxisSet().getYAxis(BaseChart.ID_PRIMARY_Y_AXIS);
//
if(xAxis != null && yAxis != null) {
/*
* Slide to the previous or next block.
*/
double minX = getBaseChart().getMinX();
double maxX = getBaseChart().getMaxX();
double delta = xAxis.getRange().upper - xAxis.getRange().lower;
double lower;
double upper;
//
if(e.stateMask == SWT.MOD1) {
/*
* Previous
*/
lower = xAxis.getRange().lower - delta;
upper = xAxis.getRange().upper - delta;
lower = (lower < minX) ? minX : lower;
} else {
/*
* Next
*/
lower = xAxis.getRange().lower + delta;
upper = xAxis.getRange().upper + delta;
upper = (upper > maxX) ? maxX : upper;
}
/*
* Validate the range.
*/
if(lower >= minX && upper <= maxX) {
Range range = new Range(lower, upper);
if(lower != upper) {
applyHorizontalSlide(xAxis, yAxis, range, new Event());
}
}
}
}

private void applyVerticalDoubleClick(MouseEvent e) {

IAxis xAxis = baseChart.getAxisSet().getXAxis(BaseChart.ID_PRIMARY_X_AXIS);
IAxis yAxis = baseChart.getAxisSet().getYAxis(BaseChart.ID_PRIMARY_Y_AXIS);
//
if(xAxis != null && yAxis != null) {
/*
* Slide to the previous or next block.
*/
double minY = getBaseChart().getMinX();
double maxY = getBaseChart().getMaxX();
double delta = yAxis.getRange().upper - yAxis.getRange().lower;
double lower;
double upper;
//
if(e.stateMask == SWT.MOD1) {
/*
* Previous
*/
lower = yAxis.getRange().lower + delta;
upper = yAxis.getRange().upper + delta;
upper = (upper > maxY) ? maxY : upper;
} else {
/*
* Next
*/
lower = yAxis.getRange().lower - delta;
upper = yAxis.getRange().upper - delta;
lower = (lower < minY) ? minY : lower;
}
/*
* Validate the range.
*/
if(lower >= minY && upper <= maxY) {
Range range = new Range(lower, upper);
if(lower != upper) {
applyVerticalSlide(xAxis, yAxis, range, new Event());
}
}
}
}

private void createSliderHorizontal(Composite parent) {

Slider slider = new Slider(parent, SWT.HORIZONTAL);
Expand All @@ -1616,50 +1656,6 @@ public void handleEvent(Event event) {
}
});
//
slider.addMouseListener(new MouseAdapter() {

@Override
public void mouseDoubleClick(MouseEvent e) {

IAxis xAxis = baseChart.getAxisSet().getXAxis(BaseChart.ID_PRIMARY_X_AXIS);
IAxis yAxis = baseChart.getAxisSet().getYAxis(BaseChart.ID_PRIMARY_Y_AXIS);
//
if(xAxis != null && yAxis != null) {
/*
* Slide to the previous or next block.
*/
double minX = getBaseChart().getMinX();
double maxX = getBaseChart().getMaxX();
double delta = xAxis.getRange().upper - xAxis.getRange().lower;
double lower;
double upper;
//
if(e.stateMask == SWT.MOD1) {
/*
* Previous
*/
lower = xAxis.getRange().lower - delta;
upper = xAxis.getRange().upper - delta;
lower = (lower < minX) ? minX : lower;
} else {
/*
* Next
*/
lower = xAxis.getRange().lower + delta;
upper = xAxis.getRange().upper + delta;
upper = (upper > maxX) ? maxX : upper;
}
/*
* Validate the range.
*/
if(lower >= minX && upper <= maxX) {
Range range = new Range(lower, upper);
applyHorizontalSlide(xAxis, yAxis, range, new Event());
}
}
}
});
//
sliderHorizontalControl.set(slider);
}

Expand Down

0 comments on commit e7c77bb

Please sign in to comment.