Explorar o código

update vpw recipe UI

chenkui hai 1 día
pai
achega
b027222d74

+ 6 - 1
Framework/Common/RecipeCenter/VpwRinseStep.cs

@@ -14,6 +14,7 @@ namespace MECF.Framework.Common.RecipeCenter
         private int _durationSeconds;
         private int _rotationSpeed;
         private int _index;
+        private int _step;
         #endregion
 
         #region 属性
@@ -22,7 +23,11 @@ namespace MECF.Framework.Common.RecipeCenter
         [JsonProperty]
         public int RotationSpeed { get { return _rotationSpeed; } set { _rotationSpeed = value; InvokePropertyChanged(nameof(RotationSpeed)); } }
         [JsonProperty]
-        public int Index { get { return _index; } set { _index = value; InvokePropertyChanged(nameof(Index)); } }
+        public int Index { get { return _index; } 
+            set { _index = value;_step = _index + 1; InvokePropertyChanged(nameof(Index)); InvokePropertyChanged(nameof(Step)); } }
+
+        [JsonProperty]
+        public int Step { get { return _step; } set { _step = value; InvokePropertyChanged(nameof(Step)); } }
         #endregion
     }
 }

+ 3 - 3
PunkHPX8_MainPages/Views/VpwRecipeView.xaml

@@ -171,7 +171,7 @@ Command="{Binding AutoCurrentBasedFalseCommand}"  IsChecked="{Binding Recipe.Vac
                             <extendedControls:BindingProxy x:Key="DataShowProxy"  Data="{Binding}" />
                         </DataGrid.Resources>
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="Step" IsReadOnly="True" Width="50"  Binding="{Binding Index,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False"/>
+                            <DataGridTextColumn Header="Step" IsReadOnly="True" Width="50"  Binding="{Binding Step,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False"/>
                             <DataGridTextColumn Header="Time(sec)" Width="80"  Binding="{Binding DurationSeconds,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False" >
                             </DataGridTextColumn>
                             <DataGridTextColumn Header="Speed(rpm)" Width="85"  Binding="{Binding RotationSpeed,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False" />
@@ -276,7 +276,7 @@ Command="{Binding AutoCurrentBasedFalseCommand}"  IsChecked="{Binding Recipe.Ven
                             <extendedControls:BindingProxy x:Key="DataShowProxy"  Data="{Binding}" />
                         </DataGrid.Resources>
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="Step" Width="50"  IsReadOnly="True" Binding="{Binding Index,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False"/>
+                            <DataGridTextColumn Header="Step" Width="50"  IsReadOnly="True" Binding="{Binding Step,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False"/>
                             <DataGridTextColumn Header="Time(sec)" Width="80"  Binding="{Binding DurationSeconds,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False" >
                             </DataGridTextColumn>
                             <DataGridTextColumn Header="Speed(rpm)" Width="85"  Binding="{Binding RotationSpeed,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False" />
@@ -336,7 +336,7 @@ Command="{Binding AutoCurrentBasedFalseCommand}"  IsChecked="{Binding Recipe.Ext
                             <extendedControls:BindingProxy x:Key="DataShowProxy"  Data="{Binding}" />
                         </DataGrid.Resources>
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="Step" Width="50"  IsReadOnly="True" Binding="{Binding Index,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False"/>
+                            <DataGridTextColumn Header="Step" Width="50"  IsReadOnly="True" Binding="{Binding Step,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False"/>
                             <DataGridTextColumn Header="Time(sec)" Width="80"  Binding="{Binding DurationSeconds,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False" >
                             </DataGridTextColumn>
                             <DataGridTextColumn Header="Speed(rpm)" Width="85"  Binding="{Binding RotationSpeed,Mode=TwoWay}" CanUserSort="false" CanUserReorder="False" CanUserResize="False" />