phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Testing II

Browse Source
This commit is contained in:
Mike Phares
2023-02-08 10:26:59 -07:00
parent 8c6a2d92db
commit 78567f9e39
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Server/Repositories/PinRepository.cs
View File

@ -36,24 +36,22 @@ public class PinRepository : IPinRepository
}
else
{
const int rows = 11;
List<string> values;
const int points = 9;
Pinned headerCommond;
List<Pinned> results = new();
if (bioRadHeader is not null)
{
const int columns = 10;
const int thickness = 5;
System.Data.DataTable dataTable = metrologyRepository.GetData((int)bioRadHeader.ToolTypeID, bioRadHeader.ID);
if (dataTable.Rows.Count == rows && dataTable.Columns.Count == columns)
if (dataTable.Rows.Count > points && dataTable.Columns.Count > thickness)
{
values = new();
const int rs = 5;
for (int i = 0; i < dataTable.Rows.Count - 1; i++)
{
if (dataTable.Rows[i]?.ItemArray[rs] is null)
if (dataTable.Rows[i]?.ItemArray[thickness] is null)
break;
values.Add(string.Concat(dataTable.Rows[i].ItemArray[rs]));
values.Add(string.Concat(dataTable.Rows[i].ItemArray[thickness]));
}
if (values.Count > points)
{
@ -64,12 +62,11 @@ public class PinRepository : IPinRepository
}
if (cdeHeader is not null)
{
const int columns = 7;
const int rs = 6;
System.Data.DataTable dataTable = metrologyRepository.GetData((int)cdeHeader.ToolTypeID, cdeHeader.ID);
if (dataTable.Rows.Count == rows && dataTable.Columns.Count == columns)
if (dataTable.Rows.Count > points && dataTable.Columns.Count > rs)
{
values = new();
const int rs = 5;
for (int i = 0; i < dataTable.Rows.Count - 1; i++)
{
if (dataTable.Rows[i]?.ItemArray[rs] is null)