WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs
@@ -29,179 +29,286 @@ /// </summary> private void InitializeComponent() { this.components = new System.ComponentModel.Container(); this.dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl(); this.importCurveByExcelCtrl1 = new HStation.WinFrmUI.ImportPumpPerform2dByExcelCtrl(); this.btnOk = new DevExpress.XtraEditors.SimpleButton(); this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components); ((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).BeginInit(); this.dataLayoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider1)).BeginInit(); this.SuspendLayout(); components = new Container(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); ComponentResourceManager resources = new ComponentResourceManager(typeof(ImportPumpPerform2dByExcelDlg)); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip(); dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components); pumpChartExcelImportCtrl1 = new PumpChartExcelImportCtrl(); bindingSource1 = new BindingSource(components); layoutControl2 = new DevExpress.XtraLayout.LayoutControl(); generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl(); btnExcelFilePath = new DevExpress.XtraEditors.ButtonEdit(); textEditName = new DevExpress.XtraEditors.TextEdit(); textEditImportance = new DevExpress.XtraEditors.TextEdit(); layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)dataLayoutControl1).BeginInit(); ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlGroup1).BeginInit(); ((ISupportInitialize)emptySpaceItem1).BeginInit(); ((ISupportInitialize)dxErrorProvider1).BeginInit(); ((ISupportInitialize)bindingSource1).BeginInit(); ((ISupportInitialize)layoutControl2).BeginInit(); layoutControl2.SuspendLayout(); ((ISupportInitialize)btnExcelFilePath.Properties).BeginInit(); ((ISupportInitialize)textEditName.Properties).BeginInit(); ((ISupportInitialize)textEditImportance.Properties).BeginInit(); ((ISupportInitialize)layoutControlGroup2).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem3).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem4).BeginInit(); ((ISupportInitialize)emptySpaceItem3).BeginInit(); ((ISupportInitialize)layoutControlItem5).BeginInit(); SuspendLayout(); // // dataLayoutControl1 // this.dataLayoutControl1.Controls.Add(this.importCurveByExcelCtrl1); this.dataLayoutControl1.Controls.Add(this.btnOk); this.dataLayoutControl1.Controls.Add(this.btnCancel); this.dataLayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataLayoutControl1.Location = new System.Drawing.Point(0, 0); this.dataLayoutControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataLayoutControl1.Name = "dataLayoutControl1"; this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(859, 142, 650, 400); this.dataLayoutControl1.Root = this.Root; this.dataLayoutControl1.Size = new System.Drawing.Size(1154, 885); this.dataLayoutControl1.TabIndex = 0; this.dataLayoutControl1.Text = "dataLayoutControl1"; // // importCurveByExcelCtrl1 // this.importCurveByExcelCtrl1.Appearance.BackColor = System.Drawing.SystemColors.Control; this.importCurveByExcelCtrl1.Appearance.Options.UseBackColor = true; this.importCurveByExcelCtrl1.Location = new System.Drawing.Point(2, 2); this.importCurveByExcelCtrl1.Name = "importCurveByExcelCtrl1"; this.importCurveByExcelCtrl1.Size = new System.Drawing.Size(1150, 845); this.importCurveByExcelCtrl1.TabIndex = 9; // // btnOk // this.btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; this.btnOk.Appearance.Options.UseBackColor = true; this.btnOk.Location = new System.Drawing.Point(891, 851); this.btnOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(128, 32); this.btnOk.StyleController = this.dataLayoutControl1; this.btnOk.TabIndex = 8; this.btnOk.Text = "ç¡®å®"; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); // // btnCancel // this.btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning; this.btnCancel.Appearance.Options.UseBackColor = true; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.Location = new System.Drawing.Point(1023, 851); this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(129, 32); this.btnCancel.StyleController = this.dataLayoutControl1; this.btnCancel.TabIndex = 7; this.btnCancel.Text = "åæ¶"; dataLayoutControl1.Dock = DockStyle.Fill; dataLayoutControl1.Location = new Point(0, 0); dataLayoutControl1.Margin = new Padding(1); dataLayoutControl1.Name = "dataLayoutControl1"; dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(859, 142, 650, 400); dataLayoutControl1.Root = Root; dataLayoutControl1.Size = new Size(808, 563); dataLayoutControl1.TabIndex = 0; dataLayoutControl1.Text = "dataLayoutControl1"; // // Root // this.Root.AppearanceItemCaption.Options.UseTextOptions = true; this.Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlGroup1}); this.Root.Name = "Root"; this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.Root.Size = new System.Drawing.Size(1154, 885); this.Root.TextVisible = false; Root.AppearanceItemCaption.Options.UseTextOptions = true; Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 }); Root.Name = "Root"; Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); Root.Size = new Size(808, 563); Root.TextVisible = false; // // layoutControlGroup1 // this.layoutControlGroup1.AllowDrawBackground = false; this.layoutControlGroup1.GroupBordersVisible = false; this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, this.emptySpaceItem1, this.layoutControlItem3}); this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup1.Name = "autoGeneratedGroup0"; this.layoutControlGroup1.Size = new System.Drawing.Size(1154, 885); // // layoutControlItem1 // this.layoutControlItem1.Control = this.btnCancel; this.layoutControlItem1.Location = new System.Drawing.Point(1021, 849); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(133, 36); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.btnOk; this.layoutControlItem2.Location = new System.Drawing.Point(889, 849); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Size = new System.Drawing.Size(132, 36); this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; layoutControlGroup1.AllowDrawBackground = false; layoutControlGroup1.GroupBordersVisible = false; layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1 }); layoutControlGroup1.Location = new Point(0, 0); layoutControlGroup1.Name = "autoGeneratedGroup0"; layoutControlGroup1.Size = new Size(808, 563); // // emptySpaceItem1 // this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.Location = new System.Drawing.Point(0, 849); this.emptySpaceItem1.Name = "emptySpaceItem1"; this.emptySpaceItem1.Size = new System.Drawing.Size(889, 36); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // layoutControlItem3 // this.layoutControlItem3.Control = this.importCurveByExcelCtrl1; this.layoutControlItem3.Location = new System.Drawing.Point(0, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.Size = new System.Drawing.Size(1154, 849); this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem3.TextVisible = false; emptySpaceItem1.AllowHotTrack = false; emptySpaceItem1.Location = new Point(0, 0); emptySpaceItem1.Name = "emptySpaceItem1"; emptySpaceItem1.Size = new Size(808, 563); emptySpaceItem1.TextSize = new Size(0, 0); // // dxErrorProvider1 // this.dxErrorProvider1.ContainerControl = this; dxErrorProvider1.ContainerControl = this; // // ImportCurveByExcelDlg // pumpChartExcelImportCtrl1 // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1154, 885); this.Controls.Add(this.dataLayoutControl1); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "ImportCurveByExcelDlg"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "æ²çº¿å¯¼å ¥"; ((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).EndInit(); this.dataLayoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider1)).EndInit(); this.ResumeLayout(false); pumpChartExcelImportCtrl1.Location = new Point(2, 28); pumpChartExcelImportCtrl1.Margin = new Padding(1); pumpChartExcelImportCtrl1.Name = "pumpChartExcelImportCtrl1"; pumpChartExcelImportCtrl1.Size = new Size(804, 503); pumpChartExcelImportCtrl1.TabIndex = 4; // // layoutControl2 // layoutControl2.Controls.Add(generalOkAndCancelCtrl1); layoutControl2.Controls.Add(pumpChartExcelImportCtrl1); layoutControl2.Controls.Add(btnExcelFilePath); layoutControl2.Controls.Add(textEditName); layoutControl2.Controls.Add(textEditImportance); layoutControl2.Dock = DockStyle.Fill; layoutControl2.Location = new Point(0, 0); layoutControl2.Margin = new Padding(2); layoutControl2.Name = "layoutControl2"; layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(565, 257, 650, 400); layoutControl2.Root = layoutControlGroup2; layoutControl2.Size = new Size(808, 563); layoutControl2.TabIndex = 4; layoutControl2.Text = "layoutControl2"; // // generalOkAndCancelCtrl1 // generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26); generalOkAndCancelCtrl1.Location = new Point(2, 535); generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1"; generalOkAndCancelCtrl1.Size = new Size(804, 26); generalOkAndCancelCtrl1.TabIndex = 6; // // btnExcelFilePath // btnExcelFilePath.Location = new Point(66, 2); btnExcelFilePath.Margin = new Padding(2); btnExcelFilePath.Name = "btnExcelFilePath"; editorButtonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions3.SvgImage"); editorButtonImageOptions3.SvgImageSize = new Size(14, 14); editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage"); editorButtonImageOptions4.SvgImageSize = new Size(14, 14); btnExcelFilePath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "å¯¼å ¥æ件", "Import", superToolTip3, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "模æ¿ä¸è½½", "Download", superToolTip4, DevExpress.Utils.ToolTipAnchor.Default) }); btnExcelFilePath.Size = new Size(211, 22); btnExcelFilePath.StyleController = layoutControl2; btnExcelFilePath.TabIndex = 0; // // textEditName // textEditName.Location = new Point(345, 2); textEditName.Margin = new Padding(2); textEditName.Name = "textEditName"; textEditName.Size = new Size(77, 20); textEditName.StyleController = layoutControl2; textEditName.TabIndex = 2; // // textEditImportance // textEditImportance.Location = new Point(490, 2); textEditImportance.Margin = new Padding(2); textEditImportance.Name = "textEditImportance"; textEditImportance.Size = new Size(78, 20); textEditImportance.StyleController = layoutControl2; textEditImportance.TabIndex = 3; // // layoutControlGroup2 // layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; layoutControlGroup2.GroupBordersVisible = false; layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem4, emptySpaceItem3, layoutControlItem5 }); layoutControlGroup2.Name = "Root"; layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); layoutControlGroup2.Size = new Size(808, 563); layoutControlGroup2.TextVisible = false; // // layoutControlItem1 // layoutControlItem1.Control = btnExcelFilePath; layoutControlItem1.Location = new Point(0, 0); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(279, 26); layoutControlItem1.Text = "æ件路å¾:"; layoutControlItem1.TextSize = new Size(52, 14); // // layoutControlItem3 // layoutControlItem3.Control = pumpChartExcelImportCtrl1; layoutControlItem3.Location = new Point(0, 26); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(808, 507); layoutControlItem3.TextSize = new Size(0, 0); layoutControlItem3.TextVisible = false; // // layoutControlItem2 // layoutControlItem2.Control = textEditName; layoutControlItem2.Location = new Point(279, 0); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(145, 26); layoutControlItem2.Text = "å称:"; layoutControlItem2.TextSize = new Size(52, 14); // // layoutControlItem4 // layoutControlItem4.Control = textEditImportance; layoutControlItem4.Location = new Point(424, 0); layoutControlItem4.Name = "layoutControlItem4"; layoutControlItem4.Size = new Size(146, 26); layoutControlItem4.Text = "éè¦åº¦:"; layoutControlItem4.TextSize = new Size(52, 14); // // emptySpaceItem3 // emptySpaceItem3.AllowHotTrack = false; emptySpaceItem3.Location = new Point(570, 0); emptySpaceItem3.Name = "emptySpaceItem3"; emptySpaceItem3.Size = new Size(238, 26); emptySpaceItem3.TextSize = new Size(0, 0); // // layoutControlItem5 // layoutControlItem5.Control = generalOkAndCancelCtrl1; layoutControlItem5.Location = new Point(0, 533); layoutControlItem5.Name = "layoutControlItem5"; layoutControlItem5.Size = new Size(808, 30); layoutControlItem5.TextSize = new Size(0, 0); layoutControlItem5.TextVisible = false; // // ImportPumpPerform2dByExcelDlg // AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(808, 563); Controls.Add(layoutControl2); Controls.Add(dataLayoutControl1); Name = "ImportPumpPerform2dByExcelDlg"; StartPosition = FormStartPosition.CenterParent; Text = "æ²çº¿å¯¼å ¥"; ((ISupportInitialize)dataLayoutControl1).EndInit(); ((ISupportInitialize)Root).EndInit(); ((ISupportInitialize)layoutControlGroup1).EndInit(); ((ISupportInitialize)emptySpaceItem1).EndInit(); ((ISupportInitialize)dxErrorProvider1).EndInit(); ((ISupportInitialize)bindingSource1).EndInit(); ((ISupportInitialize)layoutControl2).EndInit(); layoutControl2.ResumeLayout(false); ((ISupportInitialize)btnExcelFilePath.Properties).EndInit(); ((ISupportInitialize)textEditName.Properties).EndInit(); ((ISupportInitialize)textEditImportance.Properties).EndInit(); ((ISupportInitialize)layoutControlGroup2).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem3).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem4).EndInit(); ((ISupportInitialize)emptySpaceItem3).EndInit(); ((ISupportInitialize)layoutControlItem5).EndInit(); ResumeLayout(false); } #endregion private DevExpress.XtraDataLayout.DataLayoutControl dataLayoutControl1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraEditors.SimpleButton btnOk; private DevExpress.XtraEditors.SimpleButton btnCancel; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1; private ImportPumpPerform2dByExcelCtrl importCurveByExcelCtrl1; private DevExpress.XtraLayout.LayoutControl layoutControl2; private PumpChartExcelImportCtrl pumpChartExcelImportCtrl1; private DevExpress.XtraEditors.ButtonEdit btnExcelFilePath; private DevExpress.XtraEditors.TextEdit textEditName; private DevExpress.XtraEditors.TextEdit textEditImportance; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3; private BindingSource bindingSource1; private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; } } WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.cs
@@ -9,20 +9,21 @@ { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent; } /// <summary> /// åè°äºä»¶ /// </summary> public event Func<Vmo.PhartDiagramRelationExtensionsVmo, Task<bool>> ReloadDataEvent; public event Func<Vmo.PhartDiagramRelationExtensionsVmo, string, string, Task<bool>> ReloadDataEvent; //ç¡®å® private async void btnOk_Click(object sender, EventArgs e) private async void GeneralOkAndCancelCtrl1_OkEvent() { var vmo = this.importCurveByExcelCtrl1.Get(); var vmo = this.pumpChartExcelImportCtrl1.Get(); var ExtensionsVmo = new PhartDiagramRelationExtensionsVmo(); ExtensionsVmo.Diagram = vmo; var result = await this.ReloadDataEvent.Invoke(ExtensionsVmo); var result = await this.ReloadDataEvent.Invoke(ExtensionsVmo, this.textEditName.Text, this.textEditImportance.Text); if (!result) { XtraMessageBox.Show("å¯¼å ¥å¤±è´¥ï¼"); WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.resx
@@ -120,4 +120,93 @@ <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <data name="editorButtonImageOptions3.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iT3BlbjIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMy IDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLlll bGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFz cz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwxMEgxMlY3YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw2 LDIsNi41LDIsN3YxOGMwLDAuMiwwLDAuMywwLjEsMC40YzAsMCwwLjEtMC4xLDAuMS0wLjJsNS41LTEw ICAgQzgsMTQuNSw4LjcsMTQsOS41LDE0aDEzLjdMMTkuMiwxMHoiIGNsYXNzPSJZZWxsb3ciIC8+DQog IDwvZz4NCiAgPHBhdGggZD0iTTI5LjMsMTZIOS42TDQsMjZoMTkuOGMwLjUsMCwxLjEtMC4yLDEuMy0w LjZsNC45LTguOUMzMC4xLDE2LjIsMjkuOCwxNiwyOS4zLDE2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAg PHBhdGggZD0iTTI4LDhjMC0zLjMtMi43LTYtNi02cy02LDIuNy02LDZjMC0yLjIsMS44LTQsNC00czQs MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== </value> </data> <data name="editorButtonImageOptions4.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHYNAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H cmVlbntmaWxsOiMwMzlDMjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4z O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUs Miw2LDIuNSw2LDN2N2gyVjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4di04 SDZ2OWMwLDAuNSwwLjUsMSwxLDFoMjBjMC41LDAsMS0wLjUsMS0xdi05aC0yVjI2eiIgY2xhc3M9IkJs YWNrIiAvPg0KICA8cGF0aCBkPSJNMzEsOEgzQzIuNCw4LDIsOC40LDIsOXYxMGMwLDAuNiwwLjQsMSwx LDFoMjhjMC42LDAsMS0wLjQsMS0xVjlDMzIsOC40LDMxLjYsOCwzMSw4eiBNOS4xLDE4bC0xLjMtMi41 ICBjLTAuMS0wLjEtMC4xLTAuMy0wLjItMC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDYuMSwxOEg0 bDIuNS0zLjlsLTIuMi0zLjloMi4xbDEuMSwyLjNjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjdoMCAgYzAt MC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXogTTE2Ljcs MThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45Yy0wLjIsMC4zLTAuNCwwLjUtMC43 LDAuNyAgcy0wLjYsMC4zLTEsMC40Yy0wLjQsMC4xLTAuOCwwLjEtMS4yLDAuMWMtMC40LDAtMC44LDAt MS4yLTAuMWMtMC40LTAuMS0wLjctMC4yLTEtMC4zVjE2YzAuMywwLjMsMC42LDAuNSwxLDAuNnMwLjcs MC4yLDEuMSwwLjIgIGMwLjIsMCwwLjQsMCwwLjYtMC4xczAuMy0wLjEsMC40LTAuMmMwLjEtMC4xLDAu Mi0wLjIsMC4yLTAuMmMwLjEtMC4xLDAuMS0wLjIsMC4xLTAuM2MwLTAuMiwwLTAuMy0wLjEtMC40ICBj LTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0wLjctMC4zYy0w LjYtMC4zLTEuMS0wLjYtMS4zLTAuOWMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjMgIGMwLTAuNCwwLjEt MC43LDAuMi0xYzAuMi0wLjMsMC40LTAuNSwwLjctMC43YzAuMy0wLjIsMC42LTAuMywxLTAuNHMwLjgt MC4xLDEuMi0wLjFjMC40LDAsMC44LDAsMS4xLDAuMWMwLjMsMCwwLjYsMC4xLDAuOSwwLjIgIHYxLjZj LTAuMS0wLjEtMC4zLTAuMi0wLjQtMC4ycy0wLjMtMC4xLTAuNS0wLjJjLTAuMiwwLTAuMy0wLjEtMC41 LTAuMXMtMC4zLDAtMC41LDBjLTAuMiwwLTAuNCwwLTAuNSwwLjFjLTAuMiwwLTAuMywwLjEtMC40LDAu MiAgYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAuMSwwLjNjMCwwLjEs MCwwLjIsMC4xLDAuM2MwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4xLDAuMywwLjIsMC41LDAu MyAgczAuNCwwLjIsMC42LDAuM2MwLjMsMC4xLDAuNiwwLjMsMC44LDAuNGMwLjIsMC4xLDAuNSwwLjMs MC42LDAuNWMwLjIsMC4yLDAuMywwLjQsMC40LDAuNnMwLjEsMC41LDAuMSwwLjggIEMyMi42LDE2LjMs MjIuNSwxNi42LDIyLjQsMTYuOXogTTI4LjEsMThsLTEuMy0yLjVjLTAuMS0wLjEtMC4xLTAuMy0wLjIt MC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDI1LjEsMThIMjNsMi41LTMuOWwtMi4yLTMuOSAgaDIu MWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4xLTAuNCwwLjItMC43bDEu Mi0yLjNoMS45bC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xh c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTMxLDhIM0MyLjQsOCwyLDguNCwyLDl2MTBjMCwwLjYsMC40 LDEsMSwxaDI4YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwzMS42LDgsMzEsOHogTTkuMSwxOGwtMS4z LTIuNSAgIGMtMC4xLTAuMS0wLjEtMC4zLTAuMi0wLjVoMGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMNi4x LDE4SDRsMi41LTMuOWwtMi4yLTMuOWgyLjFsMS4xLDIuM2MwLjEsMC4yLDAuMiwwLjQsMC4yLDAuN2gw ICAgYzAtMC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXog TTE2LjcsMThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45ICAgYy0wLjIsMC4zLTAu NCwwLjUtMC43LDAuN3MtMC42LDAuMy0xLDAuNGMtMC40LDAuMS0wLjgsMC4xLTEuMiwwLjFjLTAuNCww LTAuOCwwLTEuMi0wLjFjLTAuNC0wLjEtMC43LTAuMi0xLTAuM1YxNiAgIGMwLjMsMC4zLDAuNiwwLjUs MSwwLjZzMC43LDAuMiwxLjEsMC4yYzAuMiwwLDAuNCwwLDAuNi0wLjFzMC4zLTAuMSwwLjQtMC4yYzAu MS0wLjEsMC4yLTAuMiwwLjItMC4yYzAuMS0wLjEsMC4xLTAuMiwwLjEtMC4zICAgYzAtMC4yLDAtMC4z LTAuMS0wLjRjLTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0w LjctMC4zYy0wLjYtMC4zLTEuMS0wLjYtMS4zLTAuOSAgIGMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjNj MC0wLjQsMC4xLTAuNywwLjItMWMwLjItMC4zLDAuNC0wLjUsMC43LTAuN2MwLjMtMC4yLDAuNi0wLjMs MS0wLjRzMC44LTAuMSwxLjItMC4xICAgYzAuNCwwLDAuOCwwLDEuMSwwLjFjMC4zLDAsMC42LDAuMSww LjksMC4ydjEuNmMtMC4xLTAuMS0wLjMtMC4yLTAuNC0wLjJzLTAuMy0wLjEtMC41LTAuMmMtMC4yLDAt MC4zLTAuMS0wLjUtMC4xcy0wLjMsMC0wLjUsMCAgIGMtMC4yLDAtMC40LDAtMC41LDAuMWMtMC4yLDAt MC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAu MSwwLjNjMCwwLjEsMCwwLjIsMC4xLDAuMyAgIGMwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4x LDAuMywwLjIsMC41LDAuM3MwLjQsMC4yLDAuNiwwLjNjMC4zLDAuMSwwLjYsMC4zLDAuOCwwLjRjMC4y LDAuMSwwLjUsMC4zLDAuNiwwLjUgICBjMC4yLDAuMiwwLjMsMC40LDAuNCwwLjZzMC4xLDAuNSwwLjEs MC44QzIyLjYsMTYuMywyMi41LDE2LjYsMjIuNCwxNi45eiBNMjguMSwxOGwtMS4zLTIuNWMtMC4xLTAu MS0wLjEtMC4zLTAuMi0wLjVoMCAgIGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMMjUuMSwxOEgyM2wyLjUt My45bC0yLjItMy45aDIuMWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4x LTAuNCwwLjItMC43bDEuMi0yLjNoMS45ICAgbC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJC bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L </value> </data> </root> WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportPumpPerform2dByImageDlg.Designer.cs
ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportAssetsExchangerCurveQLByPictureDlg.Designer.cs ÐÞ¸Ä @@ -28,24 +28,25 @@ /// </summary> private void InitializeComponent() { DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); ComponentResourceManager resources = new ComponentResourceManager(typeof(ImportPumpPerform2dByImageDlg)); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip(); layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); btnEditPicture = new DevExpress.XtraEditors.ButtonEdit(); textEdit2 = new DevExpress.XtraEditors.TextEdit(); textEditImportance = new DevExpress.XtraEditors.TextEdit(); generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl(); panelControl1 = new DevExpress.XtraEditors.PanelControl(); pumpChartImageImportCtrl1 = new PumpChartImageImportCtrl(); textEditName = new DevExpress.XtraEditors.TextEdit(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -54,11 +55,10 @@ emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); pumpChartImageImportCtrl1 = new PumpChartImageImportCtrl(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)btnEditPicture.Properties).BeginInit(); ((ISupportInitialize)textEdit2.Properties).BeginInit(); ((ISupportInitialize)textEditImportance.Properties).BeginInit(); ((ISupportInitialize)panelControl1).BeginInit(); panelControl1.SuspendLayout(); ((ISupportInitialize)textEditName.Properties).BeginInit(); @@ -74,7 +74,7 @@ // layoutControl1 // layoutControl1.Controls.Add(btnEditPicture); layoutControl1.Controls.Add(textEdit2); layoutControl1.Controls.Add(textEditImportance); layoutControl1.Controls.Add(generalOkAndCancelCtrl1); layoutControl1.Controls.Add(panelControl1); layoutControl1.Controls.Add(textEditName); @@ -91,26 +91,26 @@ // btnEditPicture.Location = new Point(76, 12); btnEditPicture.Name = "btnEditPicture"; editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage"); editorButtonImageOptions1.SvgImageSize = new Size(14, 14); editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage"); editorButtonImageOptions2.SvgImageSize = new Size(14, 14); btnEditPicture.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "å¯¼å ¥æ件", "Import", superToolTip1, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "模æ¿ä¸è½½", "Download", superToolTip2, DevExpress.Utils.ToolTipAnchor.Default) }); editorButtonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions3.SvgImage"); editorButtonImageOptions3.SvgImageSize = new Size(14, 14); editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage"); editorButtonImageOptions4.SvgImageSize = new Size(14, 14); btnEditPicture.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "å¯¼å ¥æ件", "Import", superToolTip3, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "模æ¿ä¸è½½", "Download", superToolTip4, DevExpress.Utils.ToolTipAnchor.Default) }); btnEditPicture.Size = new Size(315, 22); btnEditPicture.StyleController = layoutControl1; btnEditPicture.TabIndex = 0; // // textEdit2 // textEditImportance // textEdit2.Location = new Point(630, 13); textEdit2.Name = "textEdit2"; textEdit2.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False; textEdit2.Properties.EditFormat.FormatString = "N0"; textEdit2.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; textEdit2.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); textEdit2.Size = new Size(82, 20); textEdit2.StyleController = layoutControl1; textEdit2.TabIndex = 3; textEditImportance.Location = new Point(630, 13); textEditImportance.Name = "textEditImportance"; textEditImportance.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False; textEditImportance.Properties.EditFormat.FormatString = "N0"; textEditImportance.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; textEditImportance.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); textEditImportance.Size = new Size(82, 20); textEditImportance.StyleController = layoutControl1; textEditImportance.TabIndex = 3; // // generalOkAndCancelCtrl1 // @@ -130,6 +130,15 @@ panelControl1.Name = "panelControl1"; panelControl1.Size = new Size(1038, 465); panelControl1.TabIndex = 1; // // pumpChartImageImportCtrl1 // pumpChartImageImportCtrl1.Dock = DockStyle.Fill; pumpChartImageImportCtrl1.Location = new Point(2, 2); pumpChartImageImportCtrl1.Margin = new Padding(2, 2, 2, 2); pumpChartImageImportCtrl1.Name = "pumpChartImageImportCtrl1"; pumpChartImageImportCtrl1.Size = new Size(1034, 461); pumpChartImageImportCtrl1.TabIndex = 0; // // textEditName // @@ -171,7 +180,7 @@ // layoutControlItem5 // layoutControlItem5.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; layoutControlItem5.Control = textEdit2; layoutControlItem5.Control = textEditImportance; layoutControlItem5.Location = new Point(554, 0); layoutControlItem5.MaxSize = new Size(150, 24); layoutControlItem5.MinSize = new Size(150, 24); @@ -207,15 +216,6 @@ layoutControlItem4.Text = "å称:"; layoutControlItem4.TextSize = new Size(52, 14); // // pumpChartImageImportCtrl1 // pumpChartImageImportCtrl1.Dock = DockStyle.Fill; pumpChartImageImportCtrl1.Location = new Point(2, 2); pumpChartImageImportCtrl1.Margin = new Padding(2, 2, 2, 2); pumpChartImageImportCtrl1.Name = "pumpChartImageImportCtrl1"; pumpChartImageImportCtrl1.Size = new Size(1034, 461); pumpChartImageImportCtrl1.TabIndex = 0; // // ImportPumpPerform2dByImageDlg // AutoScaleDimensions = new SizeF(7F, 14F); @@ -228,7 +228,7 @@ ((ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((ISupportInitialize)btnEditPicture.Properties).EndInit(); ((ISupportInitialize)textEdit2.Properties).EndInit(); ((ISupportInitialize)textEditImportance.Properties).EndInit(); ((ISupportInitialize)panelControl1).EndInit(); panelControl1.ResumeLayout(false); ((ISupportInitialize)textEditName.Properties).EndInit(); @@ -250,7 +250,7 @@ private DevExpress.XtraEditors.PanelControl panelControl1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraEditors.TextEdit textEdit2; private DevExpress.XtraEditors.TextEdit textEditImportance; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraEditors.ButtonEdit btnEditPicture; WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportPumpPerform2dByImageDlg.cs
ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportAssetsExchangerCurveQLByPictureDlg.cs ÐÞ¸Ä @@ -26,17 +26,7 @@ /// <summary> /// /// </summary> public event Func<PhartDiagramRelationExtensionsVmo, Task<bool>> ReloadDataEvent; //è¿:FilePath, PhartRelation.eGraphType, // åº:PhartDiagramExGraphListVmo /// <summary> /// /// </summary> public void SetBindingData() { } public event Func<PhartDiagramRelationExtensionsVmo, string, string, Task<bool>> ReloadDataEvent; //ç¡®å® private async void GeneralOkAndCancelCtrl1_OkEvent() @@ -44,7 +34,7 @@ var diagram = this.pumpChartImageImportCtrl1.Get(); var vmo = new PhartDiagramRelationExtensionsVmo(); vmo.Diagram = diagram; var result = await this.ReloadDataEvent?.Invoke(vmo); var result = await this.ReloadDataEvent?.Invoke(vmo, this.textEditName.Name, this.textEditImportance.Text); if (!result) { XtraMessageBox.Show("å¯¼å ¥å¤±è´¥ï¼"); WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportPumpPerform2dByImageDlg.resx
ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportAssetsExchangerCurveQLByPictureDlg.resx ÐÞ¸Ä @@ -118,7 +118,7 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="editorButtonImageOptions3.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -138,7 +138,7 @@ MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== </value> </data> <data name="editorButtonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="editorButtonImageOptions4.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/PumpChartPointImport.Designer.cs
@@ -28,37 +28,58 @@ /// </summary> private void InitializeComponent() { btnCancel = new DevExpress.XtraEditors.SimpleButton(); emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); btnOk = new DevExpress.XtraEditors.SimpleButton(); layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); pumpChartPointImportCtrl1 = new PumpChartPointImportCtrl(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)emptySpaceItem1).BeginInit(); emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)emptySpaceItem3).BeginInit(); ((ISupportInitialize)layoutControlItem3).BeginInit(); ((ISupportInitialize)emptySpaceItem1).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); SuspendLayout(); // // btnCancel // layoutControl1 // btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning; btnCancel.Appearance.Options.UseBackColor = true; btnCancel.DialogResult = DialogResult.Cancel; btnCancel.Location = new Point(738, 482); btnCancel.Name = "btnCancel"; btnCancel.Size = new Size(77, 22); btnCancel.StyleController = layoutControl1; btnCancel.TabIndex = 2; btnCancel.Text = "åæ¶"; layoutControl1.Controls.Add(generalOkAndCancelCtrl1); layoutControl1.Controls.Add(pumpChartPointImportCtrl1); layoutControl1.Dock = DockStyle.Fill; layoutControl1.Location = new Point(0, 0); layoutControl1.Name = "layoutControl1"; layoutControl1.Root = Root; layoutControl1.Size = new Size(827, 516); layoutControl1.TabIndex = 11; layoutControl1.Text = "layoutControl1"; // // pumpChartPointImportCtrl1 // pumpChartPointImportCtrl1.Location = new Point(12, 12); pumpChartPointImportCtrl1.Margin = new Padding(2, 2, 2, 2); pumpChartPointImportCtrl1.Name = "pumpChartPointImportCtrl1"; pumpChartPointImportCtrl1.Size = new Size(803, 462); pumpChartPointImportCtrl1.TabIndex = 3; // // Root // Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem1 }); Root.Name = "Root"; Root.Size = new Size(827, 516); Root.TextVisible = false; // // layoutControlItem3 // layoutControlItem3.Control = pumpChartPointImportCtrl1; layoutControlItem3.Location = new Point(0, 0); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(807, 466); layoutControlItem3.TextSize = new Size(0, 0); layoutControlItem3.TextVisible = false; // // emptySpaceItem1 // @@ -68,82 +89,25 @@ emptySpaceItem1.Size = new Size(622, 24); emptySpaceItem1.TextSize = new Size(0, 0); // // btnOk // generalOkAndCancelCtrl1 // btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; btnOk.Appearance.Options.UseBackColor = true; btnOk.Location = new Point(661, 482); btnOk.Name = "btnOk"; btnOk.Size = new Size(73, 22); btnOk.StyleController = layoutControl1; btnOk.TabIndex = 0; btnOk.Text = "ç¡®å®"; btnOk.Click += btnOk_Click; // // layoutControl1 // layoutControl1.Controls.Add(pumpChartPointImportCtrl1); layoutControl1.Controls.Add(btnOk); layoutControl1.Controls.Add(btnCancel); layoutControl1.Dock = DockStyle.Fill; layoutControl1.Location = new Point(0, 0); layoutControl1.Name = "layoutControl1"; layoutControl1.Root = Root; layoutControl1.Size = new Size(827, 516); layoutControl1.TabIndex = 11; layoutControl1.Text = "layoutControl1"; // // Root // Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem3, layoutControlItem2, layoutControlItem3 }); Root.Name = "Root"; Root.Size = new Size(827, 516); Root.TextVisible = false; generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26); generalOkAndCancelCtrl1.Location = new Point(12, 478); generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1"; generalOkAndCancelCtrl1.Size = new Size(803, 26); generalOkAndCancelCtrl1.TabIndex = 6; // // layoutControlItem1 // layoutControlItem1.Control = btnCancel; layoutControlItem1.Location = new Point(726, 470); layoutControlItem1.Control = generalOkAndCancelCtrl1; layoutControlItem1.Location = new Point(0, 466); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(81, 26); layoutControlItem1.Size = new Size(807, 30); layoutControlItem1.TextSize = new Size(0, 0); layoutControlItem1.TextVisible = false; // // layoutControlItem2 // layoutControlItem2.Control = btnOk; layoutControlItem2.Location = new Point(649, 470); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(77, 26); layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; // // emptySpaceItem3 // emptySpaceItem3.AllowHotTrack = false; emptySpaceItem3.Location = new Point(0, 470); emptySpaceItem3.Name = "emptySpaceItem3"; emptySpaceItem3.Size = new Size(649, 26); emptySpaceItem3.TextSize = new Size(0, 0); // // pumpChartPointImportCtrl1 // pumpChartPointImportCtrl1.Location = new Point(12, 12); pumpChartPointImportCtrl1.Margin = new Padding(2, 2, 2, 2); pumpChartPointImportCtrl1.Name = "pumpChartPointImportCtrl1"; pumpChartPointImportCtrl1.Size = new Size(803, 466); pumpChartPointImportCtrl1.TabIndex = 3; // // layoutControlItem3 // layoutControlItem3.Control = pumpChartPointImportCtrl1; layoutControlItem3.Location = new Point(0, 0); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(807, 470); layoutControlItem3.TextSize = new Size(0, 0); layoutControlItem3.TextVisible = false; // // PumpChartPointImport // @@ -153,28 +117,22 @@ Controls.Add(layoutControl1); Name = "PumpChartPointImport"; Text = "åç¹çæ"; ((ISupportInitialize)emptySpaceItem1).EndInit(); ((ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((ISupportInitialize)Root).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)emptySpaceItem3).EndInit(); ((ISupportInitialize)layoutControlItem3).EndInit(); ((ISupportInitialize)emptySpaceItem1).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ResumeLayout(false); } #endregion private DevExpress.XtraEditors.SimpleButton btnCancel; private DevExpress.XtraLayout.LayoutControl layoutControl1; private PumpChartPointImportCtrl pumpChartPointImportCtrl1; private DevExpress.XtraEditors.SimpleButton btnOk; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; } } WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/PumpChartPointImport.cs
@@ -17,6 +17,9 @@ public PumpChartPointImport() { InitializeComponent(); this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon; this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent; this.layoutControl1.SetupLayoutControl(); } public void SetBindingData(Vmo.AssetsPumpMainVmo vmo) @@ -30,7 +33,7 @@ public event Func<Vmo.PhartDiagramRelationExtensionsVmo, Task<bool>> ReloadDataEvent; //ç¡®å® private async void btnOk_Click(object sender, EventArgs e) private async void GeneralOkAndCancelCtrl1_OkEvent() { var vmo = this.pumpChartPointImportCtrl1.Get(); var ExtensionsVmo = new PhartDiagramRelationExtensionsVmo(); WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/02-Eidt/EditAssetsExchangerCurveQLDlg.Designer.cs
@@ -30,18 +30,18 @@ { layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); panelControl1 = new DevExpress.XtraEditors.PanelControl(); pumpChartEditCtrl1 = new PumpChartEditCtrl(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)panelControl1).BeginInit(); panelControl1.SuspendLayout(); ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); SuspendLayout(); // // layoutControl1 @@ -67,33 +67,6 @@ generalOkAndCancelCtrl1.Size = new Size(874, 26); generalOkAndCancelCtrl1.TabIndex = 5; // // Root // Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 }); Root.Name = "Root"; Root.Size = new Size(898, 552); Root.TextVisible = false; // // layoutControlItem2 // layoutControlItem2.Control = generalOkAndCancelCtrl1; layoutControlItem2.Location = new Point(0, 502); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(878, 30); layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; // // layoutControlItem1 // layoutControlItem1.Control = panelControl1; layoutControlItem1.Location = new Point(0, 0); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(878, 502); layoutControlItem1.TextSize = new Size(0, 0); layoutControlItem1.TextVisible = false; // // panelControl1 // panelControl1.Controls.Add(pumpChartEditCtrl1); @@ -111,6 +84,33 @@ pumpChartEditCtrl1.Size = new Size(870, 494); pumpChartEditCtrl1.TabIndex = 0; // // Root // Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 }); Root.Name = "Root"; Root.Size = new Size(898, 552); Root.TextVisible = false; // // layoutControlItem1 // layoutControlItem1.Control = panelControl1; layoutControlItem1.Location = new Point(0, 0); layoutControlItem1.Name = "layoutControlItem1"; layoutControlItem1.Size = new Size(878, 502); layoutControlItem1.TextSize = new Size(0, 0); layoutControlItem1.TextVisible = false; // // layoutControlItem2 // layoutControlItem2.Control = generalOkAndCancelCtrl1; layoutControlItem2.Location = new Point(0, 502); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(878, 30); layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; // // EditAssetsPumpPerform2dDlg // AutoScaleDimensions = new SizeF(7F, 14F); @@ -122,11 +122,11 @@ Text = "ç¼è¾æ²çº¿"; ((ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((ISupportInitialize)Root).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)panelControl1).EndInit(); panelControl1.ResumeLayout(false); ((ISupportInitialize)Root).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ResumeLayout(false); }
@@ -55,13 +55,18 @@ private void barBtnImportByExcel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { var dlg = new ImportPumpPerform2dByExcelDlg(); dlg.ReloadDataEvent += async (rhs) => dlg.ReloadDataEvent += async (rhs, name, importance) => { var bll = new BLL.PhartDiagramRelation(); var id = await bll.InsertEx(rhs); if (id > 0) { var vmo = new PhartDiagramRelationVmo(rhs); vmo.OtherName = name; if (!string.IsNullOrEmpty(importance)) { vmo.Importance = Convert.ToInt32(importance); } var relationId = await BLLFactory<HStation.BLL.PhartDiagramRelation>.Instance.Insert(vmo); if (relationId > 0) { @@ -79,14 +84,19 @@ //å¾ç private void barBtnImportByPicture_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { var dlg = new ImportPumpPerform2dByExcelDlg(); dlg.ReloadDataEvent += async (rhs) => var dlg = new ImportPumpPerform2dByImageDlg(); dlg.ReloadDataEvent += async (rhs, name, importance) => { var bll = new BLL.PhartDiagramRelation(); var id = await bll.InsertEx(rhs); if (id > 0) { var vmo = new PhartDiagramRelationVmo(rhs); vmo.OtherName = name; if (!string.IsNullOrEmpty(importance)) { vmo.Importance = Convert.ToInt32(importance); } var relationId = await BLLFactory<HStation.BLL.PhartDiagramRelation>.Instance.Insert(vmo); if (relationId > 0) { WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/04-curveql/ImportAssetsExchangerCurveQLByPictureDlg.cs
@@ -26,16 +26,11 @@ /// </summary> public event Action<HStation.Vmo.PhartDiagramRelationVmo> ReloadDataEvent; //è¿:FilePath, PhartRelation.eGraphType, // åº:PhartDiagramExGraphListVmo /// <summary> /// /// </summary> public void SetBindingData() { } //ç¡®å® @@ -58,7 +53,5 @@ this.btnEditPicture.EditValue = fileName; } } } } WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -75,7 +75,7 @@ <Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="01-pump\07-PumpChart\01-import\02-image\ImportAssetsExchangerCurveQLByPictureDlg.cs"> <Compile Update="01-pump\07-PumpChart\01-import\02-image\ImportPumpPerform2dByImageDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsExchangerCurveQLDlg.cs">
