소스 검색

删除报告中菜单项复制和全部复制项

CXS 3 년 전
부모
커밋
46870e4230
3개의 변경된 파일1개의 추가작업 그리고 269개의 파일을 삭제
  1. 0 15
      OTSIncAReportApp/1-UI/OTSRibbon/OTSRibbonFun.cs
  2. 1 37
      OTSIncAReportApp/1-UI/frmReportApp.Designer.cs
  3. 0 217
      OTSIncAReportApp/1-UI/frmReportApp.cs

+ 0 - 15
OTSIncAReportApp/1-UI/OTSRibbon/OTSRibbonFun.cs

@@ -28,8 +28,6 @@ namespace OTSIncAReportApp.OTSRibbon
             //下拉菜单中
             m_ReportApp.dpbOpen.Enabled = true;         //打开,下拉菜单中
             m_ReportApp.dpbExport.Enabled = bRibState;  //输出,下拉菜单中
-            m_ReportApp.dpbCopy.Enabled = bRibState;    //复制,下拉菜单中
-            m_ReportApp.dpbCopyAll.Enabled = bRibState; //复制全部,下拉菜单中
 
             //Ribbon菜单中
             m_ReportApp.rbOpen.Enabled = true;                  //打开,ribbon中
@@ -69,11 +67,6 @@ namespace OTSIncAReportApp.OTSRibbon
                 //设置打开按钮
                 m_ReportApp.dpbOpen.Enabled = true;
                 m_ReportApp.rbOpen.Enabled = true;
-
-                //设置菜单中复制和复制全部不可用,取消删除和重做删除可用
-                m_ReportApp.dpbCopy.Enabled = false;//复制
-                m_ReportApp.dpbCopyAll.Enabled = false;//复制全部
-
             }
             else if (in_enum_displaypicturetype == DisplayPicutureType.AnalyzeDataTable)
             {
@@ -94,10 +87,6 @@ namespace OTSIncAReportApp.OTSRibbon
                 //设置打开按钮
                 m_ReportApp.dpbOpen.Enabled = true;
                 m_ReportApp.rbOpen.Enabled = true;
-
-                //设置菜单中复制和复制全部可用,取消删除和重做删除不可用
-                m_ReportApp.dpbCopy.Enabled = true;//复制
-                m_ReportApp.dpbCopyAll.Enabled = true;//复制全部
             }
             else if (in_enum_displaypicturetype == DisplayPicutureType.AnalyzeDataChart)
             {
@@ -118,10 +107,6 @@ namespace OTSIncAReportApp.OTSRibbon
                 //设置打开按钮
                 m_ReportApp.dpbOpen.Enabled = true;
                 m_ReportApp.rbOpen.Enabled = true;
-
-                //设置菜单中复制和复制全部可用,取消删除和重做删除不可用
-                m_ReportApp.dpbCopy.Enabled = true;//复制
-                m_ReportApp.dpbCopyAll.Enabled = true;//复制全部
             }
         }
 

+ 1 - 37
OTSIncAReportApp/1-UI/frmReportApp.Designer.cs

@@ -55,8 +55,6 @@
             this.ribbon1 = new System.Windows.Forms.Ribbon();
             this.dpbOpen = new System.Windows.Forms.RibbonOrbMenuItem();
             this.dpbExport = new System.Windows.Forms.RibbonOrbMenuItem();
-            this.dpbCopy = new System.Windows.Forms.RibbonOrbMenuItem();
-            this.dpbCopyAll = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonOrbOptionButton1 = new System.Windows.Forms.RibbonOrbOptionButton();
             this.ribbonOrbRecentItem1 = new System.Windows.Forms.RibbonOrbRecentItem();
             this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
@@ -195,12 +193,10 @@
             this.ribbon1.OrbDropDown.Location = new System.Drawing.Point(0, 0);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbOpen);
             this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbExport);
-            this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbCopy);
-            this.ribbon1.OrbDropDown.MenuItems.Add(this.dpbCopyAll);
             this.ribbon1.OrbDropDown.Name = "";
             this.ribbon1.OrbDropDown.OptionItems.Add(this.ribbonOrbOptionButton1);
             this.ribbon1.OrbDropDown.RecentItems.Add(this.ribbonOrbRecentItem1);
-            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 248);
+            this.ribbon1.OrbDropDown.Size = new System.Drawing.Size(527, 160);
             this.ribbon1.OrbDropDown.TabIndex = 0;
             this.ribbon1.OrbImage = global::OTSIncAReportApp.Properties.Resources.logo_40;
             // 
@@ -250,36 +246,6 @@
             this.dpbExport.ToolTipTitle = null;
             this.dpbExport.Click += new System.EventHandler(this.ribbonOrbMenuItem4_Click);
             // 
-            // dpbCopy
-            // 
-            this.dpbCopy.AltKey = null;
-            this.dpbCopy.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.dpbCopy.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.dpbCopy.Image = global::OTSIncAReportApp.Properties.Resources.复制32;
-            this.dpbCopy.SmallImage = global::OTSIncAReportApp.Properties.Resources.复制32;
-            this.dpbCopy.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.dpbCopy.Tag = null;
-            this.dpbCopy.Text = "复制";
-            this.dpbCopy.ToolTip = null;
-            this.dpbCopy.ToolTipImage = null;
-            this.dpbCopy.ToolTipTitle = null;
-            this.dpbCopy.Click += new System.EventHandler(this.ribbonOrbMenuItem6_Click);
-            // 
-            // dpbCopyAll
-            // 
-            this.dpbCopyAll.AltKey = null;
-            this.dpbCopyAll.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.dpbCopyAll.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.dpbCopyAll.Image = global::OTSIncAReportApp.Properties.Resources.复制全部32;
-            this.dpbCopyAll.SmallImage = global::OTSIncAReportApp.Properties.Resources.复制全部32;
-            this.dpbCopyAll.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.dpbCopyAll.Tag = null;
-            this.dpbCopyAll.Text = "复制全部";
-            this.dpbCopyAll.ToolTip = null;
-            this.dpbCopyAll.ToolTipImage = null;
-            this.dpbCopyAll.ToolTipTitle = null;
-            this.dpbCopyAll.Click += new System.EventHandler(this.ribbonOrbMenuItem8_Click);
-            // 
             // ribbonOrbOptionButton1
             // 
             this.ribbonOrbOptionButton1.AltKey = null;
@@ -734,9 +700,7 @@
         public System.Windows.Forms.RibbonButton ribbonButton2;
         private System.Windows.Forms.RibbonPanel ribbonPanel3;
         private System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem5;
-        public System.Windows.Forms.RibbonOrbMenuItem dpbCopy;
         private System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem7;
-        public System.Windows.Forms.RibbonOrbMenuItem dpbCopyAll;
         private System.Windows.Forms.RibbonOrbRecentItem ribbonOrbRecentItem1;
         public System.Windows.Forms.RibbonOrbMenuItem dpbUnDo;
         public System.Windows.Forms.RibbonOrbMenuItem dpbReDo;

+ 0 - 217
OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -246,8 +246,6 @@ namespace OTSIncAReportApp
             dpbOpen.Tag = "dpbOpen";
 
             dpbExport.Tag = "dpbExport";
-            dpbCopy.Tag = "dpbCopy";
-            dpbCopyAll.Tag = "dpbCopyAll";
             ribbonOrbOptionButton1.Tag = "ribbonOrbOptionButton1";
         }
 
@@ -990,221 +988,6 @@ namespace OTSIncAReportApp
             MemoryManagementClass.FlushMemory();
         }
 
-        /// <summary>
-        /// 复制
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ribbonOrbMenuItem6_Click(object sender, EventArgs e)
-        {
-            int tabIndex = (int)m_conditionChoose.tabIndex;
-
-            //int imgDisType = SourceGridData.SampleDataList[2].comboDownList.IndexOf(SourceGridData.SampleDataList[2].itemVal.ToString());
-            //int calTableType = SourceGridData.SampleDataList[2].comboDownList.IndexOf(SourceGridData.SampleDataList[2].itemVal.ToString());
-            //int calChartType = SourceGridData.SampleDataList[2].comboDownList.IndexOf(SourceGridData.SampleDataList[2].itemVal.ToString());
-
-            //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE);
-            //int DisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int DisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
-            switch (tabIndex)
-            {
-                case (int)DisplayPicutureType.AnalyzeImg:                 //如果是分布图,排列图
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.DISTRIBUTION) //oper_module == "颗粒分布图"
-                    {
-                        if (im_Control_DrawDistrbutionImageAndBSE != null)
-                        {
-                            //分布图
-                            im_Control_DrawDistrbutionImageAndBSE.CopyToBitmap();
-                        }
-                    }
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.IMAGE_GRID)
-                    {
-                        if (im_Control_DrawDistrbutionSortImage != null)
-                        {
-                            //排列图
-                            im_Control_DrawDistrbutionSortImage.CopyToBitmap();
-                        }
-                    }
-                    break;
-                case (int)DisplayPicutureType.AnalyzeDataTable:                //如果是Grid表格
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.MEASURE_INFO)
-                    {
-                        if (im_ResultGrid != null)
-                        {
-                            //测量结果信息
-                            im_ResultGrid.CopySelected();
-                        }
-
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
-                    {
-                        if (im_ParticlesGridDevidePage != null)
-                        {
-                            //颗粒列表
-                            im_ParticlesGridDevidePage.CopySelected();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
-                    {
-                        if (im_CompositionDistributionGrid != null)
-                        {
-                            //成份分布表
-                            im_CompositionDistributionGrid.CopySelected();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
-                    {
-                        if (im_ElementCompositionAvgGrid != null)
-                        {
-                            //平均元素含量表
-                            im_ElementCompositionAvgGrid.CopySelected();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION)
-                    {
-                        if (im_ParticlesSizeGrid != null)
-                        {
-                            //颗粒尺寸表
-                            im_ParticlesSizeGrid.CopySelected();
-                        }
-                    }
-                    break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:                   //如果是Chart图表
-                    if (DisType == (int)CALCULATE_CHART_TYPE.PARTICALE_COMP)
-                    {
-                        //if (im_ParticalesCompositionChart != null)
-                        //{
-                        //    //颗粒成份图
-                        //    im_ParticalesCompositionChart.CopyToBitmap();
-                        //}
-                    }
-                    if (DisType == (int)CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION)
-                    {
-                        //if (im_ParticalesSizeDistributionChart != null)
-                        //{
-                        //    //颗粒尺寸分布图
-                        //    im_ParticalesSizeDistributionChart.CopyToBitmap();
-                        //}
-                    }
-                    //if (DisType == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
-                    //{
-                    //    //if (im_Trianglediagram != null)
-                    //    //{
-                    //    //    //三角图
-                    //    //    im_Trianglediagram.CopyToBitmap();
-                    //    //}
-                    //}
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// 复制全部
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ribbonOrbMenuItem8_Click(object sender, EventArgs e)
-        {
-            int tabIndex = (int)m_conditionChoose.tabIndex;
-
-            //int idx = m_DataMgrFun.GetPropIndexByPropItemName(SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE);
-            //int DisType = SourceGridData.ConditionItemList[idx].comboDownList.IndexOf(SourceGridData.ConditionItemList[idx].itemVal.ToString());
-            int DisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
-            switch (tabIndex)
-            {
-                case (int)DisplayPicutureType.AnalyzeImg:
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.DISTRIBUTION)
-                    {
-                        if (im_Control_DrawDistrbutionImageAndBSE != null)
-                        {
-                            //分布图
-                            im_Control_DrawDistrbutionImageAndBSE.CopyToBitmap();
-                        }
-                    }
-                    if (DisType == (int)IMAGE_DISPLAY_TYPE.IMAGE_GRID)
-                    {
-                        if (im_Control_DrawDistrbutionSortImage != null)
-                        {
-                            //排列图
-                            im_Control_DrawDistrbutionSortImage.CopyToBitmap();
-                        }
-                    }
-                    break;
-                case (int)DisplayPicutureType.AnalyzeDataTable:
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.MEASURE_INFO)
-                    {
-                        if (im_ResultGrid != null)
-                        {
-                            //测量结果信息
-                            im_ResultGrid.CopyAll();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
-                    {
-                        if (im_ParticlesGridDevidePage != null)
-                        {
-                            //颗粒列表
-                            im_ParticlesGridDevidePage.CopyAll();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
-                    {
-                        if (im_CompositionDistributionGrid != null)
-                        {
-                            //成份分布表
-                            im_CompositionDistributionGrid.CopyAll();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
-                    {
-                        if (im_ElementCompositionAvgGrid != null)
-                        {
-                            //平均元素含量表
-                            im_ElementCompositionAvgGrid.CopyAll();
-                        }
-                    }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION)
-                    {
-                        if (im_ParticlesSizeGrid != null)
-                        {
-                            //颗粒尺寸表
-                            im_ParticlesSizeGrid.CopyAll();
-                        }
-                    }
-                    break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
-                    if (DisType == (int)CALCULATE_CHART_TYPE.PARTICALE_COMP)
-                    {
-                        //if (im_ParticalesCompositionChart != null)
-                        //{
-                        //    //颗粒成份图
-                        //    im_ParticalesCompositionChart.CopyToBitmap();
-                        //}
-                    }
-                    if (DisType == (int)CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION)
-                    {
-                        //if (im_ParticalesSizeDistributionChart != null)
-                        //{
-                        //    //颗粒尺寸分布图
-                        //    im_ParticalesSizeDistributionChart.CopyToBitmap();
-                        //}
-                    }
-                    //if (DisType == (int)CALCULATE_CHART_TYPE.TRIO_CHART)
-                    //{
-                    //    //if (im_Trianglediagram != null)
-                    //    //{
-                    //    //    //三角图
-                    //    //    im_Trianglediagram.CopyToBitmap();
-                    //    //}
-                    //}
-                    break;
-                default:
-                    break;
-            }
-        }
-
 
         private void frmReportApp_FormClosed(object sender, FormClosedEventArgs e)
         {