diff options
10 files changed, 178 insertions, 120 deletions
diff --git a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto index 36658e117..5b0268684 100644 --- a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto +++ b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto @@ -13,4 +13,6 @@ message IDSPackLevel bool FillingTimeoutError = 5; bool MidTankEmpty = 6; bool MidTankRefillPumpActive = 7; + + int32 TimerRemainingSeconds = 8; }
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Models/MidTankLevelModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Models/MidTankLevelModel.cs index c656db8c0..8ea16fe1b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Models/MidTankLevelModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Models/MidTankLevelModel.cs @@ -28,43 +28,7 @@ namespace Tango.PPC.Maintenance.Models public bool IsEmpty { get { return Level <= MachineOperator.EMPTY_MIDTANK_LITERS; } - } - - private bool _bJerricanPresent; - - public bool JerricanPresent - { - get { return _bJerricanPresent; } - set { - _bJerricanPresent = value; - RaisePropertyChangedAuto(); - } - } - - private bool _fillingTimeoutError; - - public bool FillingTimeoutError - { - get { return _fillingTimeoutError; } - set { _fillingTimeoutError = value; RaisePropertyChangedAuto(); } - } - - private bool _midTankEmpty; - - public bool MidTankEmpty - { - get { return _midTankEmpty; } - set { _midTankEmpty = value; RaisePropertyChangedAuto();} - } - - private bool _midTankRefillPumpActive; - - public bool MidTankRefillPumpActive - { - get { return _midTankRefillPumpActive; } - set { _midTankRefillPumpActive = value; RaisePropertyChangedAuto(); } - } - + } public IdsPack IDSPack { get; set; } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LiquidTypeToBrushConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LiquidTypeToBrushConverter.cs index 8e419b6fd..f9ced3719 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LiquidTypeToBrushConverter.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Converters/LiquidTypeToBrushConverter.cs @@ -20,14 +20,7 @@ namespace Tango.PPC.UI.Converters { case BL.Enumerations.LiquidTypes.Lubricant: { - - ImageBrush lubricantBrush = new ImageBrush() { Stretch = Stretch.None, TileMode = TileMode.Tile, ViewportUnits = BrushMappingMode.Absolute }; - - BitmapSource bit_source = ResourceHelper.GetImageFromResources(@"Images/lubricant2.png"); - var targetBitmap = new WriteableBitmap(new TransformedBitmap(bit_source, new ScaleTransform(0.2, 0.2))); - lubricantBrush.ImageSource = targetBitmap; - lubricantBrush.Viewport = new System.Windows.Rect(2, 2, targetBitmap.Width, targetBitmap.Height); - return lubricantBrush; + return Application.Current.Resources["TangoLubricantBrush"] as Brush; } case BL.Enumerations.LiquidTypes.Cleaner: { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/JericanRemoved.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/JericanRemoved.png Binary files differnew file mode 100644 index 000000000..4567d5146 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/JericanRemoved.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/JerricanLevelModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/JerricanLevelModel.cs new file mode 100644 index 000000000..13fa455e5 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Models/JerricanLevelModel.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; +using Tango.Core; +using Tango.Integration.Operation; + +namespace Tango.PPC.UI.Models +{ + public class JerricanLevelModel : ExtendedObject + { + public double Max { get; set; } + + private double _level; + public double Level + { + get { return _level; } + set { _level = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(IsMidTankLow)); } + } + + private bool _bJerricanPresent; + + public bool JerricanPresent + { + get { return _bJerricanPresent; } + set { + _bJerricanPresent = value; + RaisePropertyChangedAuto(); + } + } + + private bool _fillingTimeoutError; + + public bool FillingTimeoutError + { + get { return _fillingTimeoutError; } + set { _fillingTimeoutError = value; RaisePropertyChangedAuto(); } + } + + private bool _midTankEmpty; + + public bool MidTankEmpty + { + get { return _midTankEmpty; } + set { _midTankEmpty = value; RaisePropertyChangedAuto();} + } + + private bool _midTankRefillPumpActive; + + public bool MidTankRefillPumpActive + { + get { return _midTankRefillPumpActive; } + set { _midTankRefillPumpActive = value; RaisePropertyChangedAuto(); } + } + + public bool IsMidTankLow + { + get { return Level <= 0.5; } + } + + private TimeSpan _remainingTimeoutError_; + public TimeSpan RemainingTimeoutError + { + get { return _remainingTimeoutError_; } + set { _remainingTimeoutError_ = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(HasRemainingTimeoutError)); } + } + + public bool HasRemainingTimeoutError + { + get { return RemainingTimeoutError > TimeSpan.Zero; } + } + + + public IdsPack IDSPack { get; set; } + + public JerricanLevelModel() + { + //RemainingTimeoutError = new TimeSpan(1,2,0); + JerricanPresent = true; + //FillingTimeoutError = MidTankEmpty = MidTankRefillPumpActive = false; + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index ce7b9746b..120001ea3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -234,6 +234,7 @@ <Compile Include="InternalModule.cs" /> <Compile Include="Models\MachineOverviewItem.cs" /> <Compile Include="Models\MachineOverviewModel.cs" /> + <Compile Include="Models\JerricanLevelModel.cs" /> <Compile Include="Modules\DefaultPPCModuleLoader.cs" /> <Compile Include="Navigation\EurekaNavigationManager.cs" /> <Compile Include="Navigation\DefaultNavigationManager.cs" /> @@ -613,6 +614,7 @@ <Resource Include="Images\Overview Icons\Waste.png" /> <Resource Include="Images\Overview Icons\Feeder4.png" /> <Resource Include="Manifests\eureka_debug.xml" /> + <Resource Include="Images\Overview Icons\JericanRemoved.png" /> <Content Include="Intro.wmv" /> <Content Include="Manifests\release.xml" /> <Content Include="Manifests\debug.xml" /> @@ -950,7 +952,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir) </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> <Import Project="..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets" Condition="Exists('..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets')" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs index 7cd328e7b..a47b68a4f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs @@ -15,7 +15,6 @@ using Tango.PPC.Common.Diagnostics; using Tango.PPC.Jobs; using Tango.PPC.Jobs.NavigationObjects; using Tango.PPC.Jobs.Views; -using Tango.PPC.Maintenance.Models; using Tango.PPC.UI.Models; using System.Timers; using System.Windows.Threading; @@ -31,10 +30,6 @@ namespace Tango.PPC.UI.ViewModels [TangoInject] public IDiagnosticsFrameProvider DefaultDiagnosticsFrameProvider { get; set; } - private DispatcherTimer _ink_timer; - private Stopwatch _stopwatch; - - private JobHandler _handler; private Job _job; @@ -127,7 +122,7 @@ namespace Tango.PPC.UI.ViewModels get { return _currentBrushStop; } set { - // if (_currentBrushStop != value) + // if (_currentBrushStop != value) { _currentBrushStop = value; OnUpdateCurrentBrush(); @@ -183,8 +178,8 @@ namespace Tango.PPC.UI.ViewModels // get { return GetVolumeLiquidType(LiquidTypes.Lubricant); } //} - private List<MidTankLevelModel> _midTankLevels; - public List<MidTankLevelModel> MidTankLevels + private List<JerricanLevelModel> _midTankLevels; + public List<JerricanLevelModel> MidTankLevels { get { return _midTankLevels; } set { _midTankLevels = value; RaisePropertyChangedAuto(); } @@ -192,15 +187,6 @@ namespace Tango.PPC.UI.ViewModels public MachineOverviewModel OverviewModel { get; set; } - private TimeSpan _timer; - - public TimeSpan FullInkTimer - { - get { return _timer; } - set { _timer = value; RaisePropertyChangedAuto(); } - } - - #endregion #region Commands @@ -227,9 +213,7 @@ namespace Tango.PPC.UI.ViewModels public MachineStatusViewVM() { - _ink_timer = new DispatcherTimer(); - _ink_timer.Interval = TimeSpan.FromSeconds(1); - _ink_timer.Tick += _ink_timer_Tick; + StopCommand = new RelayCommand(StopJob, () => CanStopped()); AbortCommand = new RelayCommand(AbortJob, () => CanStopped()); @@ -250,13 +234,14 @@ namespace Tango.PPC.UI.ViewModels { base.OnApplicationReady(); - MidTankLevels = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.Where(x => x.MidTankType.HasLevelMeasure).OrderBy(x => x.PackIndex).Select(x => new MidTankLevelModel() + MidTankLevels = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.Where(x => x.MidTankType.HasLevelMeasure || x.MidTankType.Type == MidTankTypes.LubricantMidTank).OrderBy(x => x.PackIndex).Select(x => new JerricanLevelModel() { Max = x.MidTankType.LiterCapacity, IDSPack = x, - }).OrderBy(y => y.IDSPack.LiquidType.Code).ToList(); - // MachineProvider.MachineOperator.InkFillingStatusChanged += MachineOperator_InkFillingStatusChanged; + }).OrderBy(y => y.IDSPack.LiquidType.PreferredIndex).ToList(); + MachineProvider.MachineOperator.MachineStatusChanged += MachineOperator_MachineStatusChanged; + } #region Events @@ -280,33 +265,12 @@ namespace Tango.PPC.UI.ViewModels model.FillingTimeoutError = item.FillingTimeoutError; model.MidTankEmpty = item.MidTankEmpty; model.MidTankRefillPumpActive = item.MidTankRefillPumpActive; - if (model.FillingTimeoutError) - { - //StartInkTimer() - } + model.RemainingTimeoutError = TimeSpan.FromSeconds(item.TimerRemainingSeconds); } } } } - private void StartInkTimer() - { - _stopwatch = Stopwatch.StartNew(); - _ink_timer.Start(); - } - - private void StopInkTimer() - { - if (_stopwatch.IsRunning) - { - _stopwatch.Stop(); - _ink_timer.Stop(); - } - } - private void _ink_timer_Tick(object sender, EventArgs e) - { - FullInkTimer = _stopwatch.Elapsed; - } private void MachineOperator_InkFillingStatusChanged(object sender, InkFillingStatusChangedEventArgs e) { //foreach (var cartridge in e.Status.CartridgesStatuses.Where(x => x.Cartridge.Slot != CartridgeSlot.Ink)) @@ -380,10 +344,6 @@ namespace Tango.PPC.UI.ViewModels private void JobHandler_StatusChanged(object sender, RunningJobStatus e) { - //InvokeUI(() => - //{ - - RunningJobStatus = e; IsDyeingProcess = (RunningJobStatus != null && RunningJobStatus.CurrentSegment != null); if (RunningJobStatus != null && RunningJobStatus.CurrentSegment != null) @@ -400,7 +360,6 @@ namespace Tango.PPC.UI.ViewModels CurrentBrushStop = segment.FirstBrushStop; } } - //}); } private void JobHandler_CanCancelChanged(object sender, EventArgs e) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml index bc319367c..acaf14f15 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml @@ -42,11 +42,11 @@ <StackPanel VerticalAlignment="Top"> <Border Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 0" > <Grid > - <Border Height="71" Background="{StaticResource TangoPrimaryBackgroundBrush}"> - <Border.Effect> + <!--<Border Height="71" Background="{StaticResource TangoPrimaryBackgroundBrush}">--> + <!--<Border.Effect> <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" /> - </Border.Effect> - </Border> + </Border.Effect>--> + <!--</Border>--> <StackPanel > <DockPanel Background="{StaticResource TangoMenuPanelDarkBrush}"> <Image Source="/Images/logo.png" Stretch="Uniform" HorizontalAlignment="Center" Margin="0 10 10 10" Width="157" Height="51"></Image> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index 383ce77e6..b6541df1f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -11,6 +11,7 @@ xmlns:locaControls="clr-namespace:Tango.PPC.UI.Controls" xmlns:localConverters="clr-namespace:Tango.PPC.UI.Converters" xmlns:global="clr-namespace:Tango.PPC.UI" + xmlns:models="clr-namespace:Tango.PPC.UI.Models" xmlns:local="clr-namespace:Tango.PPC.UI.Views" mc:Ignorable="d" d:DesignHeight="1280" d:DesignWidth="932" d:DataContext="{d:DesignInstance Type=vm:MachineStatusViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineStatusViewVM}"> @@ -121,10 +122,11 @@ </DataTemplate> <PathGeometry x:Key="InkContainerPath" Figures="M16.000001,0.5 C24.560414,0.5 31.500001,6.9918714 31.500001,15 31.500001,15.500508 31.472893,15.995093 31.419976,16.48254 L31.417605,16.5 31.500001,16.5 31.500001,71 31.500001,71.5 31.486487,71.5 31.479832,71.74617 C31.064694,79.407524 24.292901,85.5 16.000001,85.5 7.7070995,85.5 0.9353075,79.407524 0.52016807,71.74617 L0.51351446,71.5 0.5,71.5 0.5,71 0.5,16.5 0.58239609,16.5 0.58002502,16.48254 C0.52710831,15.995093 0.50000054,15.500508 0.5,15 0.50000054,6.9918714 7.4395867,0.5 16.000001,0.5 z"/> - <DataTemplate x:Key="LiquidBox"> + <DataTemplate x:Key="LiquidBox" DataType="{x:Type models:JerricanLevelModel}"> <DockPanel> <TextBlock DockPanel.Dock="Bottom" Text="{Binding IDSPack.LiquidType.ShortName}" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> - <Grid> + <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Visibility="{Binding HasRemainingTimeoutError,Converter={StaticResource BooleanToVisibilityConverter}}" Text="{Binding RemainingTimeoutError, StringFormat='{}{0:hh}:{0:mm}m', FallbackValue=00:00}" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> + <Grid > <Grid ClipToBounds="True" HorizontalAlignment="Center"> <Path Fill="{Binding Path=IDSPack.LiquidType, Converter={StaticResource LiquidTypeToBrushConverter}}" StrokeThickness="1.5" > <Path.Resources> @@ -163,9 +165,30 @@ <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle> <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle> </UniformGrid> - <Image Source="../Images/Overview Icons/error.png" Stretch="Fill" VerticalAlignment="Top" Width="24" Height="24" Margin="0 4 0 0" Visibility="{Binding MidTankEmpty, Converter={StaticResource BooleanToVisibilityConverter}}"/> - <Image Source="../Images/Overview Icons/Warning.png" Stretch="Fill" VerticalAlignment="Top" Width="24" Height="24" Visibility="Collapsed"/> - <Image Source="../Images/Overview Icons/UpdateInk.png" Stretch="Fill" VerticalAlignment="Top" Width="24" Height="24" Visibility="Collapsed"/> + <Image Stretch="Fill" VerticalAlignment="Top" Width="24" Height="24" Margin="0 4 0 0"> + <Image.Style> + <Style TargetType="{x:Type Image}" > + <Setter Property="Source" Value="{x:Null}"/> + <Style.Triggers> + <DataTrigger Binding="{Binding IsMidTankLow}" Value="True"> + <Setter Property="Source" Value="../Images/Overview Icons/Warning.png"/> + </DataTrigger> + <DataTrigger Binding="{Binding FillingTimeoutError}" Value="True"> + <Setter Property="Source" Value="../Images/Overview Icons/Error.png"/> + </DataTrigger> + <DataTrigger Binding="{Binding MidTankEmpty}" Value="True"> + <Setter Property="Source" Value="../Images/Overview Icons/Error.png"/> + </DataTrigger> + <DataTrigger Binding="{Binding MidTankRefillPumpActive}" Value="True" > + <Setter Property="Source" Value="../Images/Overview Icons/UpdateInk.png"/> + </DataTrigger> + <DataTrigger Binding="{Binding JerricanPresent}" Value="False" > + <Setter Property="Source" Value="../Images/Overview Icons/JericanRemoved.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> </Grid> </DockPanel> </DataTemplate> @@ -173,7 +196,8 @@ <DataTemplate x:Key="WasteBox"> <DockPanel> <TextBlock DockPanel.Dock="Bottom" Text="Waste" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> - <Grid> + <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Text="" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> + <Grid DockPanel.Dock="Top"> <Grid ClipToBounds="True" HorizontalAlignment="Center"> <Path Fill="#CCCCCC"> <Path.Resources> @@ -212,10 +236,11 @@ </DockPanel> </DataTemplate> - <DataTemplate x:Key="LubBox"> - <DockPanel> + <!--<DataTemplate x:Key="LubBox"> + <DockPanel > <TextBlock DockPanel.Dock="Bottom" Text="Lub" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> - <Grid> + <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Text="" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> + <Grid DockPanel.Dock="Top"> <Grid ClipToBounds="True" HorizontalAlignment="Center"> <Path Fill="#CCCCCC"> <Path.Resources> @@ -230,13 +255,13 @@ <CombinedGeometry.Geometry2> <RectangleGeometry Rect="1,0 30,88"> - <!--<RectangleGeometry.Rect> + --><!--<RectangleGeometry.Rect> <MultiBinding Converter="{StaticResource MidTankLevelToElementRectConverter}"> <Binding Source="{StaticResource RectHeight}"/> <Binding Source="{StaticResource RectWidth}"/> <Binding Path="Level" /> </MultiBinding> - </RectangleGeometry.Rect>--> + </RectangleGeometry.Rect>--><!-- </RectangleGeometry> </CombinedGeometry.Geometry2> </CombinedGeometry> @@ -252,7 +277,7 @@ </UniformGrid> </Grid> </DockPanel> - </DataTemplate> + </DataTemplate>--> </UserControl.Resources> <Grid Width="960" Height="1080"> @@ -1053,8 +1078,8 @@ <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock> </StackPanel> <StackPanel Orientation="Horizontal" Margin="-25 24 0 0"> - <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 0 0 0"/> - <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/> + <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 15 0 0"/> + <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/> </StackPanel> </StackPanel> @@ -1072,8 +1097,8 @@ </ItemsControl.ItemsPanel> </ItemsControl> - <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 0 0 0"/> - <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/> + <!--<Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 15 0 0"/> + <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>--> </StackPanel> </StackPanel> </DockPanel> diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs index 099069143..a11341386 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs @@ -23,16 +23,16 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", - "IrgBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy", + "ItcBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy", "TGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVsGAMgASgBEhcKD0plcnJpY2Fu", "UHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGltZW91dEVycm9yGAUgASgIEhQK", "DE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRUYW5rUmVmaWxsUHVtcEFjdGl2", - "ZRgHIAEoCEIjCiFjb20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNi", - "BnByb3RvMw==")); + "ZRgHIAEoCBIdChVUaW1lclJlbWFpbmluZ1NlY29uZHMYCCABKAVCIwohY29t", + "LnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive", "TimerRemainingSeconds" }, null, null, null) })); } #endregion @@ -70,6 +70,7 @@ namespace Tango.PMR.MachineStatus { fillingTimeoutError_ = other.fillingTimeoutError_; midTankEmpty_ = other.midTankEmpty_; midTankRefillPumpActive_ = other.midTankRefillPumpActive_; + timerRemainingSeconds_ = other.timerRemainingSeconds_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -154,6 +155,17 @@ namespace Tango.PMR.MachineStatus { } } + /// <summary>Field number for the "TimerRemainingSeconds" field.</summary> + public const int TimerRemainingSecondsFieldNumber = 8; + private int timerRemainingSeconds_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int TimerRemainingSeconds { + get { return timerRemainingSeconds_; } + set { + timerRemainingSeconds_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as IDSPackLevel); @@ -174,6 +186,7 @@ namespace Tango.PMR.MachineStatus { if (FillingTimeoutError != other.FillingTimeoutError) return false; if (MidTankEmpty != other.MidTankEmpty) return false; if (MidTankRefillPumpActive != other.MidTankRefillPumpActive) return false; + if (TimerRemainingSeconds != other.TimerRemainingSeconds) return false; return true; } @@ -187,6 +200,7 @@ namespace Tango.PMR.MachineStatus { if (FillingTimeoutError != false) hash ^= FillingTimeoutError.GetHashCode(); if (MidTankEmpty != false) hash ^= MidTankEmpty.GetHashCode(); if (MidTankRefillPumpActive != false) hash ^= MidTankRefillPumpActive.GetHashCode(); + if (TimerRemainingSeconds != 0) hash ^= TimerRemainingSeconds.GetHashCode(); return hash; } @@ -225,6 +239,10 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(56); output.WriteBool(MidTankRefillPumpActive); } + if (TimerRemainingSeconds != 0) { + output.WriteRawTag(64); + output.WriteInt32(TimerRemainingSeconds); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -251,6 +269,9 @@ namespace Tango.PMR.MachineStatus { if (MidTankRefillPumpActive != false) { size += 1 + 1; } + if (TimerRemainingSeconds != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(TimerRemainingSeconds); + } return size; } @@ -280,6 +301,9 @@ namespace Tango.PMR.MachineStatus { if (other.MidTankRefillPumpActive != false) { MidTankRefillPumpActive = other.MidTankRefillPumpActive; } + if (other.TimerRemainingSeconds != 0) { + TimerRemainingSeconds = other.TimerRemainingSeconds; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -318,6 +342,10 @@ namespace Tango.PMR.MachineStatus { MidTankRefillPumpActive = input.ReadBool(); break; } + case 64: { + TimerRemainingSeconds = input.ReadInt32(); + break; + } } } } |
