diff options
| author | Roy <Roy.mail.net@gmail.com> | 2022-11-16 05:09:17 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2022-11-16 05:09:17 +0200 |
| commit | d391dd73fc06f996c08455e6dc2e26aec2e489c3 (patch) | |
| tree | c9615b16e5161829cf1ddc364a0c088b9e7276a1 | |
| parent | 5dc67f5f613825f9f835b9cfb9790be69f6538a4 (diff) | |
| download | Tango-d391dd73fc06f996c08455e6dc2e26aec2e489c3.tar.gz Tango-d391dd73fc06f996c08455e6dc2e26aec2e489c3.zip | |
Twine studio statistics build.
| -rw-r--r-- | Software/DB/PPC/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/PPC/Tango_log.ldf | bin | 53673984 -> 53673984 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Dialogs/JobRunStreamingView.xaml | 8 | ||||
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/streaming.png | bin | 0 -> 3157 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj | 21 | ||||
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.TwineStudio.sln | 11 |
7 files changed, 37 insertions, 5 deletions
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex 548d794d8..78bd2d0d6 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex 5d1aa48e8..45f70f71a 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf 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; diff --git a/Software/Visual_Studio/Tango.TwineStudio.sln b/Software/Visual_Studio/Tango.TwineStudio.sln index 230743a66..82015adad 100644 --- a/Software/Visual_Studio/Tango.TwineStudio.sln +++ b/Software/Visual_Studio/Tango.TwineStudio.sln @@ -45,6 +45,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{A3CC0A72-0DA EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineService", "Web\Tango.MachineService\Tango.MachineService.csproj", "{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.Statistics", "FSE\Modules\Tango.FSE.Statistics\Tango.FSE.Statistics.csproj", "{7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -189,6 +191,14 @@ Global {3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS_Debug|Any CPU.Build.0 = Debug|Any CPU {3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS|Any CPU.ActiveCfg = Release|Any CPU {3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS|Any CPU.Build.0 = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|Any CPU.Build.0 = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.TS_Debug|Any CPU.ActiveCfg = TS_Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.TS_Debug|Any CPU.Build.0 = TS_Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.TS|Any CPU.ActiveCfg = TS|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.TS|Any CPU.Build.0 = TS|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -211,6 +221,7 @@ Global {12EC97A5-C3C2-40CB-B658-EC4018B89269} = {DBE903D1-1D6C-4B0D-8EB1-CCB447FA1775} {208C8BD8-72C6-4E3C-ACAA-351091A2ACC7} = {4EDA9CB2-1455-47BC-8507-B5C034E2B986} {3F09B230-5AAC-4651-BA7A-19F3BDFCF701} = {A3CC0A72-0DAB-4414-999D-3B89707FDECD} + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788} = {DBE903D1-1D6C-4B0D-8EB1-CCB447FA1775} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {44758539-3458-4A3E-89DD-68F496B34B45} |
