mirror of
https://github.com/vdemydiuk/mtapi.git
synced 2026-07-27 18:47:55 +00:00
Updated MtApi5
This commit is contained in:
Viacheslav Demydiuk
@@ -19,9 +19,6 @@ namespace MtApi5
|
||||
|
||||
#endregion
|
||||
|
||||
private const char ParamSeparator = ';';
|
||||
private const string LogProfileName = "MtApi5Client";
|
||||
|
||||
public delegate void QuoteHandler(object sender, string symbol, double bid, double ask);
|
||||
|
||||
|
||||
@@ -1776,7 +1773,6 @@ namespace MtApi5
|
||||
Dictionary<string, object> cmdParams = new() { { "ChartId", chartId }, { "SubWindow", subWindow },
|
||||
{ "Time", Mt5TimeConverter.ConvertToMtTime(time) }, { "Price", price } };
|
||||
|
||||
Dictionary<string, int> XY = [];
|
||||
var response = SendCommand<FuncResult<Dictionary<string,int>>>(ExecutorHandle, Mt5CommandType.ChartTimePriceToXY, cmdParams);
|
||||
if (response != null && response.Result != null
|
||||
&& response.Result.TryGetValue("X", out x)
|
||||
@@ -2247,9 +2243,9 @@ namespace MtApi5
|
||||
public bool ObjectCreate(long chartId, string name, ENUM_OBJECT type, int nwin, DateTime time, double price, List<Tuple<DateTime, double>>? listOfCoordinates = null)
|
||||
{
|
||||
//Count the additional coordinates
|
||||
int iAdditionalCoordinates = (listOfCoordinates != null) ? listOfCoordinates.Count() : 0;
|
||||
int iAdditionalCoordinates = (listOfCoordinates != null) ? listOfCoordinates.Count : 0;
|
||||
if(iAdditionalCoordinates > 29)
|
||||
throw new ArgumentOutOfRangeException("listOfCoordinates", "The maximum amount of coordinates in 30.");
|
||||
throw new ArgumentOutOfRangeException(nameof(listOfCoordinates), "The maximum amount of coordinates in 30.");
|
||||
|
||||
Dictionary<string, object> cmdParams = new() { { "ChartId", chartId }, { "Name", name ?? string.Empty },
|
||||
{ "Type", (int)type }, { "Nwin", nwin } };
|
||||
|
||||
@@ -1,25 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project Sdk="WixToolset.Sdk/5.0.0">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.6</ProductVersion>
|
||||
<ProjectGuid>{a9ed070f-ab4d-4380-9dde-5d931ac71333}</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>MtApi5Installer_$(Platform)</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>..\build\installers\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>..\build\installers\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
@@ -31,21 +21,24 @@
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Product.wxs" />
|
||||
<PackageReference Include="WixToolset.UI.wixext" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WixExtension Include="WixUIExtension">
|
||||
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
<ProjectReference Include="..\MT5Connector\MT5Connector.vcxproj">
|
||||
<Name>MT5Connector</Name>
|
||||
<Project>{cb6d4a3e-2f2e-4c67-929d-3c2a8fd1c556}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\MtApi5\MtApi5.csproj">
|
||||
<Name>MtApi5</Name>
|
||||
<Project>{ac8b5010-da75-477e-9ca5-547c649e12d8}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
+33
-51
@@ -1,28 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
|
||||
<?define ProductName="MtApi5" ?>
|
||||
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<?define ProductPathNative="..\build\products\$(var.Configuration)\x64\"?>
|
||||
<?define ProductPathNative="..\build\products\$(var.Configuration)\$(var.Platform)\"?>
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
|
||||
<?define PlatformSystemFolder = "System64Folder" ?>
|
||||
<?else ?>
|
||||
<?define ProductPathNative="..\build\products\$(var.Configuration)\"?>
|
||||
<?else?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
|
||||
<?define PlatformSystemFolder = "SystemFolder" ?>
|
||||
<?endif ?>
|
||||
<?endif?>
|
||||
|
||||
<?define ProductVersion=!(bind.FileVersion.MtApi5.dll) ?>
|
||||
<?define Manufacturer="DW"?>
|
||||
<?define ProductPath="..\build\products\$(var.Configuration)\net8.0\"?>
|
||||
|
||||
<Product Id="*"
|
||||
Name="$(var.ProductName) $(var.ProductVersion)"
|
||||
Language="1033"
|
||||
Version="$(var.ProductVersion)"
|
||||
Manufacturer="$(var.Manufacturer)"
|
||||
UpgradeCode="d72d346e-e6f7-4c23-85c6-1c42b3175599">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
|
||||
<Package Name="$(var.ProductName) $(var.ProductVersion)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="d72d346e-e6f7-4c23-85c6-1c42b3175599" InstallerVersion="200">
|
||||
|
||||
|
||||
<WixVariable Id="WixUILicenseRtf" Value="..\LICENSE.rtf" />
|
||||
|
||||
@@ -30,90 +23,79 @@
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
|
||||
<Feature Id="MtApi5" Title="$(var.ProductName)" Level="1">
|
||||
<ComponentGroupRef Id="MtApi5Components"/>
|
||||
<ComponentGroupRef Id="MtApi5Components" />
|
||||
</Feature>
|
||||
|
||||
<Feature Id="MT5Connector" Title="MT5 Connector" Level="1">
|
||||
<ComponentGroupRef Id="MT5ConnectorComponents"/>
|
||||
<ComponentGroupRef Id="MT5ConnectorComponents" />
|
||||
</Feature>
|
||||
|
||||
<Property Id="WIXUI_INSTALLDIR">INSTALLFOLDER</Property>
|
||||
<UIRef Id="WixUI_Mondo" />
|
||||
</Product>
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||||
<ui:WixUI Id="WixUI_Mondo" />
|
||||
</Package>
|
||||
|
||||
<Fragment>
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="$(var.PlatformProgramFilesFolder)">
|
||||
<StandardDirectory Id="$(var.PlatformProgramFilesFolder)">
|
||||
<Directory Id="INSTALLFOLDER" Name="$(var.ProductName)">
|
||||
|
||||
<Directory Id="ExpertFolder" Name="Experts">
|
||||
</Directory>
|
||||
|
||||
</Directory>
|
||||
</Directory>
|
||||
</StandardDirectory>
|
||||
|
||||
<Directory Id="$(var.PlatformSystemFolder)">
|
||||
</Directory>
|
||||
<StandardDirectory Id="$(var.PlatformSystemFolder)">
|
||||
</StandardDirectory>
|
||||
|
||||
<Directory Id="ProgramMenuFolder">
|
||||
<StandardDirectory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)">
|
||||
</Directory>
|
||||
</Directory>
|
||||
</StandardDirectory>
|
||||
|
||||
</Directory>
|
||||
</Fragment>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<ComponentGroup Id="MtApi5Components">
|
||||
|
||||
<Component Id="MtApi5Dll" Directory="INSTALLFOLDER">
|
||||
<File Id="MtApi5.dll" Name="MtApi5.dll" KeyPath="yes"
|
||||
Source="$(var.ProductPath)MtApi5.dll" />
|
||||
<File Id="MtApi5.dll" Name="MtApi5.dll" KeyPath="yes" Source="$(var.ProductPath)MtApi5.dll" />
|
||||
|
||||
<RegistryKey Root="HKLM"
|
||||
Key="Software\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\$(var.ProductName)"
|
||||
Action="createAndRemoveOnUninstall">
|
||||
<RegistryValue Type="string" Value="[INSTALLFOLDER]"/>
|
||||
<RegistryKey Root="HKLM" Key="Software\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\$(var.ProductName)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Type="string" Value="[INSTALLFOLDER]" />
|
||||
</RegistryKey>
|
||||
|
||||
</Component>
|
||||
|
||||
<Component Id="MtClientDll" Directory="INSTALLFOLDER">
|
||||
<File Id="MtClient.dll" Name="MtClient.dll" KeyPath="yes"
|
||||
src="$(var.ProductPath)MtClient.dll"/>
|
||||
<File Id="MtClient.dll" Name="MtClient.dll" KeyPath="yes" Source="$(var.ProductPath)MtClient.dll" />
|
||||
</Component>
|
||||
|
||||
<Component Id="NewtonsoftJsondll" Directory="INSTALLFOLDER">
|
||||
<File Id="Newtonsoft.Json.dll" Name="Newtonsoft.Json.dll" KeyPath="yes"
|
||||
src="$(var.ProductPath)Newtonsoft.Json.dll"/>
|
||||
<File Id="Newtonsoft.Json.dll" Name="Newtonsoft.Json.dll" KeyPath="yes" Source="$(var.ProductPath)Newtonsoft.Json.dll" />
|
||||
</Component>
|
||||
|
||||
<Component Id="MtApi5Expert" Directory="ExpertFolder">
|
||||
<File Id="MtApi5.ex5" Name="MtApi5.ex5" KeyPath="yes"
|
||||
Source="..\mq5\MtApi5.ex5" />
|
||||
<File Id="MtApi5.ex5" Name="MtApi5.ex5" KeyPath="yes" Source="..\mq5\MtApi5.ex5" />
|
||||
</Component>
|
||||
|
||||
<Component Id="AppShortcutConnMgr" Guid="*" Directory="ApplicationProgramsFolder">
|
||||
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
|
||||
<RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
||||
<Component Id="AppShortcutConnMgr" Directory="ApplicationProgramsFolder">
|
||||
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
|
||||
<RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
</ComponentGroup>
|
||||
|
||||
<ComponentGroup Id="MT5ConnectorComponents">
|
||||
|
||||
<Component Id="ConnectionProfileRegistryKey" Guid="*" Directory="INSTALLFOLDER">
|
||||
<RegistryKey Root="HKCU"
|
||||
Key="Software\MtApi\ConnectionProfiles\Local"
|
||||
Action="createAndRemoveOnUninstall">
|
||||
<RegistryValue Type="string" Name="Host" Value=""/>
|
||||
<RegistryValue Type="integer" Name="Port" Value="8222" KeyPath="yes"/>
|
||||
<Component Id="ConnectionProfileRegistryKey" Directory="INSTALLFOLDER">
|
||||
<RegistryKey Root="HKCU" Key="Software\MtApi\ConnectionProfiles\Local" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Type="string" Name="Host" Value="" />
|
||||
<RegistryValue Type="integer" Name="Port" Value="8222" KeyPath="yes" />
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
|
||||
<Component Id="MT5ConnectorDll" Directory="$(var.PlatformSystemFolder)">
|
||||
<File Id="MT5Connector5.dll" Name="MT5Connector.dll" KeyPath="yes"
|
||||
Source="$(var.ProductPathNative)MT5Connector.dll" />
|
||||
<File Id="MT5Connector5.dll" Name="MT5Connector.dll" KeyPath="yes" Source="$(var.ProductPathNative)MT5Connector.dll" />
|
||||
</Component>
|
||||
|
||||
</ComponentGroup>
|
||||
|
||||
Reference in New Issue
Block a user