其他-合并，图章，签名自测bug修复

PDF Office/DataConvert/VisibleToBoolConvert.cs

@@ -49,4 +49,44 @@ namespace PDF_Office.DataConvert
             }
         }
     }
+    public class UnVisibleToBoolConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return false;
+            }
+            else
+            {
+                if ((Visibility)value==Visibility.Collapsed)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Visibility.Visible;
+            }
+            else
+            {
+                if ((bool)value)
+                {
+                    return Visibility.Collapsed;
+                }
+                else
+                {
+                    return Visibility.Visible;
+                }
+            }
+        }
+    }
 }

PDF Office/ViewModels/PropertyPanel/AnnotPanel/SignatureCreateDialogViewModel.cs

@@ -34,6 +34,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
         public DelegateCommand<object> CheckedCommnad { get; set; }
 
         public DelegateCommand OpenImageCommnad { get; set; }
+        public DelegateCommand ClearImageCommnad { get; set; }
         public DelegateCommand ClearInkCanvasCommnad { get; set; }
         public ObservableCollection<string> FontNameList { get; set; }
         public ObservableCollection<string> ThicknessList { get; set; }
@@ -138,7 +139,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                 SetProperty(ref drawingAttributes, value);
             }
         }
-        
+
 
         private StrokeCollection strokes;
 
@@ -188,7 +189,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
             set
             {
                 SetProperty(ref thicknessListIndex, value);
-                if (thicknessListIndex>=0)
+                if (thicknessListIndex >= 0)
                 {
                     DrawingAttributeObject.Width = DrawingAttributeObject.Height = Convert.ToDouble(ThicknessList[thicknessListIndex].Substring(0, 3));
                     UpDataToStrokesObject();
@@ -223,6 +224,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
             CreateCommnad = new DelegateCommand(Create);
             CheckedCommnad = new DelegateCommand<object>(Checked);
             OpenImageCommnad = new DelegateCommand(OpenImage);
+            ClearImageCommnad = new DelegateCommand(ClearImage);
             ClearInkCanvasCommnad = new DelegateCommand(ClearInkCanvas);
             DrawingAttributeObject.Color = Colors.Black;
             DrawingAttributeObject.Width = 1;
@@ -233,7 +235,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
 
         private void StrokesObject_StrokesChanged(object sender, StrokeCollectionChangedEventArgs e)
         {
-            int x1 =1;
+            int x1 = 1;
         }
 
         private void InitFontNameList()
@@ -333,6 +335,12 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                 SaveToPath = "";
             }
         }
+
+        private void ClearImage()
+        {
+            ShowImageButton = Visibility.Visible;
+            ImagePreviewSource = originalimagePreviewSource = null;
+        }
         private void ClearInkCanvas()
         {
             StrokesObject.Clear();

PDF Office/ViewModels/Scan/ScanViwerViewModel.cs

@@ -535,7 +535,12 @@ namespace PDF_Office.ViewModels.Scan
                     error = imEngine.Process(pageImagePath);
 
                     if (imEngine.OCRResultList == null)
+                    {
+                        App.mainWindowViewModel.IsProcessVisible = Visibility.Collapsed;
+                        App.mainWindowViewModel.MaxValue = 0;
+                        App.mainWindowViewModel.Value = 0;
                         return;
+                    }
 
                     List<KeyValuePair<Rect, string>> RectList = new List<KeyValuePair<Rect, string>>();
                     foreach (COCRResult ocrResult in imEngine.OCRResultList)

PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml

@@ -15,6 +15,7 @@
         <dataconvert:BoolToVisible x:Key="BoolToVisible" />
         <dataconvert:UnVisivleConvert x:Key="UnVisivleConvert" />
         <dataconvert:ListCountToVisible x:Key="ListCountToVisible"/>
+        <dataconvert:UnVisibleToBoolConvert x:Key="UnVisibleToBoolConvert"/>
     </UserControl.Resources>
     <Grid Background="{StaticResource color.sys.layout.anti}">
         <Grid.ColumnDefinitions>
@@ -202,7 +203,7 @@
         </ComboBox>
         <Button Grid.Column="1" Grid.Row="5"  Content="Clear"  HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="80" Height="32" Style="{StaticResource btn.sec}" Command="{Binding ClearCommand}"/>
         <StackPanel Grid.Column="2" Grid.RowSpan="2" Grid.Row="4"  HorizontalAlignment="Center" VerticalAlignment="Bottom">
-            <Button x:Name="BtnMerge" Content="Merge" Width="80" Height="32" Style="{StaticResource Btn.cta}" Command="{Binding MergeCommand}"/>
+            <Button x:Name="BtnMerge" Content="Merge" Width="80" Height="32" Style="{StaticResource Btn.cta}" Command="{Binding MergeCommand}" IsEnabled="{Binding ElementName=NoFileStackPanel,Path=Visibility,Converter={StaticResource UnVisibleToBoolConvert}}"/>
             <Button Content="Cancel" Width="80" Height="32" Style="{StaticResource btn.sec}" Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>

PDF Office/Views/PropertyPanel/AnnotPanel/SignatureCreateDialog.xaml

@@ -251,6 +251,7 @@
                                 <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
                             <Image Grid.RowSpan="2" Width="200" Height="200" Source="{Binding ImagePreviewSource}" />
+                            <Button Grid.Row="1" Width="50" Height="50" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="清除" Command="{Binding ClearImageCommnad}"/>
                             <Button Grid.Row="1" Width="50" Height="50" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="重新选择" Command="{Binding OpenImageCommnad}"/>
                         </Grid>
                         <StackPanel  Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">