|
|
@@ -28,7 +28,7 @@ namespace OTSIncAReportApp
|
|
|
public string m_strDBpath = ""; //报表模板数据库文件
|
|
|
public string m_strDBpathGB = ""; //报告国标导出
|
|
|
public string m_strDBpath_ParticleList = ""; //报表模板,颗粒列表数据库文件
|
|
|
-
|
|
|
+ System.Collections.Hashtable table;
|
|
|
public frmReportApp m_ReportApp = null; //报告项目总进程对象
|
|
|
public string m_export_type = "Excel"; //导出文件的格式类型Excel,Word,Pdf
|
|
|
|
|
|
@@ -502,6 +502,7 @@ namespace OTSIncAReportApp
|
|
|
|
|
|
#region 国际化语言
|
|
|
Language lan = new Language(this);
|
|
|
+ table = lan.GetNameTable(this.Name);
|
|
|
#endregion
|
|
|
|
|
|
}
|
|
|
@@ -704,126 +705,8 @@ namespace OTSIncAReportApp
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- /// <summary>
|
|
|
- /// 初始化模板条件编辑界面默认的值
|
|
|
- /// </summary>
|
|
|
- private void InitMBSZClass()
|
|
|
- {
|
|
|
- m_mbszclass = new MBSZClass();
|
|
|
- //首页
|
|
|
- m_mbszclass.M_SY.str_tb_ZBT = "夹杂物分析报告";
|
|
|
- m_mbszclass.M_SY.str_tb_FBT = "XXX有限公司";
|
|
|
- m_mbszclass.M_SY.str_tb_YPBH = "A009412030003";
|
|
|
- m_mbszclass.M_SY.str_tb_CKBZ = "GB/T30834-2014";
|
|
|
- m_mbszclass.M_SY.b_ck_ypsm = true;
|
|
|
- m_mbszclass.M_SY.b_ck_jggk = true;
|
|
|
-
|
|
|
- //页眉页脚
|
|
|
- m_mbszclass.M_YMYJ.str_tb_ymwb = "夹杂物分析报告";
|
|
|
- m_mbszclass.M_YMYJ.str_tb_KHH = "Copi0000123012";
|
|
|
- m_mbszclass.M_YMYJ.b_ck_ym = true;
|
|
|
- m_mbszclass.M_YMYJ.str_tb_yjwb = "OTS-IncA Report System";
|
|
|
-
|
|
|
- //颗粒分析结果
|
|
|
- m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = true;
|
|
|
- //计算方式
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = 0;
|
|
|
- //粒级表
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_klcc_ljb = 0;
|
|
|
- //颗粒范围
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_klcc_klfw = 0;
|
|
|
-
|
|
|
- m_mbszclass.M_KLFXJG.b_cb_jzwfl_xsmk = true;
|
|
|
- //选择图像
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx = 2;//柱状图
|
|
|
- //计算方式
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs = 0;
|
|
|
- //粒级表
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_jzwfl_ljb = 0;
|
|
|
- //颗粒范围
|
|
|
- m_mbszclass.M_KLFXJG.index_cb_jzwfl_klfw = 0;
|
|
|
-
|
|
|
- //元素分析结果
|
|
|
- m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk = true;
|
|
|
- //计算方式
|
|
|
- m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs = 0;
|
|
|
- //颗粒范围
|
|
|
- m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw = 0;
|
|
|
- m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = "O,Al,Mg,Ca,Ti,Si,S,Mn,N";//显示元素
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("O");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Al");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Mg");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Ca");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Ti");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Si");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("S");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("Mn");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add("N");
|
|
|
-
|
|
|
- m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk = true;
|
|
|
- //显示图形
|
|
|
- m_mbszclass.M_YSFXJG.index_cb_yscf_xstx = 1;//圈图
|
|
|
- //计算方式
|
|
|
- m_mbszclass.M_YSFXJG.index_cb_yscf_jsfs = 0;
|
|
|
- //颗粒范围
|
|
|
- m_mbszclass.M_YSFXJG.index_cb_yscf_klfw = 0;
|
|
|
- m_mbszclass.M_YSFXJG.str_tb_yscf_ysxx = "O,Al,Mg,Ca,Ti,Si,S,Mn,N";//显示元素
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("O");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Al");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Mg");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Ca");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Ti");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Si");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("S");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("Mn");
|
|
|
- m_mbszclass.M_YSFXJG.list_str_tb_yscf_ysxx.Add("N");
|
|
|
-
|
|
|
- //三元相图
|
|
|
- m_mbszclass.M_SYXT.b_ck_syxt_xsmk = true;
|
|
|
- //计算方式
|
|
|
- m_mbszclass.M_SYXT.index_cb_syxt_jsfs = 0;
|
|
|
- //颗粒范围
|
|
|
- m_mbszclass.M_SYXT.index_cb_syxt_klfw = 0;
|
|
|
- m_mbszclass.M_SYXT.str_cb_syxt_mhxssl = "2";//每行显示数量
|
|
|
-
|
|
|
- //获取勾选的项
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("MgO.CaO.Al2O3");
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.S.Al2O3");
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.SiO2.Al2O3");
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("MnO.S.Al2O3");
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.TiN.Al2O3");
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb.Add("CaO.AlN.Al2O3");
|
|
|
-
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(0);
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(1);
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(2);
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(3);
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(4);
|
|
|
- m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Add(5);
|
|
|
-
|
|
|
- //颗粒列表信息
|
|
|
- m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk = true;
|
|
|
- //计算方式
|
|
|
- m_mbszclass.M_KLLBXX.index_cb_kllb_jsfs = 0;
|
|
|
- //颗粒范围
|
|
|
- m_mbszclass.M_KLLBXX.index_cb_kllb_klfw = 0;
|
|
|
-
|
|
|
- m_mbszclass.M_KLLBXX.int_tb_kllb_ylsx = 20;//数量上限
|
|
|
- m_mbszclass.M_KLLBXX.str_tb_kllb_sxys = "O,Al,Mg,Ca,Ti,Si,S,Mn,N";//显示元素
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("O");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Al");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Mg");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Ca");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Ti");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Si");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("S");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("Mn");
|
|
|
- m_mbszclass.M_KLLBXX.list_str_tb_lllb_sxys.Add("N");
|
|
|
- m_mbszclass.M_KLLBXX.b_ck_kllb_ystx = true;//原始图像
|
|
|
- m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx = true;//放大图像
|
|
|
- m_mbszclass.M_KLLBXX.b_ck_kllb_npxx = true;//能谱图像
|
|
|
-
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
/// <summary>
|
|
|
/// 加载报告模板选择项,数据源选项
|
|
|
@@ -1199,7 +1082,7 @@ namespace OTSIncAReportApp
|
|
|
if (backgroundWorker2.IsBusy == true)
|
|
|
{
|
|
|
//导出线程正在工作中,不让退出该界面
|
|
|
- MessageBox.Show("正在导出报告,请稍候!", "请稍候", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
+ MessageBox.Show(table["messagebox1"].ToString(), table["messagebox2"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
//然后取消关闭窗体的事件
|
|
|
e.Cancel = true;
|
|
|
}
|
|
|
@@ -1215,7 +1098,7 @@ namespace OTSIncAReportApp
|
|
|
{
|
|
|
if (proc.ProcessName == "OTSIncAReportTemplate")
|
|
|
{
|
|
|
- DialogResult dr = MessageBox.Show("报告已打开,请先关闭!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
|
|
+ DialogResult dr = MessageBox.Show(table["messagebox3"].ToString(), table["messagebox4"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
|
|
if (dr == DialogResult.OK)
|
|
|
{
|
|
|
return;
|
|
|
@@ -1226,11 +1109,11 @@ namespace OTSIncAReportApp
|
|
|
//判断该测量结果文件目录中是否已经有数据库文件,有的话,直接打开,没有则进行导出数据库然后再打开
|
|
|
if (File.Exists(m_strDBpath))
|
|
|
{
|
|
|
- DialogResult dr = MessageBox.Show("[Yes]直接打开报表,[No]重新生成报表,[Cancal]取消操作", "报表已有生成数据,请选择操作", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
|
|
|
+ DialogResult dr = MessageBox.Show(table["messagebox5"].ToString(), table["messagebox6"].ToString(), MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
|
|
|
|
|
|
if (dr == DialogResult.Yes)
|
|
|
{
|
|
|
- WriteRictBox("报表模板数据库文件已存在,直接打开-----------");
|
|
|
+ WriteRictBox(table["messagebox7"].ToString());
|
|
|
//存在则直接打开报表
|
|
|
OpenOTSINcAreportTemplateAPP();
|
|
|
return;
|
|
|
@@ -1250,7 +1133,7 @@ namespace OTSIncAReportApp
|
|
|
//重新导出报表数据
|
|
|
m_ReportApp.m_ChartsWindow.Activate();
|
|
|
|
|
|
- WriteRictBox("开始执行导出操作-----------");
|
|
|
+ WriteRictBox(table["rictbox1"].ToString());
|
|
|
progressBar1.Value = 0;
|
|
|
|
|
|
//预览
|
|
|
@@ -1271,7 +1154,7 @@ namespace OTSIncAReportApp
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- WriteRictBox("未找到文件" + tb_lj.Text.Trim() + ",是否未导出?");
|
|
|
+ WriteRictBox(table["rictbox2"].ToString() + tb_lj.Text.Trim() + table["rictbox3"].ToString());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1735,7 +1618,7 @@ namespace OTSIncAReportApp
|
|
|
#region //获取模板设置的导出的内容-------------------------------------------------
|
|
|
|
|
|
//获取报告模板设置内容
|
|
|
- worker.ReportProgress(0, "已获取模板中设置内容为:-------------------");
|
|
|
+ worker.ReportProgress(0, table["rictbox4"].ToString());
|
|
|
System.Threading.Thread.Sleep(1);
|
|
|
//更新进度
|
|
|
worker.ReportProgress(5);
|
|
|
@@ -1749,126 +1632,126 @@ namespace OTSIncAReportApp
|
|
|
i_zz = 80 / 9;
|
|
|
|
|
|
//首先将测量结果信息表导出,在表头------------------------------------------------
|
|
|
- worker.ReportProgress(0, "加载测量结果信息表模块中....");
|
|
|
- worker.ReportProgress(0, "加载:测量结果信息表");
|
|
|
+ worker.ReportProgress(0, table["rictbox5"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox6"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + 1;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载测量结果信息表模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox8"].ToString());
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
|
|
//调用输出,颗粒列表----------------------------------------
|
|
|
- worker.ReportProgress(0, "加载颗粒列表模块中....");
|
|
|
- worker.ReportProgress(0, "加载:颗粒列表");
|
|
|
+ worker.ReportProgress(0, table["rictbox9"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox10"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载颗粒列表模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox14"].ToString());
|
|
|
|
|
|
|
|
|
|
|
|
//调用输出,平均元素含量表---------------------------------------
|
|
|
- worker.ReportProgress(0, "加载平均元素含量表模块中....");
|
|
|
- worker.ReportProgress(0, "加载:平均元素含量表");
|
|
|
+ worker.ReportProgress(0, table["rictbox15"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox16"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载平均元素含量表模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox17"].ToString());
|
|
|
|
|
|
|
|
|
|
|
|
//调用输出,颗粒尺寸表--------------------------------------
|
|
|
- worker.ReportProgress(0, "加载颗粒尺寸表模块中....");
|
|
|
- worker.ReportProgress(0, "加载:颗粒尺寸表");
|
|
|
+ worker.ReportProgress(0, table["rictbox19"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox20"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载颗粒尺寸表模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox21"].ToString());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//调用,颗粒成份图------------------------------------------------
|
|
|
- worker.ReportProgress(0, "加载颗粒成份图模块中....");
|
|
|
- worker.ReportProgress(0, "加载:颗粒成份图");
|
|
|
+ worker.ReportProgress(0, table["rictbox23"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox24"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载颗粒成份图模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox25"].ToString());
|
|
|
|
|
|
//调用,元素成份图---------------------------------------------
|
|
|
- worker.ReportProgress(0, "加载元素成份图模块中....");
|
|
|
- worker.ReportProgress(0, "加载:元素成份图");
|
|
|
+ worker.ReportProgress(0, table["rictbox27"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox28"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载元素成份图模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox29"].ToString());
|
|
|
|
|
|
|
|
|
//调用,三元相图----------------------------------------------
|
|
|
- worker.ReportProgress(0, "加载三元相图模块中....");
|
|
|
- worker.ReportProgress(0, "加载:三元相图");
|
|
|
+ worker.ReportProgress(0, table["rictbox31"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox32"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "加载三元相图模块完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox33"].ToString());
|
|
|
|
|
|
|
|
|
//生成,模板临时数据库文件----------------------------------------------
|
|
|
- worker.ReportProgress(0, "生成模板临时数据库文件....");
|
|
|
- worker.ReportProgress(0, "加载:生成模板临时数据库文件");
|
|
|
+ worker.ReportProgress(0, table["rictbox35"].ToString());
|
|
|
+ worker.ReportProgress(0, table["rictbox36"].ToString());
|
|
|
//更新进度条
|
|
|
processvalue = processvalue + i_zz;
|
|
|
worker.ReportProgress(processvalue);
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "等待";
|
|
|
- while (m_thread_flag == "等待")
|
|
|
+ m_thread_flag = table["rictbox7"].ToString();
|
|
|
+ while (m_thread_flag == table["rictbox7"].ToString())
|
|
|
{
|
|
|
System.Threading.Thread.Sleep(500);
|
|
|
}
|
|
|
- worker.ReportProgress(0, "模板临时数据库文件完成");
|
|
|
+ worker.ReportProgress(0, table["rictbox37"].ToString());
|
|
|
|
|
|
#endregion 依将循环调用各功能模块结束-------------------------------------------------------
|
|
|
}
|
|
|
@@ -1887,6 +1770,7 @@ namespace OTSIncAReportApp
|
|
|
|
|
|
private void backgroundWorker2_ProgressChanged(object sender, ProgressChangedEventArgs e)
|
|
|
{
|
|
|
+ string strNill = table["rictbox40"].ToString();
|
|
|
BackgroundWorker worker = sender as BackgroundWorker;
|
|
|
|
|
|
//更新进度条的进度
|
|
|
@@ -1896,79 +1780,79 @@ namespace OTSIncAReportApp
|
|
|
WriteRictBox((string)e.UserState);
|
|
|
|
|
|
string s= AnalyticGraphics(m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx);
|
|
|
- if (ls_str.IndexOf("加载:") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox12"].ToString()) > -1)
|
|
|
{
|
|
|
- if (ls_str.IndexOf("测量结果信息表") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox11"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateTable_ResultGrid();
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
- if (ls_str.IndexOf("颗粒列表") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox13"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateTable_ParticlesGridDevidePage();
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
|
|
|
- if (ls_str.IndexOf("平均元素含量表") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox18"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateTable_ElementCompositionAvgGrid();
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
|
|
|
- if (ls_str.IndexOf("颗粒尺寸表") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox22"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateTable_ParticleSizeGrid();
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
|
|
|
- if (ls_str.IndexOf("颗粒成份图") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox26"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateChart_ParticlesCompositionChart(AnalyticGraphics(m_mbszclass.M_KLFXJG.index_cb_jzwfl_xstx));
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
- if (ls_str.IndexOf("元素成份图") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox30"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateChart_ElementCompositionChart(AnalyticGraphics(m_mbszclass.M_YSFXJG.index_cb_yscf_xstx));
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
|
|
|
- if (ls_str.IndexOf("三元相图") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox34"].ToString()) > -1)
|
|
|
{
|
|
|
m_export_reporttemplate.InsertReportTemplateChart_Trianglediagram();
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
|
|
|
- if (ls_str.IndexOf("模板临时数据库文件") > -1)
|
|
|
+ if (ls_str.IndexOf(table["rictbox38"].ToString()) > -1)
|
|
|
{
|
|
|
//导出到数据库文件中
|
|
|
SaveReportTemplateDBFile();
|
|
|
|
|
|
lock (m_thread_flag)
|
|
|
- m_thread_flag = "无";
|
|
|
+ m_thread_flag = strNill;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
progressBar1.Value = e.ProgressPercentage;
|
|
|
- WriteRictBox("正在导入到报告模板中,已经完成:" + e.ProgressPercentage.ToString() + "%");
|
|
|
+ WriteRictBox(table["rictbox39"].ToString() + e.ProgressPercentage.ToString() + "%");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
private void backgroundWorker2_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
|
|
|
{
|
|
|
- WriteRictBox("导出了:" + m_export_reporttemplate.m_list_dt.Count.ToString() + "表", Color.Red);
|
|
|
+ WriteRictBox(table["rictbox41"].ToString() + m_export_reporttemplate.m_list_dt.Count.ToString() + table["rictbox42"].ToString(), Color.Red);
|
|
|
|
|
|
//处理结束后,再将button的状态更新回去
|
|
|
progressBar1.Value = 100;
|
|
|
- WriteRictBox("-----------------导出完成!--------------------", Color.Red);
|
|
|
+ WriteRictBox("-----------------"+ table["rictbox43"].ToString() + "--------------------", Color.Red);
|
|
|
MemoryManagementClass.FlushMemory();
|
|
|
|
|
|
|
|
|
@@ -1987,7 +1871,7 @@ namespace OTSIncAReportApp
|
|
|
string path = string.Empty;
|
|
|
|
|
|
OpenFileDialog Load = new OpenFileDialog();
|
|
|
- Load.Filter = "PXML文件|*.xml";
|
|
|
+ Load.Filter = "XML File|*.xml";
|
|
|
Load.InitialDirectory = @System.Windows.Forms.Application.StartupPath + "\\Config\\ProData";
|
|
|
if (Load.ShowDialog() == DialogResult.OK)
|
|
|
path = Load.FileName;//赋值目录
|
|
|
@@ -2120,7 +2004,7 @@ namespace OTSIncAReportApp
|
|
|
{
|
|
|
if (proc.ProcessName == "OTSIncAReportTemplate")
|
|
|
{
|
|
|
- DialogResult dr = MessageBox.Show("报告模板已打开,请先关闭!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
|
|
+ DialogResult dr = MessageBox.Show(table["rictbox44"].ToString(), table["rictbox45"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
|
|
if (dr == DialogResult.OK)
|
|
|
{
|
|
|
return;
|