Merge branch 'fia' of bitbucket.org:bluetradesys/spark into fia
This commit is contained in:
commit
568cf522aa
5 files changed
+9
-5
No files matched your search
@@ -48,7 +48,7 @@
|
||||
<DataGridTextColumn Header="User" CellStyle="{StaticResource RowHeaderCell}" Binding="{Binding user}"/>
|
||||
<DataGridTextColumn Header="Account" CellStyle="{StaticResource RowHeaderCell}" Binding="{Binding account}"/>
|
||||
<DataGridTextColumn Header="Exchange" CellStyle="{StaticResource RowHeaderCell}" Binding="{Binding exchange}"/>
|
||||
<DataGridTextColumn Header="Security" CellStyle="{StaticResource RowHeaderCell}" Binding="{Binding security, StringFormat='q/n:./m:c'}"/>
|
||||
<DataGridTextColumn Header="Security" CellStyle="{StaticResource RowHeaderCell}" Binding="{Binding security}"/>
|
||||
<DataGridTextColumn Header="TIF" Binding="{Binding time_in_force}"/>
|
||||
<usp:DataGridAlgoTypeColumn Header="Algo" ElementStyle="{StaticResource AlgoTypeElement}" SortMemberPath="algo_type"/>
|
||||
<DataGridTextColumn Header="B/S" ElementStyle="{StaticResource SideColorCodedTextElement}" Binding="{Binding side}" />
|
||||
|
||||
@@ -19,6 +19,7 @@ namespace mbts.ui.spark
|
||||
public ContractOneofCase type => security.ContractCase;
|
||||
public string symbol => security.ForceSymbol();
|
||||
public string display_name => security.ToString(null);
|
||||
public string display_exchange => security.DisplayExchange();
|
||||
public bool is_selected {
|
||||
get => _is_selected;
|
||||
set {
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ namespace mbts.ui.spark
|
||||
if (new_val != null) {
|
||||
new_val.ViewDestroyed += target._internal_security_items_ViewDestroyed;
|
||||
var vs = new CollectionViewSource<SecurityCollectionView>(new_val);
|
||||
vs.GroupDescriptions.AddRange(new[] { "exchange", "symbol", "type" }.Select(p => new PropertyGroupDescription(p)));
|
||||
vs.GroupDescriptions.AddRange(new[] { "display_exchange", "symbol", "type" }.Select(p => new PropertyGroupDescription(p)));
|
||||
target.SecurityItemsViewSource = vs;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +66,10 @@ namespace bts.api
|
||||
if (security.ContractCase == ContractOneofCase.Synthetic) return ForceSymbol(security.Synthetic.Legs.First().Security);
|
||||
else return security.Symbol;
|
||||
}
|
||||
|
||||
public static string DisplayExchange(this Security security) {
|
||||
return security.ContractCase == ContractOneofCase.Synthetic ? $"[{string.Join(",", get_flat_future_legs(security).Select(flt => flt.Item1.ToString()).Distinct().OrderBy(e => e))}]" : security.Exchange.ToString();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,5 @@ if not exist build\src\lib\spark_lib.vcxproj (
|
||||
copy /y tools\cpp.build.props build\Directory.Build.Props > nul
|
||||
@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul
|
||||
cd %~dp0\..
|
||||
msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore spark_client.sln
|
||||
msbuild /m /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary spark_client.sln
|
||||
|
||||
msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore %* spark_client.sln
|
||||
msbuild /m /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln
|
||||
Reference in new issue
Block a user