diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 70818ca19372d4782f72896991e797ce838f401e..c21aea205198e348bcd826b95ad6bf0112c9bd44 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -77,11 +77,11 @@ Partial Class ElectricMotorForm
Me.Panel1 = New System.Windows.Forms.Panel()
Me.lblContTq = New System.Windows.Forms.Label()
Me.lblContTqUnit = New System.Windows.Forms.Label()
- Me.tbContTq = New System.Windows.Forms.TextBox()
+ Me.tbContTqLo = New System.Windows.Forms.TextBox()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.lblOvlTime = New System.Windows.Forms.Label()
Me.lblOvltimeUnit = New System.Windows.Forms.Label()
- Me.tbOvlTime = New System.Windows.Forms.TextBox()
+ Me.tbOvlTimeLo = New System.Windows.Forms.TextBox()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.lblOvlRecovery = New System.Windows.Forms.Label()
Me.lblOvlRecoveryFactorUnit = New System.Windows.Forms.Label()
@@ -89,20 +89,18 @@ Partial Class ElectricMotorForm
Me.Panel4 = New System.Windows.Forms.Panel()
Me.lblRatedSpeed = New System.Windows.Forms.Label()
Me.lblRatedSpeedUnit = New System.Windows.Forms.Label()
- Me.tbRatedSpeed = New System.Windows.Forms.TextBox()
+ Me.tbRatedSpeedLo = New System.Windows.Forms.TextBox()
Me.pnOverloadTq = New System.Windows.Forms.Panel()
Me.lblOverloadTq = New System.Windows.Forms.Label()
Me.lblOverloadTqUnit = New System.Windows.Forms.Label()
- Me.tbOverloadTq = New System.Windows.Forms.TextBox()
+ Me.tbOverloadTqLo = New System.Windows.Forms.TextBox()
Me.Panel6 = New System.Windows.Forms.Panel()
Me.lblOverloadSpeed = New System.Windows.Forms.Label()
Me.lblOverloadSpeedUnit = New System.Windows.Forms.Label()
- Me.tbOvlSpeed = New System.Windows.Forms.TextBox()
- Me.gbVoltageLevelHi = New System.Windows.Forms.GroupBox()
+ Me.tbOvlSpeedLo = New System.Windows.Forms.TextBox()
Me.lblVoltageHi = New System.Windows.Forms.Label()
Me.lblVoltageHiUnit = New System.Windows.Forms.Label()
Me.tbVoltageHi = New System.Windows.Forms.TextBox()
- Me.gbVoltageLevelLow = New System.Windows.Forms.GroupBox()
Me.lblVoltageLow = New System.Windows.Forms.Label()
Me.lblVoltageLowUnit = New System.Windows.Forms.Label()
Me.tbVoltageLow = New System.Windows.Forms.TextBox()
@@ -118,6 +116,29 @@ Partial Class ElectricMotorForm
Me.tbMaxTorqueLow = New System.Windows.Forms.TextBox()
Me.btnMaxTorqueCurveOpenLow = New System.Windows.Forms.Button()
Me.btnBrowseMaxTorqueLow = New System.Windows.Forms.Button()
+ Me.tcVoltageLevels = New System.Windows.Forms.TabControl()
+ Me.tpVoltageLow = New System.Windows.Forms.TabPage()
+ Me.tpVoltageHigh = New System.Windows.Forms.TabPage()
+ Me.Panel5 = New System.Windows.Forms.Panel()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.tbOvlSpeedHi = New System.Windows.Forms.TextBox()
+ Me.Panel7 = New System.Windows.Forms.Panel()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.tbOverloadTqHi = New System.Windows.Forms.TextBox()
+ Me.Panel8 = New System.Windows.Forms.Panel()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.tbRatedSpeedHi = New System.Windows.Forms.TextBox()
+ Me.Panel9 = New System.Windows.Forms.Panel()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.tbOvlTimeHi = New System.Windows.Forms.TextBox()
+ Me.Panel10 = New System.Windows.Forms.Panel()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.tbContTqHi = New System.Windows.Forms.TextBox()
Me.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -130,32 +151,41 @@ Partial Class ElectricMotorForm
Me.Panel4.SuspendLayout
Me.pnOverloadTq.SuspendLayout
Me.Panel6.SuspendLayout
- Me.gbVoltageLevelHi.SuspendLayout
- Me.gbVoltageLevelLow.SuspendLayout
+ Me.tcVoltageLevels.SuspendLayout
+ Me.tpVoltageLow.SuspendLayout
+ Me.tpVoltageHigh.SuspendLayout
+ Me.Panel5.SuspendLayout
+ Me.Panel7.SuspendLayout
+ Me.Panel8.SuspendLayout
+ Me.Panel9.SuspendLayout
+ Me.Panel10.SuspendLayout
Me.SuspendLayout
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(127, 5)
+ Me.tbInertia.Location = New System.Drawing.Point(190, 8)
+ Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(49, 20)
+ Me.tbInertia.Size = New System.Drawing.Size(72, 26)
Me.tbInertia.TabIndex = 3
'
'lblinertiaUnit
'
Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(273, 12)
+ Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(52, 20)
Me.lblinertiaUnit.TabIndex = 24
Me.lblinertiaUnit.Text = "[kgm²]"
'
'lblInertia
'
Me.lblInertia.AutoSize = true
- Me.lblInertia.Location = New System.Drawing.Point(3, 7)
+ Me.lblInertia.Location = New System.Drawing.Point(4, 11)
+ Me.lblInertia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblInertia.Name = "lblInertia"
- Me.lblInertia.Size = New System.Drawing.Size(36, 13)
+ Me.lblInertia.Size = New System.Drawing.Size(54, 20)
Me.lblInertia.TabIndex = 0
Me.lblInertia.Text = "Inertia"
'
@@ -163,9 +193,10 @@ Partial Class ElectricMotorForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(811, 574)
+ Me.ButCancel.Location = New System.Drawing.Point(1281, 637)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(112, 35)
Me.ButCancel.TabIndex = 13
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -173,9 +204,10 @@ Partial Class ElectricMotorForm
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(730, 574)
+ Me.ButOK.Location = New System.Drawing.Point(1160, 637)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(112, 35)
Me.ButOK.TabIndex = 12
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -187,8 +219,8 @@ Partial Class ElectricMotorForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(898, 31)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1412, 33)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -198,7 +230,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -208,7 +240,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -218,7 +250,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -228,14 +260,14 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
'
'ToolStripBtSendTo
'
@@ -243,14 +275,14 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtSendTo.Text = "Send to Job Editor"
Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 33)
'
'ToolStripButton1
'
@@ -258,16 +290,17 @@ Partial Class ElectricMotorForm
Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(34, 28)
Me.ToolStripButton1.Text = "Help"
'
'StatusStrip1
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 599)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 677)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1412, 32)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -275,22 +308,24 @@ Partial Class ElectricMotorForm
'LbStatus
'
Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Size = New System.Drawing.Size(60, 25)
Me.LbStatus.Text = "Status"
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
+ Me.tbMakeModel.Location = New System.Drawing.Point(164, 126)
+ Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
+ Me.tbMakeModel.Size = New System.Drawing.Size(553, 26)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
+ Me.lblMakeModel.Location = New System.Drawing.Point(24, 131)
+ Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
+ Me.lblMakeModel.Size = New System.Drawing.Size(126, 20)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -298,9 +333,10 @@ Partial Class ElectricMotorForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(753, 62)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -309,18 +345,18 @@ Partial Class ElectricMotorForm
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ Me.CmOpenFile.Size = New System.Drawing.Size(203, 68)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'pnInertia
@@ -328,33 +364,37 @@ Partial Class ElectricMotorForm
Me.pnInertia.Controls.Add(Me.lblInertia)
Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
Me.pnInertia.Controls.Add(Me.tbInertia)
- Me.pnInertia.Location = New System.Drawing.Point(12, 108)
+ Me.pnInertia.Location = New System.Drawing.Point(18, 166)
+ Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(221, 30)
+ Me.pnInertia.Size = New System.Drawing.Size(332, 46)
Me.pnInertia.TabIndex = 3
'
'tbDragTorqueHi
'
- Me.tbDragTorqueHi.Location = New System.Drawing.Point(6, 103)
+ Me.tbDragTorqueHi.Location = New System.Drawing.Point(7, 141)
+ Me.tbDragTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbDragTorqueHi.Name = "tbDragTorqueHi"
- Me.tbDragTorqueHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbDragTorqueHi.Size = New System.Drawing.Size(607, 26)
Me.tbDragTorqueHi.TabIndex = 5
'
'lblDragTorqueHi
'
Me.lblDragTorqueHi.AutoSize = true
- Me.lblDragTorqueHi.Location = New System.Drawing.Point(6, 87)
+ Me.lblDragTorqueHi.Location = New System.Drawing.Point(7, 117)
+ Me.lblDragTorqueHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblDragTorqueHi.Name = "lblDragTorqueHi"
- Me.lblDragTorqueHi.Size = New System.Drawing.Size(98, 13)
+ Me.lblDragTorqueHi.Size = New System.Drawing.Size(143, 20)
Me.lblDragTorqueHi.TabIndex = 38
Me.lblDragTorqueHi.Text = "Drag Torque Curve"
'
'btnBrowseDragCurveHi
'
Me.btnBrowseDragCurveHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurveHi.Location = New System.Drawing.Point(420, 100)
+ Me.btnBrowseDragCurveHi.Location = New System.Drawing.Point(628, 137)
+ Me.btnBrowseDragCurveHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseDragCurveHi.Name = "btnBrowseDragCurveHi"
- Me.btnBrowseDragCurveHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseDragCurveHi.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseDragCurveHi.TabIndex = 6
Me.btnBrowseDragCurveHi.TabStop = false
Me.btnBrowseDragCurveHi.UseVisualStyleBackColor = true
@@ -362,9 +402,10 @@ Partial Class ElectricMotorForm
'btnDragCurveOpenHi
'
Me.btnDragCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpenHi.Location = New System.Drawing.Point(443, 100)
+ Me.btnDragCurveOpenHi.Location = New System.Drawing.Point(662, 137)
+ Me.btnDragCurveOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnDragCurveOpenHi.Name = "btnDragCurveOpenHi"
- Me.btnDragCurveOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnDragCurveOpenHi.Size = New System.Drawing.Size(36, 37)
Me.btnDragCurveOpenHi.TabIndex = 7
Me.btnDragCurveOpenHi.TabStop = false
Me.btnDragCurveOpenHi.UseVisualStyleBackColor = true
@@ -372,9 +413,10 @@ Partial Class ElectricMotorForm
'btnEmMapOpenHi
'
Me.btnEmMapOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenHi.Location = New System.Drawing.Point(443, 141)
+ Me.btnEmMapOpenHi.Location = New System.Drawing.Point(662, 200)
+ Me.btnEmMapOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
- Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmMapOpenHi.Size = New System.Drawing.Size(36, 37)
Me.btnEmMapOpenHi.TabIndex = 42
Me.btnEmMapOpenHi.TabStop = false
Me.btnEmMapOpenHi.UseVisualStyleBackColor = true
@@ -382,9 +424,10 @@ Partial Class ElectricMotorForm
'btnBrowseEmMapHi
'
Me.btnBrowseEmMapHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(420, 141)
+ Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(628, 200)
+ Me.btnBrowseEmMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
- Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseEmMapHi.TabIndex = 41
Me.btnBrowseEmMapHi.TabStop = false
Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
@@ -392,25 +435,28 @@ Partial Class ElectricMotorForm
'lblPowerMapHi
'
Me.lblPowerMapHi.AutoSize = true
- Me.lblPowerMapHi.Location = New System.Drawing.Point(6, 128)
+ Me.lblPowerMapHi.Location = New System.Drawing.Point(7, 180)
+ Me.lblPowerMapHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPowerMapHi.Name = "lblPowerMapHi"
- Me.lblPowerMapHi.Size = New System.Drawing.Size(163, 13)
+ Me.lblPowerMapHi.Size = New System.Drawing.Size(242, 20)
Me.lblPowerMapHi.TabIndex = 43
Me.lblPowerMapHi.Text = "Electric Power Consumption Map"
'
'tbMapHi
'
- Me.tbMapHi.Location = New System.Drawing.Point(6, 144)
+ Me.tbMapHi.Location = New System.Drawing.Point(7, 205)
+ Me.tbMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMapHi.Name = "tbMapHi"
- Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbMapHi.Size = New System.Drawing.Size(607, 26)
Me.tbMapHi.TabIndex = 40
'
'btnMaxTorqueCurveOpenHi
'
Me.btnMaxTorqueCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(443, 60)
+ Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(662, 75)
+ Me.btnMaxTorqueCurveOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
- Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(36, 37)
Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
Me.btnMaxTorqueCurveOpenHi.TabStop = false
Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
@@ -418,9 +464,10 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorqueHi
'
Me.btnBrowseMaxTorqueHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(420, 60)
+ Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(628, 75)
+ Me.btnBrowseMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
- Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseMaxTorqueHi.TabIndex = 45
Me.btnBrowseMaxTorqueHi.TabStop = false
Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
@@ -428,17 +475,19 @@ Partial Class ElectricMotorForm
'lblMaxTorqueHi
'
Me.lblMaxTorqueHi.AutoSize = true
- Me.lblMaxTorqueHi.Location = New System.Drawing.Point(6, 46)
+ Me.lblMaxTorqueHi.Location = New System.Drawing.Point(7, 54)
+ Me.lblMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxTorqueHi.Name = "lblMaxTorqueHi"
- Me.lblMaxTorqueHi.Size = New System.Drawing.Size(222, 13)
+ Me.lblMaxTorqueHi.Size = New System.Drawing.Size(325, 20)
Me.lblMaxTorqueHi.TabIndex = 47
Me.lblMaxTorqueHi.Text = "Max Drive and Max Generation Torque Curve"
'
'tbMaxTorqueHi
'
- Me.tbMaxTorqueHi.Location = New System.Drawing.Point(6, 62)
+ Me.tbMaxTorqueHi.Location = New System.Drawing.Point(7, 78)
+ Me.tbMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
- Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbMaxTorqueHi.Size = New System.Drawing.Size(607, 26)
Me.tbMaxTorqueHi.TabIndex = 44
'
'lblTitle
@@ -446,9 +495,10 @@ Partial Class ElectricMotorForm
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(84, 34)
+ Me.lblTitle.Location = New System.Drawing.Point(126, 52)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(190, 29)
+ Me.lblTitle.Size = New System.Drawing.Size(281, 40)
Me.lblTitle.TabIndex = 48
Me.lblTitle.Text = "Electric Machine"
'
@@ -456,9 +506,10 @@ Partial Class ElectricMotorForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(508, 28)
+ Me.PicBox.Location = New System.Drawing.Point(776, 43)
+ Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(382, 266)
+ Me.PicBox.Size = New System.Drawing.Size(572, 408)
Me.PicBox.TabIndex = 49
Me.PicBox.TabStop = false
'
@@ -466,341 +517,327 @@ Partial Class ElectricMotorForm
'
Me.Panel1.Controls.Add(Me.lblContTq)
Me.Panel1.Controls.Add(Me.lblContTqUnit)
- Me.Panel1.Controls.Add(Me.tbContTq)
- Me.Panel1.Location = New System.Drawing.Point(12, 144)
+ Me.Panel1.Controls.Add(Me.tbContTqLo)
+ Me.Panel1.Location = New System.Drawing.Point(7, 249)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(221, 30)
+ Me.Panel1.Size = New System.Drawing.Size(332, 46)
Me.Panel1.TabIndex = 25
'
'lblContTq
'
Me.lblContTq.AutoSize = true
- Me.lblContTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblContTq.Location = New System.Drawing.Point(4, 11)
+ Me.lblContTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblContTq.Name = "lblContTq"
- Me.lblContTq.Size = New System.Drawing.Size(100, 13)
+ Me.lblContTq.Size = New System.Drawing.Size(148, 20)
Me.lblContTq.TabIndex = 0
Me.lblContTq.Text = "Continuous Torque:"
'
'lblContTqUnit
'
Me.lblContTqUnit.AutoSize = true
- Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblContTqUnit.Location = New System.Drawing.Point(273, 12)
+ Me.lblContTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblContTqUnit.Name = "lblContTqUnit"
- Me.lblContTqUnit.Size = New System.Drawing.Size(29, 13)
+ Me.lblContTqUnit.Size = New System.Drawing.Size(41, 20)
Me.lblContTqUnit.TabIndex = 24
Me.lblContTqUnit.Text = "[Nm]"
'
- 'tbContTq
+ 'tbContTqLo
'
- Me.tbContTq.Location = New System.Drawing.Point(127, 5)
- Me.tbContTq.Name = "tbContTq"
- Me.tbContTq.Size = New System.Drawing.Size(49, 20)
- Me.tbContTq.TabIndex = 3
+ Me.tbContTqLo.Location = New System.Drawing.Point(190, 8)
+ Me.tbContTqLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContTqLo.Name = "tbContTqLo"
+ Me.tbContTqLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbContTqLo.TabIndex = 3
'
'Panel2
'
Me.Panel2.Controls.Add(Me.lblOvlTime)
Me.Panel2.Controls.Add(Me.lblOvltimeUnit)
- Me.Panel2.Controls.Add(Me.tbOvlTime)
- Me.Panel2.Location = New System.Drawing.Point(12, 206)
+ Me.Panel2.Controls.Add(Me.tbOvlTimeLo)
+ Me.Panel2.Location = New System.Drawing.Point(7, 344)
+ Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(221, 30)
+ Me.Panel2.Size = New System.Drawing.Size(332, 46)
Me.Panel2.TabIndex = 25
'
'lblOvlTime
'
Me.lblOvlTime.AutoSize = true
- Me.lblOvlTime.Location = New System.Drawing.Point(3, 7)
+ Me.lblOvlTime.Location = New System.Drawing.Point(4, 11)
+ Me.lblOvlTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlTime.Name = "lblOvlTime"
- Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
+ Me.lblOvlTime.Size = New System.Drawing.Size(141, 20)
Me.lblOvlTime.TabIndex = 0
Me.lblOvlTime.Text = "Overload Duration:"
'
'lblOvltimeUnit
'
Me.lblOvltimeUnit.AutoSize = true
- Me.lblOvltimeUnit.Location = New System.Drawing.Point(180, 7)
+ Me.lblOvltimeUnit.Location = New System.Drawing.Point(270, 11)
+ Me.lblOvltimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvltimeUnit.Name = "lblOvltimeUnit"
- Me.lblOvltimeUnit.Size = New System.Drawing.Size(18, 13)
+ Me.lblOvltimeUnit.Size = New System.Drawing.Size(25, 20)
Me.lblOvltimeUnit.TabIndex = 24
Me.lblOvltimeUnit.Text = "[s]"
'
- 'tbOvlTime
+ 'tbOvlTimeLo
'
- Me.tbOvlTime.Location = New System.Drawing.Point(127, 5)
- Me.tbOvlTime.Name = "tbOvlTime"
- Me.tbOvlTime.Size = New System.Drawing.Size(49, 20)
- Me.tbOvlTime.TabIndex = 3
+ Me.tbOvlTimeLo.Location = New System.Drawing.Point(190, 8)
+ Me.tbOvlTimeLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTimeLo.Name = "tbOvlTimeLo"
+ Me.tbOvlTimeLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlTimeLo.TabIndex = 3
'
'Panel3
'
Me.Panel3.Controls.Add(Me.lblOvlRecovery)
Me.Panel3.Controls.Add(Me.lblOvlRecoveryFactorUnit)
Me.Panel3.Controls.Add(Me.tbOverloadRecoveryFactor)
- Me.Panel3.Location = New System.Drawing.Point(233, 206)
+ Me.Panel3.Location = New System.Drawing.Point(369, 166)
+ Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(261, 30)
+ Me.Panel3.Size = New System.Drawing.Size(392, 46)
Me.Panel3.TabIndex = 26
'
'lblOvlRecovery
'
Me.lblOvlRecovery.AutoSize = true
- Me.lblOvlRecovery.Location = New System.Drawing.Point(-2, 8)
+ Me.lblOvlRecovery.Location = New System.Drawing.Point(-3, 12)
+ Me.lblOvlRecovery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecovery.Name = "lblOvlRecovery"
- Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
+ Me.lblOvlRecovery.Size = New System.Drawing.Size(257, 20)
Me.lblOvlRecovery.TabIndex = 0
Me.lblOvlRecovery.Text = "Thermal Overload Recovery Factor:"
'
'lblOvlRecoveryFactorUnit
'
Me.lblOvlRecoveryFactorUnit.AutoSize = true
- Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(230, 7)
+ Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(345, 11)
+ Me.lblOvlRecoveryFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
- Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(16, 13)
+ Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(22, 20)
Me.lblOvlRecoveryFactorUnit.TabIndex = 24
Me.lblOvlRecoveryFactorUnit.Text = "[-]"
'
'tbOverloadRecoveryFactor
'
- Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(177, 5)
+ Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(266, 8)
+ Me.tbOverloadRecoveryFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbOverloadRecoveryFactor.Name = "tbOverloadRecoveryFactor"
- Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(49, 20)
+ Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(72, 26)
Me.tbOverloadRecoveryFactor.TabIndex = 3
'
'Panel4
'
Me.Panel4.Controls.Add(Me.lblRatedSpeed)
Me.Panel4.Controls.Add(Me.lblRatedSpeedUnit)
- Me.Panel4.Controls.Add(Me.tbRatedSpeed)
- Me.Panel4.Location = New System.Drawing.Point(233, 144)
+ Me.Panel4.Controls.Add(Me.tbRatedSpeedLo)
+ Me.Panel4.Location = New System.Drawing.Point(339, 249)
+ Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(261, 30)
+ Me.Panel4.Size = New System.Drawing.Size(392, 46)
Me.Panel4.TabIndex = 26
'
'lblRatedSpeed
'
Me.lblRatedSpeed.AutoSize = true
- Me.lblRatedSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblRatedSpeed.Location = New System.Drawing.Point(4, 11)
+ Me.lblRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatedSpeed.Name = "lblRatedSpeed"
- Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
+ Me.lblRatedSpeed.Size = New System.Drawing.Size(234, 20)
Me.lblRatedSpeed.TabIndex = 0
Me.lblRatedSpeed.Text = "Test Speed Continuous Torque:"
'
'lblRatedSpeedUnit
'
Me.lblRatedSpeedUnit.AutoSize = true
- Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(229, 7)
+ Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(344, 11)
+ Me.lblRatedSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatedSpeedUnit.Name = "lblRatedSpeedUnit"
- Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(44, 20)
Me.lblRatedSpeedUnit.TabIndex = 24
Me.lblRatedSpeedUnit.Text = "[rpm]"
'
- 'tbRatedSpeed
+ 'tbRatedSpeedLo
'
- Me.tbRatedSpeed.Location = New System.Drawing.Point(177, 5)
- Me.tbRatedSpeed.Name = "tbRatedSpeed"
- Me.tbRatedSpeed.Size = New System.Drawing.Size(49, 20)
- Me.tbRatedSpeed.TabIndex = 3
+ Me.tbRatedSpeedLo.Location = New System.Drawing.Point(266, 8)
+ Me.tbRatedSpeedLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeedLo.Name = "tbRatedSpeedLo"
+ Me.tbRatedSpeedLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbRatedSpeedLo.TabIndex = 3
'
'pnOverloadTq
'
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTq)
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTqUnit)
- Me.pnOverloadTq.Controls.Add(Me.tbOverloadTq)
- Me.pnOverloadTq.Location = New System.Drawing.Point(12, 175)
+ Me.pnOverloadTq.Controls.Add(Me.tbOverloadTqLo)
+ Me.pnOverloadTq.Location = New System.Drawing.Point(7, 296)
+ Me.pnOverloadTq.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnOverloadTq.Name = "pnOverloadTq"
- Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
+ Me.pnOverloadTq.Size = New System.Drawing.Size(332, 46)
Me.pnOverloadTq.TabIndex = 26
'
'lblOverloadTq
'
Me.lblOverloadTq.AutoSize = true
- Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadTq.Location = New System.Drawing.Point(4, 11)
+ Me.lblOverloadTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadTq.Name = "lblOverloadTq"
- Me.lblOverloadTq.Size = New System.Drawing.Size(90, 13)
+ Me.lblOverloadTq.Size = New System.Drawing.Size(130, 20)
Me.lblOverloadTq.TabIndex = 0
Me.lblOverloadTq.Text = "Overload Torque:"
'
'lblOverloadTqUnit
'
Me.lblOverloadTqUnit.AutoSize = true
- Me.lblOverloadTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblOverloadTqUnit.Location = New System.Drawing.Point(273, 12)
+ Me.lblOverloadTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadTqUnit.Name = "lblOverloadTqUnit"
- Me.lblOverloadTqUnit.Size = New System.Drawing.Size(29, 13)
+ Me.lblOverloadTqUnit.Size = New System.Drawing.Size(41, 20)
Me.lblOverloadTqUnit.TabIndex = 24
Me.lblOverloadTqUnit.Text = "[Nm]"
'
- 'tbOverloadTq
+ 'tbOverloadTqLo
'
- Me.tbOverloadTq.Location = New System.Drawing.Point(127, 5)
- Me.tbOverloadTq.Name = "tbOverloadTq"
- Me.tbOverloadTq.Size = New System.Drawing.Size(49, 20)
- Me.tbOverloadTq.TabIndex = 3
+ Me.tbOverloadTqLo.Location = New System.Drawing.Point(190, 8)
+ Me.tbOverloadTqLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTqLo.Name = "tbOverloadTqLo"
+ Me.tbOverloadTqLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadTqLo.TabIndex = 3
'
'Panel6
'
Me.Panel6.Controls.Add(Me.lblOverloadSpeed)
Me.Panel6.Controls.Add(Me.lblOverloadSpeedUnit)
- Me.Panel6.Controls.Add(Me.tbOvlSpeed)
- Me.Panel6.Location = New System.Drawing.Point(233, 175)
+ Me.Panel6.Controls.Add(Me.tbOvlSpeedLo)
+ Me.Panel6.Location = New System.Drawing.Point(339, 296)
+ Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel6.Name = "Panel6"
- Me.Panel6.Size = New System.Drawing.Size(261, 30)
+ Me.Panel6.Size = New System.Drawing.Size(392, 46)
Me.Panel6.TabIndex = 27
'
'lblOverloadSpeed
'
Me.lblOverloadSpeed.AutoSize = true
- Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadSpeed.Location = New System.Drawing.Point(4, 11)
+ Me.lblOverloadSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
- Me.lblOverloadSpeed.Size = New System.Drawing.Size(148, 13)
+ Me.lblOverloadSpeed.Size = New System.Drawing.Size(216, 20)
Me.lblOverloadSpeed.TabIndex = 0
Me.lblOverloadSpeed.Text = "Test Speed Overload Torque:"
'
'lblOverloadSpeedUnit
'
Me.lblOverloadSpeedUnit.AutoSize = true
- Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(229, 7)
+ Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(344, 11)
+ Me.lblOverloadSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadSpeedUnit.Name = "lblOverloadSpeedUnit"
- Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(44, 20)
Me.lblOverloadSpeedUnit.TabIndex = 24
Me.lblOverloadSpeedUnit.Text = "[rpm]"
'
- 'tbOvlSpeed
- '
- Me.tbOvlSpeed.Location = New System.Drawing.Point(177, 5)
- Me.tbOvlSpeed.Name = "tbOvlSpeed"
- Me.tbOvlSpeed.Size = New System.Drawing.Size(49, 20)
- Me.tbOvlSpeed.TabIndex = 3
- '
- 'gbVoltageLevelHi
- '
- Me.gbVoltageLevelHi.Controls.Add(Me.lblVoltageHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.lblVoltageHiUnit)
- Me.gbVoltageLevelHi.Controls.Add(Me.tbVoltageHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.lblMaxTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.tbDragTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.lblDragTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnBrowseDragCurveHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnDragCurveOpenHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.tbMapHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.lblPowerMapHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnBrowseEmMapHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnEmMapOpenHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.tbMaxTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnMaxTorqueCurveOpenHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnBrowseMaxTorqueHi)
- Me.gbVoltageLevelHi.Location = New System.Drawing.Point(12, 418)
- Me.gbVoltageLevelHi.Name = "gbVoltageLevelHi"
- Me.gbVoltageLevelHi.Size = New System.Drawing.Size(482, 170)
- Me.gbVoltageLevelHi.TabIndex = 50
- Me.gbVoltageLevelHi.TabStop = false
- Me.gbVoltageLevelHi.Text = "Voltage Level High"
+ 'tbOvlSpeedLo
+ '
+ Me.tbOvlSpeedLo.Location = New System.Drawing.Point(266, 8)
+ Me.tbOvlSpeedLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlSpeedLo.Name = "tbOvlSpeedLo"
+ Me.tbOvlSpeedLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlSpeedLo.TabIndex = 3
'
'lblVoltageHi
'
Me.lblVoltageHi.AutoSize = true
- Me.lblVoltageHi.Location = New System.Drawing.Point(12, 21)
+ Me.lblVoltageHi.Location = New System.Drawing.Point(16, 15)
+ Me.lblVoltageHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHi.Name = "lblVoltageHi"
- Me.lblVoltageHi.Size = New System.Drawing.Size(43, 13)
+ Me.lblVoltageHi.Size = New System.Drawing.Size(64, 20)
Me.lblVoltageHi.TabIndex = 48
Me.lblVoltageHi.Text = "Voltage"
'
'lblVoltageHiUnit
'
Me.lblVoltageHiUnit.AutoSize = true
- Me.lblVoltageHiUnit.Location = New System.Drawing.Point(189, 21)
+ Me.lblVoltageHiUnit.Location = New System.Drawing.Point(282, 15)
+ Me.lblVoltageHiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
- Me.lblVoltageHiUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblVoltageHiUnit.Size = New System.Drawing.Size(28, 20)
Me.lblVoltageHiUnit.TabIndex = 50
Me.lblVoltageHiUnit.Text = "[V]"
'
'tbVoltageHi
'
- Me.tbVoltageHi.Location = New System.Drawing.Point(136, 19)
+ Me.tbVoltageHi.Location = New System.Drawing.Point(202, 12)
+ Me.tbVoltageHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbVoltageHi.Name = "tbVoltageHi"
- Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbVoltageHi.Size = New System.Drawing.Size(72, 26)
Me.tbVoltageHi.TabIndex = 49
'
- 'gbVoltageLevelLow
- '
- Me.gbVoltageLevelLow.Controls.Add(Me.lblVoltageLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.lblVoltageLowUnit)
- Me.gbVoltageLevelLow.Controls.Add(Me.tbVoltageLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.lblMaxTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.tbDragTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.lblDragTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseDragCurveLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnDragCurveOpenLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.tbMapLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.lblPowerMapLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseEmMapLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnEmMapOpenLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.tbMaxTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnMaxTorqueCurveOpenLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseMaxTorqueLow)
- Me.gbVoltageLevelLow.Location = New System.Drawing.Point(12, 242)
- Me.gbVoltageLevelLow.Name = "gbVoltageLevelLow"
- Me.gbVoltageLevelLow.Size = New System.Drawing.Size(482, 170)
- Me.gbVoltageLevelLow.TabIndex = 51
- Me.gbVoltageLevelLow.TabStop = false
- Me.gbVoltageLevelLow.Text = "Voltage Level Low"
- '
'lblVoltageLow
'
Me.lblVoltageLow.AutoSize = true
- Me.lblVoltageLow.Location = New System.Drawing.Point(12, 21)
+ Me.lblVoltageLow.Location = New System.Drawing.Point(16, 14)
+ Me.lblVoltageLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLow.Name = "lblVoltageLow"
- Me.lblVoltageLow.Size = New System.Drawing.Size(43, 13)
+ Me.lblVoltageLow.Size = New System.Drawing.Size(64, 20)
Me.lblVoltageLow.TabIndex = 48
Me.lblVoltageLow.Text = "Voltage"
'
'lblVoltageLowUnit
'
Me.lblVoltageLowUnit.AutoSize = true
- Me.lblVoltageLowUnit.Location = New System.Drawing.Point(189, 21)
+ Me.lblVoltageLowUnit.Location = New System.Drawing.Point(282, 14)
+ Me.lblVoltageLowUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
- Me.lblVoltageLowUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblVoltageLowUnit.Size = New System.Drawing.Size(28, 20)
Me.lblVoltageLowUnit.TabIndex = 50
Me.lblVoltageLowUnit.Text = "[V]"
'
'tbVoltageLow
'
- Me.tbVoltageLow.Location = New System.Drawing.Point(136, 19)
+ Me.tbVoltageLow.Location = New System.Drawing.Point(202, 11)
+ Me.tbVoltageLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbVoltageLow.Name = "tbVoltageLow"
- Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
+ Me.tbVoltageLow.Size = New System.Drawing.Size(72, 26)
Me.tbVoltageLow.TabIndex = 49
'
'lblMaxTorqueLow
'
Me.lblMaxTorqueLow.AutoSize = true
- Me.lblMaxTorqueLow.Location = New System.Drawing.Point(6, 46)
+ Me.lblMaxTorqueLow.Location = New System.Drawing.Point(7, 53)
+ Me.lblMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxTorqueLow.Name = "lblMaxTorqueLow"
- Me.lblMaxTorqueLow.Size = New System.Drawing.Size(222, 13)
+ Me.lblMaxTorqueLow.Size = New System.Drawing.Size(325, 20)
Me.lblMaxTorqueLow.TabIndex = 47
Me.lblMaxTorqueLow.Text = "Max Drive and Max Generation Torque Curve"
'
'tbDragTorqueLow
'
- Me.tbDragTorqueLow.Location = New System.Drawing.Point(6, 103)
+ Me.tbDragTorqueLow.Location = New System.Drawing.Point(7, 140)
+ Me.tbDragTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbDragTorqueLow.Name = "tbDragTorqueLow"
- Me.tbDragTorqueLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbDragTorqueLow.Size = New System.Drawing.Size(607, 26)
Me.tbDragTorqueLow.TabIndex = 5
'
'lblDragTorqueLow
'
Me.lblDragTorqueLow.AutoSize = true
- Me.lblDragTorqueLow.Location = New System.Drawing.Point(6, 87)
+ Me.lblDragTorqueLow.Location = New System.Drawing.Point(7, 116)
+ Me.lblDragTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblDragTorqueLow.Name = "lblDragTorqueLow"
- Me.lblDragTorqueLow.Size = New System.Drawing.Size(98, 13)
+ Me.lblDragTorqueLow.Size = New System.Drawing.Size(143, 20)
Me.lblDragTorqueLow.TabIndex = 38
Me.lblDragTorqueLow.Text = "Drag Torque Curve"
'
'btnBrowseDragCurveLow
'
Me.btnBrowseDragCurveLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurveLow.Location = New System.Drawing.Point(420, 100)
+ Me.btnBrowseDragCurveLow.Location = New System.Drawing.Point(628, 136)
+ Me.btnBrowseDragCurveLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseDragCurveLow.Name = "btnBrowseDragCurveLow"
- Me.btnBrowseDragCurveLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseDragCurveLow.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseDragCurveLow.TabIndex = 6
Me.btnBrowseDragCurveLow.TabStop = false
Me.btnBrowseDragCurveLow.UseVisualStyleBackColor = true
@@ -808,35 +845,39 @@ Partial Class ElectricMotorForm
'btnDragCurveOpenLow
'
Me.btnDragCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpenLow.Location = New System.Drawing.Point(443, 100)
+ Me.btnDragCurveOpenLow.Location = New System.Drawing.Point(662, 136)
+ Me.btnDragCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnDragCurveOpenLow.Name = "btnDragCurveOpenLow"
- Me.btnDragCurveOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnDragCurveOpenLow.Size = New System.Drawing.Size(36, 37)
Me.btnDragCurveOpenLow.TabIndex = 7
Me.btnDragCurveOpenLow.TabStop = false
Me.btnDragCurveOpenLow.UseVisualStyleBackColor = true
'
'tbMapLow
'
- Me.tbMapLow.Location = New System.Drawing.Point(6, 144)
+ Me.tbMapLow.Location = New System.Drawing.Point(7, 204)
+ Me.tbMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMapLow.Name = "tbMapLow"
- Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbMapLow.Size = New System.Drawing.Size(607, 26)
Me.tbMapLow.TabIndex = 40
'
'lblPowerMapLow
'
Me.lblPowerMapLow.AutoSize = true
- Me.lblPowerMapLow.Location = New System.Drawing.Point(6, 128)
+ Me.lblPowerMapLow.Location = New System.Drawing.Point(7, 179)
+ Me.lblPowerMapLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
- Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
+ Me.lblPowerMapLow.Size = New System.Drawing.Size(242, 20)
Me.lblPowerMapLow.TabIndex = 43
Me.lblPowerMapLow.Text = "Electric Power Consumption Map"
'
'btnBrowseEmMapLow
'
Me.btnBrowseEmMapLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(420, 141)
+ Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(628, 199)
+ Me.btnBrowseEmMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
- Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseEmMapLow.TabIndex = 41
Me.btnBrowseEmMapLow.TabStop = false
Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
@@ -844,26 +885,29 @@ Partial Class ElectricMotorForm
'btnEmMapOpenLow
'
Me.btnEmMapOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenLow.Location = New System.Drawing.Point(443, 141)
+ Me.btnEmMapOpenLow.Location = New System.Drawing.Point(662, 199)
+ Me.btnEmMapOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
- Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmMapOpenLow.Size = New System.Drawing.Size(36, 37)
Me.btnEmMapOpenLow.TabIndex = 42
Me.btnEmMapOpenLow.TabStop = false
Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
'
'tbMaxTorqueLow
'
- Me.tbMaxTorqueLow.Location = New System.Drawing.Point(6, 62)
+ Me.tbMaxTorqueLow.Location = New System.Drawing.Point(7, 77)
+ Me.tbMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
- Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbMaxTorqueLow.Size = New System.Drawing.Size(607, 26)
Me.tbMaxTorqueLow.TabIndex = 44
'
'btnMaxTorqueCurveOpenLow
'
Me.btnMaxTorqueCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(443, 60)
+ Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(662, 74)
+ Me.btnMaxTorqueCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
- Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(36, 37)
Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
Me.btnMaxTorqueCurveOpenLow.TabStop = false
Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
@@ -871,28 +915,288 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorqueLow
'
Me.btnBrowseMaxTorqueLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(420, 60)
+ Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(628, 74)
+ Me.btnBrowseMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
- Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseMaxTorqueLow.TabIndex = 45
Me.btnBrowseMaxTorqueLow.TabStop = false
Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
'
+ 'tcVoltageLevels
+ '
+ Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLow)
+ Me.tcVoltageLevels.Controls.Add(Me.tpVoltageHigh)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(18, 220)
+ Me.tcVoltageLevels.Name = "tcVoltageLevels"
+ Me.tcVoltageLevels.SelectedIndex = 0
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(751, 443)
+ Me.tcVoltageLevels.TabIndex = 52
+ '
+ 'tpVoltageLow
+ '
+ Me.tpVoltageLow.Controls.Add(Me.lblVoltageLow)
+ Me.tpVoltageLow.Controls.Add(Me.tbVoltageLow)
+ Me.tpVoltageLow.Controls.Add(Me.lblVoltageLowUnit)
+ Me.tpVoltageLow.Controls.Add(Me.btnBrowseMaxTorqueLow)
+ Me.tpVoltageLow.Controls.Add(Me.Panel6)
+ Me.tpVoltageLow.Controls.Add(Me.btnMaxTorqueCurveOpenLow)
+ Me.tpVoltageLow.Controls.Add(Me.pnOverloadTq)
+ Me.tpVoltageLow.Controls.Add(Me.lblMaxTorqueLow)
+ Me.tpVoltageLow.Controls.Add(Me.Panel4)
+ Me.tpVoltageLow.Controls.Add(Me.tbMaxTorqueLow)
+ Me.tpVoltageLow.Controls.Add(Me.tbDragTorqueLow)
+ Me.tpVoltageLow.Controls.Add(Me.Panel2)
+ Me.tpVoltageLow.Controls.Add(Me.btnEmMapOpenLow)
+ Me.tpVoltageLow.Controls.Add(Me.Panel1)
+ Me.tpVoltageLow.Controls.Add(Me.lblDragTorqueLow)
+ Me.tpVoltageLow.Controls.Add(Me.btnBrowseEmMapLow)
+ Me.tpVoltageLow.Controls.Add(Me.btnBrowseDragCurveLow)
+ Me.tpVoltageLow.Controls.Add(Me.lblPowerMapLow)
+ Me.tpVoltageLow.Controls.Add(Me.btnDragCurveOpenLow)
+ Me.tpVoltageLow.Controls.Add(Me.tbMapLow)
+ Me.tpVoltageLow.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageLow.Name = "tpVoltageLow"
+ Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpVoltageLow.Size = New System.Drawing.Size(743, 580)
+ Me.tpVoltageLow.TabIndex = 0
+ Me.tpVoltageLow.Text = "Voltage Level Low"
+ Me.tpVoltageLow.UseVisualStyleBackColor = true
+ '
+ 'tpVoltageHigh
+ '
+ Me.tpVoltageHigh.Controls.Add(Me.Panel5)
+ Me.tpVoltageHigh.Controls.Add(Me.Panel7)
+ Me.tpVoltageHigh.Controls.Add(Me.Panel8)
+ Me.tpVoltageHigh.Controls.Add(Me.Panel9)
+ Me.tpVoltageHigh.Controls.Add(Me.Panel10)
+ Me.tpVoltageHigh.Controls.Add(Me.lblVoltageHi)
+ Me.tpVoltageHigh.Controls.Add(Me.tbMaxTorqueHi)
+ Me.tpVoltageHigh.Controls.Add(Me.lblVoltageHiUnit)
+ Me.tpVoltageHigh.Controls.Add(Me.btnBrowseMaxTorqueHi)
+ Me.tpVoltageHigh.Controls.Add(Me.tbVoltageHi)
+ Me.tpVoltageHigh.Controls.Add(Me.btnMaxTorqueCurveOpenHi)
+ Me.tpVoltageHigh.Controls.Add(Me.lblMaxTorqueHi)
+ Me.tpVoltageHigh.Controls.Add(Me.btnEmMapOpenHi)
+ Me.tpVoltageHigh.Controls.Add(Me.tbDragTorqueHi)
+ Me.tpVoltageHigh.Controls.Add(Me.btnBrowseEmMapHi)
+ Me.tpVoltageHigh.Controls.Add(Me.lblDragTorqueHi)
+ Me.tpVoltageHigh.Controls.Add(Me.lblPowerMapHi)
+ Me.tpVoltageHigh.Controls.Add(Me.btnBrowseDragCurveHi)
+ Me.tpVoltageHigh.Controls.Add(Me.tbMapHi)
+ Me.tpVoltageHigh.Controls.Add(Me.btnDragCurveOpenHi)
+ Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageHigh.Name = "tpVoltageHigh"
+ Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpVoltageHigh.Size = New System.Drawing.Size(743, 410)
+ Me.tpVoltageHigh.TabIndex = 1
+ Me.tpVoltageHigh.Text = "Voltage Level High"
+ Me.tpVoltageHigh.UseVisualStyleBackColor = true
+ '
+ 'Panel5
+ '
+ Me.Panel5.Controls.Add(Me.Label1)
+ Me.Panel5.Controls.Add(Me.Label2)
+ Me.Panel5.Controls.Add(Me.tbOvlSpeedHi)
+ Me.Panel5.Location = New System.Drawing.Point(339, 297)
+ Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel5.Name = "Panel5"
+ Me.Panel5.Size = New System.Drawing.Size(392, 46)
+ Me.Panel5.TabIndex = 55
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(4, 11)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(216, 20)
+ Me.Label1.TabIndex = 0
+ Me.Label1.Text = "Test Speed Overload Torque:"
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(344, 11)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(44, 20)
+ Me.Label2.TabIndex = 24
+ Me.Label2.Text = "[rpm]"
+ '
+ 'tbOvlSpeedHi
+ '
+ Me.tbOvlSpeedHi.Location = New System.Drawing.Point(266, 8)
+ Me.tbOvlSpeedHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlSpeedHi.Name = "tbOvlSpeedHi"
+ Me.tbOvlSpeedHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlSpeedHi.TabIndex = 3
+ '
+ 'Panel7
+ '
+ Me.Panel7.Controls.Add(Me.Label3)
+ Me.Panel7.Controls.Add(Me.Label4)
+ Me.Panel7.Controls.Add(Me.tbOverloadTqHi)
+ Me.Panel7.Location = New System.Drawing.Point(7, 297)
+ Me.Panel7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel7.Name = "Panel7"
+ Me.Panel7.Size = New System.Drawing.Size(332, 46)
+ Me.Panel7.TabIndex = 53
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(4, 11)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(130, 20)
+ Me.Label3.TabIndex = 0
+ Me.Label3.Text = "Overload Torque:"
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(273, 12)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(41, 20)
+ Me.Label4.TabIndex = 24
+ Me.Label4.Text = "[Nm]"
+ '
+ 'tbOverloadTqHi
+ '
+ Me.tbOverloadTqHi.Location = New System.Drawing.Point(190, 8)
+ Me.tbOverloadTqHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTqHi.Name = "tbOverloadTqHi"
+ Me.tbOverloadTqHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadTqHi.TabIndex = 3
+ '
+ 'Panel8
+ '
+ Me.Panel8.Controls.Add(Me.Label5)
+ Me.Panel8.Controls.Add(Me.Label6)
+ Me.Panel8.Controls.Add(Me.tbRatedSpeedHi)
+ Me.Panel8.Location = New System.Drawing.Point(339, 250)
+ Me.Panel8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel8.Name = "Panel8"
+ Me.Panel8.Size = New System.Drawing.Size(392, 46)
+ Me.Panel8.TabIndex = 54
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(4, 11)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(234, 20)
+ Me.Label5.TabIndex = 0
+ Me.Label5.Text = "Test Speed Continuous Torque:"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(344, 11)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(44, 20)
+ Me.Label6.TabIndex = 24
+ Me.Label6.Text = "[rpm]"
+ '
+ 'tbRatedSpeedHi
+ '
+ Me.tbRatedSpeedHi.Location = New System.Drawing.Point(266, 8)
+ Me.tbRatedSpeedHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeedHi.Name = "tbRatedSpeedHi"
+ Me.tbRatedSpeedHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbRatedSpeedHi.TabIndex = 3
+ '
+ 'Panel9
+ '
+ Me.Panel9.Controls.Add(Me.Label7)
+ Me.Panel9.Controls.Add(Me.Label8)
+ Me.Panel9.Controls.Add(Me.tbOvlTimeHi)
+ Me.Panel9.Location = New System.Drawing.Point(7, 345)
+ Me.Panel9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel9.Name = "Panel9"
+ Me.Panel9.Size = New System.Drawing.Size(332, 46)
+ Me.Panel9.TabIndex = 51
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(4, 11)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(141, 20)
+ Me.Label7.TabIndex = 0
+ Me.Label7.Text = "Overload Duration:"
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = true
+ Me.Label8.Location = New System.Drawing.Point(270, 11)
+ Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(25, 20)
+ Me.Label8.TabIndex = 24
+ Me.Label8.Text = "[s]"
+ '
+ 'tbOvlTimeHi
+ '
+ Me.tbOvlTimeHi.Location = New System.Drawing.Point(190, 8)
+ Me.tbOvlTimeHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTimeHi.Name = "tbOvlTimeHi"
+ Me.tbOvlTimeHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlTimeHi.TabIndex = 3
+ '
+ 'Panel10
+ '
+ Me.Panel10.Controls.Add(Me.Label9)
+ Me.Panel10.Controls.Add(Me.Label10)
+ Me.Panel10.Controls.Add(Me.tbContTqHi)
+ Me.Panel10.Location = New System.Drawing.Point(7, 250)
+ Me.Panel10.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel10.Name = "Panel10"
+ Me.Panel10.Size = New System.Drawing.Size(332, 46)
+ Me.Panel10.TabIndex = 52
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(4, 11)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(148, 20)
+ Me.Label9.TabIndex = 0
+ Me.Label9.Text = "Continuous Torque:"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(273, 12)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(41, 20)
+ Me.Label10.TabIndex = 24
+ Me.Label10.Text = "[Nm]"
+ '
+ 'tbContTqHi
+ '
+ Me.tbContTqHi.Location = New System.Drawing.Point(190, 8)
+ Me.tbContTqHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContTqHi.Name = "tbContTqHi"
+ Me.tbContTqHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbContTqHi.TabIndex = 3
+ '
'ElectricMotorForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(898, 621)
- Me.Controls.Add(Me.gbVoltageLevelLow)
- Me.Controls.Add(Me.gbVoltageLevelHi)
- Me.Controls.Add(Me.Panel6)
- Me.Controls.Add(Me.pnOverloadTq)
- Me.Controls.Add(Me.Panel4)
+ Me.ClientSize = New System.Drawing.Size(1412, 709)
+ Me.Controls.Add(Me.tcVoltageLevels)
Me.Controls.Add(Me.Panel3)
- Me.Controls.Add(Me.Panel2)
- Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.PicBox)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.pnInertia)
@@ -905,6 +1209,7 @@ Partial Class ElectricMotorForm
Me.Controls.Add(Me.tbMakeModel)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.MaximizeBox = false
Me.Name = "ElectricMotorForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
@@ -931,10 +1236,21 @@ Partial Class ElectricMotorForm
Me.pnOverloadTq.PerformLayout
Me.Panel6.ResumeLayout(false)
Me.Panel6.PerformLayout
- Me.gbVoltageLevelHi.ResumeLayout(false)
- Me.gbVoltageLevelHi.PerformLayout
- Me.gbVoltageLevelLow.ResumeLayout(false)
- Me.gbVoltageLevelLow.PerformLayout
+ Me.tcVoltageLevels.ResumeLayout(false)
+ Me.tpVoltageLow.ResumeLayout(false)
+ Me.tpVoltageLow.PerformLayout
+ Me.tpVoltageHigh.ResumeLayout(false)
+ Me.tpVoltageHigh.PerformLayout
+ Me.Panel5.ResumeLayout(false)
+ Me.Panel5.PerformLayout
+ Me.Panel7.ResumeLayout(false)
+ Me.Panel7.PerformLayout
+ Me.Panel8.ResumeLayout(false)
+ Me.Panel8.PerformLayout
+ Me.Panel9.ResumeLayout(false)
+ Me.Panel9.PerformLayout
+ Me.Panel10.ResumeLayout(false)
+ Me.Panel10.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -979,11 +1295,11 @@ End Sub
Friend WithEvents Panel1 As Panel
Friend WithEvents lblContTq As Label
Friend WithEvents lblContTqUnit As Label
- Friend WithEvents tbContTq As TextBox
+ Friend WithEvents tbContTqLo As TextBox
Friend WithEvents Panel2 As Panel
Friend WithEvents lblOvlTime As Label
Friend WithEvents lblOvltimeUnit As Label
- Friend WithEvents tbOvlTime As TextBox
+ Friend WithEvents tbOvlTimeLo As TextBox
Friend WithEvents Panel3 As Panel
Friend WithEvents lblOvlRecovery As Label
Friend WithEvents lblOvlRecoveryFactorUnit As Label
@@ -991,20 +1307,18 @@ End Sub
Friend WithEvents Panel4 As Panel
Friend WithEvents lblRatedSpeed As Label
Friend WithEvents lblRatedSpeedUnit As Label
- Friend WithEvents tbRatedSpeed As TextBox
+ Friend WithEvents tbRatedSpeedLo As TextBox
Friend WithEvents pnOverloadTq As Panel
Friend WithEvents lblOverloadTq As Label
Friend WithEvents lblOverloadTqUnit As Label
- Friend WithEvents tbOverloadTq As TextBox
+ Friend WithEvents tbOverloadTqLo As TextBox
Friend WithEvents Panel6 As Panel
Friend WithEvents lblOverloadSpeed As Label
Friend WithEvents lblOverloadSpeedUnit As Label
- Friend WithEvents tbOvlSpeed As TextBox
- Friend WithEvents gbVoltageLevelHi As GroupBox
+ Friend WithEvents tbOvlSpeedLo As TextBox
Friend WithEvents lblVoltageHi As Label
Friend WithEvents lblVoltageHiUnit As Label
Friend WithEvents tbVoltageHi As TextBox
- Friend WithEvents gbVoltageLevelLow As GroupBox
Friend WithEvents lblVoltageLow As Label
Friend WithEvents lblVoltageLowUnit As Label
Friend WithEvents tbVoltageLow As TextBox
@@ -1020,4 +1334,27 @@ End Sub
Friend WithEvents tbMaxTorqueLow As TextBox
Friend WithEvents btnMaxTorqueCurveOpenLow As Button
Friend WithEvents btnBrowseMaxTorqueLow As Button
+ Friend WithEvents tcVoltageLevels As TabControl
+ Friend WithEvents tpVoltageLow As TabPage
+ Friend WithEvents tpVoltageHigh As TabPage
+ Friend WithEvents Panel5 As Panel
+ Friend WithEvents Label1 As Label
+ Friend WithEvents Label2 As Label
+ Friend WithEvents tbOvlSpeedHi As TextBox
+ Friend WithEvents Panel7 As Panel
+ Friend WithEvents Label3 As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents tbOverloadTqHi As TextBox
+ Friend WithEvents Panel8 As Panel
+ Friend WithEvents Label5 As Label
+ Friend WithEvents Label6 As Label
+ Friend WithEvents tbRatedSpeedHi As TextBox
+ Friend WithEvents Panel9 As Panel
+ Friend WithEvents Label7 As Label
+ Friend WithEvents Label8 As Label
+ Friend WithEvents tbOvlTimeHi As TextBox
+ Friend WithEvents Panel10 As Panel
+ Friend WithEvents Label9 As Label
+ Friend WithEvents Label10 As Label
+ Friend WithEvents tbContTqHi As TextBox
End Class
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 39d990831276098bd5a6b47a09e43572a858fbc3..1a714e20f4a7e77016419e50fb7403e3aa8e77a1 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -174,21 +174,28 @@ Public Class ElectricMotorForm
tbMakeModel.Text = engine.Model
tbInertia.Text = engine.Inertia.ToGUIFormat()
- tbOverloadTq.Text = If(engine.OverloadTorque?.Value().ToGUIFormat(), "")
- tbOvlSpeed.Text = If(engine.OverloadTestSpeed?.AsRPM.ToGUIFormat(), "")
- tbOvlTime.Text = engine.OverloadTime.Value().ToGUIFormat()
- tbContTq.Text = engine.ContinuousTorque.ToGUIFormat()
- tbRatedSpeed.Text = engine.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadRecoveryFactor.Text = engine.OverloadRecoveryFactor.ToGUIFormat()
+ Dim voltageLevelLow As IElectricMotorVoltageLevel = engine.VoltageLevels.MinBy(function(level) level.VoltageLevel.Value())
Dim voltageLevelHigh As IElectricMotorVoltageLevel = engine.VoltageLevels.MaxBy(function(level) level.VoltageLevel.Value())
+ tbOverloadTqLo.Text = If(voltageLevelLow.OverloadTorque?.Value().ToGUIFormat(), "")
+ tbOvlSpeedLo.Text = If(voltageLevelLow.OverloadTestSpeed?.AsRPM.ToGUIFormat(), "")
+ tbOvlTimeLo.Text = voltageLevelLow.OverloadTime.Value().ToGUIFormat()
+ tbContTqLo.Text = voltageLevelLow.ContinuousTorque.ToGUIFormat()
+ tbRatedSpeedLo.Text = voltageLevelLow.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+
+ tbOverloadTqHi.Text = If(voltageLevelHigh.OverloadTorque?.Value().ToGUIFormat(), "")
+ tbOvlSpeedHi.Text = If(voltageLevelHigh.OverloadTestSpeed?.AsRPM.ToGUIFormat(), "")
+ tbOvlTimeHi.Text = voltageLevelHigh.OverloadTime.Value().ToGUIFormat()
+ tbContTqHi.Text = voltageLevelHigh.ContinuousTorque.ToGUIFormat()
+ tbRatedSpeedHi.Text = voltageLevelHigh.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+
' tbDragTorqueHi.Text = GetRelativePath(voltageLevelHigh.DragCurve.Source, basePath)
tbMaxTorqueHi.Text = GetRelativePath(voltageLevelHigh.FullLoadCurve.Source, basePath)
' tbMapHi.Text = GetRelativePath(voltageLevelHigh.EfficiencyMap.Source, basePath) //PowerMap
tbVoltageHi.Text = voltageLevelHigh.VoltageLevel.Value().ToGUIFormat()
- Dim voltageLevelLow As IElectricMotorVoltageLevel = engine.VoltageLevels.MinBy(function(level) level.VoltageLevel.Value())
' tbDragTorqueLow.Text = GetRelativePath(voltageLevelLow.DragCurve.Source, basePath)
tbMaxTorqueLow.Text = GetRelativePath(voltageLevelLow.FullLoadCurve.Source, basePath)
@@ -229,11 +236,18 @@ Public Class ElectricMotorForm
If Trim(em.ModelName) = "" Then em.ModelName = "Undefined"
em.MotorInertia = tbInertia.Text.ToDouble(0)
- em.OvlTq = tbOverloadTq.Text.ToDouble(0)
- em.OvlSpeed = tbOvlSpeed.Text.ToDouble(0)
- em.PeakPowerTime = tbOvlTime.Text.ToDouble(0)
- em.RatedSpeed = tbRatedSpeed.Text.ToDouble(0)
- em.ContTq = tbContTq.Text.ToDouble(0)
+ em.OvlTqLo = tbOverloadTqLo.Text.ToDouble(0)
+ em.OvlSpeedLo = tbOvlSpeedLo.Text.ToDouble(0)
+ em.PeakPowerTimeLo = tbOvlTimeLo.Text.ToDouble(0)
+ em.RatedSpeedLo = tbRatedSpeedLo.Text.ToDouble(0)
+ em.ContTqLo = tbContTqLo.Text.ToDouble(0)
+
+ em.OvlTqHi = tbOverloadTqHi.Text.ToDouble(0)
+ em.OvlSpeedHi = tbOvlSpeedHi.Text.ToDouble(0)
+ em.PeakPowerTimeHi = tbOvlTimeHi.Text.ToDouble(0)
+ em.RatedSpeedHi = tbRatedSpeedHi.Text.ToDouble(0)
+ em.ContTqHi = tbContTqHi.Text.ToDouble(0)
+
em.OverloadRecoveryFactor = tbOverloadRecoveryFactor.Text.ToDouble(0)
em.PathMaxTorqueLow = tbMaxTorqueLow.Text
diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb
index 87a602e0d46be170f296c30795f629b33fc7303e..c2fd1a05c78364d81d2a37ea788a2760f08e6ec3 100644
--- a/VECTO/Input Files/ElectricMachine.vb
+++ b/VECTO/Input Files/ElectricMachine.vb
@@ -39,11 +39,17 @@ Public Class ElectricMachine
Public ModelName As String
Public MotorInertia As Double
- Public PeakPowerTime As Double
- Public ContTq As Double
- Public RatedSpeed As Double
- Public OvlTq As Double
- Public OvlSpeed As Double
+ Public PeakPowerTimeLo As Double
+ Public ContTqLo As Double
+ Public RatedSpeedLo As Double
+ Public OvlTqLo As Double
+ Public OvlSpeedLo As Double
+
+ Public PeakPowerTimeHi As Double
+ Public ContTqHi As Double
+ Public RatedSpeedHi As Double
+ Public OvlTqHi As Double
+ Public OvlSpeedHi As Double
''' <summary>
''' New instance. Initialise
@@ -254,10 +260,20 @@ Public Class ElectricMachine
Return New List(Of IElectricMotorVoltageLevel) From {
New ElectricMotorVoltageLevel() With {
.VoltageLevel = VoltageLevelLow.SI(Of Volt),
+ .ContinuousTorque=ContTqlo.si(of NewtonMeter),
+ .ContinuousTorqueSpeed=RatedSpeedLo.RPMtoRad(),
+ .OverloadTorque=OvlTqLo.SI(of NewtonMeter),
+ .OverloadTestSpeed=OvlSpeedLo.RPMtoRad(),
+ .OverloadTime = PeakPowerTimeLo.SI(Of Second),
.EfficiencyMap = EfficiencyMapLow,
.FullLoadCurve = FullLoadCurveLow},
New ElectricMotorVoltageLevel() With {
.VoltageLevel = VoltageLevelHigh.SI(Of Volt),
+ .ContinuousTorque=ContTqHi.si(of NewtonMeter),
+ .ContinuousTorqueSpeed=RatedSpeedHi.RPMtoRad(),
+ .OverloadTorque=OvlTqHi.SI(of NewtonMeter),
+ .OverloadTestSpeed=OvlSpeedHi.RPMtoRad(),
+ .OverloadTime = PeakPowerTimeHi.SI(Of Second),
.EfficiencyMap = EfficiencyMapHi,
.FullLoadCurve = FullLoadCurveHi}
}
@@ -273,42 +289,44 @@ Public Class ElectricMachine
End Get
End Property
- Public ReadOnly Property OverloadTime As Second Implements IElectricMotorDeclarationInputData.OverloadTime
- Get
- Return PeakPowerTime.SI(Of Second)
- End Get
- End Property
+
Public ReadOnly Property TestVoltageOverload As Volt Implements IElectricMotorDeclarationInputData.TestVoltageOverload
Public ReadOnly Property DcDcConverterIncluded As Boolean Implements IElectricMotorDeclarationInputData.DcDcConverterIncluded
Public ReadOnly Property IHPCType As String Implements IElectricMotorDeclarationInputData.IHPCType
- Public ReadOnly Property ContinuousTorqueSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousTorqueSpeed
- get
- Return RatedSpeed.RPMtoRad()
- End Get
- End Property
+
Public ReadOnly Property Conditioning As TableData Implements IElectricMotorDeclarationInputData.Conditioning
- Public Property OverloadRecoveryFactor As Double Implements IElectricMotorDeclarationInputData.OverloadRecoveryFactor
-
- Public ReadOnly Property ContinuousTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.ContinuousTorque
- get
- Return ContTq.si(of NewtonMeter)
- End Get
- End Property
-
- Public ReadOnly Property OverloadTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.OverloadTorque
- get
- Return OvlTq.SI(of NewtonMeter)
- End Get
- End Property
-
- Public ReadOnly Property OverloadTestSpeed As PerSecond Implements IElectricMotorDeclarationInputData.OverloadTestSpeed
- Get
- Return OvlSpeed.RPMtoRad()
- End Get
- End Property
+ Public Property OverloadRecoveryFactor As Double Implements IElectricMotorEngineeringInputData.OverloadRecoveryFactor
+
+ 'Public ReadOnly Property OverloadTime As Second Implements IElectricMotorDeclarationInputData.OverloadTime
+ ' Get
+ ' Return PeakPowerTime.SI(Of Second)
+ ' End Get
+ 'End Property
+ 'Public ReadOnly Property ContinuousTorqueSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousTorqueSpeed
+ ' get
+ ' Return RatedSpeed.RPMtoRad()
+ ' End Get
+ 'End Property
+ 'Public ReadOnly Property ContinuousTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.ContinuousTorque
+ 'get
+ ' Return ContTq.si(of NewtonMeter)
+ 'End Get
+ 'End Property
+
+ 'Public ReadOnly Property OverloadTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.OverloadTorque
+ 'get
+ ' Return OvlTq.SI(of NewtonMeter)
+ 'End Get
+ 'End Property
+
+ 'Public ReadOnly Property OverloadTestSpeed As PerSecond Implements IElectricMotorDeclarationInputData.OverloadTestSpeed
+ ' Get
+ ' Return OvlSpeed.RPMtoRad()
+ ' End Get
+ 'End Property
Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 0780e00fb62590ecf908d26513de6fca625dafce..34bd4b0c696066fd8bed11f62eeba526eb46d649 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -1061,15 +1061,10 @@ Public Class ElectricMachineWrapper
Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
- Public ReadOnly Property OverloadTime As Second Implements IElectricMotorDeclarationInputData.OverloadTime
Public ReadOnly Property TestVoltageOverload As Volt Implements IElectricMotorDeclarationInputData.TestVoltageOverload
Public ReadOnly Property DcDcConverterIncluded As Boolean Implements IElectricMotorDeclarationInputData.DcDcConverterIncluded
Public ReadOnly Property IHPCType As String Implements IElectricMotorDeclarationInputData.IHPCType
- Public ReadOnly Property ContinuousTorqueSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousTorqueSpeed
- Public ReadOnly Property OverloadTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.OverloadTorque
- Public ReadOnly Property OverloadTestSpeed As PerSecond Implements IElectricMotorDeclarationInputData.OverloadTestSpeed
Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
Public ReadOnly Property Conditioning As TableData Implements IElectricMotorDeclarationInputData.Conditioning
- Public ReadOnly Property OverloadRecoveryFactor As Double Implements IElectricMotorDeclarationInputData.OverloadRecoveryFactor
- Public ReadOnly Property ContinuousTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.ContinuousTorque
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IElectricMotorEngineeringInputData.OverloadRecoveryFactor
End Class
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/ComponentsViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/ComponentsViewModel.cs
index 87d56480bdc97dd5606d9392a9888f88e28cae00..a059c77c5d51b933c6b50c6b720256a070eaf5e2 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/ComponentsViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/ComponentsViewModel.cs
@@ -146,6 +146,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle.Components
public IElectricStorageSystemDeclarationInputData ElectricStorage => throw new NotImplementedException();
public IElectricMachinesDeclarationInputData ElectricMachines => throw new NotImplementedException();
+ public IIEPCDeclarationInputData IEPC { get => throw new NotImplementedException(); }
#endregion
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/PTOViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/PTOViewModel.cs
index b6b7746d320dc6a3c24dd67b1282a8b03ec98fbb..7789a8274b9c63daf5d822286ac13ce66994f463 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/PTOViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/Components/PTOViewModel.cs
@@ -40,8 +40,6 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle.Components
}
-
-
#region implementation of IPTOTransmissionInputData
protected string _ptoTransmissionType;
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index a2162a5e5a2035f85c84bda0043573d385e83f11..1d9996c9dcddc1a109ab84702a28137c5ea3d64c 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -725,21 +725,23 @@ namespace TUGraz.VectoCommon.InputData
IList<string> Technology { get; }
}
- public interface IPowerRatingInputData
+ //public interface IPowerRatingInputData
+ //{
+
+ //NewtonMeter ContinuousTorque { get; }
+ //PerSecond ContinuousTorqueSpeed { get; } //TestSpeedContinuousTorque
+ //NewtonMeter OverloadTorque { get; }
+ //PerSecond OverloadTestSpeed { get; } //TestSpeedOverloadTorque
+ //Second OverloadTime { get; } //OverloadDuration
+ //}
+
+
+ public interface IElectricMotorDeclarationInputData : IComponentInputData
{
ElectricMachineType ElectricMachineType { get; }
Watt R85RatedPower { get; }
KilogramSquareMeter Inertia { get; } //RotationalInertia
- NewtonMeter ContinuousTorque { get; }
- PerSecond ContinuousTorqueSpeed { get; } //TestSpeedContinuousTorque
- NewtonMeter OverloadTorque { get; }
- PerSecond OverloadTestSpeed { get; } //TestSpeedOverloadTorque
- Second OverloadTime { get; } //OverloadDuration
- }
-
- public interface IElectricMotorDeclarationInputData : IComponentInputData, IPowerRatingInputData
- {
Volt TestVoltageOverload { get; }
bool DcDcConverterIncluded { get; }
@@ -752,13 +754,23 @@ namespace TUGraz.VectoCommon.InputData
TableData Conditioning { get; }
- double OverloadRecoveryFactor { get; }
+ //double OverloadRecoveryFactor { get; }
}
public interface IElectricMotorVoltageLevel
{
Volt VoltageLevel { get; }
+ NewtonMeter ContinuousTorque { get; }
+
+ PerSecond ContinuousTorqueSpeed { get; } //TestSpeedContinuousTorque
+
+ NewtonMeter OverloadTorque { get; }
+
+ PerSecond OverloadTestSpeed { get; } //TestSpeedOverloadTorque
+
+ Second OverloadTime { get; } //OverloadDuration
+
TableData FullLoadCurve { get; } //MaxTorqueCurve
IList<IElectricMotorPowerMap> PowerMap { get; }
@@ -809,8 +821,12 @@ namespace TUGraz.VectoCommon.InputData
}
- public interface IIEPCDeclarationInputData : IComponentInputData , IPowerRatingInputData
+ public interface IIEPCDeclarationInputData : IComponentInputData
{
+ ElectricMachineType ElectricMachineType { get; }
+ Watt R85RatedPower { get; }
+ KilogramSquareMeter Inertia { get; } //RotationalInertia
+
Volt TestVoltageOverload { get; }
bool DifferentialIncluded { get; }
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index b031d8cfdae36eda448360471a5a416a34915929..5cb3918809fb32416ebfeea60a817ea2024aa5d1 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -476,6 +476,7 @@ namespace TUGraz.VectoCommon.InputData
public interface IElectricMotorEngineeringInputData : IElectricMotorDeclarationInputData
{
+ double OverloadRecoveryFactor { get; }
}
public interface IElectricMachinesEngineeringInputData : IElectricMachinesDeclarationInputData
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 254438b9be34c874274dc03ee3eac0ae51ff04c8..de8b945bc2ac921466bc4d051d7baa5c1bbd60bc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -109,7 +109,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual string VIN => GetString(XMLNames.Vehicle_VIN);
- public virtual LegislativeClass? LegislativeClass => GetString("LegislativeClass").ParseEnum<LegislativeClass>();
+ public virtual LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeClass).ParseEnum<LegislativeClass>();
//get { return GetString("LegislativeCategory").ParseEnum<LegislativeClass>(); }
public virtual VehicleCategory VehicleCategory
@@ -1139,11 +1139,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public abstract class XMLVehicleDataProviderHelperV201 : XMLDeclarationVehicleDataProviderV20
+ public abstract class AbstractXMLVehicleDataProviderV210 : XMLDeclarationVehicleDataProviderV20
{
public virtual string PowertrainPositionPrefix => "P";
- protected XMLVehicleDataProviderHelperV201(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile)
+ protected AbstractXMLVehicleDataProviderV210(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile)
: base(jobData, xmlNode, sourceFile) { }
@@ -1161,7 +1161,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.TPMLM).SI<Kilogram>();
public override bool Articulated => GetBool(XMLNames.Vehicle_Articulated);
-
+
+ public override LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeCategory).ParseEnum<LegislativeClass>();
+ //get { return GetString("LegislativeCategory").ParseEnum<LegislativeClass>(); }
#endregion
#region Overrides of XMLDeclarationVehicleDataProviderV20
@@ -1220,7 +1222,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationHeavyLorryDataProviderV210 : XMLVehicleDataProviderHelperV201
+ public class XMLDeclarationHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
public new const string XSD_TYPE = "Vehicle_Conventional_HeavyLorryDeclarationType";
@@ -1251,7 +1253,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationHEVPxHeavyLorryDataProviderV210 : XMLVehicleDataProviderHelperV201
+ public class XMLDeclarationHEVPxHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
public new const string XSD_TYPE = "Vehicle_HEV-Px_HeavyLorryDeclarationType";
@@ -1414,7 +1416,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationHEVIEPCSHeavyLorryDataProviderV210 : XMLVehicleDataProviderHelperV201
+ public class XMLDeclarationHEVIEPCSHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
public new const string XSD_TYPE = "Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
index f47fb531e5bd242a75ddd0e615dbe02ad1259194..550d806796c4381c68a30aa0341d11bdbdaf4edf 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
@@ -39,7 +39,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
private List<ElectricMachineEntry<IElectricMotorDeclarationInputData>> GetEntries()
{
var machineEntry = new ElectricMachineEntry<IElectricMotorDeclarationInputData> {
- Position = PowertrainPositionHelper.Parse(((XMLVehicleDataProviderHelperV201)_vehicle).PowertrainPositionPrefix +
+ Position = PowertrainPositionHelper.Parse(((AbstractXMLVehicleDataProviderV210)_vehicle).PowertrainPositionPrefix +
GetString(XMLNames.ElectricMachine_PowertrainPosition)),
Count = XmlConvert.ToInt32(GetString(XMLNames.ElectricMachine_Count)),
ElectricMachine = ElectricMachineSystemReader.CreateElectricMachineSystem(GetNode(XMLNames.ElectricMachineSystem)),
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
index 000a8234c398a3c4f11b36b18805197466270f08..7a7e9becf861c92cea2163e9b13b46b6129a5c9a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
@@ -15,7 +15,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
public abstract class XMLCommonElectricMotorDeclarationInputData : AbstractCommonComponentType, IComponentInputData,
- IPowerRatingInputData, IElectricMotorVoltageLevel
+ IElectricMotorVoltageLevel
{
protected XMLCommonElectricMotorDeclarationInputData(XmlNode node, string source) : base(node, source)
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index ec6ed4039d32a1e946dbec120f0b85c9b211b511..e288d765d971f1ee223ff3c5e87a8cd40edcbd11 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -298,6 +298,11 @@ namespace TUGraz.VectoCore.InputData.Impl
#region Implementation of IElectricMotorVoltageLevel
public Volt VoltageLevel { get; internal set; }
+ public NewtonMeter ContinuousTorque { get; internal set; }
+ public PerSecond ContinuousTorqueSpeed { get; internal set; }
+ public NewtonMeter OverloadTorque { get; internal set; }
+ public PerSecond OverloadTestSpeed { get; internal set; }
+ public Second OverloadTime { get; internal set; }
public TableData FullLoadCurve { get; internal set; }
public TableData EfficiencyMap { get; internal set; }
public IList<IElectricMotorPowerMap> PowerMap { get; internal set; }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index b8c9f7ed187af8c7a370c47778d691e111ff0e20..6d89749b38b65b7c3432cf249be9cf62c0013869 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -803,10 +803,15 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
voltageLevels.Add(new ElectricMotorVoltageLevelData() {
Voltage = entry.VoltageLevel,
+ ContinuousTorque = entry.ContinuousTorque * count,
+ ContinuousTorqueSpeed = entry.ContinuousTorqueSpeed,
+ OverloadTorque = entry.OverloadTorque ?? 0.SI<NewtonMeter>() * count,
+ OverloadTestSpeed = entry.OverloadTestSpeed ?? 0.RPMtoRad(),
+ OverloadTime = entry.OverloadTime,
FullLoadCurve = fullLoadCurveCombined,
- // DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
- //EfficiencyMap = ElectricMotorMapReader.Create(entry.EfficiencyMap, count), //PowerMap
- });
+ // DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
+ EfficiencyMap = ElectricMotorMapReader.Create(entry.PowerMap.First().PowerMap, count), //PowerMap
+ });
}
@@ -817,11 +822,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return new ElectricMotorData() {
EfficiencyData = new VoltageLevelData() { VoltageLevels = voltageLevels},
Inertia = motorData.Inertia,
- ContinuousTorque = motorData.ContinuousTorque * count,
- ContinuousTorqueSpeed = motorData.ContinuousTorqueSpeed,
- OverloadTorque = motorData.OverloadTorque ?? 0.SI<NewtonMeter>() * count,
- OverloadTestSpeed = motorData.OverloadTestSpeed ?? 0.RPMtoRad(),
- OverloadTime = motorData.OverloadTime,
+
OverloadRegenerationFactor = motorData.OverloadRecoveryFactor,
RatioADC = ratio,
RatioPerGear = ratioPerGear,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index 5b0a938e674d29087e8071c5518d88ce90dbfc9d..58ff67520dd4ee7526cf9429604432c7e7e285f1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -14,22 +14,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[SIRange(double.MinValue, double.MaxValue)]
public KilogramSquareMeter Inertia { get; internal set; }
- [SIRange(double.MinValue, double.MaxValue)]
- public NewtonMeter ContinuousTorque { get; internal set; }
-
- [SIRange(0, double.MaxValue)]
- public PerSecond ContinuousTorqueSpeed { get; internal set; }
-
- [SIRange(double.MinValue, double.MaxValue)]
- public NewtonMeter OverloadTorque { get; set; }
-
- [SIRange(0, double.MaxValue)]
- public PerSecond OverloadTestSpeed { get; set; }
-
-
- [SIRange(0, double.MaxValue)]
- public Second OverloadTime { get; internal set; }
-
[SIRange(0, 1)]
public double OverloadRegenerationFactor { get; internal set; }
@@ -41,6 +25,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[ValidateObject]
public VoltageLevelData EfficiencyData { get; internal set; }
+
+ public NewtonMeter ContinuousTorque { get; internal set; }
}
public class VoltageLevelData
@@ -162,6 +148,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[SIRange(0, double.MaxValue)]
public Volt Voltage { get; internal set; }
+ [SIRange(double.MinValue, double.MaxValue)]
+ public NewtonMeter ContinuousTorque { get; internal set; }
+
+ [SIRange(0, double.MaxValue)]
+ public PerSecond ContinuousTorqueSpeed { get; internal set; }
+
+ [SIRange(double.MinValue, double.MaxValue)]
+ public NewtonMeter OverloadTorque { get; set; }
+
+ [SIRange(0, double.MaxValue)]
+ public PerSecond OverloadTestSpeed { get; set; }
+
+
+ [SIRange(0, double.MaxValue)]
+ public Second OverloadTime { get; internal set; }
+
[ValidateObject]
public ElectricMotorFullLoadCurve FullLoadCurve { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index 17da629f529fe3105350e225cfefb1d018c0e86a..8c4ddf5b495a7921c4a56ee3c570bebd90fe7792 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -52,18 +52,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container.AddComponent(this); // We have to do this again because in the base class the position is unknown!
- ContinuousTorque = ModelData.ContinuousTorque;
+ var vLevel = ModelData.EfficiencyData.VoltageLevels.First();
+ ContinuousTorque = vLevel.ContinuousTorque;
var voltage = ModelData.EfficiencyData.VoltageLevels.First().Voltage;
var contElPwr =
- ModelData.EfficiencyData.LookupElectricPower(voltage, ModelData.ContinuousTorqueSpeed, -ContinuousTorque).ElectricalPower ??
- ModelData.EfficiencyData.LookupElectricPower(voltage, ModelData.ContinuousTorqueSpeed, ModelData.EfficiencyData.FullLoadDriveTorque(voltage, ModelData.ContinuousTorqueSpeed), true).ElectricalPower;
- ContinuousPowerLoss = -contElPwr - ContinuousTorque * ModelData.ContinuousTorqueSpeed; // loss needs to be positive
+ ModelData.EfficiencyData.LookupElectricPower(voltage, vLevel.ContinuousTorqueSpeed, -ContinuousTorque).ElectricalPower ??
+ ModelData.EfficiencyData.LookupElectricPower(voltage, vLevel.ContinuousTorqueSpeed, ModelData.EfficiencyData.FullLoadDriveTorque(voltage, vLevel.ContinuousTorqueSpeed), true).ElectricalPower;
+ ContinuousPowerLoss = -contElPwr - ContinuousTorque * vLevel.ContinuousTorqueSpeed; // loss needs to be positive
- var peakElPwr = ModelData.EfficiencyData.LookupElectricPower(voltage, ModelData.OverloadTestSpeed, -ModelData.OverloadTorque, true)
+ var peakElPwr = ModelData.EfficiencyData.LookupElectricPower(voltage, vLevel.OverloadTestSpeed, -vLevel.OverloadTorque, true)
.ElectricalPower;
- var peakPwrLoss = -peakElPwr - ModelData.OverloadTorque * ModelData.OverloadTestSpeed; // losses need to be positive
+ var peakPwrLoss = -peakElPwr - vLevel.OverloadTorque * vLevel.OverloadTestSpeed; // losses need to be positive
- OverloadBuffer = (peakPwrLoss - ContinuousPowerLoss) * ModelData.OverloadTime;
+ OverloadBuffer = (peakPwrLoss - ContinuousPowerLoss) * vLevel.OverloadTime;
if (OverloadBuffer.IsSmallerOrEqual(0) && !(container is SimplePowertrainContainer)) {
Log.Error("Overload buffer for thermal de-rating is negative! Please check electric motor data!");
}
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 4945fb2b5a6c3841e5d81d68663e14a2e54b1cb5..49f238ce7ef384c1af44bed7da71279f3af3536f 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -34,7 +34,7 @@ public class JSONFileWriter : IOutputFileWriter
private const int VectoVTPJobFormatVersion = 4;
- private const int ElectricMotorFormatVersion = 3;
+ private const int ElectricMotorFormatVersion = 4;
private const int REESSFormatVersion = 1;
@@ -79,26 +79,27 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("SavedInDeclMode", declMode);
body.Add("Model", electricMachine.Model);
- //body.Add("FullLoadCurve", GetRelativePath(electricMachine.FullLoadCurve.Source, Path.GetDirectoryName(filename)));
- //body.Add("DragCurve", GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
- //body.Add("EfficiencyMap", GetRelativePath(electricMachine.EfficiencyMap.Source, Path.GetDirectoryName(filename)));
- body.Add("Inertia", electricMachine.Inertia.Value());
- body.Add("ContinuousTorque", electricMachine.ContinuousTorque.Value());
- body.Add("ContinuousTorqueSpeed", electricMachine.ContinuousTorqueSpeed.AsRPM);
- body.Add("OverloadTorque", electricMachine.OverloadTorque.Value());
- body.Add("OverloadTorqueSpeed", electricMachine.OverloadTestSpeed.AsRPM);
- body.Add("OverloadTime", electricMachine.OverloadTime.Value());
+ body.Add("Inertia", electricMachine.Inertia.Value());
body.Add("ThermalOverloadRecoveryFactor", electricMachine.OverloadRecoveryFactor);
var vlevels = new List<Dictionary<string, object>>();
foreach (var entry in electricMachine.VoltageLevels) {
var vlevel = new Dictionary<string, object>();
vlevel.Add("Voltage", entry.VoltageLevel.Value());
+ vlevel.Add("ContinuousTorque", entry.ContinuousTorque.Value());
+ vlevel.Add("ContinuousTorqueSpeed", entry.ContinuousTorqueSpeed.AsRPM);
+ vlevel.Add("OverloadTorque", entry.OverloadTorque.Value());
+ vlevel.Add("OverloadTorqueSpeed", entry.OverloadTestSpeed.AsRPM);
+ vlevel.Add("OverloadTime", entry.OverloadTime.Value());
vlevel.Add("FullLoadCurve", GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)));
- // vlevel.Add("DragCurve", GetRelativePath(entry.DragCurve.Source, Path.GetDirectoryName(filename)));
- // vlevel.Add("EfficiencyMap", GetRelativePath(entry.EfficiencyMap.Source, Path.GetDirectoryName(filename))); //PowerMap
- vlevels.Add(vlevel);
+ var powerMaps = new Dictionary<int, object>();
+ foreach (var pMap in entry.PowerMap) {
+ powerMaps.Add(pMap.Gear, GetRelativePath(pMap.PowerMap.Source, Path.GetDirectoryName(filename)));
+ }
+ vlevel.Add("EfficiencyMap", powerMaps); //PowerMap
+ vlevels.Add(vlevel);
}
+ body.Add("DragCurve", GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
body.Add("VoltageLevels", vlevels);
WriteFile(header, body, filename);
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 54a80c06bc4f39b7c4db51aa04452c3c05005145..6742018bd43b9e72f4e62ca951dac0439a489f17 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -5891,9 +5891,6 @@
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\MediumLorry\PEV_mediumLorry_AMT_E2_EM_Std.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S_IEPC_Std.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\Conventional_mediumLorry_AMT_n_opt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index 2d7b95c6bbff60c24d16374a0dc31213ed3ba87f..548063658a0296d0c8c3bbf3772a167b33a0d8e6 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -361,11 +361,11 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(CertificationMethod.Measured, eMachine.CertificationMethod);
Assert.AreEqual(1.SI<Watt>(), eMachine.R85RatedPower);
Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), eMachine.Inertia);//RotationalInertia
- Assert.AreEqual(200.00.SI<NewtonMeter>(), eMachine.ContinuousTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
- Assert.AreEqual(400.00.SI<NewtonMeter>(), eMachine.OverloadTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.OverloadTestSpeed);//TestSpeedOverloadTorque
- Assert.AreEqual(30.00.SI<Second>(), eMachine.OverloadTime);
+ //Assert.AreEqual(200.00.SI<NewtonMeter>(), eMachine.ContinuousTorque);
+ //Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
+ //Assert.AreEqual(400.00.SI<NewtonMeter>(), eMachine.OverloadTorque);
+ //Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.OverloadTestSpeed);//TestSpeedOverloadTorque
+ //Assert.AreEqual(30.00.SI<Second>(), eMachine.OverloadTime);
Assert.AreEqual(483.SI<Volt>(), eMachine.TestVoltageOverload);
Assert.AreEqual(true, eMachine.DcDcConverterIncluded);
Assert.AreEqual("None", eMachine.IHPCType);
@@ -381,17 +381,28 @@ namespace TUGraz.VectoCore.Tests.XML
var voltageLevel = voltageLevels[0];
Assert.AreEqual(400.SI<Volt>(), voltageLevel.VoltageLevel);
+ TestOverloadValues(voltageLevel);
TestMaxTorqueCurve(voltageLevel.FullLoadCurve);
TestPowerMap(voltageLevel.PowerMap);
voltageLevel = voltageLevels[1];
Assert.AreEqual(600.SI<Volt>(), voltageLevel.VoltageLevel);
-
+
+ TestOverloadValues(voltageLevel);
TestMaxTorqueCurve(voltageLevel.FullLoadCurve);
TestPowerMap(voltageLevel.PowerMap);
}
+ private void TestOverloadValues(IElectricMotorVoltageLevel voltageLevel)
+ {
+ Assert.AreEqual(200.00.SI<NewtonMeter>(), voltageLevel.ContinuousTorque);
+ Assert.AreEqual(2000.00.SI<PerSecond>(), voltageLevel.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
+ Assert.AreEqual(400.00.SI<NewtonMeter>(), voltageLevel.OverloadTorque);
+ Assert.AreEqual(2000.00.SI<PerSecond>(), voltageLevel.OverloadTestSpeed);//TestSpeedOverloadTorque
+ Assert.AreEqual(30.00.SI<Second>(), voltageLevel.OverloadTime);
+ }
+
private void TestPowerMap(IList<IElectricMotorPowerMap> powerMap)
{
@@ -1315,11 +1326,6 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(CertificationMethod.Measured, iepcData.CertificationMethod);
Assert.AreEqual(1.SI<Watt>(), iepcData.R85RatedPower);
Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), iepcData.Inertia);//RotationalInertia
- Assert.AreEqual(200.00.SI<NewtonMeter>(), iepcData.ContinuousTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), iepcData.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
- Assert.AreEqual(400.00.SI<NewtonMeter>(), iepcData.OverloadTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), iepcData.OverloadTestSpeed);//TestSpeedOverloadTorque
- Assert.AreEqual(30.00.SI<Second>(), iepcData.OverloadTime);
Assert.AreEqual(483.SI<Volt>(), iepcData.TestVoltageOverload);
Assert.AreEqual(false, iepcData.DifferentialIncluded);
Assert.AreEqual(false, iepcData.DesignTypeWheelMotor);
@@ -1991,36 +1997,36 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.BoostingLimitations);
}
- [TestCase(@"PrimaryBus\HEV-S_primaryBus_IEPC-S_IEPC_Std.xml", BASE_DIR)]
- public void TestHEVSPrimaryBusIEPCStd(string jobfile, string testDir)
- {
- var filename = Path.Combine(testDir, jobfile);
- var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
- Assert.NotNull(dataProvider.JobInputData);
- var vehicle = dataProvider.JobInputData.Vehicle;
+ //[TestCase(@"PrimaryBus\HEV-S_primaryBus_IEPC-S_IEPC_Std.xml", BASE_DIR)]
+ //public void TestHEVSPrimaryBusIEPCStd(string jobfile, string testDir)
+ //{
+ // var filename = Path.Combine(testDir, jobfile);
+ // var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
+ // Assert.NotNull(dataProvider.JobInputData);
+ // var vehicle = dataProvider.JobInputData.Vehicle;
- var iepc = vehicle.Components.IEPC;
- Assert.IsNotNull(iepc);
- Assert.AreEqual(ElectricMachineType.ASM, iepc.ElectricMachineType);
- Assert.AreEqual(CertificationMethod.StandardValues, vehicle.Components.IEPC.CertificationMethod);
+ // var iepc = vehicle.Components.IEPC;
+ // Assert.IsNotNull(iepc);
+ // Assert.AreEqual(ElectricMachineType.ASM, iepc.ElectricMachineType);
+ // Assert.AreEqual(CertificationMethod.StandardValues, vehicle.Components.IEPC.CertificationMethod);
- Assert.AreEqual(1.SI<Watt>(), iepc.R85RatedPower);
- Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), iepc.Inertia);//RotationalInertia
- Assert.AreEqual(200.00.SI<NewtonMeter>(), iepc.ContinuousTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), iepc.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
- Assert.AreEqual(400.00.SI<NewtonMeter>(), iepc.OverloadTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), iepc.OverloadTestSpeed);//TestSpeedOverloadTorque
- Assert.AreEqual(30.00.SI<Second>(), iepc.OverloadTime);//OverloadDuration
- Assert.AreEqual(false, iepc.DifferentialIncluded);
- Assert.AreEqual(false, iepc.DesignTypeWheelMotor);
- Assert.AreEqual(1, iepc.NrOfDesignTypeWheelMotorMeasured);
+ // Assert.AreEqual(1.SI<Watt>(), iepc.R85RatedPower);
+ // Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), iepc.Inertia);//RotationalInertia
+ // Assert.AreEqual(200.00.SI<NewtonMeter>(), iepc.ContinuousTorque);
+ // Assert.AreEqual(2000.00.SI<PerSecond>(), iepc.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
+ // Assert.AreEqual(400.00.SI<NewtonMeter>(), iepc.OverloadTorque);
+ // Assert.AreEqual(2000.00.SI<PerSecond>(), iepc.OverloadTestSpeed);//TestSpeedOverloadTorque
+ // Assert.AreEqual(30.00.SI<Second>(), iepc.OverloadTime);//OverloadDuration
+ // Assert.AreEqual(false, iepc.DifferentialIncluded);
+ // Assert.AreEqual(false, iepc.DesignTypeWheelMotor);
+ // Assert.AreEqual(1, iepc.NrOfDesignTypeWheelMotorMeasured);
- TestGearsData(iepc.Gears);
- Assert.AreEqual(1, iepc.VoltageLevels.Count);
- TestMaxTorqueCurve(iepc.VoltageLevels[0].FullLoadCurve);
- TestPowerMapData01(iepc.VoltageLevels[0].PowerMap[0]);
- TestDragCurve(iepc.DragCurves[0].DragCurve);
- }
+ // TestGearsData(iepc.Gears);
+ // Assert.AreEqual(1, iepc.VoltageLevels.Count);
+ // TestMaxTorqueCurve(iepc.VoltageLevels[0].FullLoadCurve);
+ // TestPowerMapData01(iepc.VoltageLevels[0].PowerMap[0]);
+ // TestDragCurve(iepc.DragCurves[0].DragCurve);
+ //}
@@ -2042,11 +2048,6 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(ElectricMachineType.ASM, eMachine.ElectricMachine.ElectricMachineType);
Assert.AreEqual(1.SI<Watt>(), eMachine.ElectricMachine.R85RatedPower);
Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), eMachine.ElectricMachine.Inertia);
- Assert.AreEqual(200.00.SI<NewtonMeter>(), eMachine.ElectricMachine.ContinuousTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.ElectricMachine.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
- Assert.AreEqual(400.00.SI<NewtonMeter>(), eMachine.ElectricMachine.OverloadTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.ElectricMachine.OverloadTestSpeed);//TestSpeedOverloadTorque
- Assert.AreEqual(30.00.SI<Second>(), eMachine.ElectricMachine.OverloadTime);//OverloadDuration
Assert.AreEqual(483.SI<Volt>(), eMachine.ElectricMachine.TestVoltageOverload);
Assert.AreEqual(true, eMachine.ElectricMachine.DcDcConverterIncluded);
Assert.AreEqual("IHPC Type 1", eMachine.ElectricMachine.IHPCType);
@@ -2084,12 +2085,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(CertificationMethod.StandardValues, eMachine.ElectricMachine.CertificationMethod);
Assert.AreEqual(1.SI<Watt>(), eMachine.ElectricMachine.R85RatedPower);
Assert.AreEqual(0.10.SI<KilogramSquareMeter>(), eMachine.ElectricMachine.Inertia);//RotationalInertia
- Assert.AreEqual(200.00.SI<NewtonMeter>(), eMachine.ElectricMachine.ContinuousTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.ElectricMachine.ContinuousTorqueSpeed);//TestSpeedContinuousTorque
- Assert.AreEqual(400.00.SI<NewtonMeter>(), eMachine.ElectricMachine.OverloadTorque);
- Assert.AreEqual(2000.00.SI<PerSecond>(), eMachine.ElectricMachine.OverloadTestSpeed);//TestSpeedOverloadTorque
- Assert.AreEqual(30.00.SI<Second>(), eMachine.ElectricMachine.OverloadTime);//OverloadDuration
- Assert.IsNull(eMachine.ElectricMachine.TestVoltageOverload);
+ Assert.IsNull(eMachine.ElectricMachine.TestVoltageOverload);
Assert.AreEqual(true, eMachine.ElectricMachine.DcDcConverterIncluded);
Assert.AreEqual("None", eMachine.ElectricMachine.IHPCType);
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 05bdb98d66a883a915c0bf99c8f66581c93e5f6c..5e68b4e88be0404622c3b268db9314577855cce4 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -190,6 +190,7 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px.xml"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\IEPC_heavyLorry.xml"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_APT-N_E2.xml"/>