use highchart style build MA

iryndin · Oct 26, 2014 · a24f34d · a24f34d
1 parent 299df61
commit a24f34d
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 32 deletions.
diff --git a/app/assets/javascripts/component_ui/candlestick.js.coffee b/app/assets/javascripts/component_ui/candlestick.js.coffee
@@ -76,7 +76,7 @@ RANGE_DEFAULT =
   @initTooltip = ->
     chart = @$node.highcharts()
     tooltips = []
-    for i in [0..3]
+    for i in [0..1]
       if chart.series[i].points.length > 0
         tooltips.push chart.series[i].points[chart.series[i].points.length - 1]
     chart.tooltip.refresh tooltips
@@ -175,21 +175,22 @@ RANGE_DEFAULT =
           gridLineColor: '#222'
           gridLineDashStyle: 'ShortDot'
           top: "0%"
-          height: "60%"
+          height: "70%"
+          lineColor: '#fff'
         }
         {
           labels:
             enabled: false
-          top: "60%"
+          top: "70%"
           gridLineColor: '#000'
-          height: "20%"
+          height: "15%"
         }
         {
           labels:
             enabled: false
-          top: "80%"
+          top: "85%"
           gridLineColor: '#000'
-          height: "20%"
+          height: "15%"
         }
       ]
 
@@ -225,35 +226,29 @@ RANGE_DEFAULT =
           showInLegend: false
         }
         {
-          name: 'MA5'
           type: 'spline'
-          data: data['ma5']
-          color: '#7c9aaa'
-        }
-        {
-          name: 'MA10'
-          type: 'spline'
-          data: data['ma10']
-          color: '#be8f53'
-        }
-        {
-          name: 'MA15'
-          type: 'spline'
-          data: data['ma15']
+          data: data['close']
           visible: false
+          id: 'close'
+          showInLegend: false
         }
         {
-          name: 'MA30'
-          type: 'spline'
-          data: data['ma30']
-          visible: false
+          name: 'MA5',
+          linkedTo: 'close',
+          showInLegend: true,
+          type: 'trendline',
+          algorithm: 'MA',
+          periods: 5
+          color: '#7c9aaa'
         }
         {
-          type: 'spline'
-          data: data['close']
-          visible: false
-          id: 'close'
-          showInLegend: false
+          name: 'MA10'
+          linkedTo: 'close',
+          showInLegend: true,
+          type: 'trendline',
+          algorithm: 'MA',
+          periods: 10
+          color: '#be8f53'
         }
         {
           name: 'EMA7',

diff --git a/vendor/assets/javascripts/highsotck_ex.js → ...cripts/highcharts/technical_indicators.js b/vendor/assets/javascripts/highsotck_ex.js → ...cripts/highcharts/technical_indicators.js
@@ -70,6 +70,11 @@
 			return SMA(xData, yData, periods);
 		},
 
+    MA: function (xData, yData, periods) {
+
+			return MA(xData, yData, periods);
+    },
+
 
 		/* Function using the global EMA function.
 		 * 
@@ -271,6 +276,26 @@
 		return lineData;
 	}
 
+	function MA (xData, yData, periods) {
+    var maLine = [],
+        periodArr = [],
+        length = yData.length;
+
+		for (var i = 0; i < length; i++) {
+      periodArr.push(yData[i]);
+
+      if (i >= periods) {
+				maLine.push([xData[i] , arrayAvg(periodArr)]);
+        periodArr.shift();
+      }
+      else {
+				maLine.push([xData[i] , null]);
+      }
+    }
+
+    return maLine;
+  }
+
 
 	/* Function based on the idea of an exponential moving average.
 	 * 
@@ -283,7 +308,6 @@
 	 * @return an array containing the EMA.	
 	**/
 	function EMA (xData, yData, periods) {
-
 		var t,
 			y = false,
 			n = periods,
@@ -384,4 +408,3 @@
 	}
 
 }(Highcharts));
-
diff --git a/app/assets/javascripts/market.js.coffee b/app/assets/javascripts/market.js.coffee
@@ -21,7 +21,6 @@
 #= require ./lib/pusher_connection
 
 #= require highstock
-#= require highsotck_ex
 #= require_tree ./highcharts/
 
 #= require_tree ./helpers