diff options
Diffstat (limited to 'Software/Visual_Studio/FSE/Modules')
4 files changed, 26 insertions, 5 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Dialogs/JobRunStreamingView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Dialogs/JobRunStreamingView.xaml index 901dbd2ec..9aa5bb447 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Dialogs/JobRunStreamingView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Dialogs/JobRunStreamingView.xaml @@ -11,7 +11,7 @@ <Grid> <DockPanel Margin="10"> <StackPanel DockPanel.Dock="Top" Orientation="Horizontal"> - <material:PackIcon Kind="Update" Width="42" Height="42" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="Fant" /> + <Image Source="../Images/streaming.png" Width="42" Height="42" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="Fant" /> <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}"> Job Runs Streaming </TextBlock> @@ -22,8 +22,8 @@ <CheckBox x:Name="chkEnable" IsChecked="{Binding Config.Enable}">Enable Streaming</CheckBox> <DockPanel Margin="18 2 0 0" TextElement.Foreground="{StaticResource FSE_GrayBrush}"> <material:PackIcon Kind="InfoOutline" Width="18" Height="18" /> - <TextBlock Margin="2 0 0 0" FontSize="{StaticResource FSE_SmallerFontSize}"> - Automatically updates when the remote machine completes a job. + <TextBlock Margin="2 1 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_SmallerFontSize}"> + Automatically update this view when the remote machine completes a job. </TextBlock> </DockPanel> </StackPanel> @@ -32,7 +32,7 @@ <CheckBox IsChecked="{Binding Config.EnableCsvReports}">Enable CSV Report Streaming</CheckBox> <DockPanel Margin="18 2 0 0" TextElement.Foreground="{StaticResource FSE_GrayBrush}"> <material:PackIcon Kind="InfoOutline" Width="18" Height="18" /> - <TextBlock Margin="2 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_SmallerFontSize}"> + <TextBlock Margin="2 1 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_SmallerFontSize}"> Automatically create a new csv report file when a new job run is received. </TextBlock> </DockPanel> diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/streaming.png b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/streaming.png Binary files differnew file mode 100644 index 000000000..bc71a0077 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/streaming.png diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj index 6f04a71ab..ac7c32b57 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj @@ -33,6 +33,24 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'"> + <OutputPath>..\..\..\Build\Twine Studio\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'"> + <OutputPath>..\..\..\Build\Twine Studio\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <Optimize>false</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\..\..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> @@ -214,6 +232,9 @@ <ItemGroup> <Resource Include="Images\cmyk.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\streaming.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs index de104ba59..b5b0ebd27 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs @@ -210,7 +210,7 @@ namespace Tango.FSE.Statistics.ViewModels JobsAutoCompleteProvider = new AutoCompleteSource<string>(AutoCompleteJobs); - StartSelectedDate = DateTime.Now.AddYears(-7); + StartSelectedDate = DateTime.Now.AddMonths(-1); EndSelectedDate = DateTime.Now; LengthUpperValue = 10000; |
