From fc54b5dd4a134efd6dacdbe2b4bca105324cac5b Mon Sep 17 00:00:00 2001
From: Viacheslav Demydiuk <vdemydiuk@gmail.com>
Date: Wed, 26 Aug 2020 21:06:26 +0300
Subject: [PATCH] Updated test application (MT5) to perform testing functions
 iBullsPower, iBearsPower, BarsCalculated, CopyBuffer.

---
 TestClients/MtApi5TestClient/MainWindow.xaml | 15 ++--
 TestClients/MtApi5TestClient/ViewModel.cs    | 87 ++++++++++++++++----
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/TestClients/MtApi5TestClient/MainWindow.xaml b/TestClients/MtApi5TestClient/MainWindow.xaml
index 64baf401..8c280363 100755
--- a/TestClients/MtApi5TestClient/MainWindow.xaml
+++ b/TestClients/MtApi5TestClient/MainWindow.xaml
@@ -439,6 +439,7 @@
                                     <RowDefinition Height="Auto"/>
                                     <RowDefinition Height="Auto"/>
                                     <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
 
                                 <DockPanel Grid.Row="0" LastChildFill="True">
@@ -454,6 +455,15 @@
                                     <Button Command="{Binding IndicatorReleaseCommand}" Margin="2"
                                             Content="IndicatorRelease" HorizontalAlignment="Left" />
                                 </StackPanel>
+                                <WrapPanel Grid.Row="2" Margin="2">
+                                    <Button Command="{Binding iCustomCommand}" Content="iCustom" Margin="2"/>
+                                    <Button Command="{Binding iBullsPowerCommand}" Content="iBullPower" Margin="2"/>
+                                    <Button Command="{Binding iBearsPowerCommand}" Content="iBearPower" Margin="2"/>
+                                </WrapPanel>
+                                <WrapPanel Grid.Row="3">
+                                    <Button  Command="{Binding BarsCalculatedCommand}" Content="BarsCalculated" Margin="2"/>
+                                    <Button  Command="{Binding CopyBufferCommand}" Content="CopyBuffer" Margin="2"/>
+                                </WrapPanel>
                             </Grid>
                         </Grid>
 
@@ -498,11 +508,6 @@
                     </Grid>
                 </TabItem>
 
-                <TabItem Header="Indicators">
-                    <WrapPanel VerticalAlignment="Top" Margin="5">
-                        <Button Command="{Binding iCustomCommand}" Content="iCustom" Margin="2"/>
-                    </WrapPanel>
-                </TabItem>
                 <TabItem Header="Chart Functions">
                     <Grid>
                         <Grid.RowDefinitions>
diff --git a/TestClients/MtApi5TestClient/ViewModel.cs b/TestClients/MtApi5TestClient/ViewModel.cs
index 3389e7dc..bf373118 100755
--- a/TestClients/MtApi5TestClient/ViewModel.cs
+++ b/TestClients/MtApi5TestClient/ViewModel.cs
@@ -44,6 +44,11 @@ public class ViewModel : INotifyPropertyChanged
         public DelegateCommand CopyCloseCommand { get; private set; }
         public DelegateCommand IndicatorCreateCommand { get; private set; }
         public DelegateCommand IndicatorReleaseCommand { get; private set; }
+        public DelegateCommand iCustomCommand { get; private set; }
+        public DelegateCommand iBullsPowerCommand { get; private set; }
+        public DelegateCommand iBearsPowerCommand { get; private set; }
+        public DelegateCommand BarsCalculatedCommand { get; private set; }
+        public DelegateCommand CopyBufferCommand { get; private set; }
 
         public DelegateCommand CopyTickVolumeCommand { get; private set; }
         public DelegateCommand CopyRealVolumeCommand { get; private set; }
@@ -75,8 +80,6 @@ public class ViewModel : INotifyPropertyChanged
         public DelegateCommand AlertCommand { get; private set; }
         public DelegateCommand TesterStopCommand { get; private set; }
 
-        public DelegateCommand iCustomCommand { get; private set; }
-
         public DelegateCommand TimeCurrentCommand { get; private set; }
 
         public DelegateCommand ChartOpenCommand { get; private set; }
@@ -354,6 +357,11 @@ private void InitCommands()
             CopyCloseCommand = new DelegateCommand(ExecuteCopyClose);
             IndicatorCreateCommand = new DelegateCommand(ExecuteIndicatorCreate);
             IndicatorReleaseCommand = new DelegateCommand(ExecuteIndicatorRelease);
+            iCustomCommand = new DelegateCommand(ExecuteICustom);
+            iBullsPowerCommand = new DelegateCommand(ExecuteIBullsPowerCommand);
+            iBearsPowerCommand = new DelegateCommand(ExecuteIBearsPowerCommand);
+            BarsCalculatedCommand = new DelegateCommand(ExecuteBarsCalculatedCommand);
+            CopyBufferCommand = new DelegateCommand(ExecuteCopyBufferCommand);
 
             CopyTickVolumeCommand = new DelegateCommand(ExecuteCopyTickVolume);
             CopyRealVolumeCommand = new DelegateCommand(ExecuteCopyRealVolume);
@@ -385,8 +393,6 @@ private void InitCommands()
             ResetLastErrorCommand = new DelegateCommand(ExecuteResetLastError);
             TesterStopCommand = new DelegateCommand(ExecuteTesterStop);
 
-            iCustomCommand = new DelegateCommand(ExecuteICustom);
-
             ChartOpenCommand = new DelegateCommand(ExecuteChartOpen);
             ChartTimePriceToXYCommand = new DelegateCommand(ExecuteChartTimePriceToXY);
             ChartXYToTimePriceCommand = new DelegateCommand(ExecuteChartXYToTimePrice);
@@ -806,6 +812,68 @@ private async void ExecuteIndicatorRelease(object o)
             AddLog($"IndicatorRelease [{indicatorHandle}]: result - {retVal}");
         }
 
+        private async void ExecuteICustom(object o)
+        {
+            const string name = @"Examples\Custom Moving Average";
+            int[] parameters = { 0, 21, (int)ENUM_APPLIED_PRICE.PRICE_CLOSE };
+
+            var retVal = await Execute(() => _mtApiClient.iCustom(TimeSeriesValues.SymbolValue, TimeSeriesValues.TimeFrame, name, parameters));
+            TimeSeriesValues.IndicatorHandle = retVal;
+            AddLog($"Custom Moving Average: result - {retVal}");
+        }
+
+        private async void ExecuteIBullsPowerCommand(object o)
+        {
+            const int maPeriod = 13;
+            var retVal = await Execute(() => _mtApiClient.iBullsPower(TimeSeriesValues.SymbolValue, TimeSeriesValues.TimeFrame, maPeriod));
+            TimeSeriesValues.IndicatorHandle = retVal;
+
+            AddLog($"iBullPower: result - {retVal}");
+        }
+
+        private async void ExecuteIBearsPowerCommand(object o)
+        {
+            const int maPeriod = 13;
+            var retVal = await Execute(() => _mtApiClient.iBearsPower(TimeSeriesValues.SymbolValue, TimeSeriesValues.TimeFrame, maPeriod));
+            TimeSeriesValues.IndicatorHandle = retVal;
+
+            AddLog($"iBearsPower: result - {retVal}");
+        }
+
+        private async void ExecuteBarsCalculatedCommand(object o)
+        {
+            var retVal = await Execute(() => _mtApiClient.BarsCalculated(TimeSeriesValues.IndicatorHandle));
+
+            AddLog($"BarsCalculated: result - {retVal}");
+        }
+
+        private async void ExecuteCopyBufferCommand(object o)
+        {
+            TimeSeriesResults.Clear();
+
+            var result = await Execute(() =>
+            {
+                var count = _mtApiClient.CopyBuffer(TimeSeriesValues.IndicatorHandle, 0, TimeSeriesValues.StartPos, TimeSeriesValues.Count, out var values);
+                return count > 0 ? values : null;
+            });
+
+            if (result == null)
+            {
+                AddLog("CopyRates: result is null");
+                return;
+            }
+
+            RunOnUiThread(() =>
+            {
+                foreach (var value in result)
+                {
+                    TimeSeriesResults.Add($"{value:F6}");
+                }
+            });
+
+            AddLog("CopyRates: success");
+        }
+
         private async void ExecuteCopyRates(object o)
         {
             if (string.IsNullOrEmpty(TimeSeriesValues?.SymbolValue)) return;
@@ -1177,17 +1245,6 @@ private void ExecuteTesterStop(object obj)
             AddLog("TesterStop: executed.");
         }
 
-        private async void ExecuteICustom(object o)
-        {
-            const string symbol = "EURUSD";
-            const ENUM_TIMEFRAMES timeframe = ENUM_TIMEFRAMES.PERIOD_H1;
-            const string name = @"Examples\Custom Moving Average";
-            int[] parameters = { 0, 21, (int)ENUM_APPLIED_PRICE.PRICE_CLOSE };
-
-            var retVal = await Execute(() => _mtApiClient.iCustom(symbol, timeframe, name, parameters));
-            AddLog($"Custom Moving Average: result - {retVal}");
-        }
-
         private async void ExecuteTimeCurrent(object o)
         {
             var retVal = await Execute(() => _mtApiClient.TimeCurrent());