Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5

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

@@ -543,7 +543,7 @@ namespace OTSModelSharp
             String strPathName = "";
             // file open dialog
             SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.FileName = m_strPathName.Split('\\')[m_strPathName.Split('\\').Length-1];
+            saveFileDialog.FileName = m_strPathName.Split('\\')[m_strPathName.Split('\\').Length - 1];
             saveFileDialog.Filter = "Probject Files (*.prj)|*.prj|All files (*.*)|*.*";
             if (saveFileDialog.ShowDialog() != DialogResult.OK)
             {
@@ -552,7 +552,14 @@ namespace OTSModelSharp
             }
             // get file pathname
             strPathName = saveFileDialog.FileName;
-
+            string DirectoryName = Path.GetDirectoryName(strPathName);
+            DirectoryInfo Folder = new DirectoryInfo(DirectoryName);
+            List<string> FolderNames = new List<string>();
+            if (Folder.GetDirectories().Length != 0)
+            {
+                MessageBox.Show("Save failed, a folder exists in the current location, delete or create a new one!", "Tip", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
             //保存测量项目文件 .prj
             XmlDocument doc = new XmlDocument();
             //添加xml文件头申明

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -2253,7 +2253,7 @@ namespace OTSIncAReportGraph.Controls
                 if (System.IO.Directory.Exists(folderPath + i.ToString()))
                 {
                     Fields = folderPath + i.ToString();
-                    break;
+                    continue;
                 }
                 else
                 {

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -2167,7 +2167,7 @@ namespace OTSIncAReportGrids
                 if (System.IO.Directory.Exists(folderPath + i.ToString()))
                 {
                     Fields = folderPath + i.ToString();
-                    break;
+                    continue;
                 }
                 else
                 {

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -1185,7 +1185,7 @@ namespace OTSIncAReportApp
                 if (System.IO.Directory.Exists(folderPath + i.ToString()))
                 {
                     Fields = folderPath + i.ToString();
-                    break;
+                    continue;
                 }
                 else
                 {