Shuxia Ning
2024-12-19 56d32d8eee915934f2bd066668840bd283351c15
泵控件壳子搭建
已修改5个文件
已添加9个文件
726 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/01-excel/PumpChartExcelImportCtrl.Designer.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/01-excel/PumpChartExcelImportCtrl.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/01-excel/PumpChartExcelImportCtrl.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/02-image/UniversalChartImageImportCtrl.Designer.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/02-image/UniversalChartImageImportCtrl.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/02-image/UniversalChartImageImportCtrl.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.Designer.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/02-edit/UniversalEditChart.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/02-edit/UniversalEditChart.cs 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/02-edit/UniversalEditCtrl.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/01-excel/PumpChartExcelImportCtrl.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
namespace HStation.WinFrmUI
{
    partial class PumpChartExcelImportCtrl
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Component Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            SuspendLayout();
            //
            // UniversalChartExcelImportCtrl
            //
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Name = "UniversalChartExcelImportCtrl";
            Size = new Size(843, 697);
            ResumeLayout(false);
        }
        #endregion
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/01-excel/PumpChartExcelImportCtrl.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
namespace HStation.WinFrmUI
{
    public partial class PumpChartExcelImportCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        public PumpChartExcelImportCtrl()
        {
            InitializeComponent();
        }
        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public void SetBindingData(string file_path)
        {
        }
        /// <summary>
        /// èŽ·å–
        /// </summary>
        public HStation.Vmo.PhartDiagramRelationExtensionsVmo Get()
        {
            return new Vmo.PhartDiagramRelationExtensionsVmo();
        }
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/01-excel/PumpChartExcelImportCtrl.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/02-image/UniversalChartImageImportCtrl.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
namespace HStation.WinFrmUI
{
    partial class PumpChartImageImportCtrl
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Component Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            SuspendLayout();
            //
            // PumpChartImageImportCtrl
            //
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Name = "PumpChartImageImportCtrl";
            Size = new Size(843, 697);
            ResumeLayout(false);
        }
        #endregion
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/02-image/UniversalChartImageImportCtrl.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
namespace HStation.WinFrmUI
{
    public partial class PumpChartImageImportCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        public PumpChartImageImportCtrl()
        {
            InitializeComponent();
        }
        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public void SetBindingData(string file_path)
        {
        }
        /// <summary>
        /// èŽ·å–
        /// </summary>
        public HStation.Vmo.PhartDiagramRelationExtensionsVmo Get()
        {
            return new Vmo.PhartDiagramRelationExtensionsVmo();
        }
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/02-image/UniversalChartImageImportCtrl.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
namespace HStation.WinFrmUI
{
    partial class PumpChartPointImportCtrl
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Component Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            SuspendLayout();
            //
            // PumpChartImageImportCtrl
            //
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Name = "PumpChartImageImportCtrl";
            Size = new Size(843, 697);
            ResumeLayout(false);
        }
        #endregion
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
namespace HStation.WinFrmUI
{
    public partial class PumpChartPointImportCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        public PumpChartPointImportCtrl()
        {
            InitializeComponent();
        }
        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public void SetBindingData(double flow, double head, double speed, double? eff, double level, bool is_sxp)
        {
        }
        /// <summary>
        /// èŽ·å–
        /// </summary>
        public HStation.Vmo.PhartDiagramRelationExtensionsVmo Get()
        {
            return new Vmo.PhartDiagramRelationExtensionsVmo();
        }
    }
}
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/03-import/03-point/PumpChartPointImportCtrl.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
@@ -82,6 +82,15 @@
    <Compile Update="01-pump\02-edit\PumpChartEditCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-pump\03-import\01-excel\PumpChartExcelImportCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-pump\03-import\02-image\UniversalChartImageImportCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-pump\03-import\03-point\PumpChartPointImportCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-universal\02-edit\UniversalChartEditCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -109,12 +118,6 @@
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="01-pump\03-import\01-excel\" />
    <Folder Include="01-pump\03-import\02-image\" />
    <Folder Include="01-pump\03-import\03-point\" />
  </ItemGroup>
</Project>
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/01-view/UniversalViewChart.cs
@@ -226,8 +226,7 @@
        /// </summary>
        public void SetBindingData(List<Yw.Geometry.Point2d> pt_list, string caption = "", string coordinate = null, Color? color = null)
        {
            _pt_list = pt_list;
            _pt_list = pt_list;
            this.chartControl1.BeginInit();
            this.chartControl1.Series.Clear();
            this.chartControl1.AnnotationRepository.Clear();
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/02-edit/UniversalEditChart.Designer.cs
@@ -62,7 +62,7 @@
            textAnnotation1.Visible = false;
            chartControl1.AnnotationRepository.AddRange(new DevExpress.XtraCharts.Annotation[] { textAnnotation1 });
            chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
            xyDiagram1.AxisX.Title.Text = "流量 ï¼ˆm³/h)";
            xyDiagram1.AxisX.Title.Text = "Z";
            xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
            xyDiagram1.AxisY.Color = Color.DodgerBlue;
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/02-edit/UniversalEditChart.cs
@@ -27,9 +27,59 @@
        private List<Yw.Geometry.Point2d> _line_pt_list;
        private UniversalCoordinate _coordinate;
        private bool _initial_data = false;
        private bool _initial_data = false;
        private bool _mouse_mode = false;//鼠标模式
        #endregion
        #endregion
        #region Public Variable
        /// <summary>
        /// X轴标题
        /// </summary>
        public string AxisXTitle
        {
            get
            {
                return _axis_x.Title.Text;
            }
            set
            {
                _axis_x.Title.Text = value;
            }
        }
        /// <summary>
        /// Y轴标题
        /// </summary>
        public string AxisYTitle
        {
            get
            {
                return _axis_y.Title.Text;
            }
            set
            {
                _axis_y.Title.Text = value;
            }
        }
        /// <summary>
        /// é¼ æ ‡æ¨¡å¼
        /// </summary>
        public bool MouseModel
        {
            get
            {
                return _mouse_mode;
            }
            set
            {
                _mouse_mode = value;
            }
        }
        #endregion
        #region Public Evnet
@@ -85,34 +135,22 @@
            this.chartControl1.SetChartMonoColorDisplay();
        }
        /// <summary>
        /// æ¸…除图表数据
        /// </summary>
        public void ClearChart()
        {
            _initial_data = false;
            _line_pt_list = null;
            _point_pt_list = null;
            _coordinate = null;
            UpdateChart(false);
        }
        #endregion Initial
        #region SetBindingData
        /// <summary>
        /// ç»‘定数据
        /// </summary> 
        public void SetBindingData(
                    List<Yw.Geometry.Point2d> line_pt_list,
                    List<Yw.Geometry.Point2d> point_pt_list,
                    string coordinate = null)
        public void SetBindingData(List<Yw.Geometry.Point2d> point_pt_list, List<Yw.Geometry.Point2d> line_pt_list, string coordinate = null)
        {
            _initial_data = false;
            _point_pt_list = point_pt_list;
            _line_pt_list = line_pt_list;
            _coordinate = UniversalCoordinate.ToModel(coordinate);
            if (line_pt_list == null || !line_pt_list.Any())
            {
                ClearChart();
                return;
            }
            if (point_pt_list == null || !point_pt_list.Any())
@@ -121,9 +159,6 @@
            }
            _initial_data = true;
            _line_pt_list = line_pt_list;
            _point_pt_list = point_pt_list;
            _coordinate = UniversalCoordinate.ToModel(coordinate);
            UpdateChart();
        }
@@ -133,16 +168,14 @@
        /// <summary>
        /// æ›´æ–°æ›²çº¿
        /// </summary>
        /// <param name="fit_point_list"></param>
        public void UpdateCurve(List<Yw.Geometry.Point2d> fit_point_list)
        /// </summary>
        public void UpdateCurve(List<Yw.Geometry.Point2d> point_pt_list)
        {
            if (fit_point_list == null || !fit_point_list.Any())
            if (point_pt_list == null || !point_pt_list.Any())
                return;
            _point_pt_list = fit_point_list;
            _line_pt_list = fit_point_list.GetFitPointList();
            _axis_y.SetAxisYQLColorDisplay(_series_line, _series_point, true);
            _point_pt_list = point_pt_list;
            _line_pt_list = point_pt_list.GetFitPointList();
            UpdateChart(true);
        }
@@ -295,9 +328,8 @@
        #region ChartEvent
        private bool _mouseMode = false;//鼠标模式
        private SeriesPoint _pickPoint = null;// é€‰ä¸­ç‚¹
        private SeriesPoint _pick_point = null;// é€‰ä¸­ç‚¹
        private void chartControl1_MouseDown(object sender, MouseEventArgs e)
        {
            if (!_initial_data)
@@ -308,11 +340,11 @@
                if (hitInfo.InSeriesPoint)
                {
                   
                    _pickPoint = hitInfo.SeriesPoint;
                    _pick_point = hitInfo.SeriesPoint;
                }
                else
                {
                    _pickPoint = null;
                    _pick_point = null;
                }
            } 
        }
@@ -321,25 +353,25 @@
        {
            if (!_initial_data)
                return;
            if (!_mouseMode)
            if (!_mouse_mode)
                return;
            if (_pickPoint == null)
            if (_pick_point == null)
                return;
            var diagramCoordinates = _diagram.PointToDiagram(e.Location);
            var axisValue = diagramCoordinates.GetAxisValue(_axis_y);
            if (axisValue == null)
                return;
            _pickPoint.Values[0] = axisValue.NumericalValue;
            _pickPoint.NumericalArgument = diagramCoordinates.NumericalArgument;
            _pick_point.Values[0] = axisValue.NumericalValue;
            _pick_point.NumericalArgument = diagramCoordinates.NumericalArgument;
        }
        private void chartControl1_MouseUp(object sender, MouseEventArgs e)
        {
            if (!_initial_data)
                return;
            if (_mouseMode)
            if (_mouse_mode)
            {
                _pickPoint = null;
                _pick_point = null;
                ChartUpdateCurve();
            }
        }
@@ -348,15 +380,15 @@
        {
            if (!_initial_data)
                return;
            if (_pickPoint == null)
            if (_pick_point == null)
                return;
            double spaceX = _coordinate.CoordSpaceX / 50;
            double spaceY = 0;
            spaceY = _coordinate.CoordSpaceX / 50;
            double x = _pickPoint.NumericalArgument;
            double y = _pickPoint.Values[0];
            double x = _pick_point.NumericalArgument;
            double y = _pick_point.Values[0];
            if (e.KeyCode == Keys.Up)
            {
                y += spaceY;
@@ -373,8 +405,8 @@
            {
                x += spaceX;
            }
            _pickPoint.Values[0] = y;
            _pickPoint.NumericalArgument = x;
            _pick_point.Values[0] = y;
            _pick_point.NumericalArgument = x;
            ChartUpdateCurve();
        }
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/02-edit/UniversalEditCtrl.cs
@@ -60,7 +60,7 @@
            if (pt_ql_list == null || pt_ql_list.Count < 4)
            {
                this.curveExpressEditChart.ClearChart();
                return;
            }