From c8c72d264d5450ce53ab52835599a9336d46dcea Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Tue, 3 Oct 2017 08:05:46 +0200
Subject: [PATCH] Cross Cursor implemented
---
nbproject/private/private.xml | 5 +-
nbproject/project.properties | 2 +-
src/chart/CandleStickChartPainter.java | 4 +
.../{NewPanel.java => ChartCrossPainter.java} | 37 +++--
src/chart/ChartPainter.java | 5 +-
src/chart/ChartPanal.form | 56 --------
src/chart/ChartPanal.java | 128 ------------------
src/chart/ChartPanel.form | 3 +
src/chart/ChartPanel.java | 21 +++
src/chart/ChartTestDialog.form | 50 +++++--
src/chart/ChartTestDialog.java | 43 ++++--
src/chart/NewPanel.form | 17 ---
src/chart/OHLCChartPainter.java | 2 +-
src/chart/XLegendChartPainter.java | 2 +-
src/gui/SeSimApplication.form | 7 -
src/gui/SeSimApplication.java | 3 -
16 files changed, 128 insertions(+), 257 deletions(-)
rename src/chart/{NewPanel.java => ChartCrossPainter.java} (67%)
delete mode 100644 src/chart/ChartPanal.form
delete mode 100644 src/chart/ChartPanal.java
delete mode 100644 src/chart/NewPanel.form
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index f2e0d9e..982bc06 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -19,6 +19,7 @@
file:/home/tube/NetBeansProjects/SeSim/src/traders/RandomTraderB.java
file:/home/tube/NetBeansProjects/SeSim/src/chart/OHLCChartPainter.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/Logger.java
+ file:/home/tube/NetBeansProjects/SeSim/src/chart/CandleStickChartPainter.java
file:/home/tube/NetBeansProjects/SeSim/src/gui/EditPreferencesDialog.java
file:/home/tube/NetBeansProjects/SeSim/src/gui/QuotePanel.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/AutoTraderBase.java
@@ -27,18 +28,20 @@
file:/home/tube/NetBeansProjects/SeSim/src/gui/MainChart.java
file:/home/tube/NetBeansProjects/SeSim/src/chart/Chart.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/Clock.java
+ file:/home/tube/NetBeansProjects/SeSim/src/chart/ChartDef.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/OHLCData.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/IDGenerator.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/MinMax.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/AutoTraderGui.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/Exchange.java
+ file:/home/tube/NetBeansProjects/SeSim/src/chart/LineChartPainter.java
file:/home/tube/NetBeansProjects/SeSim/src/gui/jp99.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/Locker.java
+ file:/home/tube/NetBeansProjects/SeSim/src/chart/ChartPanel.java
file:/home/tube/NetBeansProjects/SeSim/src/gui/orderbook/OrderBook.java
file:/home/tube/NetBeansProjects/SeSim/src/chart/ChartPanal.java
file:/home/tube/NetBeansProjects/SeSim/src/sesim/OHLCDataItem.java
file:/home/tube/NetBeansProjects/SeSim/src/gui/AboutDialog.java
- file:/home/tube/NetBeansProjects/SeSim/src/chart/Chart1.java
file:/home/tube/NetBeansProjects/SeSim/src/chart/ChartPainter.java
file:/home/tube/NetBeansProjects/SeSim/README.md
file:/home/tube/NetBeansProjects/SeSim/src/gui/TestChartdialog.java
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 3d7a5de..0386c3f 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,4 +1,4 @@
-#Mon, 02 Oct 2017 22:55:32 +0200
+#Tue, 03 Oct 2017 07:33:39 +0200
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
diff --git a/src/chart/CandleStickChartPainter.java b/src/chart/CandleStickChartPainter.java
index 738bf1f..526d6de 100644
--- a/src/chart/CandleStickChartPainter.java
+++ b/src/chart/CandleStickChartPainter.java
@@ -27,6 +27,8 @@ package chart;
import java.awt.Color;
import java.awt.Graphics2D;
+import javax.swing.JScrollBar;
+import sesim.OHLCData;
import sesim.OHLCDataItem;
/**
@@ -68,5 +70,7 @@ public class CandleStickChartPainter extends OHLCChartPainter {
}
}
+
+
}
diff --git a/src/chart/NewPanel.java b/src/chart/ChartCrossPainter.java
similarity index 67%
rename from src/chart/NewPanel.java
rename to src/chart/ChartCrossPainter.java
index 12f39e3..67bfc09 100644
--- a/src/chart/NewPanel.java
+++ b/src/chart/ChartCrossPainter.java
@@ -25,31 +25,26 @@
*/
package chart;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import sesim.OHLCData;
+
/**
*
* @author 7u83 <7u83@mail.ru>
*/
-public class NewPanel extends java.awt.Panel {
+public class ChartCrossPainter extends ChartPainter{
- /**
- * Creates new form NewPanel
- */
- public NewPanel() {
- initComponents();
+ @Override
+ public void drawChart(Graphics2D g, JScrollBar sb, OHLCData data, ChartPanel p, ChartDef def) {
+ Point mp = p.mouse;
+
+
+ g.drawLine(0, p.mouse.y-1, p.getSize().width, p.mouse.y-1);
+ g.drawLine(p.mouse.x-1, 0, p.mouse.x-1, p.getSize().height);
+
}
-
- /**
- * This method is called from within the constructor to initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is always
- * regenerated by the Form Editor.
- */
- // //GEN-BEGIN:initComponents
- private void initComponents() {
-
- setLayout(new java.awt.BorderLayout());
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- // End of variables declaration//GEN-END:variables
+
}
diff --git a/src/chart/ChartPainter.java b/src/chart/ChartPainter.java
index 52fcf23..9b3bddb 100644
--- a/src/chart/ChartPainter.java
+++ b/src/chart/ChartPainter.java
@@ -50,9 +50,6 @@ abstract public class ChartPainter {
int big_tick = 10;
int y = 0;
-
-
-
- abstract public void drawChart(Graphics2D g, JScrollBar sb, OHLCData data, JPanel p, ChartDef def);
+ abstract public void drawChart(Graphics2D g, JScrollBar sb, OHLCData data, ChartPanel p, ChartDef def);
}
diff --git a/src/chart/ChartPanal.form b/src/chart/ChartPanal.form
deleted file mode 100644
index a104959..0000000
--- a/src/chart/ChartPanal.form
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
diff --git a/src/chart/ChartPanal.java b/src/chart/ChartPanal.java
deleted file mode 100644
index 0378371..0000000
--- a/src/chart/ChartPanal.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2017, 7u83 <7u83@mail.ru>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package chart;
-
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import javax.swing.Scrollable;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class ChartPanal extends javax.swing.JPanel implements Scrollable{
-
- /**
- * Creates new form ChartPanal
- */
- public ChartPanal() {
- initComponents();
- }
-
-
-
-
- @Override
- public void paint(Graphics g) {
- // Dimension psize = this.chart12.getPreferredSize();
- // this.setPreferredSize(psize);
-
-
-
- super.paint(g); //To change body of generated methods, choose Tools | Templates.
- }
-
- /**
- * This method is called from within the constructor to initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is always
- * regenerated by the Form Editor.
- */
- @SuppressWarnings("unchecked")
- // //GEN-BEGIN:initComponents
- private void initComponents() {
-
- jScrollBar1 = new javax.swing.JScrollBar();
- jButton1 = new javax.swing.JButton();
-
- setPreferredSize(new java.awt.Dimension(300, 300));
-
- jScrollBar1.setOrientation(javax.swing.JScrollBar.HORIZONTAL);
-
- jButton1.setText("jButton1");
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jScrollBar1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(layout.createSequentialGroup()
- .addGap(100, 100, 100)
- .addComponent(jButton1)
- .addContainerGap(119, Short.MAX_VALUE))
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addContainerGap(189, Short.MAX_VALUE)
- .addComponent(jScrollBar1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jButton1)
- .addGap(63, 63, 63))
- );
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton jButton1;
- private javax.swing.JScrollBar jScrollBar1;
- // End of variables declaration//GEN-END:variables
-
- @Override
- public Dimension getPreferredScrollableViewportSize() {
- return this.getPreferredSize();
- }
-
- @Override
- public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
- return 1;
- }
-
- @Override
- public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
- return 100;
- }
-
- @Override
- public boolean getScrollableTracksViewportWidth() {
- return false;
- }
-
- @Override
- public boolean getScrollableTracksViewportHeight() {
- return false;
- }
-}
diff --git a/src/chart/ChartPanel.form b/src/chart/ChartPanel.form
index 9312e7a..27ef795 100644
--- a/src/chart/ChartPanel.form
+++ b/src/chart/ChartPanel.form
@@ -1,6 +1,9 @@