Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/OTSOx50_30.wse

@@ -924,6 +924,21 @@ end
 item: Include Script
   Pathname=%_WISE_%\INCLUDE\uninstal.wse
 end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Config\ReportTemplate\CleannessA_Template\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\Config\ReportTemplate\CleannessA_Template\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Config\ReportTemplate\SummaryInfo.xml
+  Destination=%MAINDIR%\Config\ReportTemplate\SummaryInfo.xml
+  Flags=0000000010000010
+end
 item: Install File
   Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford50\Common\x64\slm_runtime_dev.dll
   Destination=%MAINDIR%\Common\x64\slm_runtime_dev.dll

Bin/x64/OTSOx61_30.wse

@@ -924,6 +924,51 @@ end
 item: Include Script
   Pathname=%_WISE_%\INCLUDE\uninstal.wse
 end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\SummaryInfo.xml
+  Destination=%MAINDIR%\Config\ReportTemplate\SummaryInfo.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\CleannessA_Template\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\Config\ReportTemplate\CleannessA_Template\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\SummaryInfo.xml
+  Destination=%MAINDIR%\SummaryInfo.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\ReportIdentification.bmp
+  Destination=%MAINDIR%\ReportIdentification.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\language.db
+  Destination=%MAINDIR%\language.db
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\Inca_Template\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\Inca_Template\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
+item: Install File
+  Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\ReportTemplate\CleannessA_Template\ReportTemplateConfig.xml
+  Destination=%MAINDIR%\CleannessA_Template\ReportTemplateConfig.xml
+  Flags=0000000010000010
+end
 item: Install File
   Source=j:\Ots\OTSReleaseSrc3_0\Bin\x64\Release_oxford61\Config\SysData\StdBattery.db
   Destination=%MAINDIR%\Config\SysData\StdBattery.db

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSField.cs

@@ -209,8 +209,18 @@ namespace OTSDataType
             var leftparts = this.GetSideParticlesByOverlap(SORTING_DIRECTION.LEFT, overlap);
             if (leftField != null && leftField.measureSequence < this.measureSequence)
             {
-
                 var rightsideparts = leftField.GetSideParticlesByOverlap(SORTING_DIRECTION.RIGHT, overlap);
+                if (leftField.upField != null && leftField.upField.measureSequence < this.measureSequence)//include the left up corner parts
+                {
+                    var leftupParts = leftField.upField.GetSideParticlesByOverlap(SORTING_DIRECTION.RIGHT, overlap);
+                    rightsideparts.AddRange(leftupParts);
+                }
+                if (leftField.downField != null && leftField.downField.measureSequence < this.measureSequence)//include the left down corner parts
+                {
+                    var leftdownParts = leftField.downField.GetSideParticlesByOverlap(SORTING_DIRECTION.RIGHT, overlap);
+                    rightsideparts.AddRange(leftdownParts);
+                }
+
                 log.Info("left side particles num:" + leftparts.Count.ToString());
                 foreach (var p in leftparts)
                 {
@@ -251,6 +261,8 @@ namespace OTSDataType
             {
 
                 var othersideparts = upField.GetSideParticlesByOverlap(SORTING_DIRECTION.DOWN, overlap);
+
+
                 log.Info("up side particles num:" + upparts.Count.ToString());
                 foreach (var p in upparts)
                 {
@@ -293,9 +305,19 @@ namespace OTSDataType
             var rightparts = this.GetSideParticlesByOverlap(SORTING_DIRECTION.RIGHT, overlap);
             if (rightField != null && rightField.measureSequence < this.measureSequence)
             {
-
                 log.Info("right side particles num:" + rightparts.Count.ToString());
                 var othersideparts = rightField.GetSideParticlesByOverlap(SORTING_DIRECTION.LEFT, overlap);
+                if (rightField.upField != null && rightField.upField.measureSequence < this.measureSequence)// right up corner parts
+                {
+                    var rightupParts = rightField.upField.GetSideParticlesByOverlap(SORTING_DIRECTION.LEFT, overlap);
+                    othersideparts.AddRange(rightupParts);
+                }
+                if (rightField.downField != null && leftField.downField.measureSequence < this.measureSequence)// rightdown corner parts
+                {
+                    var rightdownParts = leftField.downField.GetSideParticlesByOverlap(SORTING_DIRECTION.LEFT, overlap);
+                    othersideparts.AddRange(rightdownParts);
+                }
+
                 foreach (var p in rightparts)
                 {
                     int pleft = 0, pright = 0, ptop = 0, pbottom = 0;