Skip to content

Commit

Permalink
Acquisition/Cycle timers (#66)
Browse files Browse the repository at this point in the history
* Bu,ped dependency versions

* global.json

* Some shared assembly information

* Fixing version string

* Playing with DI

* Using DI for view model location

* Correct logging in MainWindow

* Prototyped timer

* Removed deprecated code

* Cleaning DI

* Removed old DI

* Trying to measure acquisition time

* Creating cycle timer

* Implemented timer

* Consuming measurements

* Working with UI display

* Better timer behavior on UI

* Refactoring

* Job progress updated

* Refactoring

* Refactored cycle timer usage

* Sharing timer logic

* Dealing with a substitute of the scoped DI

* Changed how exposure time is determined

* Removed some of the unused code

* Updated enum helpers

* Fixed a bug in debug interface

* Small refactoring

* Publishing script

* Building exes

* Revert "Building exes"

This reverts commit b8c094c.

* Trying github token

* Revert "Trying github token"

This reverts commit c02150d.
  • Loading branch information
Ilia-Kosenkov authored Jun 26, 2022
1 parent f304833 commit 7c0e6dc
Show file tree
Hide file tree
Showing 48 changed files with 1,005 additions and 857 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ MigrationBackup/*
Releases/*
**/*backup

# .NET config
!global.json

# Needed on CI
!nuget.config
!src/Host/config.json
Expand Down
17 changes: 17 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<PropertyGroup>
<Deterministic>true</Deterministic>
<LangVersion>9</LangVersion>
</PropertyGroup>

<PropertyGroup>
<Authors>Ilia Kosenkov</Authors>
<NeutralLanguage>en</NeutralLanguage>
<Description>Tools for Dipol-UF astro polarimeters.</Description>
<Copyright>Copyright Ilia Kosenkov © 2017-2022</Copyright>
<PackageLicenseUrl>https://github.com/dipol-uf/DIPOL-UF/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/dipol-uf/DIPOL-UF</PackageProjectUrl>
<RepositoryUrl>https://github.com/dipol-uf/DIPOL-UF</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
</PropertyGroup>
</Project>
39 changes: 39 additions & 0 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
param (
[string]$PathToSrc = "./src",
[string]$OutputDir = "./publish",
[string]$Arch = "x64",
[string]$Configuration = "Release",
[string]$BuildType = "All"
)

if($BuildType.Equals("all", [System.StringComparison]::OrdinalIgnoreCase) -or $BuildType.Equals("host", [System.StringComparison]::OrdinalIgnoreCase)) {
$projects = @("Host")
}
if($BuildType.Equals("all", [System.StringComparison]::OrdinalIgnoreCase) -or $BuildType.StartsWith("dipol", [System.StringComparison]::OrdinalIgnoreCase)) {
$projects += "Dipol-UF"
}


$regex = [System.Text.RegularExpressions.Regex]::new("^\s*\[assembly:\s*AssemblyVersion\s*\(\s*`"(\d+\.\d+.\d+)`"\s*\)\s*\]");

foreach($proj in $projects) {
$csprojPath = "$PathToSrc/$proj/$proj.csproj"

# Finds version string in the AssemblyInfo.cs
$version = Get-Content "$PathToSrc/$proj/Properties/AssemblyInfo.cs" | `
ForEach-Object {$regex.Matches($_)} | `
Where-Object {$_.Success} | `
ForEach-Object {$_.Groups[1].Value}

# Creates output directory if it is missing
$dir = "$OutputDir/$($proj)_$($Configuration)_$($Arch)_v$version"
New-Item $dir -Force -ItemType Directory -ErrorAction SilentlyContinue

if(![System.IO.Path]::IsPathRooted($dir)) {
$dir = "../../$dir"
}

# Restore and build project
MSBuild.exe $csprojPath -t:restore -verbosity:minimal
MSBuild.exe $csprojPath -p:Configuration=$Configuration -p:Platform=$Arch -verbosity:minimal -p:OutputPath=$dir
}
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "6.0.100",
"rollForward": "latestMinor",
"allowPrerelease": false
}
}
39 changes: 39 additions & 0 deletions publish.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
param (
[string]$PathToSrc = "./src",
[string]$OutputDir = "./publish",
[string]$Arch = "x64",
[string]$Configuration = "Release",
[string]$BuildType = "All"
)

if($BuildType.Equals("all", [System.StringComparison]::OrdinalIgnoreCase) -or $BuildType.Equals("host", [System.StringComparison]::OrdinalIgnoreCase)) {
$projects = @("Host")
}
if($BuildType.Equals("all", [System.StringComparison]::OrdinalIgnoreCase) -or $BuildType.StartsWith("dipol", [System.StringComparison]::OrdinalIgnoreCase)) {
$projects += "Dipol-UF"
}


$regex = [System.Text.RegularExpressions.Regex]::new("^\s*\[assembly:\s*AssemblyVersion\s*\(\s*`"(.*)`"\s*\)\s*\]");

foreach($proj in $projects) {
$csprojPath = "$PathToSrc/$proj/$proj.csproj"

# Finds version string in the AssemblyInfo.cs
$version = Get-Content "$PathToSrc/$proj/Properties/AssemblyInfo.cs" | `
ForEach-Object {$regex.Matches($_)} | `
Where-Object {$_.Success} | `
ForEach-Object {$_.Groups[1].Value}

# Creates output directory if it is missing
$dir = "$OutputDir/$($proj)_$($Configuration)_$($Arch)_v$version"
New-Item $dir -Force -ItemType Directory -ErrorAction SilentlyContinue

if(![System.IO.Path]::IsPathRooted($dir)) {
$dir = "../../$dir"
}

# Restore and build project
MSBuild.exe $csprojPath -t:restore -verbosity:minimal
MSBuild.exe $csprojPath -p:Configuration=$Configuration -p:Platform=$Arch -verbosity:minimal -p:OutputPath=$dir
}
2 changes: 1 addition & 1 deletion src/ANDOR-CS/Classes/DebugCamera.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ public override async Task StartAcquisitionAsync(Request metadata, CancellationT
}
finally
{
OnAcquisitionFinished(new AcquisitionStatusEventArgs(CameraStatus.Idle));
IsAcquiring = false;
OnAcquisitionFinished(new AcquisitionStatusEventArgs(CameraStatus.Idle));
}
}

Expand Down
1 change: 1 addition & 0 deletions src/ANDOR-CS/IDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public interface IDevice : IDisposable, INotifyPropertyChanged
bool IsAcquiring { get; }
(Version EPROM, Version COFFile, Version Driver, Version Dll) Software { get; }
(Version PCB, Version Decode, Version CameraFirmware) Hardware { get; }
(float Exposure, float Accumulation, float Kinetic) Timings { get; }

IAcquisitionSettings? CurrentSettings { get; }

Expand Down
36 changes: 20 additions & 16 deletions src/DIPOL-3.sln
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29920.165
# Visual Studio Version 17
VisualStudioVersion = 17.3.32519.111
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANDOR-CS", "ANDOR-CS\ANDOR-CS.csproj", "{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ANDOR-CS", "ANDOR-CS\ANDOR-CS.csproj", "{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DIPOL-UF", "DIPOL-UF\DIPOL-UF.csproj", "{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DIPOL-Remote", "DIPOL-Remote\DIPOL-Remote.csproj", "{355D3461-6989-4022-9FDE-B2BEA3581590}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{661AB979-44D7-486C-9316-8592A974D7E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FITS-CS", "FITS-CS\FITS-CS.csproj", "{89516F86-17D4-4ED3-89F2-D20DF612C7DE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FITS-CS", "FITS-CS\FITS-CS.csproj", "{89516F86-17D4-4ED3-89F2-D20DF612C7DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StepMotor", "StepMotor\StepMotor.csproj", "{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}"
EndProject
Expand All @@ -34,7 +34,6 @@ Global
Test|x86 = Test|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Debug|Any CPU.ActiveCfg = Debug|x86
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Debug|x64.ActiveCfg = Debug|x64
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Debug|x64.Build.0 = Debug|x64
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -49,7 +48,8 @@ Global
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Test|x64.Build.0 = Test|x64
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Test|x86.ActiveCfg = Test|x86
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Test|x86.Build.0 = Test|x86
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Debug|Any CPU.ActiveCfg = Debug|x86
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Debug|Any CPU.ActiveCfg = Debug|x64
{D1E8B17D-4C59-42DD-87BD-F111DF8E631D}.Debug|Any CPU.Build.0 = Debug|x64
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Debug|x64.ActiveCfg = Debug|x64
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Debug|x64.Build.0 = Debug|x64
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -64,7 +64,8 @@ Global
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Test|x64.Build.0 = Debug|x64
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Test|x86.ActiveCfg = Test|x86
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Test|x86.Build.0 = Test|x86
{355D3461-6989-4022-9FDE-B2BEA3581590}.Debug|Any CPU.ActiveCfg = Debug|x86
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Debug|Any CPU.ActiveCfg = Debug|x64
{EDB4E90E-B8FA-4A97-B684-8ED430F2A1F7}.Debug|Any CPU.Build.0 = Debug|x64
{355D3461-6989-4022-9FDE-B2BEA3581590}.Debug|x64.ActiveCfg = Debug|x64
{355D3461-6989-4022-9FDE-B2BEA3581590}.Debug|x64.Build.0 = Debug|x64
{355D3461-6989-4022-9FDE-B2BEA3581590}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -79,7 +80,8 @@ Global
{355D3461-6989-4022-9FDE-B2BEA3581590}.Test|x64.Build.0 = Test|x64
{355D3461-6989-4022-9FDE-B2BEA3581590}.Test|x86.ActiveCfg = Test|x86
{355D3461-6989-4022-9FDE-B2BEA3581590}.Test|x86.Build.0 = Test|x86
{661AB979-44D7-486C-9316-8592A974D7E7}.Debug|Any CPU.ActiveCfg = Debug|x86
{355D3461-6989-4022-9FDE-B2BEA3581590}.Debug|Any CPU.ActiveCfg = Debug|x64
{355D3461-6989-4022-9FDE-B2BEA3581590}.Debug|Any CPU.Build.0 = Debug|x64
{661AB979-44D7-486C-9316-8592A974D7E7}.Debug|x64.ActiveCfg = Debug|x64
{661AB979-44D7-486C-9316-8592A974D7E7}.Debug|x64.Build.0 = Debug|x64
{661AB979-44D7-486C-9316-8592A974D7E7}.Debug|x86.ActiveCfg = Debug|x86
Expand All @@ -94,14 +96,16 @@ Global
{661AB979-44D7-486C-9316-8592A974D7E7}.Test|x64.Build.0 = Test|x64
{661AB979-44D7-486C-9316-8592A974D7E7}.Test|x86.ActiveCfg = Test|x86
{661AB979-44D7-486C-9316-8592A974D7E7}.Test|x86.Build.0 = Test|x86
{661AB979-44D7-486C-9316-8592A974D7E7}.Debug|Any CPU.ActiveCfg = Debug|x64
{661AB979-44D7-486C-9316-8592A974D7E7}.Debug|Any CPU.Build.0 = Debug|x64
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Debug|x64.ActiveCfg = Debug|Any CPU
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Debug|x64.Build.0 = Debug|Any CPU
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Debug|x86.ActiveCfg = Debug|x86
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Debug|x86.Build.0 = Debug|x86
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|x64.ActiveCfg = Release|x64
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|x64.Build.0 = Release|x64
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|x64.ActiveCfg = Release|Any CPU
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|x64.Build.0 = Release|Any CPU
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|x86.ActiveCfg = Release|x86
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Release|x86.Build.0 = Release|x86
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Test|Any CPU.ActiveCfg = Test|Any CPU
Expand All @@ -110,14 +114,15 @@ Global
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Test|x64.Build.0 = Test|x64
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Test|x86.ActiveCfg = Test|x86
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Test|x86.Build.0 = Test|x86
{89516F86-17D4-4ED3-89F2-D20DF612C7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Debug|x64.ActiveCfg = Debug|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Debug|x64.Build.0 = Debug|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Debug|x86.ActiveCfg = Debug|x86
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Debug|x86.Build.0 = Debug|x86
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|x64.ActiveCfg = Release|x64
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|x64.Build.0 = Release|x64
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|x64.ActiveCfg = Release|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|x64.Build.0 = Release|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|x86.ActiveCfg = Release|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Release|x86.Build.0 = Release|Any CPU
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Test|Any CPU.ActiveCfg = Test|Any CPU
Expand All @@ -126,6 +131,7 @@ Global
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Test|x64.Build.0 = Test|x64
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Test|x86.ActiveCfg = Test|x86
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Test|x86.Build.0 = Test|x86
{27A3F774-A7B6-43D9-BABA-29A36AA0BFE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -134,8 +140,8 @@ Global
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Debug|x86.Build.0 = Debug|x86
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|Any CPU.Build.0 = Release|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|x64.ActiveCfg = Release|x64
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|x64.Build.0 = Release|x64
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|x64.ActiveCfg = Release|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|x64.Build.0 = Release|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|x86.ActiveCfg = Release|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Release|x86.Build.0 = Release|Any CPU
{0FFBF38F-E75E-46C9-AD9C-78926E7DAC89}.Test|Any CPU.ActiveCfg = Test|Any CPU
Expand Down Expand Up @@ -184,8 +190,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {020823D4-9685-444E-AFAD-00D6D278B3AA}
EndGlobalSection
Expand Down
4 changes: 2 additions & 2 deletions src/DIPOL-Remote/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.*")]
[assembly: AssemblyFileVersion("2.1.*")]
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
3 changes: 3 additions & 0 deletions src/DIPOL-UF/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<ResourceDictionary Source="/DIPOL-UF;component/Resources/Styles.xaml"/>
<ResourceDictionary Source="/DIPOL-UF;component/Resources/ItemTemplates.xaml"/>
<ResourceDictionary Source="/DIPOL-UF;component/Resources/ControlTemplates.xaml"/>
<ResourceDictionary>
<local:ViewModelLocator x:Key="Locator"/>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
12 changes: 5 additions & 7 deletions src/DIPOL-UF/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows;

namespace DIPOL_UF
{
Expand All @@ -13,5 +7,9 @@ namespace DIPOL_UF
/// </summary>
public partial class App : Application
{
public App()
{
InitializeComponent();
}
}
}
42 changes: 26 additions & 16 deletions src/DIPOL-UF/Controls/CameraTab.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -519,22 +519,32 @@
Source="{Binding PolarizationSymbolImage}"
/>
</Grid>
<StackPanel Grid.Row="2" Grid.Column="0">
<ProgressBar
MaxWidth="450"
Style="{StaticResource ProgressBarStyle}"
Minimum="{Binding AcquisitionPbMin}"
Maximum="{Binding AcquisitionPbMax}"
Value="{Binding AcquisitionPbVal, Mode=OneWay}"/>
<ProgressBar
MaxWidth="450"
Style="{StaticResource ProgressBarStyle}"
Minimum="0"
Maximum="{Binding JobCumulativeTotal}"
Value="{Binding JobCumulativeCurrent, Mode=OneWay}"
Foreground="{StaticResource JobProgressBarColor}"
Visibility="{Binding IsJobInProgress, Converter={StaticResource BoolToVisibilityConverter}}"/>
</StackPanel>
<Grid Grid.Row="2" Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="150"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<ProgressBar Grid.Row="0"
MaxWidth="450"
Style="{StaticResource ProgressBarStyle}"
Minimum="{Binding AcquisitionPbMin}"
Maximum="{Binding AcquisitionPbMax}"
Value="{Binding AcquisitionPbVal, Mode=OneWay}"/>
<ProgressBar Grid.Row="1"
MaxWidth="450"
Style="{StaticResource ProgressBarStyle}"
Minimum="0"
Maximum="{Binding JobCumulativeTotal}"
Value="{Binding JobCumulativeCurrent, Mode=OneWay}"
Foreground="{StaticResource JobProgressBarColor}"
Visibility="{Binding IsJobInProgress, Converter={StaticResource BoolToVisibilityConverter}}"/>
<TextBlock Grid.Row="0" Grid.Column="1" Style="{StaticResource ContentFont_TextBlock}" Text="{Binding RemainingAcquisitionTime}"/>
<TextBlock Grid.Row="1" Grid.Column="1" Style="{StaticResource ContentFont_TextBlock}" Text="{Binding RemainingCycleTime}"/>
</Grid>
</Grid>
</ScrollViewer>
</UserControl>
Loading

0 comments on commit 7c0e6dc

Please sign in to comment.