Skip to content

Commit

Permalink
Merge branch 'release/0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
takuya-takeuchi committed Aug 16, 2018
2 parents 20c13c8 + 5a0643f commit f7982e4
Show file tree
Hide file tree
Showing 121 changed files with 9,736 additions and 782 deletions.
15 changes: 13 additions & 2 deletions examples/FrameworkTester/DesignTimes/ChildWindowViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@ public RelayCommand ClearLogsCommand
get;
}

public ObservableCollection<string> Logs
public ObservableCollection<AsyncResult> AsyncResultLogs
{
get;
}

public AsyncResult SelectedAsyncResult
{
get;
set;
}

public AsyncResultParameter SelectedAsyncResultParameter
{
get;
}
Expand All @@ -41,7 +52,7 @@ public int ApiStatus
get;
}

public OperationTypes OperationType
public OperationType OperationType
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public int CaptureImageScanVerticalResolution
get;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public bool Loop
set;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace FrameworkTester.DesignTimes
public sealed class WinBioEnrollCaptureViewModel : WinBioViewModel, IWinBioEnrollCaptureViewModel, IWinBioAsyncSessionViewModel
{

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public bool EnableWait
set;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace FrameworkTester.DesignTimes
public sealed class WinBioEnrollCommitViewModel : WinBioViewModel, IWinBioEnrollCommitViewModel, IWinBioAsyncSessionViewModel
{

public IdentityTypes Type
public IdentityType Type
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public IBiometricIdentityRepositoryViewModel IdentityRepository
get;
}

public CredentialStates State
public CredentialState State
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace FrameworkTester.DesignTimes
public sealed class WinBioGetDomainLogonSettingViewModel : WinBioViewModel, IWinBioGetDomainLogonSettingViewModel
{

public SettingSourceTypes Source
public SettingSourceType Source
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace FrameworkTester.DesignTimes
public sealed class WinBioGetEnabledSettingViewModel : WinBioViewModel, IWinBioGetEnabledSettingViewModel
{

public SettingSourceTypes Source
public SettingSourceType Source
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace FrameworkTester.DesignTimes
public sealed class WinBioGetLogonSettingViewModel : WinBioViewModel, IWinBioGetLogonSettingViewModel
{

public SettingSourceTypes Source
public SettingSourceType Source
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public FingerPosition FingerPosition
get;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand All @@ -38,7 +38,7 @@ public Guid TemplateGuid
get;
}

public IdentityTypes Type
public IdentityType Type
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public FingerPosition FingerPosition
get;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand All @@ -50,7 +50,7 @@ public Guid TemplateGuid
get;
}

public IdentityTypes Type
public IdentityType Type
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public bool IsMatch
get;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public bool IsMatch
get;
}

public RejectDetails RejectDetail
public RejectDetail RejectDetail
{
get;
}
Expand Down
4 changes: 4 additions & 0 deletions examples/FrameworkTester/FrameworkTester.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
<Compile Include="DesignTimes\WinBioReleaseFocusViewModel.cs" />
<Compile Include="DesignTimes\WinBioViewModel.cs" />
<Compile Include="Helpers\BitmapSourceHelper.cs" />
<Compile Include="Selectors\ChildWindowLogTemplateSlector.cs" />
<Compile Include="ViewModels\AsyncResultCaptureSampleDummy.cs" />
<Compile Include="ViewModels\AsyncResultEnumEnrollmentsDummy.cs" />
<Compile Include="ViewModels\CustomPropertyViewModel.cs" />
<Compile Include="ViewModels\Interfaces\IWinBioSetCredentialViewModel.cs" />
<Compile Include="ViewModels\SampleHintPropertyViewModel.cs" />
Expand All @@ -141,6 +144,7 @@
<Compile Include="ViewModels\Interfaces\IHandleViewModel.cs" />
<Compile Include="ViewModels\Interfaces\IWinBioSetPropertyViewModel.cs" />
<Compile Include="DesignTimes\WinBioSetPropertyViewModel.cs" />
<Compile Include="ViewModels\WinBioFrameworkViewModel.cs" />
<Compile Include="ViewModels\WinBioSetCredentialViewModel.cs" />
<Compile Include="ViewModels\WinBioSetPropertyViewModel.cs" />
<Compile Include="ViewModels\WinBioRemoveCredentialViewModel.cs" />
Expand Down
152 changes: 152 additions & 0 deletions examples/FrameworkTester/Selectors/ChildWindowLogTemplateSlector.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
using System.Windows;
using System.Windows.Controls;
using FrameworkTester.ViewModels;
using WinBiometricDotNet;

namespace FrameworkTester.Selectors
{

internal sealed class ChildWindowLogTemplateSlector : DataTemplateSelector
{

#region Properties

public DataTemplate CaptureSample
{
get;
set;
}

public DataTemplate ControlUnit
{
get;
set;
}

public DataTemplate DeleteTemplate
{
get;
set;
}

public DataTemplate EnrollBegin
{
get;
set;
}

public DataTemplate EnrollCapture
{
get;
set;
}

public DataTemplate EnrollCommit
{
get;
set;
}

public DataTemplate EnumBiometricUnits
{
get;
set;
}

public DataTemplate EnumDatabases
{
get;
set;
}

public DataTemplate EnumEnrollments
{
get;
set;
}

public DataTemplate EnumServiceProviders
{
get;
set;
}

public DataTemplate GetEvent
{
get;
set;
}

public DataTemplate GetProperty
{
get;
set;
}

public DataTemplate Identity
{
get;
set;
}

public DataTemplate SetProperty
{
get;
set;
}

public DataTemplate Verify
{
get;
set;
}

#endregion

#region Methods

#region Overrids

public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (item is AsyncResultCaptureSampleDummy)
return this.CaptureSample;
if (item is AsyncResultControlUnit)
return this.ControlUnit;
if (item is AsyncResultDeleteTemplate)
return this.DeleteTemplate;
if (item is AsyncResultEnrollBegin)
return this.EnrollBegin;
if (item is AsyncResultEnrollCapture)
return this.EnrollCapture;
if (item is AsyncResultEnrollCommit)
return this.EnrollCommit;
if (item is AsyncResultEnumBiometricUnits)
return this.EnumBiometricUnits;
if (item is AsyncResultEnumDatabases)
return this.EnumDatabases;
if (item is AsyncResultEnumEnrollmentsDummy)
return this.EnumEnrollments;
if (item is AsyncResultEnumServiceProviders)
return this.EnumServiceProviders;
if (item is AsyncResultGetEvent)
return this.GetEvent;
if (item is AsyncResultGetProperty)
return this.GetProperty;
if (item is AsyncResultIdentity)
return this.Identity;
if (item is AsyncResultSetProperty)
return this.SetProperty;
if (item is AsyncResultVerify)
return this.Verify;

return null;
}

#endregion

#endregion

}

}
12 changes: 8 additions & 4 deletions examples/FrameworkTester/Selectors/ChildWindowTemplateSlector.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Windows;
using System.Windows.Controls;
using FrameworkTester.ViewModels.Interfaces;
using WinBiometricDotNet;

namespace FrameworkTester.Selectors
{
Expand Down Expand Up @@ -30,10 +31,13 @@ public DataTemplate AsyncOpenSession

public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (item is IAsyncOpenFrameworkChildWindowViewModel)
return this.AsyncOpenFramework;
if (item is IAsyncOpenSessionChildWindowViewModel)
return this.AsyncOpenSession;
if (item is AsyncResult result)
{
if (result.Session != null)
return this.AsyncOpenSession;
if (result.Framework != null)
return this.AsyncOpenFramework;
}

return null;
}
Expand Down
Loading

0 comments on commit f7982e4

Please sign in to comment.