diff --git a/src/main/java/chart/Chart.form b/src/main/java/chart/Chart.form index 012b78c..5559af3 100644 --- a/src/main/java/chart/Chart.form +++ b/src/main/java/chart/Chart.form @@ -8,60 +8,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/chart/Chart.java b/src/main/java/chart/Chart.java index 89750ed..d378d4b 100644 --- a/src/main/java/chart/Chart.java +++ b/src/main/java/chart/Chart.java @@ -17,6 +17,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; +import javax.swing.JMenuItem; import javax.swing.Scrollable; import sesim.MinMax; @@ -42,7 +43,7 @@ public class Chart extends javax.swing.JPanel implements QuoteReceiver, Scrollab public final void initChart() { // data = new OHLCData(60000*30); //data = new OHLCData(60000*30); - data = Globals.se.getOHLCdata(60000 * 30); + //data = Globals.se.getOHLCdata(60000 * 30); } /** @@ -51,6 +52,7 @@ public class Chart extends javax.swing.JPanel implements QuoteReceiver, Scrollab public Chart() { initComponents(); initChart(); + initCtxMenu(); //setCompression(60000); if (Globals.se == null) { return; @@ -60,12 +62,50 @@ public class Chart extends javax.swing.JPanel implements QuoteReceiver, Scrollab } + private String [] ctxMenuCompressionText = { + "5 s", "10 s", "15 s", "30 s", + "1 m", "2 m", "5 m", "10 m", "15 m", "30 m", + "1 h", "2 h", "4 h", + "1 d", "2 d" + }; + private Integer[] ctxMenuCompressionValues ={ + 5*1000, 10*1000, 15*1000, 30*1000, + 60*1000, 2*60*1000, 5*60*1000, 10*60*1000, 15*60*1000, 30*60*1000, + 1*3600*1000,2*3600*1000, 4*3600*1000, + 1*24*3600*1000, 2*24*3600*1000 + }; + + void initCtxMenu() { + for (int i=0; i { + ctxMenuCompActionPerformed(evt); + }); + this.compMenu.add(item); + } + } + + private void ctxMenuCompActionPerformed(java.awt.event.ActionEvent evt) { + String cmd = evt.getActionCommand(); + for (int i=0;i