ViewUpdate

InkjetScale/InkjetScale.Common/Enums.cs

@@ -21,11 +21,11 @@ namespace InkjetScale.Common
         HeadPack1Head2,
         HeadPack1Head3,
         HeadPack1Head4,
-        HeadPack2Head1,
+        HeadPack2Head1 = 5,
         HeadPack2Head2,
         HeadPack2Head3,
         HeadPack2Head4,
-        HeadPack3Head1,
+        HeadPack3Head1 = 9,
         HeadPack3Head2,
         HeadPack3Head3,
         HeadPack3Head4,

InkjetScale/InkjetScale.GUI.LogViews/Views/RegisteredWeightViewModel.cs

@@ -1,4 +1,5 @@
-using InkjetScale.Common.Events;
+using InkjetScale.Common;
+using InkjetScale.Common.Events;
 using Prism.Events;
 using Prism.Mvvm;
 using System;
@@ -37,7 +38,20 @@ namespace InkjetScale.GUI.LogViews.Views
 
         internal void Init()
         {
+            for(eHeadList head = eHeadList.HeadPack1Head1; head <= eHeadList.HeadPack1Head4; head++)
+            {
+                HeadPack1DataList.Add(new ViewLogArgs() { Head = head, Time = DateTime.Now, Weight = 0, pl = 0 });
+            }
 
+            for (eHeadList head = eHeadList.HeadPack2Head1; head <= eHeadList.HeadPack2Head4; head++)
+            {
+                HeadPack2DataList.Add(new ViewLogArgs() { Head = head, Time = DateTime.Now, Weight = 0, pl = 0 });
+            }
+
+            for (eHeadList head = eHeadList.HeadPack3Head1; head <= eHeadList.HeadPack3Head4; head++)
+            {
+                HeadPack3DataList.Add(new ViewLogArgs() { Head = head, Time = DateTime.Now, Weight = 0, pl = 0 });
+            }
         }
 
         private void ViewLogSubEvent(ViewLogArgs obj)
@@ -45,6 +59,59 @@ namespace InkjetScale.GUI.LogViews.Views
             if (!obj.IsRegister)
                 return;
 
+            int i = 0;
+
+            if ((obj.Head < eHeadList.HeadPack2Head1))
+            {
+                if(HeadPack1DataList.Count > 0)
+                {
+                    foreach (ViewLogArgs data in HeadPack1DataList)
+                    {
+                        if (obj.Head == data.Head)
+                        {
+                            HeadPack1DataList[i] = obj;
+                            return;
+                        }
+                        i++;
+                    }
+                }
+                    
+                HeadPack1DataList.Add(new ViewLogArgs() { Time = obj.Time, Head = obj.Head, Weight = obj.Weight, pl = obj.pl });
+            }
+            else if ((obj.Head < eHeadList.HeadPack3Head1))
+            {
+                if (HeadPack2DataList.Count > 0)
+                {
+                    foreach (ViewLogArgs data in HeadPack2DataList)
+                    {
+                        if (obj.Head == data.Head)
+                        {
+                            HeadPack2DataList[i] = obj;
+                            return;
+                        }
+                        i++;
+                    }
+                }
+
+                HeadPack2DataList.Add(new ViewLogArgs() { Time = obj.Time, Head = obj.Head, Weight = obj.Weight, pl = obj.pl });
+            }
+            else
+            {
+                if (HeadPack3DataList.Count > 0)
+                {
+                    foreach (ViewLogArgs data in HeadPack3DataList)
+                    {
+                        if (obj.Head == data.Head)
+                        {
+                            HeadPack3DataList[i] = obj;
+                            return;
+                        }
+                        i++;
+                    }
+                }
+
+                HeadPack3DataList.Add(new ViewLogArgs() { Time = obj.Time, Head = obj.Head, Weight = obj.Weight, pl = obj.pl });
+            }
 
         }
     }

InkjetScale/InkjetScale.GUI.LogViews/Views/ScaleLogView.xaml.cs

@@ -20,9 +20,16 @@ namespace InkjetScale.GUI.LogViews.Views
     /// </summary>
     public partial class ScaleLogView : UserControl
     {
+        ScaleLogViewModel ViewModel => this.DataContext as ScaleLogViewModel;
         public ScaleLogView()
         {
             InitializeComponent();
+            this.Loaded += ScaleLogView_Loaded;
+        }
+
+        private void ScaleLogView_Loaded(object sender, RoutedEventArgs e)
+        {
+            ViewModel.Init();
         }
     }
 }

InkjetScale/InkjetScale.GUI.LogViews/Views/ScaleLogViewModel.cs

@@ -1,4 +1,5 @@
-using InkjetScale.Common.Events;
+using InkjetScale.Common;
+using InkjetScale.Common.Events;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -30,9 +31,16 @@ namespace InkjetScale.GUI.LogViews.Views
             this.ClearCommand = new DelegateCommand(ExecuteClear);
             this.eventAggregator = eventAggregator;
 
-            MeasurementList = new ObservableCollection<ViewLogArgs>();
+            this.MeasurementList = new ObservableCollection<ViewLogArgs>();
             this.eventAggregator.GetEvent<ViewLogEvent>().Subscribe(ViewLogSubEvent, ThreadOption.UIThread);
         }
+        internal void Init()
+        {
+            for (eHeadList head = eHeadList.HeadPack1Head1; head <= eHeadList.HeadPack3Head4; head++)
+            {
+                this.MeasurementList.Add(new ViewLogArgs() { Head = head, Time = DateTime.Now, Weight = 60, pl = 29 });
+            }
+        }
 
         private void ExecuteRegister()
         {
@@ -40,7 +48,7 @@ namespace InkjetScale.GUI.LogViews.Views
             {
                 var d = new ViewLogArgs()
                 {
-                    Time = DateTime.Now,
+                    Time = SelectedValues.Time,
                     IsRegister = true,
                     Head = SelectedValues.Head,
                     Weight = SelectedValues.Weight,

InkjetScale/InkjetScale.GUI.MainViews/Views/ScaleMainView.xaml

@@ -47,10 +47,10 @@
                     <RowDefinition Height="0.25*"/>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.7*"/>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="*"/>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="0.25*"/>
+                    <RowDefinition Height="0.55*"/>
                 </Grid.RowDefinitions>
 
                 <Grid Grid.Row="1">
@@ -70,7 +70,8 @@
                             <Separator Grid.Row="1"/>
 
                             <Grid Grid.Row="2">
-                                <ComboBox ItemsSource="{Binding HeadList}" SelectedItem="{Binding SelectedHead}" FontSize="25" Width="auto" HorizontalAlignment="Center"/>
+                                <ComboBox ItemsSource="{Binding HeadList}" SelectedItem="{Binding SelectedHead}" FontSize="25" Width="auto" 
+                                          HorizontalAlignment="Center" Foreground="Black"/>
                             </Grid>
 
                         </Grid>