删除 颗粒列表相关无效代码及大颗粒拼接部分代码

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -176,24 +176,6 @@ namespace OTSIncAReportGrids
 
         private void ParticlesGridDevidePage_Load(object sender, EventArgs e)
         {
-            ////显示进度条,计算进度条应该显示的位置和宽度
-            //Form ls_main_form = this.ParentForm.ParentForm;//取出父窗体
-            //if (ls_main_form == null)
-            //{
-            //    m_frm_userprogress.Visible = false;
-            //}
-            //else
-            //{
-            //    string str7 = table["str7"].ToString();
-            //    m_frm_userprogress.Width = (int)(MyPrimaryScreen.DESKTOP.Width / MyPrimaryScreen.ScaleX * 0.9);
-            //    m_frm_userprogress.Location = new Point(ls_main_form.Location.X + 80, ls_main_form.Location.Y + (int)(MyPrimaryScreen.DESKTOP.Height / MyPrimaryScreen.ScaleX) / 2);
-            //    m_frm_userprogress.Show();
-            //    m_frm_userprogress.SetProgressValueAndText(0, str7);
-            //}
-            //string str2 = "加载颗粒列表，开始从底层加载数据....";
-            //str2 = table["str2"].ToString();
-            //m_frm_userprogress.SetProgressValueAndText(1, str2);
-    
             //初始化底层操作类
             m_OTSIncAReportGridsFun = new OTSIncAReportGridsFun(m_ReportApp, this);
 
@@ -227,10 +209,6 @@ namespace OTSIncAReportGrids
             cbB_PageSize.SelectedIndex = 0;
             cbB_PageSize.SelectedIndexChanged += new System.EventHandler(this.cbB_PageSize_SelectedIndexChanged);
 
-            //string str8 = table["str8"].ToString();
-            //m_frm_userprogress.SetProgressValueAndText(100, str8);
-            ////加载完成，关闭进度条
-            //m_frm_userprogress.Close();
         }
 
         #region 自定义方法
@@ -548,18 +526,8 @@ namespace OTSIncAReportGrids
             {
                 dgV_ParticlesDevidePage.Columns.Add(ElementTypeSort[i], ElementTypeSort[i]);
             }
-            ////禁止列排序
-            //for (int i = 0; i < this.dgV_ParticlesDevidePage.Columns.Count; i++)
-            //{
-            //    this.dgV_ParticlesDevidePage.Columns[i].SortMode = DataGridViewColumnSortMode.NotSortable;
-            //}
 
             RecordCount = fielddata.GetAllInfo(condition).Rows.Count;
-            string particleM = "";
-
-
-
-            //DataTable particlesNew = particles.Clone();
 
             double jd = 95f / (double)particles.Rows.Count;//计算进度刻度
 
@@ -569,7 +537,8 @@ namespace OTSIncAReportGrids
             {
                 //更新进度,每100条记录加载完，更新一次进度
                 if (i % 100 == 0)
-                    m_frm_userprogress.SetProgressValueAndText((int)(jd * i), "Loding..");
+                    
+                    m_frm_userprogress.SetProgressValueAndText((int)(jd * i), "loading..");
 
                 Dictionary<string, string>.Enumerator enl = keyValues.GetEnumerator();
 
@@ -587,35 +556,35 @@ namespace OTSIncAReportGrids
                         }
                         if (enl.Current.Key == "ParticleImage")
                         {
-                            string subt = particles.Rows[i]["SubParticles"].ToString();
-                            if (subt != null && subt != "")
-                            {
-                                double ScanFieldSize = Convert.ToDouble(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize"]);
-                                string filePatht = result.FilePath + "\\FIELD_FILES\\";
-                                string imagePatht = filePatht + "Field" + subt.Split(',')[0].Split(':')[0].ToString() + ".bmp";
-                                //然后将取出的数据，转换成Bitmap对象
-                                Bitmap tempbit = fielddata.ReadImageFile(imagePatht);
-                                int pixw = tempbit.Width;
-                                double xs = pixw / ScanFieldSize;
-
-                                particleM = particleM + "," + subt;
-                                Bitmap bmap = fielddata.GetBitmapForBig(subt, xs, result.FilePath);
-                                if (bmap != null)
-                                {
-                                    bmap.Tag = new List<string>() { subt.Split(',')[0].Split(':')[0], subt.Split(',')[0].Split(':')[1], particles.Rows[i]["TypeId"].ToString() };
-                                    dgV_ParticlesDevidePage.Rows[add_rowindex].Height = 150;
-                                    dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = bmap;
-                                    dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
-                                }
-                                else
-                                {
-                                    dgV_ParticlesDevidePage.Rows[add_rowindex].Height = 150;
-
-                                    dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
-                                }
-                            }
-                            else
-                            {
+                            //string subt = particles.Rows[i]["SubParticles"].ToString();
+                            //if (subt != null && subt != "")
+                            //{
+                            //    double ScanFieldSize = Convert.ToDouble(((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["SEMDataMsr"])["ScanFieldSize"]);
+                            //    string filePatht = result.FilePath + "\\FIELD_FILES\\";
+                            //    string imagePatht = filePatht + "Field" + subt.Split(',')[0].Split(':')[0].ToString() + ".bmp";
+                            //    //然后将取出的数据，转换成Bitmap对象
+                            //    Bitmap tempbit = fielddata.ReadImageFile(imagePatht);
+                            //    int pixw = tempbit.Width;
+                            //    double xs = pixw / ScanFieldSize;
+
+                            //    particleM = particleM + "," + subt;
+                            //    Bitmap bmap = fielddata.GetBitmapForBig(subt, xs, result.FilePath);
+                            //    if (bmap != null)
+                            //    {
+                            //        bmap.Tag = new List<string>() { subt.Split(',')[0].Split(':')[0], subt.Split(',')[0].Split(':')[1], particles.Rows[i]["TypeId"].ToString() };
+                            //        dgV_ParticlesDevidePage.Rows[add_rowindex].Height = 150;
+                            //        dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = bmap;
+                            //        dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
+                            //    }
+                            //    else
+                            //    {
+                            //        dgV_ParticlesDevidePage.Rows[add_rowindex].Height = 150;
+
+                            //        dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Style.BackColor = Color.Azure;
+                            //    }
+                            //}
+                            //else
+                            //{
                                 if (FieldImage.Key != particles.Rows[i]["fieldid"].ToString() || FieldImage.Value == null)
                                 {
                                     string imagePath = filePath + "Field" + particles.Rows[i]["fieldid"].ToString() + ".bmp";
@@ -626,7 +595,7 @@ namespace OTSIncAReportGrids
                                 Bitmap bmap = fielddata.GetBitmapByParticle(FieldImage.Value, rectangle);
                                 bmap.Tag = new List<string>() { particles.Rows[i]["FieldId"].ToString(), particles.Rows[i]["ParticleId"].ToString(), particles.Rows[i]["TypeId"].ToString() };
                                 dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = bmap;
-                            }
+                            //}
                         }
                         if (enl.Current.Key == "DiameterRatio")
                         {
@@ -668,15 +637,7 @@ namespace OTSIncAReportGrids
                         }
                         if (enl.Current.Key == "TypeName")
                         {
-                            if (particles.Rows[i]["TypeId"].ToString() == "7")
-                            {
-                                dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = "SiC";
-                            }
-                            else if (particles.Rows[i]["TypeId"].ToString() == "8")
-                            {
-                                dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = "FeO";
-                            }
-                            else if (particles.Rows[i]["TypeId"].ToString() == "9")
+                            if (particles.Rows[i]["TypeId"].ToString() == "9")
                             {
                                 dgV_ParticlesDevidePage.Rows[add_rowindex].Cells[k].Value = "Not Identified";
                             }
@@ -691,11 +652,11 @@ namespace OTSIncAReportGrids
                 }
 
                 //每加载2000条数据后，进行一次内存回收
-                if (i % 2000 == 0)
-                {
-                    GC.Collect();
-                    GC.WaitForPendingFinalizers();
-                }
+                //if (i % 2000 == 0)
+                //{
+                //    GC.Collect();
+                //    GC.WaitForPendingFinalizers();
+                //}
 
             }
 
@@ -754,56 +715,6 @@ namespace OTSIncAReportGrids
             dgV_ParticlesDevidePage.Columns[0].Resizable = DataGridViewTriState.False;
 
             dgV_ParticlesDevidePage.RowsDefaultCellStyle.BackColor = Color.Azure;
-
-            ////用户不能调整标题的高度
-            //dgV_ParticlesDevidePage.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-
-            ////用户不能调整 行高
-            //dgV_ParticlesDevidePage.AllowUserToResizeRows = false;
-
-            ////点击选择整行
-            //dgV_ParticlesDevidePage.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-
-            ////居中显示
-            //System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            //dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            //dgV_ParticlesDevidePage.DefaultCellStyle = dataGridViewCellStyle1;
-            //dgV_ParticlesDevidePage.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-
-            ////再次重覆禁用拖动表头高度，居然有效果了
-            //dgV_ParticlesDevidePage.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-
-            ////设置grid可以复制
-            //dgV_ParticlesDevidePage.ClipboardCopyMode = DataGridViewClipboardCopyMode.EnableAlwaysIncludeHeaderText;
-
-            ////设置每列的宽度
-            //dgV_ParticlesDevidePage.Columns[0].Width = 40;//第一列序号的宽度设置一下吧，要不太丑
-            //dgV_ParticlesDevidePage.Columns[1].Width = 200;
-            //dgV_ParticlesDevidePage.AutoResizeColumn(dgV_ParticlesDevidePage.Columns.Count - 1);
-            //dgV_ParticlesDevidePage.Columns[dgV_ParticlesDevidePage.Columns.Count - 1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft;
-            ////设置序号列不排序
-            //dgV_ParticlesDevidePage.Columns[0].SortMode = DataGridViewColumnSortMode.NotSortable;
-
-            ////设置序号列不可以设置宽度
-            //dgV_ParticlesDevidePage.Columns[0].Resizable = DataGridViewTriState.False;
-
-            //dgV_ParticlesDevidePage.AllowUserToAddRows = false;
-            //dgV_ParticlesDevidePage.AllowUserToDeleteRows = false;
-            //dgV_ParticlesDevidePage.AllowUserToResizeRows = false;
-            //dgV_ParticlesDevidePage.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
-            //dgV_ParticlesDevidePage.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            //dgV_ParticlesDevidePage.ContextMenuStrip = this.contextMenuStrip1;
-            //dgV_ParticlesDevidePage.BorderStyle = 0;
-
-            //dgV_ParticlesDevidePage.Margin = new System.Windows.Forms.Padding(2);
-            //dgV_ParticlesDevidePage.ReadOnly = true;
-            //dgV_ParticlesDevidePage.RowHeadersVisible = false;
-            //dgV_ParticlesDevidePage.RowHeadersWidth = 40;
-
-            ////先设置一下头的高度，否则会太矮不好看
-            //dgV_ParticlesDevidePage.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing;
-
-            //dgV_ParticlesDevidePage.RowsDefaultCellStyle.BackColor = Color.Azure;
         }
 
         #endregion
@@ -1031,170 +942,6 @@ namespace OTSIncAReportGrids
             //m_COTSReportProjFileMgrClr.ReZoom(str_srcPathName, str_outPathName);
         }
 
-
-        /// <summary>
-        /// 显示x-ray能谱图
-        /// </summary>
-        /// <param name="in_dparticle"></param>
-        //private void ShowXRay(OTSIncAReportGraph.DParticle in_dparticle)
-        //{
-        //    //显示xray相关信息
-        //    uint[] Search_xray = new uint[2000];
-        //    uint[] Analysis_xray = new uint[2000];
-
-        //    //
-        //    int i_xray_id = 0;
-
-        //    List<Element> list_celementchemistryclr = new List<Element>();
-
-        //    //获取Xray数据
-        //    m_OTSIncAReportGridsFun.GetXrayByParticleTagIDAndFieldID_ForDrawDistrbutionImageAndBSE(in_dparticle.CLRTagID, in_dparticle.CLRFieldID, out Search_xray, out Analysis_xray, out i_xray_id, out list_celementchemistryclr);
-
-        //    //get CElementChemistryClr list
-        //    List<ShowElementInfo> list_showelementinfo = new List<ShowElementInfo>();
-        //    for (int i = 0; i < list_celementchemistryclr.Count; i++)
-        //    {
-        //        ShowElementInfo ls_sei = new ShowElementInfo();
-        //        ls_sei.ElementName = list_celementchemistryclr[i].Name;
-        //        ls_sei.Percentage = list_celementchemistryclr[i].Percentage;
-        //        list_showelementinfo.Add(ls_sei);
-        //    }
-
-        //    //获取使用标准库的名称
-        //    string str_stdname = "";
-        //    string str_IncALibName = "";
-
-        //    List<int> FLID = new List<int>() { 0, 1, 2, 4, 6, 7, 8, 9 };
-        //    List<string> NameList = new List<string>() { table["partcletype0"].ToString(), table["partcletype1"].ToString(), table["partcletype2"].ToString(), table["partcletype4"].ToString(), table["partcletype6"].ToString(), table["partcletype7"].ToString(), table["partcletype8"].ToString(), table["partcletype9"].ToString() };
-
-        //    if (in_dparticle.STDTypeID < 1000)
-        //    {
-        //        int index = FLID.IndexOf(in_dparticle.STDTypeID);
-        //        if (index == -1)
-        //        {
-        //            index = 7;
-        //        }
-        //        string name = NameList[index];
-        //        //小于1000，使用系统默认分类
-        //        str_IncALibName = name;
-        //        str_stdname = "Default standard library";
-        //    }
-        //    else if (in_dparticle.STDTypeID > 10000)
-        //    {
-        //        //大于10000时，使用用户标准库来分析夹杂物名称
-        //        str_IncALibName = in_dparticle.TypeName;
-        //        if (str_stdname == "")
-        //            str_stdname = "System standard library";
-        //    }
-
-        //    //获取数据后，需要对xraytable设置
-        //    control_XRayTable1.Visible = false;
-        //    control_XRayTable1.SetXRayShowLineValue(Search_xray, Analysis_xray);
-        //    //颗粒国标信息
-        //    control_XRayTable1.GBInfoStr = in_dparticle.GBContent;
-        //    control_XRayTable1.GoodName = str_IncALibName;//杂夹物
-        //    control_XRayTable1.STDName = str_stdname;//标准库
-        //    control_XRayTable1.List_ShowElementInfo = list_showelementinfo;
-        //    control_XRayTable1.Visible = false;
-
-        //    this.Refresh();
-        //}
-
-        ///// <summary>
-        ///// 输入颗粒的所在帧图id,颗粒id,颗粒类型id,获取对应的XRay能谱数据图
-        ///// </summary>
-        ///// <returns></returns>
-        //public Bitmap ExportXRayBitmap(string in_fieldid, string in_particleid, int in_stdtypeid, string TypeName)
-        //{
-        //    Bitmap ret_bp;
-
-        //    //显示xray相关信息
-        //    uint[] Search_xray = new uint[2000];
-        //    uint[] Analysis_xray = new uint[2000];
-
-        //    //
-        //    int i_xray_id = 0;
-
-        //    List<Element> list_celementchemistryclr = new List<Element>();
-
-        //    //获取Xray数据
-
-        //    list_celementchemistryclr = new List<Element>();
-
-        //    ParticleData particleData = new ParticleData(result.FilePath);
-        //    Particle list = particleData.GetParticleByFidAndPid(in_fieldid, in_particleid);
-        //    if (list == null)
-        //    {
-        //        return null;
-        //    }
-        //    Particle particle = list;
-        //    if (particle.XrayId > -1)
-        //    {
-        //        for (int i = 0; i < 2000; i++)
-        //        {
-        //            Analysis_xray[i] = BitConverter.ToUInt32(particle.XRayData, i * 4);
-        //        }
-
-        //        Search_xray = Analysis_xray;
-        //        i_xray_id = particle.XrayId;
-        //        list_celementchemistryclr = particle.ElementList;
-        //    }
-
-        //    //get CElementChemistryClr list
-        //    List<ShowElementInfo> list_showelementinfo = new List<ShowElementInfo>();
-        //    for (int i = 0; i < list_celementchemistryclr.Count; i++)
-        //    {
-        //        ShowElementInfo ls_sei = new ShowElementInfo();
-        //        ls_sei.ElementName = list_celementchemistryclr[i].Name;
-        //        ls_sei.Percentage = list_celementchemistryclr[i].Percentage;
-        //        list_showelementinfo.Add(ls_sei);
-        //    }
-
-        //    //获取使用标准库的名称
-        //    string str_stdname = "";
-        //    string str_IncALibName = "";
-
-        //    if (in_stdtypeid < 1000)
-        //    {
-        //        //小于1000，使用系统默认分类
-        //        str_IncALibName = TypeName;
-        //        str_stdname = "Default standard library";
-        //    }
-        //    else if (in_stdtypeid >= 1000 && in_stdtypeid < 10000)
-        //    {
-        //        //大于等于1000，并且小于10000时，使用系统数据库中夹杂物来分析
-        //        str_IncALibName = TypeName;
-        //        str_stdname = "User defined standard library";
-        //    }
-        //    else if (in_stdtypeid > 10000)
-        //    {
-        //        //大于10000时，使用用户标准库来分析夹杂物名称
-        //        str_IncALibName = TypeName;
-        //        str_stdname = "System standard library";
-        //    }
-
-        //    //获取数据后，需要对xraytable设置
-
-        //    control_XRayTable1.SetXRayShowLineValue(Search_xray, Analysis_xray);
-        //    //颗粒国标信息
-        //    //control_XRayTable1.GBInfoStr = in_dparticle.GBContent;
-        //    control_XRayTable1.GoodName = str_IncALibName;//杂夹物
-        //    control_XRayTable1.STDName = str_stdname;//标准库
-        //    control_XRayTable1.List_ShowElementInfo = list_showelementinfo;
-        //    control_XRayTable1.Visible = true;
-        //    control_XRayTable1.Invalidate();
-        //    control_XRayTable1.Refresh();
-
-
-        //    //this.Controls.Add(control_XRayTable1);
-        //    ret_bp = control_XRayTable1.ExportXRayImage();
-
-
-
-
-        //    return ret_bp;
-        //}
-
         private void ToolStripMenuItem3_Click(object sender, EventArgs e)
         {
             //恢复至初始状态
@@ -2039,16 +1786,6 @@ namespace OTSIncAReportGrids
         public List<string> GetElementsColName()
         {
             List<string> list_str = new List<string>();
-            // m_COTSReportProjFileMgrClr.GetPropertyParams().get
-            //CRptParamFileMgrClr crptparam = new CRptParamFileMgrClr();
-
-            //if (!crptparam.Load(0))
-            //{
-            //    log.Error("(OTSDataMgrFun.CheckParamFile) m_pRptParamFileMgr.Load((int)OTS_SOFT_PACKAGE_ID.OTSIncA)");
-            //}
-
-            //string ls_str = crptparam.GetRptParamFile().GetElementsColName();
-
             string ls_str = "Ar,Al,Si,B,P,C,S,N,Cl,O,F,Ne,He,Lr,Lu,Rn,Xe,Kr,Md,Tm,Po,Te,Se,Es,Ho,Pb,Sn,Ge,Np,Pm,Os,Ru,Fe,Bk,Tb,Hg,Cd,Zn,Pa,Pr,W,Mo,Cr,No,Yb,At,I,Br,Fm,Er,Bi,Sb,As,Hf,Zr,Ti,Am,Eu,Pt,Pd,Ni,U,Nd,Re,Tc,Mn,Cf,Dy,Tl,In,Ga,Ra,Ba,Sr,Ca,Cm,Gd,Au,Ag,Cu,Th,Ce,Ta,Pu,Nb,Sm,V,Ir,Rh,Co,Ac,La,Y,Sc,Fr,Cs,Rb,K,Na,Mg,Be,Li,H";
 
             string[] strs = ls_str.Split(',');

OTSIncAReportApp/DataOperation/DataAccess/ParticleData.cs

@@ -378,6 +378,14 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         /// <param name=""></param>
         /// <returns></returns>
         public DataTable GetInfoForPartucleDevidePage(int currentPage, int pagesize, string OrderFunction, string condition)
+        {
+            int p = (currentPage - 1) * pagesize;
+            string sqliteString = "select fieldid,particleid,AveGray,RectLeft,RectTop,RectWidth,RectHeight,Area,PosX,PosY,TypeId,ElementNum,SegmentNum,FieldPosX,FieldPosY,ParticleId,DMAX,DMIN,DPERP,PERIMETER,ORIENTATION,DINSCR,DMEAN,DELONG,DFERET,TypeName,TypeColor,'' as SubParticles, SEMPosX,SEMPosY, (select group_concat(name || '-' || Percentage, ';') from ElementChemistry where XRayId = INcAData.XRayId and fieldid = INcAData.fieldid  ) as Element from INcAData where xrayid > -1 and instr(','||(select ifnull(group_concat(SubParticles, '&'),'') from MergedParticleInfo)|| ',',',' || fieldid || ':' || particleid || ',')= 0 " + condition + " order by " + OrderFunction + " limit " + pagesize.ToString() + " offset " + p.ToString();
+            DataTable DT = dbHelper.ExecuteQuery(sqliteString);
+            return DT;
+        }
+
+        public DataTable GetInfoForPartucleDevidePage2(int currentPage, int pagesize, string OrderFunction, string condition)
         {
             int p = (currentPage - 1) * pagesize;
             string sqliteString = "select fieldid,particleid,AveGray,RectLeft,RectTop,RectWidth,RectHeight,Area,PosX,PosY,TypeId,ElementNum,SegmentNum,FieldPosX,FieldPosY,ParticleId,DMAX,DMIN,DPERP,PERIMETER,ORIENTATION,DINSCR,DMEAN,DELONG,DFERET,TypeName,TypeColor,SubParticles,0 as SEMPosX, 0 as SEMPosY, (select group_concat(name || '-' || Percentage, ';') from ElementChemistry where XRayId = MergedParticleInfo.XRayId and fieldid = MergedParticleInfo.fieldid) as Element from MergedParticleInfo where 1=1 " + condition + " union select fieldid,particleid,AveGray,RectLeft,RectTop,RectWidth,RectHeight,Area,PosX,PosY,TypeId,ElementNum,SegmentNum,FieldPosX,FieldPosY,ParticleId,DMAX,DMIN,DPERP,PERIMETER,ORIENTATION,DINSCR,DMEAN,DELONG,DFERET,TypeName,TypeColor,'' as SubParticles, SEMPosX,SEMPosY, (select group_concat(name || '-' || Percentage, ';') from ElementChemistry where XRayId = INcAData.XRayId and fieldid = INcAData.fieldid  ) as Element from INcAData where xrayid > -1 and instr(','||(select ifnull(group_concat(SubParticles, '&'),'') from MergedParticleInfo)|| ',',',' || fieldid || ':' || particleid || ',')= 0 " + condition + " order by " + OrderFunction + " limit " + pagesize.ToString() + " offset " + p.ToString();

OTSIncAReportApp/Frm_UserProgress.cs

@@ -57,13 +57,13 @@ namespace OTSIncAReportMailInterface
         {
             if (m_mpbr != null)
             {
-                string str1 = "当前进度";
-                Language lan = new Language();
-                Hashtable table = lan.GetNameTable("Frm_UserProgress");
-                str1 = table["str1"].ToString();
+                //string str1 = "当前进度";
+                //Language lan = new Language();
+                //Hashtable table = lan.GetNameTable("Frm_UserProgress");
+                //str1 = table["str1"].ToString();
 
                 m_mpbr.Value = in_value;
-                m_l.Text = str1 + m_mpbr.Value.ToString() + "%" + "(" + in_str + ")";
+                m_l.Text =  m_mpbr.Value.ToString() + "%" + "(" + in_str + ")";
 
                 this.Refresh();
             }