|
@@ -110,8 +110,8 @@ namespace OTSIncAReportApp._3_ServiceCenter
|
|
|
}
|
|
|
public void opencv_outpic()
|
|
|
{
|
|
|
-
|
|
|
|
|
|
+
|
|
|
List<DataTable> list_dt_picdata = new List<DataTable>();
|
|
|
OpenCvSharp.Mat[] list_mats;
|
|
|
if (type == (int)Outpic_enum.pic)
|
|
@@ -227,6 +227,8 @@ namespace OTSIncAReportApp._3_ServiceCenter
|
|
|
OpenCvSharp.Cv2.VConcat(list_mats, save_pano);
|
|
|
OpenCvSharp.Cv2.ImWrite(sfd.FileName, save_pano);
|
|
|
NLog.LogManager.GetCurrentClassLogger().Info("Save complete.");
|
|
|
+
|
|
|
+ MessageBox.Show("Export completed!");
|
|
|
}
|
|
|
private int getPICstringLong(DataTable particleData, List<OpenCvSharp.Mat> list_pano)
|
|
|
{
|
|
@@ -274,13 +276,13 @@ namespace OTSIncAReportApp._3_ServiceCenter
|
|
|
for (int i=0;i< dt.Rows.Count;i++)
|
|
|
{
|
|
|
double ParticleArea = 0;
|
|
|
- double ParticleColer = 0;
|
|
|
+ string ParticleColer = "";
|
|
|
for (int a=0;a< ParticleAll.Rows.Count;a++)
|
|
|
{
|
|
|
if (dt.Rows[i]["TypeName"].ToString()== ParticleAll.Rows[a]["TypeName"].ToString())
|
|
|
{
|
|
|
ParticleArea = ParticleArea + Convert.ToDouble(ParticleAll.Rows[a]["Area"]);
|
|
|
- ParticleColer = Convert.ToDouble(ParticleAll.Rows[a]["TypeColor"]);
|
|
|
+ ParticleColer = ParticleAll.Rows[a]["TypeColor"].ToString();
|
|
|
}
|
|
|
}
|
|
|
dt.Rows[i]["Area"] = ParticleArea;
|