diff --git a/VECTO/GUI/BatteryForm.Designer.vb b/VECTO/GUI/BatteryForm.Designer.vb
index cd94fb8f81eb50a8e92e7d53a9ebe6c8946e861f..553552e108f794351c5a591c31a3fed26ab7cd93 100644
--- a/VECTO/GUI/BatteryForm.Designer.vb
+++ b/VECTO/GUI/BatteryForm.Designer.vb
@@ -132,29 +132,26 @@ Partial Class BatteryForm
'
'tbCapacity
'
- Me.tbCapacity.Location = New System.Drawing.Point(135, 6)
- Me.tbCapacity.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbCapacity.Location = New System.Drawing.Point(90, 4)
Me.tbCapacity.Name = "tbCapacity"
- Me.tbCapacity.Size = New System.Drawing.Size(84, 26)
+ Me.tbCapacity.Size = New System.Drawing.Size(57, 20)
Me.tbCapacity.TabIndex = 3
'
'lblCapacityUnit
'
Me.lblCapacityUnit.AutoSize = true
- Me.lblCapacityUnit.Location = New System.Drawing.Point(230, 11)
- Me.lblCapacityUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblCapacityUnit.Location = New System.Drawing.Point(153, 7)
Me.lblCapacityUnit.Name = "lblCapacityUnit"
- Me.lblCapacityUnit.Size = New System.Drawing.Size(37, 20)
+ Me.lblCapacityUnit.Size = New System.Drawing.Size(26, 13)
Me.lblCapacityUnit.TabIndex = 24
Me.lblCapacityUnit.Text = "[Ah]"
'
'lblCapacity
'
Me.lblCapacity.AutoSize = true
- Me.lblCapacity.Location = New System.Drawing.Point(4, 11)
- Me.lblCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblCapacity.Location = New System.Drawing.Point(3, 7)
Me.lblCapacity.Name = "lblCapacity"
- Me.lblCapacity.Size = New System.Drawing.Size(70, 20)
+ Me.lblCapacity.Size = New System.Drawing.Size(48, 13)
Me.lblCapacity.TabIndex = 0
Me.lblCapacity.Text = "Capacity"
'
@@ -162,10 +159,9 @@ Partial Class BatteryForm
'
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(1216, 476)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(811, 323)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 13
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -173,10 +169,9 @@ Partial Class BatteryForm
'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(1095, 476)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Location = New System.Drawing.Point(730, 323)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 12
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -188,8 +183,8 @@ Partial Class BatteryForm
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, 3, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(1347, 33)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(898, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -199,7 +194,7 @@ Partial Class BatteryForm
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(34, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -209,7 +204,7 @@ Partial Class BatteryForm
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(34, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -219,7 +214,7 @@ Partial Class BatteryForm
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(34, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -229,14 +224,14 @@ Partial Class BatteryForm
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(34, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -244,14 +239,14 @@ Partial Class BatteryForm
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(34, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 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, 33)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -259,17 +254,16 @@ Partial Class BatteryForm
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(34, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 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, 518)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 349)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(1347, 32)
+ Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -277,24 +271,22 @@ Partial Class BatteryForm
'LbStatus
'
Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(60, 25)
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
Me.LbStatus.Text = "Status"
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(164, 126)
- Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(553, 26)
+ Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(24, 131)
- Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(126, 20)
+ Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -302,10 +294,9 @@ Partial Class BatteryForm
'
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, 43)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(753, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -314,18 +305,18 @@ Partial Class BatteryForm
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(203, 68)
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'pnInertia
@@ -333,37 +324,33 @@ Partial Class BatteryForm
Me.pnInertia.Controls.Add(Me.lblCapacity)
Me.pnInertia.Controls.Add(Me.lblCapacityUnit)
Me.pnInertia.Controls.Add(Me.tbCapacity)
- Me.pnInertia.Location = New System.Drawing.Point(4, 5)
- Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnInertia.Location = New System.Drawing.Point(3, 3)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(318, 46)
+ Me.pnInertia.Size = New System.Drawing.Size(212, 30)
Me.pnInertia.TabIndex = 3
'
'tbSoCCurve
'
- Me.tbSoCCurve.Location = New System.Drawing.Point(4, 190)
- Me.tbSoCCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSoCCurve.Location = New System.Drawing.Point(3, 123)
Me.tbSoCCurve.Name = "tbSoCCurve"
- Me.tbSoCCurve.Size = New System.Drawing.Size(649, 26)
+ Me.tbSoCCurve.Size = New System.Drawing.Size(434, 20)
Me.tbSoCCurve.TabIndex = 5
'
'lblSoCCurve
'
Me.lblSoCCurve.AutoSize = true
- Me.lblSoCCurve.Location = New System.Drawing.Point(4, 165)
- Me.lblSoCCurve.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSoCCurve.Location = New System.Drawing.Point(3, 107)
Me.lblSoCCurve.Name = "lblSoCCurve"
- Me.lblSoCCurve.Size = New System.Drawing.Size(85, 20)
+ Me.lblSoCCurve.Size = New System.Drawing.Size(60, 13)
Me.lblSoCCurve.TabIndex = 38
- Me.lblSoCCurve.Text = "SoC Curve"
+ Me.lblSoCCurve.Text = "OCV Curve"
'
'btnBrowseSoCCurve
'
Me.btnBrowseSoCCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseSoCCurve.Location = New System.Drawing.Point(655, 187)
- Me.btnBrowseSoCCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseSoCCurve.Location = New System.Drawing.Point(437, 122)
Me.btnBrowseSoCCurve.Name = "btnBrowseSoCCurve"
- Me.btnBrowseSoCCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseSoCCurve.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseSoCCurve.TabIndex = 6
Me.btnBrowseSoCCurve.TabStop = false
Me.btnBrowseSoCCurve.UseVisualStyleBackColor = true
@@ -371,10 +358,9 @@ Partial Class BatteryForm
'btnSoCCurveOpen
'
Me.btnSoCCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnSoCCurveOpen.Location = New System.Drawing.Point(690, 187)
- Me.btnSoCCurveOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnSoCCurveOpen.Location = New System.Drawing.Point(460, 122)
Me.btnSoCCurveOpen.Name = "btnSoCCurveOpen"
- Me.btnSoCCurveOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnSoCCurveOpen.Size = New System.Drawing.Size(24, 24)
Me.btnSoCCurveOpen.TabIndex = 7
Me.btnSoCCurveOpen.TabStop = false
Me.btnSoCCurveOpen.UseVisualStyleBackColor = true
@@ -382,10 +368,9 @@ Partial Class BatteryForm
'btnRiMapOpen
'
Me.btnRiMapOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnRiMapOpen.Location = New System.Drawing.Point(690, 244)
- Me.btnRiMapOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRiMapOpen.Location = New System.Drawing.Point(460, 159)
Me.btnRiMapOpen.Name = "btnRiMapOpen"
- Me.btnRiMapOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnRiMapOpen.Size = New System.Drawing.Size(24, 24)
Me.btnRiMapOpen.TabIndex = 42
Me.btnRiMapOpen.TabStop = false
Me.btnRiMapOpen.UseVisualStyleBackColor = true
@@ -393,10 +378,9 @@ Partial Class BatteryForm
'btnBrowseRiMap
'
Me.btnBrowseRiMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseRiMap.Location = New System.Drawing.Point(655, 244)
- Me.btnBrowseRiMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseRiMap.Location = New System.Drawing.Point(437, 159)
Me.btnBrowseRiMap.Name = "btnBrowseRiMap"
- Me.btnBrowseRiMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseRiMap.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseRiMap.TabIndex = 41
Me.btnBrowseRiMap.TabStop = false
Me.btnBrowseRiMap.UseVisualStyleBackColor = true
@@ -404,19 +388,17 @@ Partial Class BatteryForm
'lblRiMap
'
Me.lblRiMap.AutoSize = true
- Me.lblRiMap.Location = New System.Drawing.Point(4, 222)
- Me.lblRiMap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRiMap.Location = New System.Drawing.Point(3, 144)
Me.lblRiMap.Name = "lblRiMap"
- Me.lblRiMap.Size = New System.Drawing.Size(192, 20)
+ Me.lblRiMap.Size = New System.Drawing.Size(129, 13)
Me.lblRiMap.TabIndex = 43
Me.lblRiMap.Text = "Internal Resistance Curve"
'
'tbRiCurve
'
- Me.tbRiCurve.Location = New System.Drawing.Point(4, 247)
- Me.tbRiCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRiCurve.Location = New System.Drawing.Point(3, 161)
Me.tbRiCurve.Name = "tbRiCurve"
- Me.tbRiCurve.Size = New System.Drawing.Size(649, 26)
+ Me.tbRiCurve.Size = New System.Drawing.Size(434, 20)
Me.tbRiCurve.TabIndex = 40
'
'lblTitle
@@ -424,10 +406,9 @@ Partial Class BatteryForm
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(124, 52)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Location = New System.Drawing.Point(115, 34)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(395, 40)
+ Me.lblTitle.Size = New System.Drawing.Size(266, 29)
Me.lblTitle.TabIndex = 48
Me.lblTitle.Text = "Electric Energy Storage"
'
@@ -435,10 +416,9 @@ Partial Class BatteryForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(762, 43)
- Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicBox.Location = New System.Drawing.Point(508, 28)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(572, 408)
+ Me.PicBox.Size = New System.Drawing.Size(382, 266)
Me.PicBox.TabIndex = 49
Me.PicBox.TabStop = false
'
@@ -447,38 +427,34 @@ Partial Class BatteryForm
Me.Panel1.Controls.Add(Me.lblMinSoc)
Me.Panel1.Controls.Add(Me.lblSoCMinUnit)
Me.Panel1.Controls.Add(Me.tbSoCMin)
- Me.Panel1.Location = New System.Drawing.Point(4, 55)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Location = New System.Drawing.Point(3, 36)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(318, 46)
+ Me.Panel1.Size = New System.Drawing.Size(212, 30)
Me.Panel1.TabIndex = 25
'
'lblMinSoc
'
Me.lblMinSoc.AutoSize = true
- Me.lblMinSoc.Location = New System.Drawing.Point(4, 11)
- Me.lblMinSoc.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMinSoc.Location = New System.Drawing.Point(3, 7)
Me.lblMinSoc.Name = "lblMinSoc"
- Me.lblMinSoc.Size = New System.Drawing.Size(69, 20)
+ Me.lblMinSoc.Size = New System.Drawing.Size(46, 13)
Me.lblMinSoc.TabIndex = 0
Me.lblMinSoc.Text = "SoC min"
'
'lblSoCMinUnit
'
Me.lblSoCMinUnit.AutoSize = true
- Me.lblSoCMinUnit.Location = New System.Drawing.Point(230, 11)
- Me.lblSoCMinUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSoCMinUnit.Location = New System.Drawing.Point(153, 7)
Me.lblSoCMinUnit.Name = "lblSoCMinUnit"
- Me.lblSoCMinUnit.Size = New System.Drawing.Size(31, 20)
+ Me.lblSoCMinUnit.Size = New System.Drawing.Size(21, 13)
Me.lblSoCMinUnit.TabIndex = 24
Me.lblSoCMinUnit.Text = "[%]"
'
'tbSoCMin
'
- Me.tbSoCMin.Location = New System.Drawing.Point(135, 6)
- Me.tbSoCMin.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSoCMin.Location = New System.Drawing.Point(90, 4)
Me.tbSoCMin.Name = "tbSoCMin"
- Me.tbSoCMin.Size = New System.Drawing.Size(84, 26)
+ Me.tbSoCMin.Size = New System.Drawing.Size(57, 20)
Me.tbSoCMin.TabIndex = 3
'
'Panel2
@@ -486,47 +462,44 @@ Partial Class BatteryForm
Me.Panel2.Controls.Add(Me.lblSoCMax)
Me.Panel2.Controls.Add(Me.lblSoCMaxUnit)
Me.Panel2.Controls.Add(Me.tbSoCMax)
- Me.Panel2.Location = New System.Drawing.Point(337, 55)
- Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel2.Location = New System.Drawing.Point(225, 36)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(318, 46)
+ Me.Panel2.Size = New System.Drawing.Size(212, 30)
Me.Panel2.TabIndex = 25
'
'lblSoCMax
'
Me.lblSoCMax.AutoSize = true
- Me.lblSoCMax.Location = New System.Drawing.Point(4, 11)
- Me.lblSoCMax.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSoCMax.Location = New System.Drawing.Point(3, 7)
Me.lblSoCMax.Name = "lblSoCMax"
- Me.lblSoCMax.Size = New System.Drawing.Size(73, 20)
+ Me.lblSoCMax.Size = New System.Drawing.Size(49, 13)
Me.lblSoCMax.TabIndex = 0
Me.lblSoCMax.Text = "SoC max"
'
'lblSoCMaxUnit
'
Me.lblSoCMaxUnit.AutoSize = true
- Me.lblSoCMaxUnit.Location = New System.Drawing.Point(230, 11)
- Me.lblSoCMaxUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSoCMaxUnit.Location = New System.Drawing.Point(153, 7)
Me.lblSoCMaxUnit.Name = "lblSoCMaxUnit"
- Me.lblSoCMaxUnit.Size = New System.Drawing.Size(31, 20)
+ Me.lblSoCMaxUnit.Size = New System.Drawing.Size(21, 13)
Me.lblSoCMaxUnit.TabIndex = 24
Me.lblSoCMaxUnit.Text = "[%]"
'
'tbSoCMax
'
- Me.tbSoCMax.Location = New System.Drawing.Point(135, 6)
- Me.tbSoCMax.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSoCMax.Location = New System.Drawing.Point(90, 4)
Me.tbSoCMax.Name = "tbSoCMax"
- Me.tbSoCMax.Size = New System.Drawing.Size(84, 26)
+ Me.tbSoCMax.Size = New System.Drawing.Size(57, 20)
Me.tbSoCMax.TabIndex = 3
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.pnBattery)
Me.FlowLayoutPanel1.Controls.Add(Me.pnSuperCap)
- Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 210)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(8, 136)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(743, 303)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(495, 200)
Me.FlowLayoutPanel1.TabIndex = 50
'
'pnBattery
@@ -546,36 +519,34 @@ Partial Class BatteryForm
Me.pnBattery.Controls.Add(Me.lblRiMap)
Me.pnBattery.Controls.Add(Me.btnRiMapOpen)
Me.pnBattery.Controls.Add(Me.btnBrowseRiMap)
- Me.pnBattery.Location = New System.Drawing.Point(3, 3)
+ Me.pnBattery.Location = New System.Drawing.Point(2, 2)
+ Me.pnBattery.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.pnBattery.Name = "pnBattery"
- Me.pnBattery.Size = New System.Drawing.Size(734, 290)
+ Me.pnBattery.Size = New System.Drawing.Size(489, 188)
Me.pnBattery.TabIndex = 0
'
'tbMaxCurrentMap
'
- Me.tbMaxCurrentMap.Location = New System.Drawing.Point(6, 134)
- Me.tbMaxCurrentMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMaxCurrentMap.Location = New System.Drawing.Point(4, 87)
Me.tbMaxCurrentMap.Name = "tbMaxCurrentMap"
- Me.tbMaxCurrentMap.Size = New System.Drawing.Size(649, 26)
+ Me.tbMaxCurrentMap.Size = New System.Drawing.Size(434, 20)
Me.tbMaxCurrentMap.TabIndex = 44
'
'lblMaxCurrentMap
'
Me.lblMaxCurrentMap.AutoSize = true
- Me.lblMaxCurrentMap.Location = New System.Drawing.Point(6, 109)
- Me.lblMaxCurrentMap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxCurrentMap.Location = New System.Drawing.Point(4, 71)
Me.lblMaxCurrentMap.Name = "lblMaxCurrentMap"
- Me.lblMaxCurrentMap.Size = New System.Drawing.Size(130, 20)
+ Me.lblMaxCurrentMap.Size = New System.Drawing.Size(88, 13)
Me.lblMaxCurrentMap.TabIndex = 47
Me.lblMaxCurrentMap.Text = "Max Current Map"
'
'btnBrowseMaxCurrentMap
'
Me.btnBrowseMaxCurrentMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxCurrentMap.Location = New System.Drawing.Point(657, 131)
- Me.btnBrowseMaxCurrentMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseMaxCurrentMap.Location = New System.Drawing.Point(438, 85)
Me.btnBrowseMaxCurrentMap.Name = "btnBrowseMaxCurrentMap"
- Me.btnBrowseMaxCurrentMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseMaxCurrentMap.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxCurrentMap.TabIndex = 45
Me.btnBrowseMaxCurrentMap.TabStop = false
Me.btnBrowseMaxCurrentMap.UseVisualStyleBackColor = true
@@ -583,10 +554,9 @@ Partial Class BatteryForm
'btnMaxCurrentMapOpen
'
Me.btnMaxCurrentMapOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxCurrentMapOpen.Location = New System.Drawing.Point(692, 131)
- Me.btnMaxCurrentMapOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnMaxCurrentMapOpen.Location = New System.Drawing.Point(461, 85)
Me.btnMaxCurrentMapOpen.Name = "btnMaxCurrentMapOpen"
- Me.btnMaxCurrentMapOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnMaxCurrentMapOpen.Size = New System.Drawing.Size(24, 24)
Me.btnMaxCurrentMapOpen.TabIndex = 46
Me.btnMaxCurrentMapOpen.TabStop = false
Me.btnMaxCurrentMapOpen.UseVisualStyleBackColor = true
@@ -599,9 +569,10 @@ Partial Class BatteryForm
Me.pnSuperCap.Controls.Add(Me.pnSuperCapMinV)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapResistance)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapCapacity)
- Me.pnSuperCap.Location = New System.Drawing.Point(3, 299)
+ Me.pnSuperCap.Location = New System.Drawing.Point(2, 194)
+ Me.pnSuperCap.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.pnSuperCap.Name = "pnSuperCap"
- Me.pnSuperCap.Size = New System.Drawing.Size(734, 169)
+ Me.pnSuperCap.Size = New System.Drawing.Size(489, 110)
Me.pnSuperCap.TabIndex = 1
'
'Panel4
@@ -609,38 +580,34 @@ Partial Class BatteryForm
Me.Panel4.Controls.Add(Me.lblMaxCurrentDischarge)
Me.Panel4.Controls.Add(Me.lblMaxCurrentDischargeUnit)
Me.Panel4.Controls.Add(Me.tbSuperCapMaxCurrentDischarge)
- Me.Panel4.Location = New System.Drawing.Point(337, 117)
- Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel4.Location = New System.Drawing.Point(225, 76)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(318, 46)
+ Me.Panel4.Size = New System.Drawing.Size(212, 30)
Me.Panel4.TabIndex = 27
'
'lblMaxCurrentDischarge
'
Me.lblMaxCurrentDischarge.AutoSize = true
- Me.lblMaxCurrentDischarge.Location = New System.Drawing.Point(4, 11)
- Me.lblMaxCurrentDischarge.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxCurrentDischarge.Location = New System.Drawing.Point(3, 7)
Me.lblMaxCurrentDischarge.Name = "lblMaxCurrentDischarge"
- Me.lblMaxCurrentDischarge.Size = New System.Drawing.Size(148, 20)
+ Me.lblMaxCurrentDischarge.Size = New System.Drawing.Size(100, 13)
Me.lblMaxCurrentDischarge.TabIndex = 0
Me.lblMaxCurrentDischarge.Text = "Max Current Dischg"
'
'lblMaxCurrentDischargeUnit
'
Me.lblMaxCurrentDischargeUnit.AutoSize = true
- Me.lblMaxCurrentDischargeUnit.Location = New System.Drawing.Point(257, 13)
- Me.lblMaxCurrentDischargeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxCurrentDischargeUnit.Location = New System.Drawing.Point(171, 8)
Me.lblMaxCurrentDischargeUnit.Name = "lblMaxCurrentDischargeUnit"
- Me.lblMaxCurrentDischargeUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblMaxCurrentDischargeUnit.Size = New System.Drawing.Size(20, 13)
Me.lblMaxCurrentDischargeUnit.TabIndex = 24
Me.lblMaxCurrentDischargeUnit.Text = "[A]"
'
'tbSuperCapMaxCurrentDischarge
'
- Me.tbSuperCapMaxCurrentDischarge.Location = New System.Drawing.Point(162, 8)
- Me.tbSuperCapMaxCurrentDischarge.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSuperCapMaxCurrentDischarge.Location = New System.Drawing.Point(108, 5)
Me.tbSuperCapMaxCurrentDischarge.Name = "tbSuperCapMaxCurrentDischarge"
- Me.tbSuperCapMaxCurrentDischarge.Size = New System.Drawing.Size(84, 26)
+ Me.tbSuperCapMaxCurrentDischarge.Size = New System.Drawing.Size(57, 20)
Me.tbSuperCapMaxCurrentDischarge.TabIndex = 3
'
'Panel3
@@ -648,38 +615,34 @@ Partial Class BatteryForm
Me.Panel3.Controls.Add(Me.lblMaxCurrentChg)
Me.Panel3.Controls.Add(Me.lblMaxCurrentChargeUnit)
Me.Panel3.Controls.Add(Me.tbSuperCapMaxCurrentCharge)
- Me.Panel3.Location = New System.Drawing.Point(4, 117)
- Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel3.Location = New System.Drawing.Point(3, 76)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(318, 46)
+ Me.Panel3.Size = New System.Drawing.Size(212, 30)
Me.Panel3.TabIndex = 26
'
'lblMaxCurrentChg
'
Me.lblMaxCurrentChg.AutoSize = true
- Me.lblMaxCurrentChg.Location = New System.Drawing.Point(4, 11)
- Me.lblMaxCurrentChg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxCurrentChg.Location = New System.Drawing.Point(3, 7)
Me.lblMaxCurrentChg.Name = "lblMaxCurrentChg"
- Me.lblMaxCurrentChg.Size = New System.Drawing.Size(128, 20)
+ Me.lblMaxCurrentChg.Size = New System.Drawing.Size(86, 13)
Me.lblMaxCurrentChg.TabIndex = 0
Me.lblMaxCurrentChg.Text = "Max Current Chg"
'
'lblMaxCurrentChargeUnit
'
Me.lblMaxCurrentChargeUnit.AutoSize = true
- Me.lblMaxCurrentChargeUnit.Location = New System.Drawing.Point(230, 11)
- Me.lblMaxCurrentChargeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxCurrentChargeUnit.Location = New System.Drawing.Point(153, 7)
Me.lblMaxCurrentChargeUnit.Name = "lblMaxCurrentChargeUnit"
- Me.lblMaxCurrentChargeUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblMaxCurrentChargeUnit.Size = New System.Drawing.Size(20, 13)
Me.lblMaxCurrentChargeUnit.TabIndex = 24
Me.lblMaxCurrentChargeUnit.Text = "[A]"
'
'tbSuperCapMaxCurrentCharge
'
- Me.tbSuperCapMaxCurrentCharge.Location = New System.Drawing.Point(135, 6)
- Me.tbSuperCapMaxCurrentCharge.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSuperCapMaxCurrentCharge.Location = New System.Drawing.Point(90, 4)
Me.tbSuperCapMaxCurrentCharge.Name = "tbSuperCapMaxCurrentCharge"
- Me.tbSuperCapMaxCurrentCharge.Size = New System.Drawing.Size(84, 26)
+ Me.tbSuperCapMaxCurrentCharge.Size = New System.Drawing.Size(57, 20)
Me.tbSuperCapMaxCurrentCharge.TabIndex = 3
'
'pnSuperCapMaxV
@@ -687,38 +650,34 @@ Partial Class BatteryForm
Me.pnSuperCapMaxV.Controls.Add(Me.lblSuperCapMaxV)
Me.pnSuperCapMaxV.Controls.Add(Me.lblSuperCapMaxVUnit)
Me.pnSuperCapMaxV.Controls.Add(Me.tbSuperCapMaxV)
- Me.pnSuperCapMaxV.Location = New System.Drawing.Point(337, 61)
- Me.pnSuperCapMaxV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnSuperCapMaxV.Location = New System.Drawing.Point(225, 40)
Me.pnSuperCapMaxV.Name = "pnSuperCapMaxV"
- Me.pnSuperCapMaxV.Size = New System.Drawing.Size(318, 46)
+ Me.pnSuperCapMaxV.Size = New System.Drawing.Size(212, 30)
Me.pnSuperCapMaxV.TabIndex = 26
'
'lblSuperCapMaxV
'
Me.lblSuperCapMaxV.AutoSize = true
- Me.lblSuperCapMaxV.Location = New System.Drawing.Point(4, 11)
- Me.lblSuperCapMaxV.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapMaxV.Location = New System.Drawing.Point(3, 7)
Me.lblSuperCapMaxV.Name = "lblSuperCapMaxV"
- Me.lblSuperCapMaxV.Size = New System.Drawing.Size(97, 20)
+ Me.lblSuperCapMaxV.Size = New System.Drawing.Size(66, 13)
Me.lblSuperCapMaxV.TabIndex = 0
Me.lblSuperCapMaxV.Text = "Max Voltage"
'
'lblSuperCapMaxVUnit
'
Me.lblSuperCapMaxVUnit.AutoSize = true
- Me.lblSuperCapMaxVUnit.Location = New System.Drawing.Point(257, 13)
- Me.lblSuperCapMaxVUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapMaxVUnit.Location = New System.Drawing.Point(171, 8)
Me.lblSuperCapMaxVUnit.Name = "lblSuperCapMaxVUnit"
- Me.lblSuperCapMaxVUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblSuperCapMaxVUnit.Size = New System.Drawing.Size(20, 13)
Me.lblSuperCapMaxVUnit.TabIndex = 24
Me.lblSuperCapMaxVUnit.Text = "[V]"
'
'tbSuperCapMaxV
'
- Me.tbSuperCapMaxV.Location = New System.Drawing.Point(162, 8)
- Me.tbSuperCapMaxV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSuperCapMaxV.Location = New System.Drawing.Point(108, 5)
Me.tbSuperCapMaxV.Name = "tbSuperCapMaxV"
- Me.tbSuperCapMaxV.Size = New System.Drawing.Size(84, 26)
+ Me.tbSuperCapMaxV.Size = New System.Drawing.Size(57, 20)
Me.tbSuperCapMaxV.TabIndex = 3
'
'pnSuperCapMinV
@@ -726,38 +685,34 @@ Partial Class BatteryForm
Me.pnSuperCapMinV.Controls.Add(Me.lblSuperCapMinV)
Me.pnSuperCapMinV.Controls.Add(Me.lblSuperCapMinVUnit)
Me.pnSuperCapMinV.Controls.Add(Me.tbSuperCapMinV)
- Me.pnSuperCapMinV.Location = New System.Drawing.Point(4, 61)
- Me.pnSuperCapMinV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnSuperCapMinV.Location = New System.Drawing.Point(3, 40)
Me.pnSuperCapMinV.Name = "pnSuperCapMinV"
- Me.pnSuperCapMinV.Size = New System.Drawing.Size(318, 46)
+ Me.pnSuperCapMinV.Size = New System.Drawing.Size(212, 30)
Me.pnSuperCapMinV.TabIndex = 25
'
'lblSuperCapMinV
'
Me.lblSuperCapMinV.AutoSize = true
- Me.lblSuperCapMinV.Location = New System.Drawing.Point(4, 11)
- Me.lblSuperCapMinV.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapMinV.Location = New System.Drawing.Point(3, 7)
Me.lblSuperCapMinV.Name = "lblSuperCapMinV"
- Me.lblSuperCapMinV.Size = New System.Drawing.Size(93, 20)
+ Me.lblSuperCapMinV.Size = New System.Drawing.Size(63, 13)
Me.lblSuperCapMinV.TabIndex = 0
Me.lblSuperCapMinV.Text = "Min Voltage"
'
'lblSuperCapMinVUnit
'
Me.lblSuperCapMinVUnit.AutoSize = true
- Me.lblSuperCapMinVUnit.Location = New System.Drawing.Point(230, 11)
- Me.lblSuperCapMinVUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapMinVUnit.Location = New System.Drawing.Point(153, 7)
Me.lblSuperCapMinVUnit.Name = "lblSuperCapMinVUnit"
- Me.lblSuperCapMinVUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblSuperCapMinVUnit.Size = New System.Drawing.Size(20, 13)
Me.lblSuperCapMinVUnit.TabIndex = 24
Me.lblSuperCapMinVUnit.Text = "[V]"
'
'tbSuperCapMinV
'
- Me.tbSuperCapMinV.Location = New System.Drawing.Point(135, 6)
- Me.tbSuperCapMinV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSuperCapMinV.Location = New System.Drawing.Point(90, 4)
Me.tbSuperCapMinV.Name = "tbSuperCapMinV"
- Me.tbSuperCapMinV.Size = New System.Drawing.Size(84, 26)
+ Me.tbSuperCapMinV.Size = New System.Drawing.Size(57, 20)
Me.tbSuperCapMinV.TabIndex = 3
'
'pnSuperCapResistance
@@ -765,38 +720,34 @@ Partial Class BatteryForm
Me.pnSuperCapResistance.Controls.Add(Me.lblSuperCapRi)
Me.pnSuperCapResistance.Controls.Add(Me.lblSuperCapRiUnit)
Me.pnSuperCapResistance.Controls.Add(Me.tbSuperCapRi)
- Me.pnSuperCapResistance.Location = New System.Drawing.Point(337, 5)
- Me.pnSuperCapResistance.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnSuperCapResistance.Location = New System.Drawing.Point(225, 3)
Me.pnSuperCapResistance.Name = "pnSuperCapResistance"
- Me.pnSuperCapResistance.Size = New System.Drawing.Size(318, 46)
+ Me.pnSuperCapResistance.Size = New System.Drawing.Size(212, 30)
Me.pnSuperCapResistance.TabIndex = 25
'
'lblSuperCapRi
'
Me.lblSuperCapRi.AutoSize = true
- Me.lblSuperCapRi.Location = New System.Drawing.Point(4, 11)
- Me.lblSuperCapRi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapRi.Location = New System.Drawing.Point(3, 7)
Me.lblSuperCapRi.Name = "lblSuperCapRi"
- Me.lblSuperCapRi.Size = New System.Drawing.Size(147, 20)
+ Me.lblSuperCapRi.Size = New System.Drawing.Size(98, 13)
Me.lblSuperCapRi.TabIndex = 0
Me.lblSuperCapRi.Text = "Internal Resistance"
'
'lblSuperCapRiUnit
'
Me.lblSuperCapRiUnit.AutoSize = true
- Me.lblSuperCapRiUnit.Location = New System.Drawing.Point(257, 13)
- Me.lblSuperCapRiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapRiUnit.Location = New System.Drawing.Point(171, 8)
Me.lblSuperCapRiUnit.Name = "lblSuperCapRiUnit"
- Me.lblSuperCapRiUnit.Size = New System.Drawing.Size(29, 20)
+ Me.lblSuperCapRiUnit.Size = New System.Drawing.Size(22, 13)
Me.lblSuperCapRiUnit.TabIndex = 24
Me.lblSuperCapRiUnit.Text = "[Ω]"
'
'tbSuperCapRi
'
- Me.tbSuperCapRi.Location = New System.Drawing.Point(162, 8)
- Me.tbSuperCapRi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSuperCapRi.Location = New System.Drawing.Point(108, 5)
Me.tbSuperCapRi.Name = "tbSuperCapRi"
- Me.tbSuperCapRi.Size = New System.Drawing.Size(84, 26)
+ Me.tbSuperCapRi.Size = New System.Drawing.Size(57, 20)
Me.tbSuperCapRi.TabIndex = 3
'
'pnSuperCapCapacity
@@ -804,65 +755,61 @@ Partial Class BatteryForm
Me.pnSuperCapCapacity.Controls.Add(Me.lblSuperCapCapacity)
Me.pnSuperCapCapacity.Controls.Add(Me.lblSuperCapCapacityUnit)
Me.pnSuperCapCapacity.Controls.Add(Me.tbSuperCapCapacity)
- Me.pnSuperCapCapacity.Location = New System.Drawing.Point(4, 5)
- Me.pnSuperCapCapacity.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnSuperCapCapacity.Location = New System.Drawing.Point(3, 3)
Me.pnSuperCapCapacity.Name = "pnSuperCapCapacity"
- Me.pnSuperCapCapacity.Size = New System.Drawing.Size(318, 46)
+ Me.pnSuperCapCapacity.Size = New System.Drawing.Size(212, 30)
Me.pnSuperCapCapacity.TabIndex = 4
'
'lblSuperCapCapacity
'
Me.lblSuperCapCapacity.AutoSize = true
- Me.lblSuperCapCapacity.Location = New System.Drawing.Point(4, 11)
- Me.lblSuperCapCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapCapacity.Location = New System.Drawing.Point(3, 7)
Me.lblSuperCapCapacity.Name = "lblSuperCapCapacity"
- Me.lblSuperCapCapacity.Size = New System.Drawing.Size(70, 20)
+ Me.lblSuperCapCapacity.Size = New System.Drawing.Size(67, 13)
Me.lblSuperCapCapacity.TabIndex = 0
- Me.lblSuperCapCapacity.Text = "Capacity"
+ Me.lblSuperCapCapacity.Text = "Capacitance"
'
'lblSuperCapCapacityUnit
'
Me.lblSuperCapCapacityUnit.AutoSize = true
- Me.lblSuperCapCapacityUnit.Location = New System.Drawing.Point(230, 11)
- Me.lblSuperCapCapacityUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblSuperCapCapacityUnit.Location = New System.Drawing.Point(153, 7)
Me.lblSuperCapCapacityUnit.Name = "lblSuperCapCapacityUnit"
- Me.lblSuperCapCapacityUnit.Size = New System.Drawing.Size(27, 20)
+ Me.lblSuperCapCapacityUnit.Size = New System.Drawing.Size(19, 13)
Me.lblSuperCapCapacityUnit.TabIndex = 24
Me.lblSuperCapCapacityUnit.Text = "[F]"
'
'tbSuperCapCapacity
'
- Me.tbSuperCapCapacity.Location = New System.Drawing.Point(135, 6)
- Me.tbSuperCapCapacity.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbSuperCapCapacity.Location = New System.Drawing.Point(90, 4)
Me.tbSuperCapCapacity.Name = "tbSuperCapCapacity"
- Me.tbSuperCapCapacity.Size = New System.Drawing.Size(84, 26)
+ Me.tbSuperCapCapacity.Size = New System.Drawing.Size(57, 20)
Me.tbSuperCapCapacity.TabIndex = 3
'
'cbRESSType
'
Me.cbRESSType.FormattingEnabled = true
- Me.cbRESSType.Location = New System.Drawing.Point(166, 165)
+ Me.cbRESSType.Location = New System.Drawing.Point(111, 107)
+ Me.cbRESSType.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.cbRESSType.Name = "cbRESSType"
- Me.cbRESSType.Size = New System.Drawing.Size(211, 28)
+ Me.cbRESSType.Size = New System.Drawing.Size(142, 21)
Me.cbRESSType.TabIndex = 51
'
'lblRessType
'
Me.lblRessType.AutoSize = true
- Me.lblRessType.Location = New System.Drawing.Point(24, 168)
- Me.lblRessType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRessType.Location = New System.Drawing.Point(16, 109)
Me.lblRessType.Name = "lblRessType"
- Me.lblRessType.Size = New System.Drawing.Size(103, 20)
+ Me.lblRessType.Size = New System.Drawing.Size(70, 13)
Me.lblRessType.TabIndex = 52
Me.lblRessType.Text = "REESS Type"
'
'BatteryForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(1347, 550)
+ Me.ClientSize = New System.Drawing.Size(898, 371)
Me.Controls.Add(Me.lblRessType)
Me.Controls.Add(Me.cbRESSType)
Me.Controls.Add(Me.FlowLayoutPanel1)
@@ -877,7 +824,6 @@ Partial Class BatteryForm
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 = "BatteryForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 25505784ae5a0042752e499ec9d78d46ea1b1548..1bfd1b48fbfb928a4622bd8b5038722f6a856ad3 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -75,9 +75,9 @@ Partial Class ElectricMotorForm
Me.lblTitle = New System.Windows.Forms.Label()
Me.PicBox = New System.Windows.Forms.PictureBox()
Me.Panel1 = New System.Windows.Forms.Panel()
- Me.lblContPwr = New System.Windows.Forms.Label()
- Me.lblContPwrUnit = New System.Windows.Forms.Label()
- Me.tbContPwr = New System.Windows.Forms.TextBox()
+ Me.lblContTq = New System.Windows.Forms.Label()
+ Me.lblContTqUnit = New System.Windows.Forms.Label()
+ Me.tbContTq = 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()
@@ -90,6 +90,14 @@ Partial Class ElectricMotorForm
Me.lblRatedSpeed = New System.Windows.Forms.Label()
Me.lblRatedSpeedUnit = New System.Windows.Forms.Label()
Me.tbRatedSpeed = 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.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.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -100,33 +108,32 @@ Partial Class ElectricMotorForm
Me.Panel2.SuspendLayout
Me.Panel3.SuspendLayout
Me.Panel4.SuspendLayout
+ Me.pnOverloadTq.SuspendLayout
+ Me.Panel6.SuspendLayout
Me.SuspendLayout
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(191, 8)
- Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInertia.Location = New System.Drawing.Point(127, 5)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(71, 26)
+ Me.tbInertia.Size = New System.Drawing.Size(49, 20)
Me.tbInertia.TabIndex = 3
'
'lblinertiaUnit
'
Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(273, 13)
- Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(182, 8)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(52, 20)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
Me.lblinertiaUnit.TabIndex = 24
Me.lblinertiaUnit.Text = "[kgm²]"
'
'lblInertia
'
Me.lblInertia.AutoSize = true
- Me.lblInertia.Location = New System.Drawing.Point(4, 11)
- Me.lblInertia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInertia.Location = New System.Drawing.Point(3, 7)
Me.lblInertia.Name = "lblInertia"
- Me.lblInertia.Size = New System.Drawing.Size(54, 20)
+ Me.lblInertia.Size = New System.Drawing.Size(36, 13)
Me.lblInertia.TabIndex = 0
Me.lblInertia.Text = "Inertia"
'
@@ -134,10 +141,9 @@ 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(1216, 506)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(811, 343)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 13
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -145,10 +151,9 @@ 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(1095, 506)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Location = New System.Drawing.Point(730, 343)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 12
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -160,8 +165,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, 3, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(1347, 33)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(898, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -171,7 +176,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(34, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -181,7 +186,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(34, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -191,7 +196,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(34, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -201,14 +206,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(34, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -216,14 +221,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(34, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 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, 33)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -231,17 +236,16 @@ 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(34, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 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, 547)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 368)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(1347, 32)
+ Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -249,24 +253,22 @@ Partial Class ElectricMotorForm
'LbStatus
'
Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(60, 25)
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
Me.LbStatus.Text = "Status"
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(164, 126)
- Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(553, 26)
+ Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(24, 131)
- Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(126, 20)
+ Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -274,10 +276,9 @@ 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, 43)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(753, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -286,18 +287,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(203, 68)
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'pnInertia
@@ -305,37 +306,33 @@ 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(18, 166)
- Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnInertia.Location = New System.Drawing.Point(12, 108)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(332, 46)
+ Me.pnInertia.Size = New System.Drawing.Size(221, 30)
Me.pnInertia.TabIndex = 3
'
'tbDragTorque
'
- Me.tbDragTorque.Location = New System.Drawing.Point(18, 432)
- Me.tbDragTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbDragTorque.Location = New System.Drawing.Point(12, 296)
Me.tbDragTorque.Name = "tbDragTorque"
- Me.tbDragTorque.Size = New System.Drawing.Size(649, 26)
+ Me.tbDragTorque.Size = New System.Drawing.Size(434, 20)
Me.tbDragTorque.TabIndex = 5
'
'lblDragTorque
'
Me.lblDragTorque.AutoSize = true
- Me.lblDragTorque.Location = New System.Drawing.Point(18, 407)
- Me.lblDragTorque.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblDragTorque.Location = New System.Drawing.Point(12, 280)
Me.lblDragTorque.Name = "lblDragTorque"
- Me.lblDragTorque.Size = New System.Drawing.Size(143, 20)
+ Me.lblDragTorque.Size = New System.Drawing.Size(98, 13)
Me.lblDragTorque.TabIndex = 38
Me.lblDragTorque.Text = "Drag Torque Curve"
'
'btnBrowseDragCurve
'
Me.btnBrowseDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurve.Location = New System.Drawing.Point(669, 429)
- Me.btnBrowseDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseDragCurve.Location = New System.Drawing.Point(446, 294)
Me.btnBrowseDragCurve.Name = "btnBrowseDragCurve"
- Me.btnBrowseDragCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseDragCurve.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseDragCurve.TabIndex = 6
Me.btnBrowseDragCurve.TabStop = false
Me.btnBrowseDragCurve.UseVisualStyleBackColor = true
@@ -343,10 +340,9 @@ Partial Class ElectricMotorForm
'btnDragCurveOpen
'
Me.btnDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpen.Location = New System.Drawing.Point(704, 429)
- Me.btnDragCurveOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnDragCurveOpen.Location = New System.Drawing.Point(469, 294)
Me.btnDragCurveOpen.Name = "btnDragCurveOpen"
- Me.btnDragCurveOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnDragCurveOpen.Size = New System.Drawing.Size(24, 24)
Me.btnDragCurveOpen.TabIndex = 7
Me.btnDragCurveOpen.TabStop = false
Me.btnDragCurveOpen.UseVisualStyleBackColor = true
@@ -354,10 +350,9 @@ Partial Class ElectricMotorForm
'btnEmMapOpen
'
Me.btnEmMapOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpen.Location = New System.Drawing.Point(704, 493)
- Me.btnEmMapOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmMapOpen.Location = New System.Drawing.Point(469, 335)
Me.btnEmMapOpen.Name = "btnEmMapOpen"
- Me.btnEmMapOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmMapOpen.Size = New System.Drawing.Size(24, 24)
Me.btnEmMapOpen.TabIndex = 42
Me.btnEmMapOpen.TabStop = false
Me.btnEmMapOpen.UseVisualStyleBackColor = true
@@ -365,10 +360,9 @@ Partial Class ElectricMotorForm
'btnBrowseEmMap
'
Me.btnBrowseEmMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMap.Location = New System.Drawing.Point(669, 493)
- Me.btnBrowseEmMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseEmMap.Location = New System.Drawing.Point(446, 335)
Me.btnBrowseEmMap.Name = "btnBrowseEmMap"
- Me.btnBrowseEmMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseEmMap.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseEmMap.TabIndex = 41
Me.btnBrowseEmMap.TabStop = false
Me.btnBrowseEmMap.UseVisualStyleBackColor = true
@@ -376,28 +370,25 @@ Partial Class ElectricMotorForm
'lblEmMap
'
Me.lblEmMap.AutoSize = true
- Me.lblEmMap.Location = New System.Drawing.Point(18, 471)
- Me.lblEmMap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmMap.Location = New System.Drawing.Point(12, 321)
Me.lblEmMap.Name = "lblEmMap"
- Me.lblEmMap.Size = New System.Drawing.Size(242, 20)
+ Me.lblEmMap.Size = New System.Drawing.Size(163, 13)
Me.lblEmMap.TabIndex = 43
Me.lblEmMap.Text = "Electric Power Consumption Map"
'
'tbMap
'
- Me.tbMap.Location = New System.Drawing.Point(18, 496)
- Me.tbMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMap.Location = New System.Drawing.Point(12, 337)
Me.tbMap.Name = "tbMap"
- Me.tbMap.Size = New System.Drawing.Size(649, 26)
+ Me.tbMap.Size = New System.Drawing.Size(434, 20)
Me.tbMap.TabIndex = 40
'
'btnMaxTorqueCurveOpen
'
Me.btnMaxTorqueCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpen.Location = New System.Drawing.Point(704, 367)
- Me.btnMaxTorqueCurveOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnMaxTorqueCurveOpen.Location = New System.Drawing.Point(469, 254)
Me.btnMaxTorqueCurveOpen.Name = "btnMaxTorqueCurveOpen"
- Me.btnMaxTorqueCurveOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnMaxTorqueCurveOpen.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpen.TabIndex = 46
Me.btnMaxTorqueCurveOpen.TabStop = false
Me.btnMaxTorqueCurveOpen.UseVisualStyleBackColor = true
@@ -405,10 +396,9 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorque
'
Me.btnBrowseMaxTorque.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorque.Location = New System.Drawing.Point(669, 367)
- Me.btnBrowseMaxTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseMaxTorque.Location = New System.Drawing.Point(446, 254)
Me.btnBrowseMaxTorque.Name = "btnBrowseMaxTorque"
- Me.btnBrowseMaxTorque.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseMaxTorque.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorque.TabIndex = 45
Me.btnBrowseMaxTorque.TabStop = false
Me.btnBrowseMaxTorque.UseVisualStyleBackColor = true
@@ -416,19 +406,17 @@ Partial Class ElectricMotorForm
'lblMaxTorque
'
Me.lblMaxTorque.AutoSize = true
- Me.lblMaxTorque.Location = New System.Drawing.Point(18, 345)
- Me.lblMaxTorque.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxTorque.Location = New System.Drawing.Point(12, 239)
Me.lblMaxTorque.Name = "lblMaxTorque"
- Me.lblMaxTorque.Size = New System.Drawing.Size(325, 20)
+ Me.lblMaxTorque.Size = New System.Drawing.Size(222, 13)
Me.lblMaxTorque.TabIndex = 47
Me.lblMaxTorque.Text = "Max Drive and Max Generation Torque Curve"
'
'tbMaxTorque
'
- Me.tbMaxTorque.Location = New System.Drawing.Point(18, 370)
- Me.tbMaxTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMaxTorque.Location = New System.Drawing.Point(12, 255)
Me.tbMaxTorque.Name = "tbMaxTorque"
- Me.tbMaxTorque.Size = New System.Drawing.Size(649, 26)
+ Me.tbMaxTorque.Size = New System.Drawing.Size(434, 20)
Me.tbMaxTorque.TabIndex = 44
'
'lblTitle
@@ -436,10 +424,9 @@ 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(126, 52)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Location = New System.Drawing.Point(84, 34)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(281, 40)
+ Me.lblTitle.Size = New System.Drawing.Size(190, 29)
Me.lblTitle.TabIndex = 48
Me.lblTitle.Text = "Electric Machine"
'
@@ -447,89 +434,80 @@ 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(762, 43)
- Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicBox.Location = New System.Drawing.Point(508, 28)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(572, 408)
+ Me.PicBox.Size = New System.Drawing.Size(382, 266)
Me.PicBox.TabIndex = 49
Me.PicBox.TabStop = false
'
'Panel1
'
- Me.Panel1.Controls.Add(Me.lblContPwr)
- Me.Panel1.Controls.Add(Me.lblContPwrUnit)
- Me.Panel1.Controls.Add(Me.tbContPwr)
- Me.Panel1.Location = New System.Drawing.Point(18, 222)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(332, 46)
+ Me.Panel1.Size = New System.Drawing.Size(221, 30)
Me.Panel1.TabIndex = 25
'
- 'lblContPwr
+ 'lblContTq
'
- Me.lblContPwr.AutoSize = true
- Me.lblContPwr.Location = New System.Drawing.Point(4, 11)
- Me.lblContPwr.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblContPwr.Name = "lblContPwr"
- Me.lblContPwr.Size = New System.Drawing.Size(142, 20)
- Me.lblContPwr.TabIndex = 0
- Me.lblContPwr.Text = "Continuous Power:"
+ Me.lblContTq.AutoSize = true
+ Me.lblContTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblContTq.Name = "lblContTq"
+ Me.lblContTq.Size = New System.Drawing.Size(100, 13)
+ Me.lblContTq.TabIndex = 0
+ Me.lblContTq.Text = "Continuous Torque:"
'
- 'lblContPwrUnit
+ 'lblContTqUnit
'
- Me.lblContPwrUnit.AutoSize = true
- Me.lblContPwrUnit.Location = New System.Drawing.Point(273, 13)
- Me.lblContPwrUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblContPwrUnit.Name = "lblContPwrUnit"
- Me.lblContPwrUnit.Size = New System.Drawing.Size(32, 20)
- Me.lblContPwrUnit.TabIndex = 24
- Me.lblContPwrUnit.Text = "[W]"
+ Me.lblContTqUnit.AutoSize = true
+ Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblContTqUnit.Name = "lblContTqUnit"
+ Me.lblContTqUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblContTqUnit.TabIndex = 24
+ Me.lblContTqUnit.Text = "[W]"
'
- 'tbContPwr
+ 'tbContTq
'
- Me.tbContPwr.Location = New System.Drawing.Point(191, 8)
- Me.tbContPwr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tbContPwr.Name = "tbContPwr"
- Me.tbContPwr.Size = New System.Drawing.Size(71, 26)
- Me.tbContPwr.TabIndex = 3
+ 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
'
'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(18, 278)
- Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel2.Location = New System.Drawing.Point(12, 206)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(332, 46)
+ Me.Panel2.Size = New System.Drawing.Size(221, 30)
Me.Panel2.TabIndex = 25
'
'lblOvlTime
'
Me.lblOvlTime.AutoSize = true
- Me.lblOvlTime.Location = New System.Drawing.Point(4, 11)
- Me.lblOvlTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvlTime.Location = New System.Drawing.Point(3, 7)
Me.lblOvlTime.Name = "lblOvlTime"
- Me.lblOvlTime.Size = New System.Drawing.Size(178, 20)
+ Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
Me.lblOvlTime.TabIndex = 0
- Me.lblOvlTime.Text = "Peak Performance Time"
+ Me.lblOvlTime.Text = "Overload Duration:"
'
'lblOvltimeUnit
'
Me.lblOvltimeUnit.AutoSize = true
- Me.lblOvltimeUnit.Location = New System.Drawing.Point(270, 11)
- Me.lblOvltimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvltimeUnit.Location = New System.Drawing.Point(180, 7)
Me.lblOvltimeUnit.Name = "lblOvltimeUnit"
- Me.lblOvltimeUnit.Size = New System.Drawing.Size(25, 20)
+ Me.lblOvltimeUnit.Size = New System.Drawing.Size(18, 13)
Me.lblOvltimeUnit.TabIndex = 24
Me.lblOvltimeUnit.Text = "[s]"
'
'tbOvlTime
'
- Me.tbOvlTime.Location = New System.Drawing.Point(191, 8)
- Me.tbOvlTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTime.Location = New System.Drawing.Point(127, 5)
Me.tbOvlTime.Name = "tbOvlTime"
- Me.tbOvlTime.Size = New System.Drawing.Size(71, 26)
+ Me.tbOvlTime.Size = New System.Drawing.Size(49, 20)
Me.tbOvlTime.TabIndex = 3
'
'Panel3
@@ -537,38 +515,34 @@ Partial Class ElectricMotorForm
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(346, 278)
- Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel3.Location = New System.Drawing.Point(233, 206)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(391, 46)
+ Me.Panel3.Size = New System.Drawing.Size(261, 30)
Me.Panel3.TabIndex = 26
'
'lblOvlRecovery
'
Me.lblOvlRecovery.AutoSize = true
- Me.lblOvlRecovery.Location = New System.Drawing.Point(4, 11)
- Me.lblOvlRecovery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvlRecovery.Location = New System.Drawing.Point(-2, 8)
Me.lblOvlRecovery.Name = "lblOvlRecovery"
- Me.lblOvlRecovery.Size = New System.Drawing.Size(253, 20)
+ Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
Me.lblOvlRecovery.TabIndex = 0
- Me.lblOvlRecovery.Text = "Thermal Overload Recovery Factor"
+ Me.lblOvlRecovery.Text = "Thermal Overload Recovery Factor:"
'
'lblOvlRecoveryFactorUnit
'
Me.lblOvlRecoveryFactorUnit.AutoSize = true
- Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(345, 11)
- Me.lblOvlRecoveryFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(230, 7)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
- Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(22, 20)
+ Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(16, 13)
Me.lblOvlRecoveryFactorUnit.TabIndex = 24
Me.lblOvlRecoveryFactorUnit.Text = "[-]"
'
'tbOverloadRecoveryFactor
'
- Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(265, 8)
- Me.tbOverloadRecoveryFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(177, 5)
Me.tbOverloadRecoveryFactor.Name = "tbOverloadRecoveryFactor"
- Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(49, 20)
Me.tbOverloadRecoveryFactor.TabIndex = 3
'
'Panel4
@@ -576,47 +550,115 @@ Partial Class ElectricMotorForm
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(349, 222)
- Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel4.Location = New System.Drawing.Point(233, 144)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(391, 46)
+ Me.Panel4.Size = New System.Drawing.Size(261, 30)
Me.Panel4.TabIndex = 26
'
'lblRatedSpeed
'
Me.lblRatedSpeed.AutoSize = true
- Me.lblRatedSpeed.Location = New System.Drawing.Point(4, 11)
- Me.lblRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedSpeed.Location = New System.Drawing.Point(3, 7)
Me.lblRatedSpeed.Name = "lblRatedSpeed"
- Me.lblRatedSpeed.Size = New System.Drawing.Size(183, 20)
+ Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
Me.lblRatedSpeed.TabIndex = 0
- Me.lblRatedSpeed.Text = "Rated Speed (cont. Pwr)"
+ Me.lblRatedSpeed.Text = "Test Speed Continuous Torque:"
'
'lblRatedSpeedUnit
'
Me.lblRatedSpeedUnit.AutoSize = true
- Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(344, 11)
- Me.lblRatedSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(229, 7)
Me.lblRatedSpeedUnit.Name = "lblRatedSpeedUnit"
- Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(44, 20)
+ Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(30, 13)
Me.lblRatedSpeedUnit.TabIndex = 24
Me.lblRatedSpeedUnit.Text = "[rpm]"
'
'tbRatedSpeed
'
- Me.tbRatedSpeed.Location = New System.Drawing.Point(265, 8)
- Me.tbRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeed.Location = New System.Drawing.Point(177, 5)
Me.tbRatedSpeed.Name = "tbRatedSpeed"
- Me.tbRatedSpeed.Size = New System.Drawing.Size(71, 26)
+ Me.tbRatedSpeed.Size = New System.Drawing.Size(49, 20)
Me.tbRatedSpeed.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.Name = "pnOverloadTq"
+ Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
+ Me.pnOverloadTq.TabIndex = 26
+ '
+ 'lblOverloadTq
+ '
+ Me.lblOverloadTq.AutoSize = true
+ Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadTq.Name = "lblOverloadTq"
+ Me.lblOverloadTq.Size = New System.Drawing.Size(90, 13)
+ 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.Name = "lblOverloadTqUnit"
+ Me.lblOverloadTqUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblOverloadTqUnit.TabIndex = 24
+ Me.lblOverloadTqUnit.Text = "[W]"
+ '
+ 'tbOverloadTq
+ '
+ 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
+ '
+ '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.Name = "Panel6"
+ Me.Panel6.Size = New System.Drawing.Size(261, 30)
+ Me.Panel6.TabIndex = 27
+ '
+ 'lblOverloadSpeed
+ '
+ Me.lblOverloadSpeed.AutoSize = true
+ Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
+ Me.lblOverloadSpeed.Size = New System.Drawing.Size(148, 13)
+ 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.Name = "lblOverloadSpeedUnit"
+ Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ 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
+ '
'ElectricMotorForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(1347, 579)
+ Me.ClientSize = New System.Drawing.Size(898, 390)
+ Me.Controls.Add(Me.Panel6)
+ Me.Controls.Add(Me.pnOverloadTq)
Me.Controls.Add(Me.Panel4)
Me.Controls.Add(Me.Panel3)
Me.Controls.Add(Me.Panel2)
@@ -645,7 +687,6 @@ 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
@@ -668,6 +709,10 @@ Partial Class ElectricMotorForm
Me.Panel3.PerformLayout
Me.Panel4.ResumeLayout(false)
Me.Panel4.PerformLayout
+ Me.pnOverloadTq.ResumeLayout(false)
+ Me.pnOverloadTq.PerformLayout
+ Me.Panel6.ResumeLayout(false)
+ Me.Panel6.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -710,9 +755,9 @@ End Sub
Friend WithEvents lblTitle As Label
Friend WithEvents PicBox As PictureBox
Friend WithEvents Panel1 As Panel
- Friend WithEvents lblContPwr As Label
- Friend WithEvents lblContPwrUnit As Label
- Friend WithEvents tbContPwr As TextBox
+ Friend WithEvents lblContTq As Label
+ Friend WithEvents lblContTqUnit As Label
+ Friend WithEvents tbContTq As TextBox
Friend WithEvents Panel2 As Panel
Friend WithEvents lblOvlTime As Label
Friend WithEvents lblOvltimeUnit As Label
@@ -725,4 +770,12 @@ End Sub
Friend WithEvents lblRatedSpeed As Label
Friend WithEvents lblRatedSpeedUnit As Label
Friend WithEvents tbRatedSpeed As TextBox
+ Friend WithEvents pnOverloadTq As Panel
+ Friend WithEvents lblOverloadTq As Label
+ Friend WithEvents lblOverloadTqUnit As Label
+ Friend WithEvents tbOverloadTq As TextBox
+ Friend WithEvents Panel6 As Panel
+ Friend WithEvents lblOverloadSpeed As Label
+ Friend WithEvents lblOverloadSpeedUnit As Label
+ Friend WithEvents tbOvlSpeed As TextBox
End Class
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 818ed8d76f297d3b3972f17243d84b6e12bb8288..a5ab7cdec231ca8633a010d2014de43fb58641f3 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -177,9 +177,11 @@ Public Class ElectricMotorForm
tbMakeModel.Text = engine.Model
tbInertia.Text = engine.Inertia.ToGUIFormat()
+ tbOverloadTq.Text = If(engine.OverloadTorque?.Value().ToGUIFormat(), "")
+ tbOvlSpeed.Text = If(engine.OverloadTestSpeed?.Value().ToGUIFormat(), "")
tbOvlTime.Text = engine.OverloadTime.Value().ToGUIFormat()
- tbContPwr.Text = engine.ContinuousPower.ToGUIFormat()
- tbRatedSpeed.Text = engine.ContinuousPowerSpeed.AsRPM.ToGUIFormat()
+ tbContTq.Text = engine.ContinuousTorque.ToGUIFormat()
+ tbRatedSpeed.Text = engine.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadRecoveryFactor.Text = engine.OverloadRecoveryFactor.ToGUIFormat()
tbDragTorque.Text = GetRelativePath(engine.DragCurve.Source, basePath)
@@ -218,9 +220,12 @@ Public Class ElectricMotorForm
em.ModelName = tbMakeModel.Text
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.ContPwr = tbContPwr.Text.ToDouble(0)
+ em.ContTq = tbContTq.Text.ToDouble(0)
em.OverloadRecoveryFactor = tbOverloadRecoveryFactor.Text.ToDouble(0)
em.PathMaxTorque = tbMaxTorque.Text
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index adbc3547b34511c41988b28fc74378efc6d1ca77..785f68654cf1e623f5f7c15235e1ae8345dd89de 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -648,6 +648,7 @@ Public Class VectoJobForm
'a_DesMax
vectoJob.DesMaxFile = TbDesMaxFile.Text
+ vectoJob.AuxEntries.Clear()
For Each lv0 As ListViewItem In LvAux.Items
Dim auxEntry As VectoJob.AuxEntry = New VectoJob.AuxEntry
@@ -657,7 +658,7 @@ Public Class VectoJobForm
Function(x) Trim(x)))
auxEntry.Type = AuxiliaryTypeHelper.ParseKey(lv0.SubItems(AuxViewColumns.AuxID).Text)
-
+ vectoJob.AuxEntries(AuxiliaryTypeHelper.GetAuxKey(auxEntry.Type)) = auxEntry
Next
vectoJob.AuxPwrICEOn = TbAuxPAuxICEOn.Text.ToDouble(0)
vectoJob.AuxPwrDrivingICEOff = tbPAuxDrivingICEOff.Text.ToDouble(0)
@@ -672,6 +673,8 @@ Public Class VectoJobForm
vectoJob.UseBusAux = false
End If
+
+
'vectoJob.EngineOnly = JobType = VectoSimulationJobType.EngineOnlySimulation
vectoJob.OverSpeedOn = RdOverspeed.Checked
diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb
index aed1d1adf1147f7831683531a8e652b7e599eb65..d19172a9789d1ceb122087e88c38ecdc73add5ec 100644
--- a/VECTO/Input Files/ElectricMachine.vb
+++ b/VECTO/Input Files/ElectricMachine.vb
@@ -36,8 +36,10 @@ Public Class ElectricMachine
Public ModelName As String
Public MotorInertia As Double
Public PeakPowerTime As Double
- Public ContPwr As Double
+ Public ContTq As Double
Public RatedSpeed As Double
+ Public OvlTq As Double
+ Public OvlSpeed As Double
''' <summary>
''' New instance. Initialise
@@ -229,7 +231,7 @@ Public Class ElectricMachine
End Get
End Property
- Public ReadOnly Property ConinuousPowerSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousPowerSpeed
+ Public ReadOnly Property ContinuousTorqueSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousTorqueSpeed
get
Return RatedSpeed.RPMtoRad()
End Get
@@ -237,9 +239,21 @@ Public Class ElectricMachine
Public Property OverloadRecoveryFactor As Double Implements IElectricMotorDeclarationInputData.OverloadRecoveryFactor
- Public ReadOnly Property ContinuousPower As Watt Implements IElectricMotorDeclarationInputData.ContinuousPower
+ Public ReadOnly Property ContinuousTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.ContinuousTorque
get
- Return ContPwr.si(of Watt)
+ 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
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index c55f884d98b59bb9accaed934272bf2b13472d75..4254f25dd2af3c01d9480c5d6afce72f3f78c89c 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -35,6 +35,7 @@ Public Class VectoJob
IDeclarationJobInputData, IDriverEngineeringInputData, IDriverDeclarationInputData, IAuxiliariesEngineeringInputData, IAuxiliaryEngineeringInputData,
IAuxiliariesDeclarationInputData, IJSONVehicleComponents, IEngineStopStartEngineeringInputData, IEcoRollEngineeringInputData, IPCCEngineeringInputData
+
Private _sFilePath As String
Private _myPath As String
@@ -93,6 +94,8 @@ Public Class VectoJob
Public AuxPwrDrivingICEOff As Double
Public AuxPwrStandstillICEOff As Double
+ Public AuxEntries As Dictionary(Of String, AuxEntry )
+
'Private _vehicleInputData As JSONComponentInputData
'Private _engineInputData As JSONComponentInputData
'Private _gearboxInputData As JSONComponentInputData
@@ -126,6 +129,8 @@ Public Class VectoJob
_driverAccelerationFile = New SubPath
CycleFiles = New List(Of SubPath)
+
+ AuxEntries = new Dictionary(Of String,AuxEntry)
End Sub
Public Function SaveFile() As Boolean
@@ -711,7 +716,7 @@ Public Class VectoJob
Public ReadOnly Property Auxiliaries As IAuxiliaryEngineeringInputData _
Implements IAuxiliariesEngineeringInputData.Auxiliaries
Get
- Return me
+ Return Me 'AuxData().Cast(Of IAuxiliariesEngineeringInputData).ToList()
End Get
End Property
@@ -735,7 +740,9 @@ Public Class VectoJob
Protected Function AuxData() As IList(Of DeclarationAuxiliaryDataInputData)
Dim retVal As List(Of DeclarationAuxiliaryDataInputData) = New List(Of DeclarationAuxiliaryDataInputData)
-
+ For Each entry As KeyValuePair(Of string, AuxEntry) In AuxEntries
+ retVal.Add(New DeclarationAuxiliaryDataInputData() With{ .ID = entry.Key, .Technology = entry.Value.TechnologyList, .Type = AuxiliaryTypeHelper.ParseKey(entry.Key)})
+ Next
Return retVal
End Function
@@ -808,6 +815,8 @@ Public Class VectoJob
Return AuxElPadd.SI(of Watt)
End Get
End Property
+
+
End Class
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 6b85e2a0025fe60db89c6f15e5d18fc8cc04d80b..9c30f229b014613c99ab52f5b0ea6326e7900b09 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -1012,7 +1012,9 @@ Public Class ElectricMachineWrapper
Public ReadOnly Property EfficiencyMap As TableData Implements IElectricMotorDeclarationInputData.EfficiencyMap
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
Public ReadOnly Property OverloadTime As Second Implements IElectricMotorDeclarationInputData.OverloadTime
- Public ReadOnly Property ContinuousPowerSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousPowerSpeed
+ 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 OverloadRecoveryFactor As Double Implements IElectricMotorDeclarationInputData.OverloadRecoveryFactor
- Public ReadOnly Property ContinuousPower As Watt Implements IElectricMotorDeclarationInputData.ContinuousPower
+ Public ReadOnly Property ContinuousTorque As NewtonMeter Implements IElectricMotorDeclarationInputData.ContinuousTorque
End Class
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 45c35f5ba7f6634e4b6b421000c9e32cc0f7525e..efff8a8ba3ac301a137fa5cd6e0fa769be9c746d 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -705,9 +705,13 @@ namespace TUGraz.VectoCommon.InputData
double OverloadRecoveryFactor { get; }
- Watt ContinuousPower { get; }
+ NewtonMeter ContinuousTorque { get; }
- PerSecond ContinuousPowerSpeed { get; }
+ PerSecond ContinuousTorqueSpeed { get; }
+
+ NewtonMeter OverloadTorque { get; }
+
+ PerSecond OverloadTestSpeed { get; }
}
public interface IElectricMachinesDeclarationInputData
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
index 8a90d8ad77de410aa8f3dfc654da2e7130bbc8d1..276238786ad892e4e299912920b6f74b98aaf2b7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
@@ -6,19 +6,42 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
namespace TUGraz.VectoCore.InputData.FileIO.JSON {
+
+ public class JSONElectricMotorV2 : JSONElectricMotorV1
+ {
+ public JSONElectricMotorV2(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
+
+ public override NewtonMeter ContinuousTorque {
+ get { return Body.GetValueOrDefault<double>("ContinuousTorque")?.SI<NewtonMeter>() ?? 1e12.SI<NewtonMeter>(); }
+ }
+
+ public override PerSecond ContinuousTorqueSpeed {
+ get { return Body.GetValueOrDefault<double>("ContinuousTorqueSpeed")?.RPMtoRad(); }
+ }
+
+ public override NewtonMeter OverloadTorque {
+ get { return Body.GetValueOrDefault<double>("OverloadTorque")?.SI<NewtonMeter>() ?? 1e12.SI<NewtonMeter>(); }
+ }
+
+ public override PerSecond OverloadTestSpeed {
+ get { return Body.GetValueOrDefault<double>("OverloadTorqueSpeed")?.RPMtoRad(); }
+ }
+ }
+
+
public class JSONElectricMotorV1 : JSONFile, IElectricMotorEngineeringInputData
{
public JSONElectricMotorV1(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
- public string Manufacturer
+ public virtual string Manufacturer
{
get { return Constants.NOT_AVailABLE; }
}
- public string Model
+ public virtual string Model
{
get { return Body.GetEx<string>("Model"); }
}
- public DateTime Date { get { return DateTime.MinValue; } }
- public CertificationMethod CertificationMethod
+ public virtual DateTime Date { get { return DateTime.MinValue; } }
+ public virtual CertificationMethod CertificationMethod
{
get { return CertificationMethod.NotCertified; }
}
@@ -31,32 +54,32 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON {
get { return null; }
}
- public TableData FullLoadCurve
+ public virtual TableData FullLoadCurve
{
get { return ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve"); }
}
- public TableData DragCurve
+ public virtual TableData DragCurve
{
get { return ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"); }
}
- public TableData EfficiencyMap
+ public virtual TableData EfficiencyMap
{
get { return ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map"); }
}
- public KilogramSquareMeter Inertia
+ public virtual KilogramSquareMeter Inertia
{
get { return Body.GetEx<double>("Inertia").SI<KilogramSquareMeter>(); }
}
- public Joule OverloadBuffer
+ public virtual Joule OverloadBuffer
{
get { return Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>(); }
}
- public double OverloadRecoveryFactor
+ public virtual double OverloadRecoveryFactor
{
get
{
@@ -64,22 +87,28 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON {
}
}
- public Watt ContinuousPower
+ public virtual NewtonMeter ContinuousTorque
{
- get { return Body.GetValueOrDefault<double>("ContinuousPower")?.SI<Watt>() ?? 1e12.SI<Watt>(); }
+ get { return (Body.GetValueOrDefault<double>("ContinuousPower")?.SI<Watt>() ?? 1e12.SI<Watt>()) / (Body.GetValueOrDefault<double>("ContinuousPowerSpeed")?.RPMtoRad() ?? 1.SI<PerSecond>()) ; }
}
- public PerSecond ContinuousPowerSpeed
+ public virtual PerSecond ContinuousTorqueSpeed
{
get { return Body.GetValueOrDefault<double>("ContinuousPowerSpeed")?.RPMtoRad() ?? 0.RPMtoRad(); }
}
- public Second OverloadTime
+ public virtual NewtonMeter OverloadTorque {
+ get { return null; }
+ }
+
+ public virtual PerSecond OverloadTestSpeed
{
- get
- {
- return Body.GetValueOrDefault<double>("OverloadTime")?.SI<Second>() ?? 0.SI<Second>();
- }
+ get { return null; }
+ }
+
+ public virtual Second OverloadTime
+ {
+ get { return Body.GetValueOrDefault<double>("OverloadTime")?.SI<Second>() ?? 0.SI<Second>(); }
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index bce5f74b01424a55d1965d58ca1f807e5c3e4079..152b4e9b7bcd1dff7874d1584413479098b6d810 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -209,6 +209,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
case 1:
return new JSONElectricMotorV1(json, filename, tolerateMissing);
+ case 2:
+ return new JSONElectricMotorV2(json, filename, tolerateMissing);
default:
throw new VectoException("ElectricMotor-File: Unsupported FileVersion. Got {0}", version);
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index f86702c1f1699a04e2211f6561a0021c603c586f..7ebb331a15bcfb56f6348ffe3b55a51f47cf296b 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -774,8 +774,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
DragCurve = ElectricMotorDragCurveReader.Create(motorData.DragCurve, count),
EfficiencyMap = ElectricMotorMapReader.Create(motorData.EfficiencyMap, count),
Inertia = motorData.Inertia,
- ContinuousPower = motorData.ContinuousPower * count,
- ContinuousPowerSpeed = motorData.ContinuousPowerSpeed,
+ 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,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index 0b52d3d8cc67a2198d8d487d1147fac0ebbbb088..e22a0db1f5bc6dbacdb0c3790c9d2fc61734947a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -20,14 +20,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public DragCurve DragCurve { get; internal set; }
[SIRange(double.MinValue, double.MaxValue)]
- public Watt ContinuousPower { get; internal set; }
+ public NewtonMeter ContinuousTorque { get; internal set; }
[SIRange(0, double.MaxValue)]
- public Second OverloadTime { get; internal set; }
-
+ public PerSecond ContinuousTorqueSpeed { get; internal set; }
+
+
+ [SIRange(double.MinValue, double.MaxValue)]
+ public NewtonMeter OverloadTorque { get; set; }
+
[SIRange(0, double.MaxValue)]
- public PerSecond ContinuousPowerSpeed { get; internal set; }
+ public PerSecond OverloadTestSpeed { get; set; }
+
+ [SIRange(0, double.MaxValue)]
+ public Second OverloadTime { get; internal set; }
+
[SIRange(0, 1)]
public double OverloadRegenerationFactor { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 33317317cb5ab7715a606562c0a36861db9db3ce..434b08694afa8e62d98c71484098e04582096468 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -139,6 +139,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
(AdditionalAux?.PowerDemandESSEngineOn(0.SI<Second>(), 1.SI<Second>(), angularSpeed) ?? 0.SI<Watt>());
var avgAngularSpeed = (CurrentState.AngularSpeed + PreviousState.AngularSpeed) / 2.0;
+ if (avgAngularSpeed.IsEqual(0)) {
+ return 0.SI<NewtonMeter>();
+ }
return CurrentState.PowerDemand / avgAngularSpeed;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index ee20603c96eb9c65a4411bc1889816276ff5ceae..7e9ff4a809457b960f5e04c9838f0543a2c4457f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -52,15 +52,16 @@ 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.ContinuousPower / ModelData.ContinuousPowerSpeed;
+ ContinuousTorque = ModelData.ContinuousTorque;
var contElPwr =
- ModelData.EfficiencyMap.LookupElectricPower(ModelData.ContinuousPowerSpeed, -ContinuousTorque).ElectricalPower ??
- ModelData.EfficiencyMap.LookupElectricPower(ModelData.ContinuousPowerSpeed, ModelData.FullLoadCurve.FullLoadDriveTorque(ModelData.ContinuousPowerSpeed), true).ElectricalPower;
- ContinuousPowerLoss = -contElPwr - ModelData.ContinuousPower; // loss needs to be positive
- var maxTqDrive = ModelData.FullLoadCurve.FullLoadDriveTorque(ModelData.ContinuousPowerSpeed);
- var peakElPwr = ModelData.EfficiencyMap.LookupElectricPower(ModelData.ContinuousPowerSpeed, maxTqDrive, true)
+ ModelData.EfficiencyMap.LookupElectricPower(ModelData.ContinuousTorqueSpeed, -ContinuousTorque).ElectricalPower ??
+ ModelData.EfficiencyMap.LookupElectricPower(ModelData.ContinuousTorqueSpeed, ModelData.FullLoadCurve.FullLoadDriveTorque(ModelData.ContinuousTorqueSpeed), true).ElectricalPower;
+ ContinuousPowerLoss = -contElPwr - ContinuousTorque * ModelData.ContinuousTorqueSpeed; // loss needs to be positive
+
+ var peakElPwr = ModelData.EfficiencyMap.LookupElectricPower(ModelData.OverloadTestSpeed, -ModelData.OverloadTorque, true)
.ElectricalPower;
- var peakPwrLoss = -peakElPwr + ModelData.ContinuousPowerSpeed * maxTqDrive; // losses need to be positive
+ var peakPwrLoss = -peakElPwr + ModelData.OverloadTorque * ModelData.OverloadTestSpeed; // losses need to be positive
+
OverloadBuffer = (peakPwrLoss - ContinuousPowerLoss) * ModelData.OverloadTime;
if (OverloadBuffer.IsSmallerOrEqual(0) && !(container is SimplePowertrainContainer)) {
Log.Error("Overload buffer for thermal de-rating is negative! Please check electric motor data!");
@@ -368,9 +369,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private NewtonMeter GetMaxRecuperationTorque(Second dt, PerSecond avgSpeed)
{
var tqContinuousPwr = DeRatingActive ? ContinuousTorque : null;
- if (!avgSpeed.IsEqual(0)) {
- tqContinuousPwr = DeRatingActive ? ModelData.ContinuousPower / avgSpeed : null;
- }
+ //if (!avgSpeed.IsEqual(0)) {
+ // tqContinuousPwr = DeRatingActive ? ModelData.ContinuousTorque / avgSpeed : null;
+ //}
var maxEmTorque = VectoMath.Min(tqContinuousPwr, ModelData.FullLoadCurve.FullGenerationTorque(avgSpeed));
var electricSystemResponse = ElectricPower.Request(0.SI<Second>(), dt, 0.SI<Watt>(), true);
var maxBatPower = electricSystemResponse.MaxPowerDrag;
@@ -398,9 +399,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private NewtonMeter GetMaxDriveTorque(Second dt, PerSecond avgSpeed)
{
var tqContinuousPwr = DeRatingActive ? -ContinuousTorque : null;
- if (!avgSpeed.IsEqual(0)) {
- tqContinuousPwr = DeRatingActive ? -ModelData.ContinuousPower / avgSpeed : null;
- }
+ //if (!avgSpeed.IsEqual(0)) {
+ // tqContinuousPwr = DeRatingActive ? -ModelData.ContinuousTorque / avgSpeed : null;
+ //}
var maxEmTorque = VectoMath.Max(tqContinuousPwr ,ModelData.FullLoadCurve.FullLoadDriveTorque(avgSpeed));
var electricSystemResponse = ElectricPower.Request(0.SI<Second>(), dt, 0.SI<Watt>(), true);
var maxBatPower = electricSystemResponse.MaxPowerDrive;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index a55790cf0d572243335e39cacb1aa2cfbea7eaf4..fb13bd67ce4364735c0f8ef9e16357877753d66a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -50,15 +50,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public PEVAMTShiftStrategy(IVehicleContainer dataBus)
{
- GearboxModelData = dataBus.RunData.GearboxData;
- GearshiftParams = dataBus.RunData.GearshiftParameters;
- GearList = GearboxModelData.GearList;
- MaxStartGear = GearList.Reverse().First();
var runData = dataBus.RunData;
if (runData.VehicleData == null) {
return;
}
-
+ GearboxModelData = dataBus.RunData.GearboxData;
+ GearshiftParams = dataBus.RunData.GearshiftParameters;
+ GearList = GearboxModelData.GearList;
+ MaxStartGear = GearList.Reverse().First();
PowerMap = dataBus.RunData.ElectricMachinesData
.FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.EfficiencyMap;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
index f00d8a092505990d6c6952c3050898193f661904..56ff12176d4561f0facfaee38baf4a3d26b186e6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
@@ -211,16 +211,23 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override PerSecond GetMotorTargetSpeed(VectoRunData runData)
{
- return 0.5 * runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.FullLoadCurve
- .MaxSpeed;
+ var em = runData.ElectricMachinesData
+ .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2);
+ if (em == null) {
+ throw new VectoException("E2 EM required for PEV E2 GearshiftPreprocessing");
+ }
+ return 0.5 * em.Item2.FullLoadCurve
+ .MaxSpeed / em.Item2.RatioADC;
}
protected override PerSecond GetMaxMotorspeed(VectoRunData runData)
{
- return runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.FullLoadCurve
- .MaxSpeed;
+ var em = runData.ElectricMachinesData
+ .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2);
+ if (em == null) {
+ throw new VectoException("E2 EM required for PEV E2 GearshiftPreprocessing");
+ }
+ return em.Item2.FullLoadCurve.MaxSpeed / em.Item2.RatioADC;
}
}
}
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 1952619333a865881664e91538229b10c9995467..fd1d5a08bd278b12296223ce53f33c3851c04dc1 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 = 1;
+ private const int ElectricMotorFormatVersion = 2;
private const int REESSFormatVersion = 1;
@@ -83,8 +83,10 @@ public class JSONFileWriter : IOutputFileWriter
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("ContinuousPower", electricMachine.ContinuousPower.Value());
- body.Add("ContinuousPowerSpeed", electricMachine.ContinuousPowerSpeed.AsRPM);
+ 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("ThermalOverloadRecoveryFactor", electricMachine.OverloadRecoveryFactor);
WriteFile(header, body, filename);
@@ -964,15 +966,16 @@ public class JSONFileWriter : IOutputFileWriter
auxOut.Add("Type", auxEntry.Type.Name());
auxOut.Add("Technology", new string[] { });
} else {
+ auxOut.Add("ID", auxEntry.Type.Key());
auxOut.Add("Type", auxEntry.Type.Name());
auxOut.Add("Technology", engineeringAuxEntry.Technology);
}
auxList.Add(auxOut);
- body.Add("Aux", auxList);
+
}
-
+ body.Add("Aux", auxList);
}
if (!job.SavedInDeclarationMode && job.Vehicle is IVehicleEngineeringInputData engVehicle) {