Issue #32: Added function ObjectCreate in MtApi (MT4)

MTApiService/MTApiService.csproj

@@ -83,7 +83,7 @@
     <Compile Include="MtResponse.cs" />
     <Compile Include="MtServer.cs" />
     <Compile Include="MtCommand.cs" />
-    <Compile Include="MtServerInstance.cs" />
+    <Compile Include="MtAdapter.cs" />
     <Compile Include="MtService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

MTApiService/MtAdapter.cs

@@ -4,13 +4,13 @@ using log4net;
 
 namespace MTApiService
 {
-    public class MtServerInstance
+    public class MtAdapter
     {
         #region Fields
         private const string LogProfileName = "MtApiService";
 
-        private static readonly ILog Log = LogManager.GetLogger(typeof(MtServerInstance));
-        private static readonly MtServerInstance Instance = new MtServerInstance();
+        private static readonly ILog Log = LogManager.GetLogger(typeof(MtAdapter));
+        private static readonly MtAdapter Instance = new MtAdapter();
 
         private readonly Dictionary<int, MtServer> _servers = new Dictionary<int, MtServer>();
         private readonly Dictionary<int, MtExpert> _experts = new Dictionary<int, MtExpert>();
@@ -18,16 +18,16 @@ namespace MTApiService
 
         #region Init Instance
 
-        private MtServerInstance()
+        private MtAdapter()
         {
             LogConfigurator.Setup(LogProfileName);
         }
         
-        static MtServerInstance() 
+        static MtAdapter() 
         {
         }
 
-        public static MtServerInstance GetInstance()
+        public static MtAdapter GetInstance()
         {
             return Instance;
         }
@@ -208,6 +208,50 @@ namespace MTApiService
 
             return retval;
         }
+
+        public object GetNamedParameter(int expertHandle, string name)
+        {
+            Log.DebugFormat("GetNamedParameter: begin. expertHandle = {0}, name = {1}", expertHandle, name);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert == null)
+            {
+                Log.WarnFormat("GetNamedParameter: expert with id {0} has not been found.", expertHandle);
+            }
+
+            var retval = expert?.GetNamedParameter(name);
+
+            Log.DebugFormat("GetNamedParameter: end. retval = {0}", retval);
+
+            return retval;
+        }
+
+        public bool ContainsNamedParameter(int expertHandle, string name)
+        {
+            Log.DebugFormat("ContainsNamedParameter: begin. expertHandle = {0}, name = {1}", expertHandle, name);
+
+            MtExpert expert;
+            lock (_experts)
+            {
+                expert = _experts[expertHandle];
+            }
+
+            if (expert == null)
+            {
+                Log.WarnFormat("ContainsNamedParameter: expert with id {0} has not been found.", expertHandle);
+            }
+
+            bool retval = expert != null ? expert.ContainsNamedParameter(name) : false;
+
+            Log.DebugFormat("ContainsNamedParameter: end. retval = {0}", retval);
+
+            return retval;
+        }
         #endregion
 
         #region Private Methods

MTApiService/MtClient.cs

@@ -139,7 +139,7 @@ namespace MTApiService
         }
 
         /// <exception cref="CommunicationException">Thrown when connection failed</exception>
-        public MtResponse SendCommand(int commandType, ArrayList parameters, int expertHandle)
+        public MtResponse SendCommand(int commandType, ArrayList parameters, Dictionary<string, object> namedParams, int expertHandle)
         {
             Log.DebugFormat("SendCommand: begin. commandType = {0}, parameters count = {1}", commandType, parameters?.Count);
 
@@ -153,7 +153,11 @@ namespace MTApiService
 
             try
             {
-                result = _proxy.SendCommand(new MtCommand { CommandType = commandType, Parameters = parameters, ExpertHandle = expertHandle});
+                result = _proxy.SendCommand(new MtCommand {
+                    CommandType = commandType,
+                    Parameters = parameters,
+                    NamedParams = namedParams,
+                    ExpertHandle = expertHandle});
             }
             catch (Exception ex)
             {

MTApiService/MtCommand.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Serialization;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace MTApiService
 {
@@ -12,6 +13,9 @@ namespace MTApiService
         [DataMember]
         public ArrayList Parameters { get; set; }
 
+        [DataMember]
+        public Dictionary<string, object> NamedParams { get; set; }
+
         [DataMember]
         public int ExpertHandle { get; set; }
 

MTApiService/MtExpert.cs

@@ -60,7 +60,7 @@ namespace MTApiService
 
         public object GetCommandParameter(int index)
         {
-            Log.DebugFormat("GetCommandType: called. index = {0}", index);
+            Log.DebugFormat("GetCommandParameter: called. index = {0}", index);
 
             var command = _currentTask?.Command;
             if (command?.Parameters != null && index >= 0 && index < command.Parameters.Count)
@@ -71,6 +71,46 @@ namespace MTApiService
             return null;
         }
 
+        public object GetNamedParameter(string name)
+        {
+            Log.DebugFormat("GetNamedParameter: called. name = {0}", name);
+
+            var command = _currentTask?.Command;
+            if (command == null)
+            {
+                Log.Warn("GetNamedParameter: command is not defined in task.");
+                return null;
+            }
+
+            if (command.NamedParams == null)
+            {
+                Log.Warn("GetNamedParameter: NamedParams is not defined in command.");
+                return null;
+            }
+
+            return command.NamedParams[name];
+        }
+
+        public bool ContainsNamedParameter(string name)
+        {
+            Log.DebugFormat("ContainsNamedParameter: called. name = {0}", name);
+
+            var command = _currentTask?.Command;
+            if (command == null)
+            {
+                Log.Warn("ContainsNamedParameter: command is not defined in task.");
+                return false;
+            }
+
+            if (command.NamedParams == null)
+            {
+                Log.Warn("ContainsNamedParameter: NamedParams is not defined in command.");
+                return false;
+            }
+
+            return command.NamedParams.ContainsKey(name);
+        }
+
         public void SendEvent(MtEvent mtEvent)
         {
             Log.DebugFormat("SendEvent: begin. event = {0}", mtEvent);

MTApiService/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.24.0")]
-[assembly: AssemblyFileVersion("1.0.24.0")]
+[assembly: AssemblyVersion("1.0.25.0")]
+[assembly: AssemblyFileVersion("1.0.25.0")]