添加 完成机架修正的 关键点插入方式拟合

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgScanCorr/PgScanCorr.xaml

@@ -293,16 +293,31 @@
 
                                         <StackPanel Orientation="Horizontal">
                                             <StackPanel Orientation="Horizontal">
-                                                <Button Content="添加" Command="{Binding AddKeyPointModeCmd}" Style="{StaticResource Styles.Button.Square2}"/>
-                                                <Button Content="删除" Command="{Binding RemoveKeyPointModeCmd}" Style="{StaticResource Styles.Button.Square2}" />
-                                                <Button Content="移动" Command="{Binding MoveKeyPointModeCmd}" Style="{StaticResource Styles.Button.Square2}" />
-                                                <Button Content="生成" Command="{Binding CreateCorrByKeyPointCmd}" >
+                                                <Button Content="添加" Command="{Binding AddKeyPointModeCmd}" >
                                                     <Button.Style>
-                                                        <Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Square.Accent2}">
-
+                                                        <Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Square2}">
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding KpSelectMode}" Value="{x:Static local:KeyPointsSelectMode.Add}" >
+                                                                    <Setter Property="IsEnabled" Value="False"/>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
                                                         </Style>
                                                     </Button.Style>
                                                 </Button>
+                                                <Button Content="删除" Command="{Binding RemoveKeyPointModeCmd}" >
+                                                    <Button.Style>
+                                                        <Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Square2}">
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding KpSelectMode}" Value="{x:Static local:KeyPointsSelectMode.Remove}" >
+                                                                    <Setter Property="IsEnabled" Value="False"/>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Button.Style>
+                                                </Button>
+                                                <Button Style="{StaticResource Styles.Button.Square.Accent2}" 
+                                                        Content="生成" Command="{Binding CreateCorrByKeyPointCmd}" />
+
                                             </StackPanel>
                                         </StackPanel>
                                     </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgScanCorr/PgScanCorr.xaml.cs

@@ -78,7 +78,7 @@ namespace FLY.Thick.Base.UI
 
             //pEnd = closetsPoint;
             pEnd = p;
-            vm.Select(pBegin, pEnd);
+            vm.Select(PgScanCorrVm.SelectType.Move, pBegin, pEnd);
 
         }
 
@@ -105,7 +105,7 @@ namespace FLY.Thick.Base.UI
             //}
             //cpBegin = closetsPoint;
 
-            vm.Select(pBegin, pBegin);
+            vm.Select(PgScanCorrVm.SelectType.Click, pBegin, pBegin);
 
         }
         private void UIElement_MouseUp(object sender, MouseButtonEventArgs e)
@@ -132,7 +132,7 @@ namespace FLY.Thick.Base.UI
             //if (closetsPoint == null)
             //    return;
             pEnd = p;
-            vm.Select(pBegin, pEnd);
+            vm.Select(PgScanCorrVm.SelectType.Cancel, pBegin, pEnd);
         }
     }
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgScanCorr/PgScanCorrVmUt.cs

@@ -132,27 +132,10 @@ namespace FLY.Thick.Base.UI
         #endregion
 
         #region 关键点方式生成修正曲线
-        /// <summary>
-        /// 关键点列表，单位grid
-        /// </summary>
-        public ObservableCollection<int> KeyPoints = new ObservableCollection<int>();
-        /// <summary>
-        /// 每个关键点的数据宽度 单位grid
-        /// </summary>
-        public int KeyPointWidth { get; set; }
 
-        /// <summary>
-        /// 选择中
-        /// </summary>
-        public bool IsSelecting => SelectObj != SELECT_OBJ.Null;
-        public SELECT_OBJ SelectObj { get; set; } = SELECT_OBJ.Null;
-        public enum SELECT_OBJ
-        {
-            Null,
-            Add,
-            Remove,
-            Move
-        }
+
+        public KeyPointsSelectMode KpSelectMode { get; set; } = KeyPointsSelectMode.Null;
+
         #endregion
 
         /// <summary>