Permalink
Browse files

Pro6 Pro5 Pro6 Pro5 @@

  • Loading branch information...
1 parent 620d28f commit b10029503b9025f291f449bb7ae1eeffc6f804cf @cheetahray committed Apr 25, 2012
@@ -607,7 +607,7 @@ public override Type WealthScriptType
get { return typeof(ATMDec2007); }
}
}
-
+ /*
public class ATMOct2007 : WealthScript
{
protected override void Execute()
@@ -706,5 +706,5 @@ public override Type WealthScriptType
get { return typeof(ATMOct2007); }
}
}
-
+ */
}
@@ -888,7 +888,7 @@ public override Type WealthScriptType
get { return typeof(ATMMay2010); }
}
}
-
+ /*
public class ATMJun2010 : WealthScript
{
private StrategyParameter longChannelPer;
@@ -1002,7 +1002,7 @@ public override Type WealthScriptType
get { return typeof(ATMJun2010); }
}
}
-
+ */
public class ATMJul2010 : WealthScript
{
protected override void Execute()
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{F83793FA-C5CF-4B3A-AF0E-AFD5BE1658D8}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Strategies.ActiveTrader</RootNamespace>
- <AssemblyName>Strategies.ActiveTrader</AssemblyName>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- <Reference Include="WealthLab, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\WealthLab.dll</HintPath>
- </Reference>
- <Reference Include="WealthLab.Extensions.Attribute, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\WealthLab.Extensions.Attribute.dll</HintPath>
- </Reference>
- <Reference Include="WealthLab.Indicators, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\WealthLab.Indicators.dll</HintPath>
- </Reference>
- <Reference Include="WealthLab.Rules, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\WealthLab.Rules.dll</HintPath>
- </Reference>
- <Reference Include="WealthLab.Rules.Candlesticks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\WealthLab.Rules.Candlesticks.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="ATMag2007.cs" />
- <Compile Include="ATMag2008.cs" />
- <Compile Include="ATMag2009.cs" />
- <Compile Include="ATMag2010.cs" />
- <Compile Include="ATM_Legacy.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="Resources\EM.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <SubType>Designer</SubType>
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\AT.png" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\History.txt" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <StartAction>Program</StartAction>
- <StartProgram>C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\WealthLabPro.exe</StartProgram>
- </PropertyGroup>
-</Project>
@@ -6,3 +6,11 @@ C:\Users\Ray\Downloads\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader
C:\Users\Ray\Downloads\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\Strategies.ActiveTrader.pdb
C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\Strategies.ActiveTrader.dll
C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 6\Strategies.ActiveTrader.pdb
+C:\Users\Ray\Documents\Visual Studio 2010\Projects\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\ResolveAssemblyReference.cache
+C:\Users\Ray\Documents\Visual Studio 2010\Projects\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\Strategies.ActiveTrader.Properties.Resources.resources
+C:\Users\Ray\Documents\Visual Studio 2010\Projects\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\ResGen.read.1.tlog
+C:\Users\Ray\Documents\Visual Studio 2010\Projects\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\ResGen.write.1.tlog
+C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 5\Strategies.ActiveTrader.dll
+C:\Program Files (x86)\Fidelity Investments\Wealth-Lab Pro 5\Strategies.ActiveTrader.pdb
+C:\Users\Ray\Documents\Visual Studio 2010\Projects\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\Strategies.ActiveTrader.dll
+C:\Users\Ray\Documents\Visual Studio 2010\Projects\WealthLab.Strategies.ActiveTrader\Strategies.ActiveTrader\obj\Debug\Strategies.ActiveTrader.pdb
@@ -41,10 +41,12 @@ public override void ConnectStreaming(IConnectionStatus connStatus)
{
t.Enabled = true;
}
+ /*
public override void DisconnectStreaming(IConnectionStatus connStatus)
{
t.Enabled = false;
}
+ */
public override StaticDataProvider GetStaticProvider()
{
rayProvider = new StaticProvider();
@@ -99,7 +101,7 @@ private void OnTimerEvent(object sender, EventArgs e)
q.TimeStamp = q.TimeStamp.AddMinutes(minutes);
q.TimeStamp = q.TimeStamp.AddSeconds(seconds);
bool updatelastmin = (q.TimeStamp.Minute != lastMinute.Minute && DateTime.Compare(q.TimeStamp, lastMinute) > 0);
- if (updatelastmin && (highest - lowest) < maxrange )
+ if (updatelastmin && highest > lowest )
{
barsNew.Add(q.TimeStamp, firstOpen, highest, lowest, q.Price, minSize);
rayProvider.LoadAndUpdateBars(ref bars, barsNew);
@@ -261,7 +263,7 @@ private void OnTimerEvent(object sender, EventArgs e)
public override string FriendlyName { get { return "OpenWealth"; } }
public override System.Drawing.Bitmap Glyph { get { return Properties.Resources.Image1; } }
public override bool IsConnected { get { return t.Enabled; } }
- public override bool StreamingAtDisconnect { get { return !t.Enabled; } }
+ //public override bool StreamingAtDisconnect { get { return !t.Enabled; } }
public override string URL { get { return "http://openwealth.ru/"; } }
#endregion Descriptive

0 comments on commit b100295

Please sign in to comment.