优化 颗粒同步更新范围大小

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

@@ -2043,6 +2043,18 @@ namespace OTSIncAReportGraph.Controls
                 return false;
             }
         }
+        public bool WhetherThereAreDeleteParticles()
+        {
+            foreach (var p in m_list_allDPart)
+            {
+                if (p.IsDeleted)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
         private bool BackupDatabase()
         {
             //创建备份数据库文件夹

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -669,21 +669,21 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_TablesWindow.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO:
-                            //if (m_ReportApp.im_ParticlesGridDevidePage != null && m_ReportApp.im_ParticlesGridDevidePage.FileName == m_fileName)
-                            //{
-                            //    m_ReportApp.m_TablesWindow.Controls.Clear();
-                            //    m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
-                            //    m_ReportApp.m_TablesWindow.Activate();
-                            //}
-                            //else
-                            //{
+                            if (m_ReportApp.im_ParticlesGridDevidePage != null && m_ReportApp.im_ParticlesGridDevidePage.FileName == m_fileName&&!m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles()&& m_ReportApp.GetSelectedParticles().Count == 0)
+                            {
+                                m_ReportApp.m_TablesWindow.Controls.Clear();
+                                m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
+                                m_ReportApp.m_TablesWindow.Activate();
+                            }
+                            else
+                            {
                                 m_ReportApp.m_TablesWindow.Controls.Clear();
                                 m_ReportApp.im_ParticlesGridDevidePage = new OTSIncAReportGrids.ParticlesGridDevidePage(m_ReportApp);
                                 m_ReportApp.im_ParticlesGridDevidePage.FileName = m_fileName;
                                 m_ReportApp.im_ParticlesGridDevidePage.Dock = DockStyle.Fill;
                                 m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ParticlesGridDevidePage);
                                 m_ReportApp.m_TablesWindow.Activate();
-                            //}
+                            }
                             break;
                         case CALCULATE_TABLE_TYPE.PARTICALE_COMP:
                             m_ReportApp.m_TablesWindow.Controls.Clear();

OTSIncAReportApp/1-UI/frmTables.cs

@@ -43,11 +43,11 @@ namespace OTSIncAReportApp
             //根据标签索引 显示默认的数据图表
             if (m_ReportApp.m_TablesWindow.Controls != null)
             {
-                //if (m_ReportApp.m_TablesWindow.Controls.Count == 0)
-                //{
+                if (m_ReportApp.m_TablesWindow.Controls.Count == 0|| m_ReportApp.im_Control_DrawDistrbutionImageAndBSE.WhetherThereAreDeleteParticles()|| m_ReportApp.GetSelectedParticles().Count!=0)
+                {
                     m_ReportApp.m_conditionChoose.tabIndex = DisplayPicutureType.AnalyzeDataTable;
                     m_ReportApp.m_conditionChoose.ShowsTheDefaultPic();
-                //}
+                }
             }
 
             m_ReportApp.m_RstWindow.SelectWorkSampleNode();

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -255,75 +255,57 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
- 
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
- 
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraReports.v21.2.Extensions, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
@@ -906,7 +888,6 @@
     <EmbeddedResource Include="1-UI\OutputNlog.resx">
       <DependentUpon>OutputNlog.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="1-UI\Control_Graph\Controls\ClassDiagram1.cd" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>