Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -15,8 +15,8 @@
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>1</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
+    <index_cb_klcc_jsfs>0</index_cb_klcc_jsfs>
+    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>1</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
     <index_cb_jzwfl_xstx>4</index_cb_jzwfl_xstx>

Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,1.5,2,5,10,20,30,40" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,1.5,2,5,10,20,30" Version="1.1.1" />

OTSIncAMeasureApp/0-OTSModel/Measure/GetBSEPic/CSmplMeasure.cs

@@ -299,7 +299,7 @@ namespace OTSModelSharp
 
             return true;
         }
-
+        
         public  void SetWorkingFolder(String a_strWorkingFolder)
         {
             // add "\\" at the string end if it is not "\\"

OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/COTSMsrPrjResultData.cs

@@ -146,6 +146,7 @@ namespace OTSModelSharp
             doc.Load(strPathName);
             XmlNode root = doc.SelectSingleNode("XMLData");
             Serialize(false, doc, root);
+
             //设置测量项目文件路径
             m_strPathName = strPathName;
             //-------------
@@ -1604,7 +1605,14 @@ namespace OTSModelSharp
                 {
                     m_listSamples.Add(xsamples.getItem(i));
                 }
-
+                if(xSystype.value()== "IncA")
+                {
+                    m_nPackId = otsdataconst.OTS_SysType_ID.IncA;
+                }
+                else 
+                {
+                    m_nPackId = otsdataconst.OTS_SysType_ID.CleanlinessA;
+                }
             }
 
         }

OTSIncAMeasureApp/0-OTSModel/Measure/GetParticleData/IncADataTable.cs

@@ -59,23 +59,23 @@ namespace OTSModelSharp
             AddColumn(new ColumnDefine() { ColumName = "RectWidth", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "RectHeight", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "Area", ColumType = new ColumnType(ColumnType.ID.FLOAT,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "PosX", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "PosY", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "PosX", ColumType =new ColumnType(ColumnType.ID.INTEGER, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "PosY", ColumType =new ColumnType(ColumnType.ID.INTEGER, false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "TypeId", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "ElementNum", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "SegmentNum", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "FieldPosX", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "FieldPosY", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "FieldPosX", ColumType =new ColumnType(ColumnType.ID.INTEGER, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "FieldPosY", ColumType =new ColumnType(ColumnType.ID.INTEGER, false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "ParticleId", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DMAX", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DMIN", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DPERP", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "PERIMETER", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "ORIENTATION", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DINSCR", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DMEAN", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DELONG", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
-            AddColumn(new ColumnDefine() { ColumName = "DFERET", ColumType =new ColumnType(ColumnType.ID.INTEGER,false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DMAX", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DMIN", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DPERP", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "PERIMETER", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "ORIENTATION", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DINSCR", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DMEAN", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DELONG", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
+            AddColumn(new ColumnDefine() { ColumName = "DFERET", ColumType =new ColumnType(ColumnType.ID.FLOAT, false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "TypeName", ColumType =new ColumnType(ColumnType.ID.STRING,false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "TypeColor", ColumType =new ColumnType(ColumnType.ID.STRING,false,false), IsPrimarykey = false });
             AddColumn(new ColumnDefine() { ColumName = "SEMPosX", ColumType = new ColumnType(ColumnType.ID.INTEGER, false, false), IsPrimarykey = false });

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -163,10 +163,9 @@ namespace OTSMeasureApp
 
 
 
-            if (bNewFileFlag)
+            if (m_ResultData.GetPathName()=="")
             {
-                m_ResultData.SetPathName("Untitled");
-             
+                m_ResultData.SetPathName("Untitled");             
             }
 
             m_ResultData.m_nPackId = m_DefaultParam.m_nPackId;

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -548,7 +548,15 @@ namespace OTSMeasureApp
             if (SMInfo.sSampleSoluName != "")
             {
                 string str = table[this.Name.ToLower()].ToString();
-                this.Text = str + "-" + SMInfo.sSampleSoluName;
+                //this.Text = str + "-" + SMInfo.sSampleSoluName;
+                if (m_ProjParam.m_ResultData.m_nPackId.ToString() == "IncA")
+                {
+                    this.Text = str + " -- Inclusion Analysis System";
+                }
+                else if (m_ProjParam.m_ResultData.m_nPackId.ToString() == "CleanlinessA")
+                {
+                    this.Text = str + " -- Cleanliness Analysis System";
+                }
             }
             if ("" == sWSampleName)
             {

OTSIncAReportApp/Control_Grids/ParticlesSizeGrid.cs

@@ -37,7 +37,7 @@ namespace OTSIncAReportGrids
 
         private string getWhere(string max, string min, string col, string partic)
         {
-            return col + ">=" + min + " and " + col + "<=" + max + " and TypeId=" + partic;
+            return col + ">=" + min + " and " + col + "<" + max + " and TypeId=" + partic;
         }
 
         /// <summary>

OTSIncAReportApp/DataOperation/DataAccess/SqlHelper.cs

@@ -211,10 +211,16 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
                     {
                         pi.SetValue(item, Convert.ToInt32(value));
                     }
+                    else if(value.GetType().ToString() == "System.Decimal")
+                    {
+                        pi.SetValue(item, Convert.ToDouble(value));
+                    }
                     else
                     {
                         pi.SetValue(item, value);
                     }
+                    
+
                 }
             }
             return result;

OTSIncAReportApp/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -493,7 +493,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
                 DataRow dr = ls_partsize_dt.NewRow();
                 //从2开始，固定的
-                int col = 9;
+                int col = 6;
                 for (int i = 1; i < 11; i++)
                 {
                     if (ls_gv.Columns.Count > col)
@@ -527,7 +527,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr2["Hardness"] = ls_gv.Rows[i].Cells[6].Value.ToString();
                     dr2["Density"] = ls_gv.Rows[i].Cells[7].Value.ToString();
                     dr2["Conductivity"] = ls_gv.Rows[i].Cells[8].Value.ToString();
-                    int col2 = 9;
+                    int col2 = 6;
                     for (int j = 1; j < 11; j++)
                     {
                         if (ls_gv.Columns.Count > col2)
@@ -539,7 +539,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     {
                         dr2["total"] = "0"; //求合
                         double d_total = 0;
-                        int col3 = 9;
+                        int col3 = 6;
                         for (int j = 1; j < 11; j++)
                         {
                             if (ls_gv.Columns.Count > col3)