Shuxia Ning
2024-12-23 701340a6acf3cccc33864d0e1a1053870b2238bb
查询线
已修改5个文件
119 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/01-view/UniversalChartViewCtrl.Designer.cs 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/01-view/UniversalChartViewCtrl.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/01-view/UniversalChartViewCtrl.resx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/01-view/UniversalChartViewCtrl.Designer.cs
@@ -28,7 +28,16 @@
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            universalViewChart1 = new Yw.WinFrmUI.Phart.UniversalViewChart();
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            bar2 = new DevExpress.XtraBars.Bar();
            barCekLineVisible = new DevExpress.XtraBars.BarCheckItem();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            SuspendLayout();
            // 
            // universalViewChart1
@@ -37,23 +46,99 @@
            universalViewChart1.AxisYTitle = "扬程/m";
            universalViewChart1.Dock = DockStyle.Fill;
            universalViewChart1.LineVisible = true;
            universalViewChart1.Location = new Point(0, 0);
            universalViewChart1.Location = new Point(0, 33);
            universalViewChart1.Name = "universalViewChart1";
            universalViewChart1.Size = new Size(954, 795);
            universalViewChart1.Size = new Size(954, 762);
            universalViewChart1.TabIndex = 0;
            //
            // barManager1
            //
            barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2 });
            barManager1.DockControls.Add(barDockControlTop);
            barManager1.DockControls.Add(barDockControlBottom);
            barManager1.DockControls.Add(barDockControlLeft);
            barManager1.DockControls.Add(barDockControlRight);
            barManager1.Form = this;
            barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barCekLineVisible });
            barManager1.MainMenu = bar2;
            barManager1.MaxItemId = 1;
            //
            // barDockControlTop
            //
            barDockControlTop.CausesValidation = false;
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(954, 33);
            //
            // barDockControlBottom
            //
            barDockControlBottom.CausesValidation = false;
            barDockControlBottom.Dock = DockStyle.Bottom;
            barDockControlBottom.Location = new Point(0, 795);
            barDockControlBottom.Manager = barManager1;
            barDockControlBottom.Size = new Size(954, 0);
            //
            // barDockControlLeft
            //
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 33);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 762);
            //
            // barDockControlRight
            //
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(954, 33);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 762);
            //
            // bar2
            //
            bar2.BarName = "Main menu";
            bar2.DockCol = 0;
            bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
            bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barCekLineVisible) });
            bar2.OptionsBar.DrawDragBorder = false;
            bar2.OptionsBar.MultiLine = true;
            bar2.OptionsBar.UseWholeRow = true;
            bar2.Text = "Main menu";
            //
            // barCekLineVisible
            //
            barCekLineVisible.Caption = "查询线";
            barCekLineVisible.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
            barCekLineVisible.Id = 0;
            barCekLineVisible.Name = "barCekLineVisible";
            barCekLineVisible.CheckedChanged += barCekLineVisible_CheckedChanged;
            // 
            // UniversalChartViewCtrl
            // 
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(universalViewChart1);
            Controls.Add(barDockControlLeft);
            Controls.Add(barDockControlRight);
            Controls.Add(barDockControlBottom);
            Controls.Add(barDockControlTop);
            Name = "UniversalChartViewCtrl";
            Size = new Size(954, 795);
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
        #endregion
        private Yw.WinFrmUI.Phart.UniversalViewChart universalViewChart1;
        private DevExpress.XtraBars.BarManager barManager1;
        private DevExpress.XtraBars.Bar bar2;
        private DevExpress.XtraBars.BarCheckItem barCekLineVisible;
        private DevExpress.XtraBars.BarDockControl barDockControlTop;
        private DevExpress.XtraBars.BarDockControl barDockControlBottom;
        private DevExpress.XtraBars.BarDockControl barDockControlLeft;
        private DevExpress.XtraBars.BarDockControl barDockControlRight;
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/01-view/UniversalChartViewCtrl.cs
@@ -6,7 +6,7 @@
        {
            InitializeComponent();
        }
        /// <summary>
        /// 绑定数据
        /// </summary> 
@@ -30,15 +30,21 @@
        public void ClearBindingData()
        {
            this.universalViewChart1.Clear();
        }
        }
        //查询线
        private void barCekLineVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            this.universalViewChart1.LineVisible=this.barCekLineVisible.Checked;
        }
        /// <summary>
        /// 获取
        /// </summary> 
        public Yw.Vmo.PhartDiagramExGraphListVmo Get()
        {
            return new ();
        }
            return new();
        }
    }
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/01-view/UniversalChartViewCtrl.resx
@@ -117,4 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.Designer.cs
@@ -36,7 +36,7 @@
            DevExpress.XtraCharts.LayoutDefinition layoutDefinition3 = new DevExpress.XtraCharts.LayoutDefinition();
            DevExpress.XtraCharts.Series series1 = new DevExpress.XtraCharts.Series();
            DevExpress.XtraCharts.SplineSeriesView splineSeriesView1 = new DevExpress.XtraCharts.SplineSeriesView();
            chartControl1 = new DevExpress.XtraCharts.ChartControl();
            chartControl1 = new DevExpress.XtraCharts.ChartControl();
            ((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)xyDiagram1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)constantLine1).BeginInit();
@@ -56,7 +56,6 @@
            constantLine1.Title.Alignment = DevExpress.XtraCharts.ConstantLineTitleAlignment.Far;
            constantLine1.Title.DXFont = new DevExpress.Drawing.DXFont("Tahoma", 8F);
            constantLine1.Title.Text = "ConstantLineZ";
            constantLine1.Visible = false;
            xyDiagram1.AxisX.ConstantLines.AddRange(new DevExpress.XtraCharts.ConstantLine[] { constantLine1 });
            xyDiagram1.AxisX.Title.Text = "流量 (m³/h)";
            xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
@@ -66,7 +65,6 @@
            constantLine2.ConstantLineID = 0;
            constantLine2.Name = "ConstantLineY";
            constantLine2.ShowInLegend = false;
            constantLine2.Visible = false;
            xyDiagram1.AxisY.ConstantLines.AddRange(new DevExpress.XtraCharts.ConstantLine[] { constantLine2 });
            xyDiagram1.AxisY.Label.TextColor = Color.DodgerBlue;
            xyDiagram1.AxisY.Title.Alignment = StringAlignment.Far;
@@ -99,13 +97,13 @@
    };
            chartControl1.Size = new Size(1023, 857);
            chartControl1.TabIndex = 0;
            //
            // UniversalChart
            //
            // UniversalViewChart
            // 
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(chartControl1);
            Name = "UniversalChart";
            Name = "UniversalViewChart";
            Size = new Size(1023, 857);
            ((System.ComponentModel.ISupportInitialize)constantLine1).EndInit();
            ((System.ComponentModel.ISupportInitialize)constantLine2).EndInit();
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs
@@ -29,7 +29,7 @@
        private List<Yw.Geometry.Point2d> _pt_list = null;
        private UniversalCoordinate _coordinate = null;
        private bool _line_visible = true;
        private bool _line_visible = false;
        private bool _initial_data = false;
        #endregion
@@ -77,6 +77,7 @@
                _line_visible = value;
                _const_line_x.Visible = value;
                _const_line_y.Visible = value;
                SetAxisXValue();
            }
        }