Merge branch 'Release3.3' of http://36.129.169.60:30080/gogsadmin/OTS into Release3.3

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -454,6 +454,10 @@ namespace OTSMeasureApp
                 newGDI.SetZoomNumber(m_visualStage.GetZoomNum());
                 newGDI.SetDisplayRefPoint(m_visualStage.GetDisplayRefPoint());
                 newGDI.IsWorkSample = true;
+
+
+                newGDI.HoleNo = sam.GetMeasureGDIObject().HoleNo;
+
                 sam.SetMeasureGDIObject(newGDI);
                 m_DrawPolygonFinishGDIObject = null;
                 m_DrawMeasureGDIObject = null;
@@ -502,9 +506,6 @@ namespace OTSMeasureApp
         
         
         
-        
-        
-        
         
         
         
@@ -537,6 +538,11 @@ namespace OTSMeasureApp
                 newGDI.SetZoomNumber(m_visualStage.GetZoomNum());
                 newGDI.SetDisplayRefPoint(m_visualStage.GetDisplayRefPoint());
                 newGDI.IsWorkSample = true;
+
+                newGDI.HoleNo = sam.GetMeasureGDIObject().HoleNo;
+
+
+
                 sam.SetMeasureGDIObject(newGDI);
                 m_DrawPolygonFinishGDIObject = null;
                 m_DrawMeasureGDIObject = null;
@@ -544,8 +550,6 @@ namespace OTSMeasureApp
 
                 SetWorkSampleMeasureArea(para);
                 
-
-                
                 if (frmInput.IsInclinedPlaneFocus) {
                     m_MeasureAppForm.m_ProjParam.GetWorkSample().GetMsrParams().SlopParam = frmInput.GetCSlopFocusParam();
                 }
@@ -554,15 +558,14 @@ namespace OTSMeasureApp
                 PrepareVisualMeasureField(GetWorkingVisualSample());
             }
         }
+
         public void SetWorkSampleMeasureArea(SampleMeasurePara SMeasurePara)
         {
-
             COTSSample WSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
             if (null == WSample)
             {
                 return;
             }
-
             CDomain Domain = new CDomain();
             Domain.SetShape((otsdataconst.DOMAIN_SHAPE)SMeasurePara.iShape);
             Domain.SetRectDomain(SMeasurePara.MeasureRect);
@@ -580,6 +583,11 @@ namespace OTSMeasureApp
             return;
         }
 
+
+
+
+
+
         public CVisualSampleArea GetWorkingVisualSample()
         {
 

OTSIncAReportApp/1-UI/OTSMgrInfo/frmPartSizeEditorNew.cs

@@ -379,7 +379,7 @@ namespace OTSIncAReportApp
             //另存，新建文件
             SaveFileDialog savePath = new SaveFileDialog();
             savePath.RestoreDirectory = true;
-            savePath.InitialDirectory = mPartSizeFilePath;
+            savePath.InitialDirectory = Application.StartupPath+ "\\Config\\ProData\\";
             savePath.Title = "Save file";
             savePath.Filter = "psf File(*.psf)|*.psf";
             savePath.RestoreDirectory = false;

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleList.cs

@@ -381,7 +381,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 			return OutDt;
 		}
 
-
+	
 
 		/// <summary>
 		/// 颗粒列表帧图
@@ -392,20 +392,32 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 		/// <param name="m_otsreport_export"></param>
 		public void Get_dev_kllb_data_frame_pic(c_TemplateClass m_mbszclass, out DataTable file_pic, out List<DataTable> list_dt, OTSReport_Export m_otsreport_export, List<DataTable> a_FrameData)
 		{
-            //去除拼接后的颗粒
-            List<DataTable> FrameData = new List<DataTable>();
+			//去除拼接后的颗粒
+
+
+			List<DataTable> FrameData = new List<DataTable>();
 			for (int i = 0; i < a_FrameData.Count; i++)
-            {
-                DataTable DT = a_FrameData[i].Clone();
+			{
+				//DataTable DT = a_FrameData[i].Clone();
+				DataTable DT = new DataTable();
+				for (int a = 0; a < a_FrameData[i].Columns.Count; a++)
+					DT.Columns.Add(a_FrameData[i].Columns[a].ColumnName);
+
 				for (int a = 0; a < a_FrameData[i].Rows.Count; a++)
-                {
-                    if (a_FrameData[i].Rows[a]["SubParticles"].ToString() == "")
-                    {
-                        DT.Rows.Add(a_FrameData[i].Rows[a].ItemArray);
+				{
+					if (a_FrameData[i].Rows[a]["SubParticles"].ToString() == "")
+					{
+						//DT.Rows.Add(a_FrameData[i].Rows[a].ItemArray);
 
+						DataRow row = DT.NewRow();
+						for (int b = 0; b < a_FrameData[i].Columns.Count; b++)
+						{
+							row[a_FrameData[i].Columns[b].ColumnName] = a_FrameData[i].Rows[a][a_FrameData[i].Columns[b].ColumnName];
+						}
+						DT.Rows.Add(row);
 					}
-                }
-                FrameData.Add(DT);
+				}
+				FrameData.Add(DT);
 			}
 
 

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -770,6 +770,10 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             {
                 dData = Convert.ToDecimal(Decimal.Parse(strData.ToString(), System.Globalization.NumberStyles.Float));
             }
+            else if (string.IsNullOrWhiteSpace(strData))
+            {
+				return Convert.ToDouble(dData).ToString("0.00");
+			}
             else
             {
                 return Convert.ToDouble(strData).ToString("0.00");