From f6c1c2534c2cd1ceb294fdac8ae4b8583370ce80 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@maiol.ru>
Date: Sun, 9 Apr 2017 08:56:15 +0200
Subject: [PATCH] Removed old chart stuff
---
src/chart/FullChart.form | 28 --
src/chart/FullChart.java | 445 -------------------------------
src/chart/Legend.form | 28 --
src/chart/Legend.java | 65 -----
src/chart/NewJInternalFrame.form | 95 -------
src/chart/NewJInternalFrame.java | 111 --------
src/chart/NewJPanel.form | 66 -----
src/chart/NewJPanel.java | 89 -------
src/chart/NewJPanel1.form | 41 ---
src/chart/NewJPanel1.java | 73 -----
src/chart/OHLCChart.java | 35 ---
11 files changed, 1076 deletions(-)
delete mode 100644 src/chart/FullChart.form
delete mode 100644 src/chart/FullChart.java
delete mode 100644 src/chart/Legend.form
delete mode 100644 src/chart/Legend.java
delete mode 100644 src/chart/NewJInternalFrame.form
delete mode 100644 src/chart/NewJInternalFrame.java
delete mode 100644 src/chart/NewJPanel.form
delete mode 100644 src/chart/NewJPanel.java
delete mode 100644 src/chart/NewJPanel1.form
delete mode 100644 src/chart/NewJPanel1.java
delete mode 100644 src/chart/OHLCChart.java
diff --git a/src/chart/FullChart.form b/src/chart/FullChart.form
deleted file mode 100644
index 4060794..0000000
--- a/src/chart/FullChart.form
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
diff --git a/src/chart/FullChart.java b/src/chart/FullChart.java
deleted file mode 100644
index 33d6b44..0000000
--- a/src/chart/FullChart.java
+++ /dev/null
@@ -1,445 +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 gui.Globals;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import javax.swing.Scrollable;
-import sesim.Exchange;
-import sesim.OHLCData;
-import sesim.OHLCDataItem;
-import sesim.Quote;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class FullChart extends javax.swing.JPanel {
-
- public class Chart extends javax.swing.JPanel implements Exchange.QuoteReceiver, Scrollable {
-
- /**
- * Creates new form Chart
- */
- public Chart() {
- initComponentsChart();
- if (Globals.se == null) {
- return;
- }
-
- Globals.se.addQuoteReceiver(this);
-
- //Graphics g = this.getGraphics();
- //g.drawString("Hello world", 0, 0);
- }
-
- int item_width = 10;
- int items = 350;
- long ntime = 0;
-
- OHLCData data = new OHLCData(2000);
-
- OHLCDataItem current = null;
-
- // int min;
- // int max;
- int getY(float Y) {
-
- return 0;
- }
-
- void drawCandle(Graphics2D g, OHLCData d, int x, int y) {
-
- }
-
- @Override
- public Dimension getPreferredScrollableViewportSize() {
- return this.getPreferredSize();
- }
-
- @Override
- public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
- return 100;
- }
-
- @Override
- public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
- return 100;
- }
-
- @Override
- public boolean getScrollableTracksViewportWidth() {
- return false;
- }
-
- @Override
- public boolean getScrollableTracksViewportHeight() {
- return false;
- }
-
- class XLegendDef {
-
- double unit_width = 1;
- int big_tick = 10;
- long start;
-
- XLegendDef() {
-
- }
-
- String getAt(int unit) {
- Date date = new Date(0 + unit * 5000);
-// DateFormat formatter = new SimpleDateFormat("HH:mm:ss:SSS");
- DateFormat formatter = new SimpleDateFormat("HH:mm:ss");
- String dateFormatted = formatter.format(date);
- return dateFormatted;
- }
-
- }
-
- void drawOHLC(Graphics2D g, int x, OHLCDataItem di) {
-
- }
-
- void drawXLegend(Graphics2D g, XLegendDef xld) {
-
- //XLegendDef xld = new XLegendDef();
- g = (Graphics2D) g.create();
-
- int xl_height = 30;
- Dimension dim = this.getSize();
-
- int em_height = g.getFontMetrics().getHeight();
- int em_width = g.getFontMetrics().stringWidth("M");
-
- int y = dim.height - em_height * 3;
-
- g.drawLine(0, y, dim.width, y);
-
- int n;
- double x;
-
- for (n = 0, x = 0; x < dim.width; x += em_width * xld.unit_width) {
-
- if (n % xld.big_tick == 0) {
- g.drawLine((int) x, y, (int) x, y + em_height);
- } else {
- g.drawLine((int) x, y, (int) x, y + em_height / 2);
- }
-
- if (n % xld.big_tick == 0) {
- String text = "Hello";
-
- text = xld.getAt(n);
- int swidth = g.getFontMetrics().stringWidth(text);
-
- g.drawString(text, (int) x - swidth / 2, y + em_height * 2);
- }
-
- OHLCDataItem d;
- try {
- d = data.data.get(n);
- } catch (Exception e) {
- d = null;
- }
-
- n++;
-
- }
- }
-
- private void getData() {
-
- }
-
- class RenderCtx {
-
- Rectangle rect;
- float scaling;
- float min;
- Graphics2D g;
- float iwidth;
-
- float getY(float y) {
- return rect.height - ((y - min) * scaling);
- }
- }
-
- float getY(float y, float min, float s, Rectangle r) {
-
- return r.height - ((y - min) * s);
- }
-
- private void old_drawItem(Graphics2D g, Rectangle r, int prevx, int x, OHLCDataItem prev, OHLCDataItem item, float s, float min) {
-
- if (prev == null) {
- prev = item;
- }
-
- g.drawLine(prevx, (int) getY(prev.close, min, s, r), x, (int) getY(item.close, min, s, r));
- g.drawLine(r.x, r.height + r.y, r.x + r.width, r.height + r.y);
- }
-
- private void drawItem_l(RenderCtx ctx, int prevx, int x, OHLCDataItem prev, OHLCDataItem item) {
-
- if (prev == null) {
- prev = item;
- }
- Graphics2D g = ctx.g;
-
- Rectangle r = ctx.rect;
- g.drawLine(prevx, (int) ctx.getY(prev.close), x, (int) ctx.getY(item.close));
- g.drawLine(r.x, r.height + r.y, r.x + r.width, r.height + r.y);
- }
-
- private void drawItem(RenderCtx ctx, int prevx, int x, OHLCDataItem prev, OHLCDataItem i) {
-
- if (prev == null) {
- prev = i;
- }
- Graphics2D g = ctx.g;
-
- Rectangle r = ctx.rect;
-// g.drawLine(prevx, (int) ctx.getY(prev.close), x, (int) ctx.getY(item.close));
-
-// g.drawLine(x,(int)ctx.getY(i.high),x,(int)ctx.getY(i.low));
- if (i.open < i.close) {
-
- g.setColor(Color.BLACK);
- g.drawLine(x, (int) ctx.getY(i.close), x, (int) ctx.getY(i.high));
- g.drawLine(x, (int) ctx.getY(i.low), x, (int) ctx.getY(i.open));
-
- float w = ctx.iwidth;
- float h = (int) (ctx.getY(i.open) - ctx.getY(i.close));
-
- // System.out.printf("CLO: %f %f \n", w, h);
- g.setColor(Color.GREEN);
- g.fillRect((int) (x - w / 2), (int) ctx.getY(i.close), (int) w, (int) h);
- g.setColor(Color.BLACK);
- g.drawRect((int) (x - w / 2), (int) ctx.getY(i.close), (int) w, (int) h);
-
- } else {
-
- g.setColor(Color.RED);
- g.drawLine(x, (int) ctx.getY(i.high), x, (int) ctx.getY(i.close));
- g.drawLine(x, (int) ctx.getY(i.open), x, (int) ctx.getY(i.low));
-
- float w = ctx.iwidth;
- float h = (int) (ctx.getY(i.close) - ctx.getY(i.open));
-
- g.fillRect((int) (x - w / 2), (int) ctx.getY(i.open), (int) w, (int) h);
- g.setColor(Color.BLACK);
- g.drawRect((int) (x - w / 2), (int) ctx.getY(i.open), (int) w, (int) h);
-
- }
-
- g.drawLine(r.x, r.height + r.y, r.x + r.width, r.height + r.y);
- }
-
- private void drawYLegend(Graphics2D g) {
-
-
-// Dimension dim = jScrollPane1.
- //Dimension dim = new Dimension();
- Rectangle dim = g.getClipBounds();
- //dim.height = 300;
-
- System.out.printf("GetX %d %d\n", dim.x,dim.width);
-
-
-
- Dimension dim0 = this.getSize();
- //Rectangle dim = this.getVisibleRect();
-
- g.drawLine(dim.width+dim.x - 50, 0, dim.x+dim.width - 50, dim.height);
- // System.out.printf("Size: %d %d\n",dim.width,dim.height);
- // System.exit(0);
- }
-
- private void draw(Graphics2D g) {
-
- if (data == null) {
- return;
- }
- if (data.size() == 0) {
- return;
- }
-
- OHLCDataItem di0 = data.get(0);
- XLegendDef xld = new XLegendDef();
- this.drawXLegend(g, xld);
- this.drawYLegend(g);
-
- int em_height = g.getFontMetrics().getHeight();
- int em_width = g.getFontMetrics().stringWidth("M");
-
- this.getSize();
-
- int pwidth = em_width * items;
- int phight = 400;
-
- this.setPreferredSize(new Dimension(pwidth, phight));
- this.revalidate();
-
- Dimension dim = this.getSize();
-
- Iterator it = data.iterator();
- OHLCDataItem prev = null;
- int myi = 0;
-
- RenderCtx ctx = new RenderCtx();
-
- Rectangle r = new Rectangle(0, 2 * em_width, pwidth, dim.height - 6 * em_width);
- ctx.rect = r;
- ctx.scaling = (float) r.height / (data.getMax() - data.getMin());
- ctx.min = data.getMin();
- ctx.g = g;
- ctx.iwidth = em_width - em_width / 5f;
-
- //System.out.printf("Scaling: %f %f %f %f %f\n",diff,(float)r.height,data.getMin(),data.getMax(),yscaling);
- while (it.hasNext()) {
- OHLCDataItem di = it.next();
-
- int x = myi * em_width;
- this.drawItem(ctx, x - em_width, x, prev, di); //, ctx.scaling, data.getMin());
-
- myi++;
- prev = di;
-
- }
-
- }
-
- @Override
- public void paintComponent(Graphics go) {
- super.paintComponent(go);
-
- Graphics2D g = (Graphics2D) go;
-
- g.setColor(Color.GRAY);
-
- g.setBackground(Color.BLACK);
- // g.get
-
- Rectangle bounds = g.getDeviceConfiguration().getBounds();
- // System.out.print(bounds.width + "\n");
-
- //g.fillRect(0, 0, 100, 100);
- Dimension d = this.getSize();
-
- //g.drawString("Hello world", 810, 10);
- //g.drawLine(0, 0, d.width, d.height);
- //this.setPreferredSize(new Dimension(2000,4000));
- draw(g);
- }
-
- /**
- * 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")
- //
- private void initComponentsChart() {
-
- setBackground(java.awt.Color.white);
- setBorder(null);
- setOpaque(false);
- setPreferredSize(new java.awt.Dimension(300, 300));
- setRequestFocusEnabled(false);
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 300, Short.MAX_VALUE)
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 300, Short.MAX_VALUE)
- );
- }//
-
- @Override
- public void UpdateQuote(Quote q) {
- // System.out.print("Quote Received\n");
-// this.realTimeAdd(q.time, (float) q.price, (float)q.volume);
-
- data.realTimeAdd(q.time, (float) q.price, (float) q.volume);
- // this.invalidate();
- this.repaint();
- }
-
- // Variables declaration - do not modify
- // End of variables declaration
- }
-
- /**
- * Creates new form FullChart
- */
- public FullChart() {
- initComponents();
- Chart chart = new Chart();
-// this.jScrollPane1.setViewportView(chart);
-
-
- // this.jScrollPane1.setRowHeaderView(chart);
- // this.jScrollPane1.setCorner(JScrollPane., chart);
- }
-
- /**
- * 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() {
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 629, Short.MAX_VALUE)
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 333, Short.MAX_VALUE)
- );
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- // End of variables declaration//GEN-END:variables
-}
diff --git a/src/chart/Legend.form b/src/chart/Legend.form
deleted file mode 100644
index c638b68..0000000
--- a/src/chart/Legend.form
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
diff --git a/src/chart/Legend.java b/src/chart/Legend.java
deleted file mode 100644
index e159b7c..0000000
--- a/src/chart/Legend.java
+++ /dev/null
@@ -1,65 +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;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class Legend extends javax.swing.JPanel {
-
- /**
- * Creates new form Legend
- */
- public Legend() {
- initComponents();
- }
-
- /**
- * 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() {
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 400, Short.MAX_VALUE)
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 300, Short.MAX_VALUE)
- );
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- // End of variables declaration//GEN-END:variables
-}
diff --git a/src/chart/NewJInternalFrame.form b/src/chart/NewJInternalFrame.form
deleted file mode 100644
index bf4d1b5..0000000
--- a/src/chart/NewJInternalFrame.form
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
diff --git a/src/chart/NewJInternalFrame.java b/src/chart/NewJInternalFrame.java
deleted file mode 100644
index 57523d7..0000000
--- a/src/chart/NewJInternalFrame.java
+++ /dev/null
@@ -1,111 +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;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class NewJInternalFrame extends javax.swing.JInternalFrame {
-
- /**
- * Creates new form NewJInternalFrame
- */
- public NewJInternalFrame() {
- initComponents();
- }
-
- /**
- * 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() {
-
- jButton1 = new javax.swing.JButton();
- jCheckBox1 = new javax.swing.JCheckBox();
- jTabbedPane1 = new javax.swing.JTabbedPane();
- chart1 = new chart.Chart();
-
- jButton1.setText("jButton1");
-
- jCheckBox1.setText("jCheckBox1");
-
- javax.swing.GroupLayout chart1Layout = new javax.swing.GroupLayout(chart1);
- chart1.setLayout(chart1Layout);
- chart1Layout.setHorizontalGroup(
- chart1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 168, Short.MAX_VALUE)
- );
- chart1Layout.setVerticalGroup(
- chart1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 239, Short.MAX_VALUE)
- );
-
- jTabbedPane1.addTab("tab1", chart1);
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
- getContentPane().setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(133, 133, 133)
- .addComponent(jButton1))
- .addGroup(layout.createSequentialGroup()
- .addGap(41, 41, 41)
- .addComponent(jCheckBox1)))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
- .addContainerGap())
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(27, 27, 27)
- .addComponent(jButton1)
- .addGap(18, 18, 18)
- .addComponent(jCheckBox1)
- .addContainerGap(184, Short.MAX_VALUE))
- .addGroup(layout.createSequentialGroup()
- .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
- .addContainerGap())
- );
-
- pack();
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private chart.Chart chart1;
- private javax.swing.JButton jButton1;
- private javax.swing.JCheckBox jCheckBox1;
- private javax.swing.JTabbedPane jTabbedPane1;
- // End of variables declaration//GEN-END:variables
-}
diff --git a/src/chart/NewJPanel.form b/src/chart/NewJPanel.form
deleted file mode 100644
index 22288e4..0000000
--- a/src/chart/NewJPanel.form
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
diff --git a/src/chart/NewJPanel.java b/src/chart/NewJPanel.java
deleted file mode 100644
index aa13b8a..0000000
--- a/src/chart/NewJPanel.java
+++ /dev/null
@@ -1,89 +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;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class NewJPanel extends javax.swing.JPanel {
-
- /**
- * Creates new form NewJPanel
- */
- public NewJPanel() {
- initComponents();
- }
-
- /**
- * 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() {
-
- jTabbedPane1 = new javax.swing.JTabbedPane();
- chart1 = new chart.Chart();
-
- javax.swing.GroupLayout chart1Layout = new javax.swing.GroupLayout(chart1);
- chart1.setLayout(chart1Layout);
- chart1Layout.setHorizontalGroup(
- chart1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 516, Short.MAX_VALUE)
- );
- chart1Layout.setVerticalGroup(
- chart1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 408, Short.MAX_VALUE)
- );
-
- jTabbedPane1.addTab("tab1", chart1);
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 516, Short.MAX_VALUE)
- .addContainerGap())
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 437, Short.MAX_VALUE)
- .addContainerGap())
- );
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private chart.Chart chart1;
- private javax.swing.JTabbedPane jTabbedPane1;
- // End of variables declaration//GEN-END:variables
-}
diff --git a/src/chart/NewJPanel1.form b/src/chart/NewJPanel1.form
deleted file mode 100644
index 4d3875d..0000000
--- a/src/chart/NewJPanel1.form
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
diff --git a/src/chart/NewJPanel1.java b/src/chart/NewJPanel1.java
deleted file mode 100644
index c646a91..0000000
--- a/src/chart/NewJPanel1.java
+++ /dev/null
@@ -1,73 +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;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class NewJPanel1 extends javax.swing.JPanel {
-
- /**
- * Creates new form NewJPanel1
- */
- public NewJPanel1() {
- initComponents();
- }
-
- /**
- * 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() {
-
- jScrollPane1 = new javax.swing.JScrollPane();
-
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 388, Short.MAX_VALUE)
- .addContainerGap())
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 294, Short.MAX_VALUE)
- .addContainerGap())
- );
- }// //GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JScrollPane jScrollPane1;
- // End of variables declaration//GEN-END:variables
-}
diff --git a/src/chart/OHLCChart.java b/src/chart/OHLCChart.java
deleted file mode 100644
index cd184be..0000000
--- a/src/chart/OHLCChart.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- *
- * @author 7u83 <7u83@mail.ru>
- */
-public class OHLCChart extends Chart{
-
-
-}