From e9a89bb81655c29d7347287a3854967b75fb3b09 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Tue, 23 Jan 2018 01:36:25 +0100 Subject: [PATCH] Som work on MMChart --- nbproject/project.properties | 2 +- src/chart/MMChart.form | 10 ++++++++++ src/chart/MMChart.java | 37 +++++++++++++++++++++++++++++++++--- src/sesim/ChartPanel.form | 1 + src/sesim/ChartPanel.java | 9 ++++++++- 5 files changed, 54 insertions(+), 5 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 310d550..cb0a9d4 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Sat, 20 Jan 2018 21:21:05 +0100 +#Tue, 23 Jan 2018 01:36:03 +0100 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/src/chart/MMChart.form b/src/chart/MMChart.form index f84b99c..32b790a 100644 --- a/src/chart/MMChart.form +++ b/src/chart/MMChart.form @@ -1,8 +1,18 @@
+ + + + + + + + + + diff --git a/src/chart/MMChart.java b/src/chart/MMChart.java index e356211..714c8d2 100644 --- a/src/chart/MMChart.java +++ b/src/chart/MMChart.java @@ -33,6 +33,7 @@ import chart.painter.XLegendPainter; import chart.painter.YLegendPainter; import gui.Globals; import java.awt.Color; +import java.awt.Cursor; import java.awt.Dimension; import java.awt.Graphics; import java.awt.GridBagConstraints; @@ -50,7 +51,7 @@ import sesim.Stock; * * @author 7u83 <7u83@mail.ru> */ -public class MMChart extends javax.swing.JPanel { +public class MMChart extends JPanel { Stock stock; @@ -68,6 +69,11 @@ public class MMChart extends javax.swing.JPanel { ChartPanel xLegend; ChartPanel yLegend; ChartPanel mainChart; + + private int compression=60000; + + + private void setupYLegend() { yLegend = new ChartPanel(); @@ -88,7 +94,7 @@ public class MMChart extends javax.swing.JPanel { this.addMouseMotionListener(yLegend); OHLCChartPainter ylp = new YLegendPainter(/*null*/); - OHLCData mydata = stock.getOHLCdata(60000); + OHLCData mydata = stock.getOHLCdata(compression); ylp.setOHLCData(mydata); yLegend.setChartDef(chartDef); @@ -116,7 +122,7 @@ public class MMChart extends javax.swing.JPanel { add(xLegend, gbConstraints); OHLCChartPainter p; - OHLCData mydata = stock.getOHLCdata(60000); + OHLCData mydata = stock.getOHLCdata(compression); // this.xScrollBar.setMaximum(0); p = new XLegendPainter(); @@ -136,6 +142,7 @@ public class MMChart extends javax.swing.JPanel { private void addMouseMotionListener(JPanel panel) { panel.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { + @Override public void mouseMoved(java.awt.event.MouseEvent evt) { formMouseMoved(evt); } @@ -162,6 +169,9 @@ public class MMChart extends javax.swing.JPanel { mainChart.addChartPainter(p0); this.addMouseMotionListener(mainChart); + + + mainChart.setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR)); } @@ -216,11 +226,23 @@ public class MMChart extends javax.swing.JPanel { // //GEN-BEGIN:initComponents private void initComponents() { + popupMenu = new javax.swing.JPopupMenu(); + addMouseMotionListener(new java.awt.event.MouseMotionAdapter() { public void mouseMoved(java.awt.event.MouseEvent evt) { formMouseMoved(evt); } }); + addMouseWheelListener(new java.awt.event.MouseWheelListener() { + public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) { + formMouseWheelMoved(evt); + } + }); + addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + formMouseClicked(evt); + } + }); setLayout(null); }// //GEN-END:initComponents @@ -231,7 +253,16 @@ public class MMChart extends javax.swing.JPanel { xLegend.repaint(); }//GEN-LAST:event_formMouseMoved + private void formMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseClicked + System.out.printf("The mouse was clicked\n"); + }//GEN-LAST:event_formMouseClicked + + private void formMouseWheelMoved(java.awt.event.MouseWheelEvent evt) {//GEN-FIRST:event_formMouseWheelMoved + System.out.printf("Wheel!!!\n"); + }//GEN-LAST:event_formMouseWheelMoved + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JPopupMenu popupMenu; // End of variables declaration//GEN-END:variables } diff --git a/src/sesim/ChartPanel.form b/src/sesim/ChartPanel.form index 754aaa3..3cbafdd 100644 --- a/src/sesim/ChartPanel.form +++ b/src/sesim/ChartPanel.form @@ -3,6 +3,7 @@ + diff --git a/src/sesim/ChartPanel.java b/src/sesim/ChartPanel.java index 2941da9..f282b3b 100644 --- a/src/sesim/ChartPanel.java +++ b/src/sesim/ChartPanel.java @@ -31,7 +31,7 @@ public class ChartPanel extends javax.swing.JPanel implements AdjustmentListener public ChartPanel() { initComponents(); - setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR)); + //setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR)); } @@ -101,6 +101,9 @@ public class ChartPanel extends javax.swing.JPanel implements AdjustmentListener } }); addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + formMouseClicked(evt); + } public void mouseExited(java.awt.event.MouseEvent evt) { formMouseExited(evt); } @@ -141,6 +144,10 @@ public class ChartPanel extends javax.swing.JPanel implements AdjustmentListener repaint(); }//GEN-LAST:event_formMouseExited + private void formMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseClicked + getParent().dispatchEvent(evt); + }//GEN-LAST:event_formMouseClicked + @Override public void adjustmentValueChanged(AdjustmentEvent e) {