From 3e19afbe256ea1e559687508d543148dfbd41595 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@maiol.ru>
Date: Fri, 17 Nov 2017 23:09:06 +0100
Subject: [PATCH] SMAIndicator works

---
 nbproject/project.properties |  2 +-
 src/chart/MasterChart.java   |  2 +-
 src/sesim/OHLCData.java      |  4 ++++
 src/sesim/SMAIndicator.java  | 26 ++++++++++++++++++++------
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index f32b1e4..f87edc6 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,4 +1,4 @@
-#Fri, 17 Nov 2017 21:34:44 +0100
+#Fri, 17 Nov 2017 23:03:13 +0100
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
diff --git a/src/chart/MasterChart.java b/src/chart/MasterChart.java
index ecbc510..a2a3630 100644
--- a/src/chart/MasterChart.java
+++ b/src/chart/MasterChart.java
@@ -255,7 +255,7 @@ public class MasterChart extends javax.swing.JPanel implements QuoteReceiver, Ch
 
     @Override
     public OHLCData get() {
-        return Globals.se.getOHLCdata(60000 * 60);
+        return Globals.se.getOHLCdata(60000 * 10);
 
     }
 }
diff --git a/src/sesim/OHLCData.java b/src/sesim/OHLCData.java
index 4e48d96..0ec2ec8 100644
--- a/src/sesim/OHLCData.java
+++ b/src/sesim/OHLCData.java
@@ -149,6 +149,10 @@ public class OHLCData {
         data.set(n,item);
     }
 
+    public void add(OHLCDataItem item){
+        data.add(item);
+    }
+    
     private void updateMinMax(float price) {
         if (price > max) {
 
diff --git a/src/sesim/SMAIndicator.java b/src/sesim/SMAIndicator.java
index 1749aa9..f9f892d 100644
--- a/src/sesim/SMAIndicator.java
+++ b/src/sesim/SMAIndicator.java
@@ -25,6 +25,8 @@
  */
 package sesim;
 
+import gui.Globals;
+
 /**
  *
  * @author 7u83 <7u83@mail.ru>
@@ -36,9 +38,10 @@ public class SMAIndicator  implements Indicator {
     
     public SMAIndicator(OHLCData parent){
         this.parent=parent;
+        indicator = new OHLCData();
     }
     
-    int len=10;
+    int len=30;
     
     float getAt(int pos){
         if (parent.size()==0)
@@ -50,7 +53,8 @@ public class SMAIndicator  implements Indicator {
             start=0;
         float sum=0;
         for (int i=start; i<pos; i++){
-            sum += parent.get(i).getAverage();
+            //sum += parent.get(i).getAverage();
+           sum += parent.get(i).close;
             
         }
         if (pos-start==0){
@@ -61,16 +65,26 @@ public class SMAIndicator  implements Indicator {
     }
     
     void update(){
+        parent =  Globals.se.getOHLCdata(60000 * 10);
+        
         if (parent.size()==0)
             return;
         
-        for (int i = parent.size()-1;i<0;i++){
+  /*      if (parent.size()==indicator.size()){
+            int i=parent.size()-1;
             OHLCDataItem p = parent.get(i);
-            
             float pr = this.getAt(i);
-            
             OHLCDataItem it = new sesim.OHLCDataItem(p.time, pr, 0);
-            this.indicator.set(i, it);
+            return;
+        }
+    */    
+        for (int i = indicator.size();i<parent.size();i++){
+            OHLCDataItem p = parent.get(i);
+            float pr = this.getAt(i);
+            OHLCDataItem it = new sesim.OHLCDataItem(p.time, pr, 0);
+
+            this.indicator.add(it);
+            
            
             
         }