lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2026-02-25 13:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved wrapped capabilities into its own class to reduce DataSource complexity.

Browse Source
This commit is contained in:
soukoku
2015-02-20 18:17:51 -05:00
parent 59e8b996de
commit b757cc4a42
14 changed files with 288 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NTwain/CapWrapper.cs
View File

@@ -114,7 +114,7 @@ namespace NTwain
var srcVersion = _source.ProtocolVersion;
if (srcVersion >= ProtocolVersions.GetMinimumVersion(Capability))
{
_supports = _source.CapQuerySupport(Capability);
_supports = _source.Capabilities.QuerySupport(Capability);
if (!_supports.HasValue)
{
@@ -275,7 +275,7 @@ namespace NTwain
{
if (CanGetDefault)
{
return _getConvertRoutine(_source.CapGetDefault(Capability));
return _getConvertRoutine(_source.Capabilities.GetDefault(Capability));
}
return default(TValue);
}
@@ -288,7 +288,7 @@ namespace NTwain
{
if (CanGetCurrent)
{
return _getConvertRoutine(_source.CapGetCurrent(Capability));
return _getConvertRoutine(_source.Capabilities.GetCurrent(Capability));
}
return default(TValue);
}
@@ -299,7 +299,7 @@ namespace NTwain
/// <returns></returns>
public IList<TValue> GetValues()
{
return _source.CapGet(Capability).Select(o => _getConvertRoutine(o)).ToList();
return _source.Capabilities.GetValues(Capability).Select(o => _getConvertRoutine(o)).ToList();
}
/// <summary>
@@ -384,7 +384,7 @@ namespace NTwain
/// <returns></returns>
public ReturnCode Reset()
{
return _source.CapReset(Capability);
return _source.Capabilities.Reset(Capability);
}
/// <summary>