Merge branch 'release/0.2.0'

takuya-takeuchi · Aug 5, 2018 · 2cf2b7d · 2cf2b7d
2 parents 811928a + e48e7f6
commit 2cf2b7d
Show file tree

Hide file tree

Showing 65 changed files with 4,834 additions and 702 deletions.
diff --git a/README.md b/README.md
@@ -27,8 +27,8 @@ Windows Bitometric Framework .NET wrapper
 |WinBioEnrollDiscard||
 |WinBioEnrollSelect||
 |WinBioEnumBiometricUnits|✓|
-|WinBioEnumDatabases||
-|WinBioEnumEnrollments||
+|WinBioEnumDatabases|✓|
+|WinBioEnumEnrollments|✓|
 |WinBioEnumServiceProviders||
 |WinBioFree|✓|
 |WinBioGetCredentialState||
@@ -54,6 +54,6 @@ Windows Bitometric Framework .NET wrapper
 |WinBioSetProperty||
 |WinBioUnlockUnit||
 |WinBioUnregisterEventMonitor||
-|WinBioVerify||
+|WinBioVerify|✓|
 |WinBioVerifyWithCallback||
 |WinBioWait||
diff --git a/examples/FrameworkTester/DesignTimes/WinBioAcquireFocusViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioAcquireFocusViewModel.cs
@@ -1,27 +1,10 @@
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioAcquireFocusViewModel : IWinBioAcquireFocusViewModel
+    public sealed class WinBioAcquireFocusViewModel : WinBioViewModel, IWinBioAcquireFocusViewModel
     {
-
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
-        public string Name
-        {
-            get;
-        }
-
-        public string Result
-        {
-            get;
-        }
-
     }
 
 }
diff --git a/examples/FrameworkTester/DesignTimes/WinBioCaptureSampleViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioCaptureSampleViewModel.cs
@@ -1,11 +1,11 @@
 using System.Windows.Media.Imaging;
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
+using WinBiometricDotNet;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioCaptureSampleViewModel : IWinBioCaptureSampleViewModel
+    public sealed class WinBioCaptureSampleViewModel : WinBioViewModel, IWinBioCaptureSampleViewModel
     {
 
         public BitmapSource CaptureImage
@@ -43,22 +43,7 @@ public int CaptureImageScanVerticalResolution
             get;
         }
 
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
-        public string Name
-        {
-            get;
-        }
-
-        public uint RejectDetail
-        {
-            get;
-        }
-
-        public string Result
+        public RejectDetails RejectDetail
         {
             get;
         }

diff --git a/examples/FrameworkTester/DesignTimes/WinBioCaptureSampleWithCallbackViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioCaptureSampleWithCallbackViewModel.cs
@@ -1,11 +1,11 @@
 using System.Windows.Media.Imaging;
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
+using WinBiometricDotNet;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioCaptureSampleWithCallbackViewModel : IWinBioCaptureSampleWithCallbackViewModel
+    public sealed class WinBioCaptureSampleWithCallbackViewModel : WinBioViewModel, IWinBioCaptureSampleWithCallbackViewModel
     {
 
         public BitmapSource CaptureImage
@@ -43,28 +43,13 @@ public int CaptureImageScanVerticalResolution
             get;
         }
 
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
         public bool Loop
         {
             get;
             set;
         }
 
-        public string Name
-        {
-            get;
-        }
-
-        public uint RejectDetail
-        {
-            get;
-        }
-
-        public string Result
+        public RejectDetails RejectDetail
         {
             get;
         }

diff --git a/examples/FrameworkTester/DesignTimes/WinBioCloseSessionViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioCloseSessionViewModel.cs
@@ -1,27 +1,10 @@
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioCloseSessionViewModel : IWinBioCloseSessionViewModel
+    public sealed class WinBioCloseSessionViewModel : WinBioViewModel, IWinBioCloseSessionViewModel
     {
-
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
-        public string Name
-        {
-            get;
-        }
-
-        public string Result
-        {
-            get;
-        }
-
     }
 
 }
diff --git a/examples/FrameworkTester/DesignTimes/WinBioEnumBiometricUnitsViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioEnumBiometricUnitsViewModel.cs
@@ -1,29 +1,13 @@
 using System.Collections.ObjectModel;
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
 using WinBiometricDotNet;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioEnumBiometricUnitsViewModel : IWinBioEnumBiometricUnitsViewModel
+    public sealed class WinBioEnumBiometricUnitsViewModel : WinBioViewModel, IWinBioEnumBiometricUnitsViewModel
     {
 
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
-        public string Name
-        {
-            get;
-        }
-
-        public string Result
-        {
-            get;
-        }
-
         public ObservableCollection<BiometricUnit> Units
         {
             get;

diff --git a/examples/FrameworkTester/DesignTimes/WinBioEnumDatabasesViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioEnumDatabasesViewModel.cs
@@ -0,0 +1,35 @@
+using System.Collections.ObjectModel;
+using FrameworkTester.ViewModels.Interfaces;
+using GalaSoft.MvvmLight.Command;
+using WinBiometricDotNet;
+
+namespace FrameworkTester.DesignTimes
+{
+
+    public sealed class WinBioEnumDatabasesViewModel : WinBioViewModel, IWinBioEnumDatabasesViewModel
+    {
+
+        public RelayCommand CreateDatabaseCommand
+        {
+            get;
+        }
+
+        public BiometricDatabase CurrentDatabase
+        {
+            get;
+            set;
+        }
+
+        public ObservableCollection<BiometricDatabase> Databases
+        {
+            get;
+        }
+
+        public RelayCommand RemoveDatabaseCommand
+        {
+            get;
+        }
+
+    }
+
+}
diff --git a/examples/FrameworkTester/DesignTimes/WinBioEnumEnrollmentsViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioEnumEnrollmentsViewModel.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using FrameworkTester.ViewModels.Interfaces;
+using GalaSoft.MvvmLight.Command;
+using WinBiometricDotNet;
+
+namespace FrameworkTester.DesignTimes
+{
+
+    public sealed class WinBioEnumEnrollmentsViewModel : WinBioViewModel, IWinBioEnumEnrollmentsViewModel
+    {
+
+        public ObservableCollection<KeyValuePair<string, bool>> FingerPositions
+        {
+            get;
+        }
+
+    }
+
+}
diff --git a/examples/FrameworkTester/DesignTimes/WinBioOpenSessionViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioOpenSessionViewModel.cs
@@ -1,28 +1,12 @@
 using System;
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioOpenSessionViewModel : IWinBioOpenSessionViewModel
+    public sealed class WinBioOpenSessionViewModel : WinBioViewModel, IWinBioOpenSessionViewModel
     {
 
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
-        public string Name
-        {
-            get;
-        }
-
-        public string Result
-        {
-            get;
-        }
-
         public IntPtr SessionHandle
         {
             get;

diff --git a/examples/FrameworkTester/DesignTimes/WinBioReleaseFocusViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioReleaseFocusViewModel.cs
@@ -1,27 +1,10 @@
 using FrameworkTester.ViewModels.Interfaces;
-using GalaSoft.MvvmLight.Command;
 
 namespace FrameworkTester.DesignTimes
 {
 
-    public sealed class WinBioReleaseFocusViewModel : IWinBioReleaseFocusViewModel
+    public sealed class WinBioReleaseFocusViewModel : WinBioViewModel, IWinBioReleaseFocusViewModel
     {
-
-        public RelayCommand ExecuteCommand
-        {
-            get;
-        }
-
-        public string Name
-        {
-            get;
-        }
-
-        public string Result
-        {
-            get;
-        }
-
     }
 
 }
diff --git a/examples/FrameworkTester/DesignTimes/WinBioVerifyViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioVerifyViewModel.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Windows.Media.Imaging;
+using FrameworkTester.ViewModels.Interfaces;
+using WinBiometricDotNet;
+
+namespace FrameworkTester.DesignTimes
+{
+
+    public sealed class WinBioVerifyViewModel : WinBioViewModel, IWinBioVerifyViewModel
+    {
+
+        public bool IsMatch
+        {
+            get;
+        }
+
+        public RejectDetails RejectDetail
+        {
+            get;
+        }
+
+        public uint UnitId
+        {
+            get;
+        }
+
+        public FingerPosition SelectedFingerPosition
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<FingerPosition> FingerPositions
+        {
+            get;
+        }
+
+    }
+
+}
diff --git a/examples/FrameworkTester/DesignTimes/WinBioVerifyWithCallbackViewModel.cs b/examples/FrameworkTester/DesignTimes/WinBioVerifyWithCallbackViewModel.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Windows.Media.Imaging;
+using FrameworkTester.ViewModels.Interfaces;
+using WinBiometricDotNet;
+
+namespace FrameworkTester.DesignTimes
+{
+
+    public sealed class WinBioVerifyWithCallbackViewModel : WinBioViewModel, IWinBioVerifyWithCallbackViewModel
+    {
+
+        public bool IsMatch
+        {
+            get;
+        }
+
+        public RejectDetails RejectDetail
+        {
+            get;
+        }
+
+        public uint UnitId
+        {
+            get;
+        }
+
+        public FingerPosition SelectedFingerPosition
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<FingerPosition> FingerPositions
+        {
+            get;
+        }
+
+    }
+
+}