Moved all OHLC stuff from ChartPainter to OHLCChartPainter
This commit is contained in:
@ -43,6 +43,9 @@ public class ChartCrossPainter extends ChartPainter{
|
||||
if (mp==null)
|
||||
return;
|
||||
|
||||
if (!p.mouseEntered)
|
||||
return;
|
||||
|
||||
g.drawLine(0, p.mouse.y, p.getSize().width, p.mouse.y);
|
||||
g.drawLine(p.mouse.x, 0, p.mouse.x, p.getSize().height);
|
||||
|
||||
|
@ -42,12 +42,7 @@ abstract public class ChartPainter implements ChartPainterInterface{
|
||||
protected int em_size;
|
||||
|
||||
|
||||
protected OHLCData data;
|
||||
|
||||
public void setOHLCData(OHLCData data){
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
|
||||
/* public abstract interface DataProvider {
|
||||
|
||||
abstract OHLCData get();
|
||||
@ -59,26 +54,6 @@ abstract public class ChartPainter implements ChartPainterInterface{
|
||||
this.dataProvider = dataProvider;
|
||||
}
|
||||
*/
|
||||
protected OHLCData getData() {
|
||||
return this.data;
|
||||
/*if (dataProvider == null) {
|
||||
return null;
|
||||
}
|
||||
return dataProvider.get();
|
||||
*/
|
||||
}
|
||||
|
||||
protected int getFirstBar(ChartPanel p) {
|
||||
if (p.x_scrollbar != null) {
|
||||
return p.x_scrollbar.getValue();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
protected int getBars(ChartPanel p, ChartDef def) {
|
||||
Dimension dim = p.getSize();
|
||||
return (int) (dim.width / (def.x_unit_width * em_size));
|
||||
}
|
||||
|
||||
/**
|
||||
* Init method scould be called before painting the chart
|
||||
|
@ -49,9 +49,70 @@ public abstract class OHLCChartPainter extends ChartPainter {
|
||||
|
||||
abstract void drawItem(Graphics2D g, int prevx, int x, OHLCDataItem prev, OHLCDataItem i);
|
||||
|
||||
protected OHLCData data;
|
||||
|
||||
public void setOHLCData(OHLCData data){
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
protected OHLCData getData() {
|
||||
return this.data;
|
||||
/*if (dataProvider == null) {
|
||||
return null;
|
||||
}
|
||||
return dataProvider.get();
|
||||
*/
|
||||
}
|
||||
|
||||
protected int getFirstBar(ChartPanel p) {
|
||||
if (p.x_scrollbar != null) {
|
||||
return p.x_scrollbar.getValue();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
protected int getBars(ChartPanel p, ChartDef def) {
|
||||
Dimension dim = p.getSize();
|
||||
return (int) (dim.width / (def.x_unit_width * em_size));
|
||||
}
|
||||
|
||||
protected float y_scaling;
|
||||
protected int y_height;
|
||||
protected float y_min;
|
||||
|
||||
float getY(float y) {
|
||||
//c_yscaling = ctx.rect.height / c_mm.getDiff();
|
||||
// float ys = dim.height / mm.getDiff();
|
||||
/* if (minmax.isLog()) {
|
||||
// return rect.height + rect.y - ((float) Math.log(y) - c_mm.getMin()) * ys;
|
||||
}
|
||||
*/
|
||||
// return (dim.height - ((y - minmax.getMin()) * y_scaling));
|
||||
return (y_height - ((y - y_min) * y_scaling));
|
||||
|
||||
}
|
||||
|
||||
double getValAtY(float y) {
|
||||
float val = 0;
|
||||
|
||||
/* if (c_mm.isLog()) {
|
||||
float ys = rect.height / c_mm.getDiff();
|
||||
|
||||
return Math.exp((rect.height + rect.y) / ys + c_mm.getMin() - y / ys);
|
||||
|
||||
}
|
||||
*/
|
||||
return (-(y - y_height)) / y_scaling + y_min;
|
||||
|
||||
}
|
||||
|
||||
void initGetY(MinMax minmax, Dimension dim) {
|
||||
y_height = dim.height;
|
||||
y_scaling = dim.height / minmax.getDiff();
|
||||
y_min = minmax.getMin();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void drawChart(Graphics2D g, ChartPanel p, ChartDef def) {
|
||||
OHLCData data = getData();
|
||||
|
@ -33,12 +33,13 @@ import java.awt.Graphics2D;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JScrollBar;
|
||||
import sesim.OHLCData;
|
||||
import sesim.OHLCDataItem;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author 7u83 <7u83@mail.ru>
|
||||
*/
|
||||
public class XLegendPainter extends ChartPainter {
|
||||
public class XLegendPainter extends OHLCChartPainter {
|
||||
|
||||
private String getTimeStrAt(OHLCData data, int unit) {
|
||||
|
||||
@ -91,4 +92,9 @@ public class XLegendPainter extends ChartPainter {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
void drawItem(Graphics2D g, int prevx, int x, OHLCDataItem prev, OHLCDataItem i) {
|
||||
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ import sesim.OHLCDataItem;
|
||||
*
|
||||
* @author 7u83 <7u83@mail.ru>
|
||||
*/
|
||||
public class YLegendPainter extends ChartPainter {
|
||||
public class YLegendPainter extends OHLCChartPainter {
|
||||
|
||||
ChartPanel master;
|
||||
|
||||
@ -87,6 +87,11 @@ public class YLegendPainter extends ChartPainter {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
void drawItem(Graphics2D g, int prevx, int x, OHLCDataItem prev, OHLCDataItem i) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user