diff --git a/VECTO/File Browser/FileBrowserModule.vb b/VECTO/File Browser/FileBrowserModule.vb
index 896404162a94ae297a61af31c671c188572987c0..a0115609f3767382cd5efeff7b9040e1e02ba4b6 100644
--- a/VECTO/File Browser/FileBrowserModule.vb
+++ b/VECTO/File Browser/FileBrowserModule.vb
@@ -69,7 +69,12 @@ Public Module FileBrowserModule
Public REESSFileBrowser As FileBrowser
public EmADCLossMapFileBrowser As FileBrowser
+ Public IEPCFileBrowser As FileBrowser
+ Public IEPCFLCFileBrowser As FileBrowser
+ Public IEPCDragFileBrowser As FileBrowser
+ Public IEPCPowerMapFileBrowser As FileBrowser
+ Public IHPCFileBrowser As FileBrowser
Public IHPCPowerMapFileBrowser As FileBrowser
Public IHPCFullLoadCurveFileBrowser As FileBrowser
public IHPCDragCurveFileBrowser As FileBrowser
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 25da7c409933e02fcf6596eb39fda7b973c73165..d7453bab608fabe7cdb62ae8f4d49dc0d6e24b5f 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -159,29 +159,26 @@ Partial Class ElectricMotorForm
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(190, 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(72, 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, 12)
- 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"
'
@@ -189,10 +186,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(1281, 648)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(854, 421)
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
@@ -200,10 +196,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(1160, 648)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Location = New System.Drawing.Point(773, 421)
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
@@ -215,8 +210,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(1412, 33)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(941, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -226,7 +221,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"
'
@@ -236,7 +231,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..."
'
@@ -246,7 +241,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"
'
@@ -256,14 +251,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
'
@@ -271,14 +266,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
'
@@ -286,17 +281,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, 688)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 446)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(1412, 32)
+ Me.StatusStrip1.Size = New System.Drawing.Size(941, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -304,24 +298,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"
'
@@ -329,10 +321,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
'
@@ -341,18 +332,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
@@ -360,19 +351,17 @@ 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
'
'btnEmMapOpenHi
'
Me.btnEmMapOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenHi.Location = New System.Drawing.Point(662, 134)
- Me.btnEmMapOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmMapOpenHi.Location = New System.Drawing.Point(441, 87)
Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
- Me.btnEmMapOpenHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
Me.btnEmMapOpenHi.TabIndex = 42
Me.btnEmMapOpenHi.TabStop = false
Me.btnEmMapOpenHi.UseVisualStyleBackColor = true
@@ -380,10 +369,9 @@ Partial Class ElectricMotorForm
'btnBrowseEmMapHi
'
Me.btnBrowseEmMapHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(628, 134)
- Me.btnBrowseEmMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(419, 87)
Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
- Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseEmMapHi.TabIndex = 41
Me.btnBrowseEmMapHi.TabStop = false
Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
@@ -391,28 +379,25 @@ Partial Class ElectricMotorForm
'lblPowerMapHi
'
Me.lblPowerMapHi.AutoSize = true
- Me.lblPowerMapHi.Location = New System.Drawing.Point(7, 114)
- Me.lblPowerMapHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPowerMapHi.Location = New System.Drawing.Point(5, 74)
Me.lblPowerMapHi.Name = "lblPowerMapHi"
- Me.lblPowerMapHi.Size = New System.Drawing.Size(242, 20)
+ Me.lblPowerMapHi.Size = New System.Drawing.Size(163, 13)
Me.lblPowerMapHi.TabIndex = 43
Me.lblPowerMapHi.Text = "Electric Power Consumption Map"
'
'tbMapHi
'
- Me.tbMapHi.Location = New System.Drawing.Point(7, 139)
- Me.tbMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMapHi.Location = New System.Drawing.Point(5, 90)
Me.tbMapHi.Name = "tbMapHi"
- Me.tbMapHi.Size = New System.Drawing.Size(607, 26)
+ Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
Me.tbMapHi.TabIndex = 40
'
'btnMaxTorqueCurveOpenHi
'
Me.btnMaxTorqueCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(662, 75)
- Me.btnMaxTorqueCurveOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(441, 49)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
- Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
Me.btnMaxTorqueCurveOpenHi.TabStop = false
Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
@@ -420,10 +405,9 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorqueHi
'
Me.btnBrowseMaxTorqueHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(628, 75)
- Me.btnBrowseMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(419, 49)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
- Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorqueHi.TabIndex = 45
Me.btnBrowseMaxTorqueHi.TabStop = false
Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
@@ -431,19 +415,17 @@ Partial Class ElectricMotorForm
'lblMaxTorqueHi
'
Me.lblMaxTorqueHi.AutoSize = true
- Me.lblMaxTorqueHi.Location = New System.Drawing.Point(7, 54)
- Me.lblMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxTorqueHi.Location = New System.Drawing.Point(5, 35)
Me.lblMaxTorqueHi.Name = "lblMaxTorqueHi"
- Me.lblMaxTorqueHi.Size = New System.Drawing.Size(325, 20)
+ Me.lblMaxTorqueHi.Size = New System.Drawing.Size(222, 13)
Me.lblMaxTorqueHi.TabIndex = 47
Me.lblMaxTorqueHi.Text = "Max Drive and Max Generation Torque Curve"
'
'tbMaxTorqueHi
'
- Me.tbMaxTorqueHi.Location = New System.Drawing.Point(7, 78)
- Me.tbMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMaxTorqueHi.Location = New System.Drawing.Point(5, 51)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
- Me.tbMaxTorqueHi.Size = New System.Drawing.Size(607, 26)
+ Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
Me.tbMaxTorqueHi.TabIndex = 44
'
'lblTitle
@@ -451,10 +433,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(119, 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"
'
@@ -462,10 +443,9 @@ 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(776, 43)
- Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicBox.Location = New System.Drawing.Point(517, 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
'
@@ -474,38 +454,34 @@ Partial Class ElectricMotorForm
Me.Panel1.Controls.Add(Me.lblContTq)
Me.Panel1.Controls.Add(Me.lblContTqUnit)
Me.Panel1.Controls.Add(Me.tbContTqLo)
- Me.Panel1.Location = New System.Drawing.Point(7, 184)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Location = New System.Drawing.Point(5, 120)
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
'
'lblContTq
'
Me.lblContTq.AutoSize = true
- Me.lblContTq.Location = New System.Drawing.Point(4, 11)
- Me.lblContTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblContTq.Location = New System.Drawing.Point(3, 7)
Me.lblContTq.Name = "lblContTq"
- Me.lblContTq.Size = New System.Drawing.Size(148, 20)
+ Me.lblContTq.Size = New System.Drawing.Size(100, 13)
Me.lblContTq.TabIndex = 0
Me.lblContTq.Text = "Continuous Torque:"
'
'lblContTqUnit
'
Me.lblContTqUnit.AutoSize = true
- Me.lblContTqUnit.Location = New System.Drawing.Point(273, 12)
- Me.lblContTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
Me.lblContTqUnit.Name = "lblContTqUnit"
- Me.lblContTqUnit.Size = New System.Drawing.Size(41, 20)
+ Me.lblContTqUnit.Size = New System.Drawing.Size(29, 13)
Me.lblContTqUnit.TabIndex = 24
Me.lblContTqUnit.Text = "[Nm]"
'
'tbContTqLo
'
- Me.tbContTqLo.Location = New System.Drawing.Point(190, 8)
- Me.tbContTqLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContTqLo.Location = New System.Drawing.Point(127, 5)
Me.tbContTqLo.Name = "tbContTqLo"
- Me.tbContTqLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbContTqLo.Size = New System.Drawing.Size(49, 20)
Me.tbContTqLo.TabIndex = 3
'
'Panel2
@@ -513,38 +489,34 @@ Partial Class ElectricMotorForm
Me.Panel2.Controls.Add(Me.lblOvlTime)
Me.Panel2.Controls.Add(Me.lblOvltimeUnit)
Me.Panel2.Controls.Add(Me.tbOvlTimeLo)
- Me.Panel2.Location = New System.Drawing.Point(7, 279)
- Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel2.Location = New System.Drawing.Point(5, 181)
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(141, 20)
+ Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
Me.lblOvlTime.TabIndex = 0
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]"
'
'tbOvlTimeLo
'
- Me.tbOvlTimeLo.Location = New System.Drawing.Point(190, 8)
- Me.tbOvlTimeLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTimeLo.Location = New System.Drawing.Point(127, 5)
Me.tbOvlTimeLo.Name = "tbOvlTimeLo"
- Me.tbOvlTimeLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlTimeLo.Size = New System.Drawing.Size(49, 20)
Me.tbOvlTimeLo.TabIndex = 3
'
'Panel3
@@ -552,38 +524,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(369, 166)
- Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel3.Location = New System.Drawing.Point(246, 108)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(392, 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(-3, 12)
- 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(257, 20)
+ Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
Me.lblOvlRecovery.TabIndex = 0
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(266, 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
@@ -591,38 +559,34 @@ Partial Class ElectricMotorForm
Me.Panel4.Controls.Add(Me.lblRatedSpeed)
Me.Panel4.Controls.Add(Me.lblRatedSpeedUnit)
Me.Panel4.Controls.Add(Me.tbRatedSpeedLo)
- Me.Panel4.Location = New System.Drawing.Point(339, 184)
- Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel4.Location = New System.Drawing.Point(226, 120)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(392, 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(234, 20)
+ Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
Me.lblRatedSpeed.TabIndex = 0
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]"
'
'tbRatedSpeedLo
'
- Me.tbRatedSpeedLo.Location = New System.Drawing.Point(266, 8)
- Me.tbRatedSpeedLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeedLo.Location = New System.Drawing.Point(177, 5)
Me.tbRatedSpeedLo.Name = "tbRatedSpeedLo"
- Me.tbRatedSpeedLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbRatedSpeedLo.Size = New System.Drawing.Size(49, 20)
Me.tbRatedSpeedLo.TabIndex = 3
'
'pnOverloadTq
@@ -630,38 +594,34 @@ Partial Class ElectricMotorForm
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTq)
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTqUnit)
Me.pnOverloadTq.Controls.Add(Me.tbOverloadTqLo)
- Me.pnOverloadTq.Location = New System.Drawing.Point(7, 231)
- Me.pnOverloadTq.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnOverloadTq.Location = New System.Drawing.Point(5, 150)
Me.pnOverloadTq.Name = "pnOverloadTq"
- Me.pnOverloadTq.Size = New System.Drawing.Size(332, 46)
+ 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(4, 11)
- Me.lblOverloadTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
Me.lblOverloadTq.Name = "lblOverloadTq"
- Me.lblOverloadTq.Size = New System.Drawing.Size(130, 20)
+ 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(273, 12)
- Me.lblOverloadTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadTqUnit.Location = New System.Drawing.Point(182, 8)
Me.lblOverloadTqUnit.Name = "lblOverloadTqUnit"
- Me.lblOverloadTqUnit.Size = New System.Drawing.Size(41, 20)
+ Me.lblOverloadTqUnit.Size = New System.Drawing.Size(29, 13)
Me.lblOverloadTqUnit.TabIndex = 24
Me.lblOverloadTqUnit.Text = "[Nm]"
'
'tbOverloadTqLo
'
- Me.tbOverloadTqLo.Location = New System.Drawing.Point(190, 8)
- Me.tbOverloadTqLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTqLo.Location = New System.Drawing.Point(127, 5)
Me.tbOverloadTqLo.Name = "tbOverloadTqLo"
- Me.tbOverloadTqLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadTqLo.Size = New System.Drawing.Size(49, 20)
Me.tbOverloadTqLo.TabIndex = 3
'
'Panel6
@@ -669,131 +629,117 @@ Partial Class ElectricMotorForm
Me.Panel6.Controls.Add(Me.lblOverloadSpeed)
Me.Panel6.Controls.Add(Me.lblOverloadSpeedUnit)
Me.Panel6.Controls.Add(Me.tbOvlSpeedLo)
- Me.Panel6.Location = New System.Drawing.Point(339, 231)
- Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel6.Location = New System.Drawing.Point(226, 150)
Me.Panel6.Name = "Panel6"
- Me.Panel6.Size = New System.Drawing.Size(392, 46)
+ 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(4, 11)
- Me.lblOverloadSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
- Me.lblOverloadSpeed.Size = New System.Drawing.Size(216, 20)
+ 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(344, 11)
- Me.lblOverloadSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(229, 7)
Me.lblOverloadSpeedUnit.Name = "lblOverloadSpeedUnit"
- Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(44, 20)
+ Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
Me.lblOverloadSpeedUnit.TabIndex = 24
Me.lblOverloadSpeedUnit.Text = "[rpm]"
'
'tbOvlSpeedLo
'
- Me.tbOvlSpeedLo.Location = New System.Drawing.Point(266, 8)
- Me.tbOvlSpeedLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlSpeedLo.Location = New System.Drawing.Point(177, 5)
Me.tbOvlSpeedLo.Name = "tbOvlSpeedLo"
- Me.tbOvlSpeedLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlSpeedLo.Size = New System.Drawing.Size(49, 20)
Me.tbOvlSpeedLo.TabIndex = 3
'
'lblVoltageHi
'
Me.lblVoltageHi.AutoSize = true
- Me.lblVoltageHi.Location = New System.Drawing.Point(16, 15)
- Me.lblVoltageHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageHi.Location = New System.Drawing.Point(11, 10)
Me.lblVoltageHi.Name = "lblVoltageHi"
- Me.lblVoltageHi.Size = New System.Drawing.Size(64, 20)
+ Me.lblVoltageHi.Size = New System.Drawing.Size(43, 13)
Me.lblVoltageHi.TabIndex = 48
Me.lblVoltageHi.Text = "Voltage"
'
'lblVoltageHiUnit
'
Me.lblVoltageHiUnit.AutoSize = true
- Me.lblVoltageHiUnit.Location = New System.Drawing.Point(282, 15)
- Me.lblVoltageHiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageHiUnit.Location = New System.Drawing.Point(188, 10)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
- Me.lblVoltageHiUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblVoltageHiUnit.Size = New System.Drawing.Size(20, 13)
Me.lblVoltageHiUnit.TabIndex = 50
Me.lblVoltageHiUnit.Text = "[V]"
'
'tbVoltageHi
'
- Me.tbVoltageHi.Location = New System.Drawing.Point(202, 12)
- Me.tbVoltageHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVoltageHi.Location = New System.Drawing.Point(135, 8)
Me.tbVoltageHi.Name = "tbVoltageHi"
- Me.tbVoltageHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
Me.tbVoltageHi.TabIndex = 49
'
'lblVoltageLow
'
Me.lblVoltageLow.AutoSize = true
- Me.lblVoltageLow.Location = New System.Drawing.Point(16, 14)
- Me.lblVoltageLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageLow.Location = New System.Drawing.Point(11, 9)
Me.lblVoltageLow.Name = "lblVoltageLow"
- Me.lblVoltageLow.Size = New System.Drawing.Size(64, 20)
+ Me.lblVoltageLow.Size = New System.Drawing.Size(43, 13)
Me.lblVoltageLow.TabIndex = 48
Me.lblVoltageLow.Text = "Voltage"
'
'lblVoltageLowUnit
'
Me.lblVoltageLowUnit.AutoSize = true
- Me.lblVoltageLowUnit.Location = New System.Drawing.Point(282, 14)
- Me.lblVoltageLowUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageLowUnit.Location = New System.Drawing.Point(188, 9)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
- Me.lblVoltageLowUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblVoltageLowUnit.Size = New System.Drawing.Size(20, 13)
Me.lblVoltageLowUnit.TabIndex = 50
Me.lblVoltageLowUnit.Text = "[V]"
'
'tbVoltageLow
'
- Me.tbVoltageLow.Location = New System.Drawing.Point(202, 11)
- Me.tbVoltageLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVoltageLow.Location = New System.Drawing.Point(135, 7)
Me.tbVoltageLow.Name = "tbVoltageLow"
- Me.tbVoltageLow.Size = New System.Drawing.Size(72, 26)
+ Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
Me.tbVoltageLow.TabIndex = 49
'
'lblMaxTorqueLow
'
Me.lblMaxTorqueLow.AutoSize = true
- Me.lblMaxTorqueLow.Location = New System.Drawing.Point(7, 53)
- Me.lblMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxTorqueLow.Location = New System.Drawing.Point(5, 34)
Me.lblMaxTorqueLow.Name = "lblMaxTorqueLow"
- Me.lblMaxTorqueLow.Size = New System.Drawing.Size(325, 20)
+ Me.lblMaxTorqueLow.Size = New System.Drawing.Size(222, 13)
Me.lblMaxTorqueLow.TabIndex = 47
Me.lblMaxTorqueLow.Text = "Max Drive and Max Generation Torque Curve"
'
'tbDragTorque
'
- Me.tbDragTorque.Location = New System.Drawing.Point(26, 247)
- Me.tbDragTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbDragTorque.Location = New System.Drawing.Point(17, 161)
Me.tbDragTorque.Name = "tbDragTorque"
- Me.tbDragTorque.Size = New System.Drawing.Size(607, 26)
+ Me.tbDragTorque.Size = New System.Drawing.Size(406, 20)
Me.tbDragTorque.TabIndex = 5
'
'lblDragTorque
'
Me.lblDragTorque.AutoSize = true
- Me.lblDragTorque.Location = New System.Drawing.Point(26, 223)
- Me.lblDragTorque.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblDragTorque.Location = New System.Drawing.Point(17, 145)
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(647, 243)
- Me.btnBrowseDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseDragCurve.Location = New System.Drawing.Point(431, 158)
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
@@ -801,39 +747,35 @@ Partial Class ElectricMotorForm
'btnDragCurveOpen
'
Me.btnDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpen.Location = New System.Drawing.Point(681, 243)
- Me.btnDragCurveOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnDragCurveOpen.Location = New System.Drawing.Point(454, 158)
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
'
'tbMapLow
'
- Me.tbMapLow.Location = New System.Drawing.Point(7, 139)
- Me.tbMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMapLow.Location = New System.Drawing.Point(5, 90)
Me.tbMapLow.Name = "tbMapLow"
- Me.tbMapLow.Size = New System.Drawing.Size(607, 26)
+ Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
Me.tbMapLow.TabIndex = 40
'
'lblPowerMapLow
'
Me.lblPowerMapLow.AutoSize = true
- Me.lblPowerMapLow.Location = New System.Drawing.Point(7, 114)
- Me.lblPowerMapLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPowerMapLow.Location = New System.Drawing.Point(5, 74)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
- Me.lblPowerMapLow.Size = New System.Drawing.Size(242, 20)
+ Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
Me.lblPowerMapLow.TabIndex = 43
Me.lblPowerMapLow.Text = "Electric Power Consumption Map"
'
'btnBrowseEmMapLow
'
Me.btnBrowseEmMapLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(628, 134)
- Me.btnBrowseEmMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(419, 87)
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
- Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseEmMapLow.TabIndex = 41
Me.btnBrowseEmMapLow.TabStop = false
Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
@@ -841,29 +783,26 @@ Partial Class ElectricMotorForm
'btnEmMapOpenLow
'
Me.btnEmMapOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenLow.Location = New System.Drawing.Point(662, 134)
- Me.btnEmMapOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmMapOpenLow.Location = New System.Drawing.Point(441, 87)
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
- Me.btnEmMapOpenLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
Me.btnEmMapOpenLow.TabIndex = 42
Me.btnEmMapOpenLow.TabStop = false
Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
'
'tbMaxTorqueLow
'
- Me.tbMaxTorqueLow.Location = New System.Drawing.Point(7, 77)
- Me.tbMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMaxTorqueLow.Location = New System.Drawing.Point(5, 50)
Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
- Me.tbMaxTorqueLow.Size = New System.Drawing.Size(607, 26)
+ Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
Me.tbMaxTorqueLow.TabIndex = 44
'
'btnMaxTorqueCurveOpenLow
'
Me.btnMaxTorqueCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(662, 74)
- Me.btnMaxTorqueCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(441, 48)
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
- Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
Me.btnMaxTorqueCurveOpenLow.TabStop = false
Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
@@ -871,10 +810,9 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorqueLow
'
Me.btnBrowseMaxTorqueLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(628, 74)
- Me.btnBrowseMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(419, 48)
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
- Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorqueLow.TabIndex = 45
Me.btnBrowseMaxTorqueLow.TabStop = false
Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
@@ -883,10 +821,11 @@ Partial Class ElectricMotorForm
'
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLow)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageHigh)
- Me.tcVoltageLevels.Location = New System.Drawing.Point(18, 291)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 189)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
- Me.tcVoltageLevels.Size = New System.Drawing.Size(751, 379)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(501, 246)
Me.tcVoltageLevels.TabIndex = 52
'
'tpVoltageLow
@@ -907,10 +846,11 @@ Partial Class ElectricMotorForm
Me.tpVoltageLow.Controls.Add(Me.btnBrowseEmMapLow)
Me.tpVoltageLow.Controls.Add(Me.lblPowerMapLow)
Me.tpVoltageLow.Controls.Add(Me.tbMapLow)
- Me.tpVoltageLow.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageLow.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLow.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.tpVoltageLow.Name = "tpVoltageLow"
- Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(3)
- Me.tpVoltageLow.Size = New System.Drawing.Size(743, 346)
+ Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageLow.Size = New System.Drawing.Size(493, 220)
Me.tpVoltageLow.TabIndex = 0
Me.tpVoltageLow.Text = "Voltage Level Low"
Me.tpVoltageLow.UseVisualStyleBackColor = true
@@ -933,10 +873,11 @@ Partial Class ElectricMotorForm
Me.tpVoltageHigh.Controls.Add(Me.btnBrowseEmMapHi)
Me.tpVoltageHigh.Controls.Add(Me.lblPowerMapHi)
Me.tpVoltageHigh.Controls.Add(Me.tbMapHi)
- Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageHigh.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.tpVoltageHigh.Name = "tpVoltageHigh"
- Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(3)
- Me.tpVoltageHigh.Size = New System.Drawing.Size(743, 346)
+ Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageHigh.Size = New System.Drawing.Size(493, 220)
Me.tpVoltageHigh.TabIndex = 1
Me.tpVoltageHigh.Text = "Voltage Level High"
Me.tpVoltageHigh.UseVisualStyleBackColor = true
@@ -946,38 +887,34 @@ Partial Class ElectricMotorForm
Me.Panel5.Controls.Add(Me.Label1)
Me.Panel5.Controls.Add(Me.Label2)
Me.Panel5.Controls.Add(Me.tbOvlSpeedHi)
- Me.Panel5.Location = New System.Drawing.Point(339, 231)
- Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel5.Location = New System.Drawing.Point(226, 150)
Me.Panel5.Name = "Panel5"
- Me.Panel5.Size = New System.Drawing.Size(392, 46)
+ Me.Panel5.Size = New System.Drawing.Size(261, 30)
Me.Panel5.TabIndex = 55
'
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(4, 11)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Location = New System.Drawing.Point(3, 7)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(216, 20)
+ Me.Label1.Size = New System.Drawing.Size(148, 13)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Test Speed Overload Torque:"
'
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(344, 11)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Location = New System.Drawing.Point(229, 7)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(44, 20)
+ Me.Label2.Size = New System.Drawing.Size(30, 13)
Me.Label2.TabIndex = 24
Me.Label2.Text = "[rpm]"
'
'tbOvlSpeedHi
'
- Me.tbOvlSpeedHi.Location = New System.Drawing.Point(266, 8)
- Me.tbOvlSpeedHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlSpeedHi.Location = New System.Drawing.Point(177, 5)
Me.tbOvlSpeedHi.Name = "tbOvlSpeedHi"
- Me.tbOvlSpeedHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlSpeedHi.Size = New System.Drawing.Size(49, 20)
Me.tbOvlSpeedHi.TabIndex = 3
'
'Panel7
@@ -985,38 +922,34 @@ Partial Class ElectricMotorForm
Me.Panel7.Controls.Add(Me.Label3)
Me.Panel7.Controls.Add(Me.Label4)
Me.Panel7.Controls.Add(Me.tbOverloadTqHi)
- Me.Panel7.Location = New System.Drawing.Point(7, 231)
- Me.Panel7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel7.Location = New System.Drawing.Point(5, 150)
Me.Panel7.Name = "Panel7"
- Me.Panel7.Size = New System.Drawing.Size(332, 46)
+ Me.Panel7.Size = New System.Drawing.Size(221, 30)
Me.Panel7.TabIndex = 53
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(4, 11)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Location = New System.Drawing.Point(3, 7)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(130, 20)
+ Me.Label3.Size = New System.Drawing.Size(90, 13)
Me.Label3.TabIndex = 0
Me.Label3.Text = "Overload Torque:"
'
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(273, 12)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Location = New System.Drawing.Point(182, 8)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(41, 20)
+ Me.Label4.Size = New System.Drawing.Size(29, 13)
Me.Label4.TabIndex = 24
Me.Label4.Text = "[Nm]"
'
'tbOverloadTqHi
'
- Me.tbOverloadTqHi.Location = New System.Drawing.Point(190, 8)
- Me.tbOverloadTqHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTqHi.Location = New System.Drawing.Point(127, 5)
Me.tbOverloadTqHi.Name = "tbOverloadTqHi"
- Me.tbOverloadTqHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadTqHi.Size = New System.Drawing.Size(49, 20)
Me.tbOverloadTqHi.TabIndex = 3
'
'Panel8
@@ -1024,38 +957,34 @@ Partial Class ElectricMotorForm
Me.Panel8.Controls.Add(Me.Label5)
Me.Panel8.Controls.Add(Me.Label6)
Me.Panel8.Controls.Add(Me.tbRatedSpeedHi)
- Me.Panel8.Location = New System.Drawing.Point(339, 184)
- Me.Panel8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel8.Location = New System.Drawing.Point(226, 120)
Me.Panel8.Name = "Panel8"
- Me.Panel8.Size = New System.Drawing.Size(392, 46)
+ Me.Panel8.Size = New System.Drawing.Size(261, 30)
Me.Panel8.TabIndex = 54
'
'Label5
'
Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(4, 11)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Location = New System.Drawing.Point(3, 7)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(234, 20)
+ Me.Label5.Size = New System.Drawing.Size(158, 13)
Me.Label5.TabIndex = 0
Me.Label5.Text = "Test Speed Continuous Torque:"
'
'Label6
'
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(344, 11)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Location = New System.Drawing.Point(229, 7)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(44, 20)
+ Me.Label6.Size = New System.Drawing.Size(30, 13)
Me.Label6.TabIndex = 24
Me.Label6.Text = "[rpm]"
'
'tbRatedSpeedHi
'
- Me.tbRatedSpeedHi.Location = New System.Drawing.Point(266, 8)
- Me.tbRatedSpeedHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeedHi.Location = New System.Drawing.Point(177, 5)
Me.tbRatedSpeedHi.Name = "tbRatedSpeedHi"
- Me.tbRatedSpeedHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbRatedSpeedHi.Size = New System.Drawing.Size(49, 20)
Me.tbRatedSpeedHi.TabIndex = 3
'
'Panel9
@@ -1063,38 +992,34 @@ Partial Class ElectricMotorForm
Me.Panel9.Controls.Add(Me.Label7)
Me.Panel9.Controls.Add(Me.Label8)
Me.Panel9.Controls.Add(Me.tbOvlTimeHi)
- Me.Panel9.Location = New System.Drawing.Point(7, 279)
- Me.Panel9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel9.Location = New System.Drawing.Point(5, 181)
Me.Panel9.Name = "Panel9"
- Me.Panel9.Size = New System.Drawing.Size(332, 46)
+ Me.Panel9.Size = New System.Drawing.Size(221, 30)
Me.Panel9.TabIndex = 51
'
'Label7
'
Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(4, 11)
- Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Location = New System.Drawing.Point(3, 7)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(141, 20)
+ Me.Label7.Size = New System.Drawing.Size(96, 13)
Me.Label7.TabIndex = 0
Me.Label7.Text = "Overload Duration:"
'
'Label8
'
Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(270, 11)
- Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.Location = New System.Drawing.Point(180, 7)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(25, 20)
+ Me.Label8.Size = New System.Drawing.Size(18, 13)
Me.Label8.TabIndex = 24
Me.Label8.Text = "[s]"
'
'tbOvlTimeHi
'
- Me.tbOvlTimeHi.Location = New System.Drawing.Point(190, 8)
- Me.tbOvlTimeHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTimeHi.Location = New System.Drawing.Point(127, 5)
Me.tbOvlTimeHi.Name = "tbOvlTimeHi"
- Me.tbOvlTimeHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlTimeHi.Size = New System.Drawing.Size(49, 20)
Me.tbOvlTimeHi.TabIndex = 3
'
'Panel10
@@ -1102,47 +1027,43 @@ Partial Class ElectricMotorForm
Me.Panel10.Controls.Add(Me.Label9)
Me.Panel10.Controls.Add(Me.Label10)
Me.Panel10.Controls.Add(Me.tbContTqHi)
- Me.Panel10.Location = New System.Drawing.Point(7, 184)
- Me.Panel10.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel10.Location = New System.Drawing.Point(5, 120)
Me.Panel10.Name = "Panel10"
- Me.Panel10.Size = New System.Drawing.Size(332, 46)
+ Me.Panel10.Size = New System.Drawing.Size(221, 30)
Me.Panel10.TabIndex = 52
'
'Label9
'
Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(4, 11)
- Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Location = New System.Drawing.Point(3, 7)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(148, 20)
+ Me.Label9.Size = New System.Drawing.Size(100, 13)
Me.Label9.TabIndex = 0
Me.Label9.Text = "Continuous Torque:"
'
'Label10
'
Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(273, 12)
- Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Location = New System.Drawing.Point(182, 8)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(41, 20)
+ Me.Label10.Size = New System.Drawing.Size(29, 13)
Me.Label10.TabIndex = 24
Me.Label10.Text = "[Nm]"
'
'tbContTqHi
'
- Me.tbContTqHi.Location = New System.Drawing.Point(190, 8)
- Me.tbContTqHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContTqHi.Location = New System.Drawing.Point(127, 5)
Me.tbContTqHi.Name = "tbContTqHi"
- Me.tbContTqHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbContTqHi.Size = New System.Drawing.Size(49, 20)
Me.tbContTqHi.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(1412, 720)
+ Me.ClientSize = New System.Drawing.Size(941, 468)
Me.Controls.Add(Me.tcVoltageLevels)
Me.Controls.Add(Me.Panel3)
Me.Controls.Add(Me.PicBox)
@@ -1161,7 +1082,6 @@ Partial Class ElectricMotorForm
Me.Controls.Add(Me.btnBrowseDragCurve)
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
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 409b1c430aa3006be4d98f3421ee14ff33812b55..702d9efabbd26e02377a1053014d5f9a50b1ed11 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -573,12 +573,17 @@ Public Class ElectricMotorForm
OpenFiles(FileRepl(tbDragTorque.Text, GetPath(_emFile)))
End If
End Sub
-
- Private Sub btnBrowseEmMapLow_Click(sender As Object, e As EventArgs) Handles btnBrowseEmMapLow.Click
+
+ Private Sub btnBrowseMaxTorqueLow_Click(sender As Object, e As EventArgs) Handles btnBrowseMaxTorqueLow.Click
If ElectricMachineMaxTorqueFileBrowser.OpenDialog(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile))) Then _
tbMaxTorqueLow.Text = GetFilenameWithoutDirectory(ElectricMachineMaxTorqueFileBrowser.Files(0), GetPath(_emFile))
End Sub
+ Private Sub btnBrowseEmMapLow_Click(sender As Object, e As EventArgs) Handles btnBrowseEmMapLow.Click
+ If ElectricMachineEfficiencyMapFileBrowser.OpenDialog(FileRepl(tbMapLow.Text, GetPath(_emFile))) Then _
+ tbMapLow.Text = GetFilenameWithoutDirectory(ElectricMachineEfficiencyMapFileBrowser.Files(0), GetPath(_emFile))
+ End Sub
+
Private Sub btnEmMapOpenLow_Click(sender As Object, e As EventArgs) Handles btnEmMapOpenLow.Click
Dim theFile As String
@@ -590,4 +595,16 @@ Public Class ElectricMotorForm
OpenFiles(FileRepl(tbMapLow.Text, GetPath(_emFile)))
End If
End Sub
+
+ Private Sub btnMaxTorqueCurveOpenLow_Click(sender As Object, e As EventArgs) Handles btnMaxTorqueCurveOpenLow.Click
+ Dim theFile As String
+
+ theFile = FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile)), theFile)
+ Else
+ OpenFiles(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile)))
+ End If
+ End Sub
End Class
diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..e9a57fb3138221e2f96d2f9c6666a155a7b387f1
--- /dev/null
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -0,0 +1,1638 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class IEPCForm
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()>
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()>
+ Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IEPCForm))
+ Me.btFLCurveFile1 = New System.Windows.Forms.Button()
+ Me.tbThermalOverload = New System.Windows.Forms.TextBox()
+ Me.Label52 = New System.Windows.Forms.Label()
+ Me.Label48 = New System.Windows.Forms.Label()
+ Me.tbNumberOfDesignTypeWheelMotor = New System.Windows.Forms.TextBox()
+ Me.Label51 = New System.Windows.Forms.Label()
+ Me.tbInertia = New System.Windows.Forms.TextBox()
+ Me.Label49 = New System.Windows.Forms.Label()
+ Me.tbModel = New System.Windows.Forms.TextBox()
+ Me.tcVoltageLevels = New System.Windows.Forms.TabControl()
+ Me.tpFirstVoltageLevel = New System.Windows.Forms.TabPage()
+ Me.FlowLayoutPanel9 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label44 = New System.Windows.Forms.Label()
+ Me.tbFLCurve1 = New System.Windows.Forms.TextBox()
+ Me.btShowFLCurve1 = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.Label43 = New System.Windows.Forms.Label()
+ Me.Label37 = New System.Windows.Forms.Label()
+ Me.tbOverloadTime1 = New System.Windows.Forms.TextBox()
+ Me.tbVoltage1 = New System.Windows.Forms.TextBox()
+ Me.Label39 = New System.Windows.Forms.Label()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.tbContinousTorque1 = New System.Windows.Forms.TextBox()
+ Me.tbContinousTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.Label42 = New System.Windows.Forms.Label()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.tboverloadTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.Label41 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorque1 = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel6 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label47 = New System.Windows.Forms.Label()
+ Me.lvPowerMap1 = New System.Windows.Forms.ListView()
+ Me.ColumnHeader13 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader14 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.tpVoltageLevel = New System.Windows.Forms.TabPage()
+ Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.lvPowerMap2 = New System.Windows.Forms.ListView()
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.FlowLayoutPanel10 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label28 = New System.Windows.Forms.Label()
+ Me.tbFLCurve2 = New System.Windows.Forms.TextBox()
+ Me.btFLCurveFile2 = New System.Windows.Forms.Button()
+ Me.btShowFLCurve2 = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.tbOverloadTime2 = New System.Windows.Forms.TextBox()
+ Me.Label24 = New System.Windows.Forms.Label()
+ Me.tbVoltage2 = New System.Windows.Forms.TextBox()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.Label21 = New System.Windows.Forms.Label()
+ Me.tbContinousTorque2 = New System.Windows.Forms.TextBox()
+ Me.tbContinousTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.Label27 = New System.Windows.Forms.Label()
+ Me.Label23 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.Label25 = New System.Windows.Forms.Label()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorque2 = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.cbDesignTypeWheelMotor = New System.Windows.Forms.CheckBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.cbDifferentialIncluded = New System.Windows.Forms.CheckBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btAddGear = New System.Windows.Forms.Button()
+ Me.btRemoveGear = New System.Windows.Forms.Button()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.lvGear = New System.Windows.Forms.ListView()
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
+ Me.lvDragCurve = New System.Windows.Forms.ListView()
+ Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.FlowLayoutPanel11 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btAddDragCurve = New System.Windows.Forms.Button()
+ Me.btRemoveDragCurve = New System.Windows.Forms.Button()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.lblTitle = New System.Windows.Forms.Label()
+ Me.ButCancel = New System.Windows.Forms.Button()
+ Me.ButOK = New System.Windows.Forms.Button()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel4 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel5 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel6 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.lblinertiaUnit = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel7 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel8 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+ Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.tcVoltageLevels.SuspendLayout
+ Me.tpFirstVoltageLevel.SuspendLayout
+ Me.FlowLayoutPanel9.SuspendLayout
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.GroupBox2.SuspendLayout
+ Me.TableLayoutPanel6.SuspendLayout
+ Me.tpVoltageLevel.SuspendLayout
+ Me.GroupBox4.SuspendLayout
+ Me.TableLayoutPanel2.SuspendLayout
+ Me.FlowLayoutPanel10.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
+ Me.GroupBox1.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.FlowLayoutPanel2.SuspendLayout
+ Me.GroupBox3.SuspendLayout
+ Me.TableLayoutPanel3.SuspendLayout
+ Me.FlowLayoutPanel11.SuspendLayout
+ Me.ToolStrip1.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.FlowLayoutPanel4.SuspendLayout
+ Me.FlowLayoutPanel5.SuspendLayout
+ Me.FlowLayoutPanel6.SuspendLayout
+ Me.FlowLayoutPanel7.SuspendLayout
+ Me.FlowLayoutPanel8.SuspendLayout
+ Me.StatusStrip1.SuspendLayout
+ Me.CmOpenFile.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'btFLCurveFile1
+ '
+ Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
+ Me.btFLCurveFile1.Location = New System.Drawing.Point(425, 1)
+ Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
+ Me.btFLCurveFile1.Name = "btFLCurveFile1"
+ Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile1.TabIndex = 15
+ Me.btFLCurveFile1.UseVisualStyleBackColor = true
+ '
+ 'tbThermalOverload
+ '
+ Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbThermalOverload.Location = New System.Drawing.Point(216, 3)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(30, 3, 3, 3)
+ Me.tbThermalOverload.Name = "tbThermalOverload"
+ Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
+ Me.tbThermalOverload.TabIndex = 3
+ '
+ 'Label52
+ '
+ Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label52.AutoSize = true
+ Me.Label52.Location = New System.Drawing.Point(3, 6)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 10, 0)
+ Me.Label52.Name = "Label52"
+ Me.Label52.Size = New System.Drawing.Size(173, 13)
+ Me.Label52.TabIndex = 50
+ Me.Label52.Text = "Thermal Overload Recovery Factor"
+ '
+ 'Label48
+ '
+ Me.Label48.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label48.AutoSize = true
+ Me.Label48.Location = New System.Drawing.Point(3, 6)
+ Me.Label48.Name = "Label48"
+ Me.Label48.Size = New System.Drawing.Size(207, 13)
+ Me.Label48.TabIndex = 48
+ Me.Label48.Text = "Nr of Design Type Wheel Motor Measured"
+ '
+ 'tbNumberOfDesignTypeWheelMotor
+ '
+ Me.tbNumberOfDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbNumberOfDesignTypeWheelMotor.Enabled = false
+ Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(216, 3)
+ Me.tbNumberOfDesignTypeWheelMotor.Name = "tbNumberOfDesignTypeWheelMotor"
+ Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(30, 20)
+ Me.tbNumberOfDesignTypeWheelMotor.TabIndex = 5
+ '
+ 'Label51
+ '
+ Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label51.AutoSize = true
+ Me.Label51.Location = New System.Drawing.Point(3, 6)
+ Me.Label51.Name = "Label51"
+ Me.Label51.Size = New System.Drawing.Size(36, 13)
+ Me.Label51.TabIndex = 45
+ Me.Label51.Text = "Inertia"
+ '
+ 'tbInertia
+ '
+ Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbInertia.Location = New System.Drawing.Point(45, 3)
+ Me.tbInertia.Name = "tbInertia"
+ Me.tbInertia.Size = New System.Drawing.Size(57, 20)
+ Me.tbInertia.TabIndex = 2
+ '
+ 'Label49
+ '
+ Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(3, 6)
+ Me.Label49.Name = "Label49"
+ Me.Label49.Size = New System.Drawing.Size(36, 13)
+ Me.Label49.TabIndex = 43
+ Me.Label49.Text = "Model"
+ '
+ 'tbModel
+ '
+ Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbModel.Location = New System.Drawing.Point(45, 3)
+ Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
+ Me.tbModel.Name = "tbModel"
+ Me.tbModel.Size = New System.Drawing.Size(194, 20)
+ Me.tbModel.TabIndex = 1
+ '
+ 'tcVoltageLevels
+ '
+ Me.tcVoltageLevels.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
+ Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(16, 207)
+ Me.tcVoltageLevels.Name = "tcVoltageLevels"
+ Me.tcVoltageLevels.SelectedIndex = 0
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 322)
+ Me.tcVoltageLevels.TabIndex = 107
+ '
+ 'tpFirstVoltageLevel
+ '
+ Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel9)
+ Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
+ Me.tpFirstVoltageLevel.Controls.Add(Me.GroupBox2)
+ Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
+ Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 296)
+ Me.tpFirstVoltageLevel.TabIndex = 0
+ Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
+ '
+ 'FlowLayoutPanel9
+ '
+ Me.FlowLayoutPanel9.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.FlowLayoutPanel9.Controls.Add(Me.Label44)
+ Me.FlowLayoutPanel9.Controls.Add(Me.tbFLCurve1)
+ Me.FlowLayoutPanel9.Controls.Add(Me.btFLCurveFile1)
+ Me.FlowLayoutPanel9.Controls.Add(Me.btShowFLCurve1)
+ Me.FlowLayoutPanel9.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel9.Name = "FlowLayoutPanel9"
+ Me.FlowLayoutPanel9.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel9.TabIndex = 108
+ '
+ 'Label44
+ '
+ Me.Label44.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label44.AutoSize = true
+ Me.Label44.Location = New System.Drawing.Point(14, 6)
+ Me.Label44.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
+ Me.Label44.Name = "Label44"
+ Me.Label44.Size = New System.Drawing.Size(125, 13)
+ Me.Label44.TabIndex = 59
+ Me.Label44.Text = "Full Load Curve (.viepcp)"
+ '
+ 'tbFLCurve1
+ '
+ Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbFLCurve1.Location = New System.Drawing.Point(142, 3)
+ Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve1.Name = "tbFLCurve1"
+ Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve1.TabIndex = 14
+ '
+ 'btShowFLCurve1
+ '
+ Me.btShowFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btShowFLCurve1.Location = New System.Drawing.Point(449, 1)
+ Me.btShowFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btShowFLCurve1.Name = "btShowFLCurve1"
+ Me.btShowFLCurve1.Size = New System.Drawing.Size(24, 24)
+ Me.btShowFLCurve1.TabIndex = 85
+ Me.btShowFLCurve1.TabStop = false
+ Me.btShowFLCurve1.UseVisualStyleBackColor = true
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 7
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59!))
+ Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label43, 3, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label37, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTime1, 4, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbVoltage1, 1, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label39, 0, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label1, 0, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinousTorque1, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinousTorqueSpeed1, 1, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label15, 2, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label42, 3, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label14, 5, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tboverloadTorqueSpeed1, 4, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 3
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel1.TabIndex = 107
+ '
+ 'Label11
+ '
+ Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(202, 34)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(29, 13)
+ Me.Label11.TabIndex = 63
+ Me.Label11.Text = "[Nm]"
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(207, 7)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(20, 13)
+ Me.Label4.TabIndex = 62
+ Me.Label4.Text = "[V]"
+ '
+ 'Label13
+ '
+ Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(422, 7)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(30, 13)
+ Me.Label13.TabIndex = 65
+ Me.Label13.Text = "[sec]"
+ '
+ 'Label43
+ '
+ Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label43.AutoSize = true
+ Me.Label43.Location = New System.Drawing.Point(281, 7)
+ Me.Label43.Name = "Label43"
+ Me.Label43.Size = New System.Drawing.Size(76, 13)
+ Me.Label43.TabIndex = 11
+ Me.Label43.Text = "Overload Time"
+ '
+ 'Label37
+ '
+ Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label37.AutoSize = true
+ Me.Label37.Location = New System.Drawing.Point(94, 7)
+ Me.Label37.Name = "Label37"
+ Me.Label37.Size = New System.Drawing.Size(43, 13)
+ Me.Label37.TabIndex = 1
+ Me.Label37.Text = "Voltage"
+ '
+ 'tbOverloadTime1
+ '
+ Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTime1.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbOverloadTime1.Name = "tbOverloadTime1"
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime1.TabIndex = 11
+ '
+ 'tbVoltage1
+ '
+ Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbVoltage1.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbVoltage1.Name = "tbVoltage1"
+ Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage1.TabIndex = 8
+ '
+ 'Label39
+ '
+ Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label39.AutoSize = true
+ Me.Label39.Location = New System.Drawing.Point(40, 34)
+ Me.Label39.Name = "Label39"
+ Me.Label39.Size = New System.Drawing.Size(97, 13)
+ Me.Label39.TabIndex = 3
+ Me.Label39.Text = "Continuous Torque"
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(6, 61)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(131, 13)
+ Me.Label1.TabIndex = 6
+ Me.Label1.Text = "Continuous Torque Speed"
+ '
+ 'tbContinousTorque1
+ '
+ Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorque1.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinousTorque1.Name = "tbContinousTorque1"
+ Me.tbContinousTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorque1.TabIndex = 9
+ '
+ 'tbContinousTorqueSpeed1
+ '
+ Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
+ Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorqueSpeed1.TabIndex = 10
+ '
+ 'Label15
+ '
+ Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(202, 61)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(30, 13)
+ Me.Label15.TabIndex = 67
+ Me.Label15.Text = "[rpm]"
+ '
+ 'Label42
+ '
+ Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label42.AutoSize = true
+ Me.Label42.Location = New System.Drawing.Point(236, 61)
+ Me.Label42.Name = "Label42"
+ Me.Label42.Size = New System.Drawing.Size(121, 13)
+ Me.Label42.TabIndex = 9
+ Me.Label42.Text = "Overload Torque Speed"
+ '
+ 'Label14
+ '
+ Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(422, 61)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(30, 13)
+ Me.Label14.TabIndex = 66
+ Me.Label14.Text = "[rpm]"
+ '
+ 'tboverloadTorqueSpeed1
+ '
+ Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
+ Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
+ Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tboverloadTorqueSpeed1.TabIndex = 13
+ '
+ 'Label41
+ '
+ Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(270, 34)
+ Me.Label41.Name = "Label41"
+ Me.Label41.Size = New System.Drawing.Size(87, 13)
+ Me.Label41.TabIndex = 7
+ Me.Label41.Text = "Overload Torque"
+ '
+ 'tbOverloadTorque1
+ '
+ Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque1.TabIndex = 12
+ '
+ 'Label12
+ '
+ Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(422, 34)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(29, 13)
+ Me.Label12.TabIndex = 64
+ Me.Label12.Text = "[Nm]"
+ '
+ 'GroupBox2
+ '
+ Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox2.Controls.Add(Me.TableLayoutPanel6)
+ Me.GroupBox2.Location = New System.Drawing.Point(6, 126)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.Size = New System.Drawing.Size(315, 162)
+ Me.GroupBox2.TabIndex = 60
+ Me.GroupBox2.TabStop = false
+ Me.GroupBox2.Text = "Power Map Per Gear"
+ '
+ 'TableLayoutPanel6
+ '
+ Me.TableLayoutPanel6.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel6.ColumnCount = 2
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 169!))
+ Me.TableLayoutPanel6.Controls.Add(Me.Label47, 1, 1)
+ Me.TableLayoutPanel6.Controls.Add(Me.lvPowerMap1, 0, 0)
+ Me.TableLayoutPanel6.Location = New System.Drawing.Point(6, 13)
+ Me.TableLayoutPanel6.Name = "TableLayoutPanel6"
+ Me.TableLayoutPanel6.RowCount = 2
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
+ Me.TableLayoutPanel6.Size = New System.Drawing.Size(298, 143)
+ Me.TableLayoutPanel6.TabIndex = 53
+ '
+ 'Label47
+ '
+ Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label47.AutoSize = true
+ Me.Label47.Location = New System.Drawing.Point(189, 127)
+ Me.Label47.Name = "Label47"
+ Me.Label47.Size = New System.Drawing.Size(106, 13)
+ Me.Label47.TabIndex = 6
+ Me.Label47.Text = "(Double-Click to Edit)"
+ '
+ 'lvPowerMap1
+ '
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader13, Me.ColumnHeader14})
+ Me.TableLayoutPanel6.SetColumnSpan(Me.lvPowerMap1, 2)
+ Me.lvPowerMap1.FullRowSelect = true
+ Me.lvPowerMap1.GridLines = true
+ Me.lvPowerMap1.HideSelection = false
+ Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
+ Me.lvPowerMap1.MultiSelect = false
+ Me.lvPowerMap1.Name = "lvPowerMap1"
+ Me.lvPowerMap1.Size = New System.Drawing.Size(292, 121)
+ Me.lvPowerMap1.TabIndex = 108
+ Me.lvPowerMap1.TabStop = false
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap1.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader13
+ '
+ Me.ColumnHeader13.Text = "Gear #"
+ Me.ColumnHeader13.Width = 59
+ '
+ 'ColumnHeader14
+ '
+ Me.ColumnHeader14.Text = "Power Map Filename"
+ Me.ColumnHeader14.Width = 223
+ '
+ 'tpVoltageLevel
+ '
+ Me.tpVoltageLevel.Controls.Add(Me.GroupBox4)
+ Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
+ Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
+ Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLevel.Name = "tpVoltageLevel"
+ Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 296)
+ Me.tpVoltageLevel.TabIndex = 1
+ Me.tpVoltageLevel.Text = "Voltage Level High"
+ Me.tpVoltageLevel.UseVisualStyleBackColor = true
+ '
+ 'GroupBox4
+ '
+ Me.GroupBox4.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox4.Controls.Add(Me.TableLayoutPanel2)
+ Me.GroupBox4.Location = New System.Drawing.Point(6, 126)
+ Me.GroupBox4.Name = "GroupBox4"
+ Me.GroupBox4.Size = New System.Drawing.Size(315, 162)
+ Me.GroupBox4.TabIndex = 75
+ Me.GroupBox4.TabStop = false
+ Me.GroupBox4.Text = "Power Map Per Gear"
+ '
+ 'TableLayoutPanel2
+ '
+ Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel2.ColumnCount = 2
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 169!))
+ Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
+ Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
+ Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 13)
+ Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
+ Me.TableLayoutPanel2.RowCount = 2
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
+ Me.TableLayoutPanel2.Size = New System.Drawing.Size(298, 143)
+ Me.TableLayoutPanel2.TabIndex = 53
+ '
+ 'Label5
+ '
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(189, 127)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(106, 13)
+ Me.Label5.TabIndex = 6
+ Me.Label5.Text = "(Double-Click to Edit)"
+ '
+ 'lvPowerMap2
+ '
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader6, Me.ColumnHeader7})
+ Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
+ Me.lvPowerMap2.FullRowSelect = true
+ Me.lvPowerMap2.GridLines = true
+ Me.lvPowerMap2.HideSelection = false
+ Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
+ Me.lvPowerMap2.MultiSelect = false
+ Me.lvPowerMap2.Name = "lvPowerMap2"
+ Me.lvPowerMap2.Size = New System.Drawing.Size(292, 121)
+ Me.lvPowerMap2.TabIndex = 109
+ Me.lvPowerMap2.TabStop = false
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap2.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader6
+ '
+ Me.ColumnHeader6.Text = "Gear #"
+ Me.ColumnHeader6.Width = 59
+ '
+ 'ColumnHeader7
+ '
+ Me.ColumnHeader7.Text = "Power Map Filename"
+ Me.ColumnHeader7.Width = 223
+ '
+ 'FlowLayoutPanel10
+ '
+ Me.FlowLayoutPanel10.Controls.Add(Me.Label28)
+ Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btShowFLCurve2)
+ Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
+ Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel10.TabIndex = 110
+ '
+ 'Label28
+ '
+ Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(14, 6)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
+ Me.Label28.Name = "Label28"
+ Me.Label28.Size = New System.Drawing.Size(125, 13)
+ Me.Label28.TabIndex = 59
+ Me.Label28.Text = "Full Load Curve (.viepcp)"
+ '
+ 'tbFLCurve2
+ '
+ Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbFLCurve2.Location = New System.Drawing.Point(142, 3)
+ Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve2.Name = "tbFLCurve2"
+ Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve2.TabIndex = 23
+ '
+ 'btFLCurveFile2
+ '
+ Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
+ Me.btFLCurveFile2.Location = New System.Drawing.Point(425, 1)
+ Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
+ Me.btFLCurveFile2.Name = "btFLCurveFile2"
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile2.TabIndex = 24
+ Me.btFLCurveFile2.UseVisualStyleBackColor = true
+ '
+ 'btShowFLCurve2
+ '
+ Me.btShowFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btShowFLCurve2.Location = New System.Drawing.Point(449, 1)
+ Me.btShowFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btShowFLCurve2.Name = "btShowFLCurve2"
+ Me.btShowFLCurve2.Size = New System.Drawing.Size(24, 24)
+ Me.btShowFLCurve2.TabIndex = 85
+ Me.btShowFLCurve2.TabStop = false
+ Me.btShowFLCurve2.UseVisualStyleBackColor = true
+ '
+ 'TableLayoutPanel4
+ '
+ Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel4.ColumnCount = 7
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59!))
+ Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label19, 0, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTime2, 4, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label24, 3, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbVoltage2, 1, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label20, 0, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label21, 0, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinousTorque2, 1, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinousTorqueSpeed2, 1, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label27, 2, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label23, 3, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorqueSpeed2, 4, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label25, 5, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
+ Me.TableLayoutPanel4.RowCount = 3
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel4.TabIndex = 109
+ '
+ 'Label17
+ '
+ Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(202, 34)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(29, 13)
+ Me.Label17.TabIndex = 63
+ Me.Label17.Text = "[Nm]"
+ '
+ 'Label18
+ '
+ Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(207, 7)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(20, 13)
+ Me.Label18.TabIndex = 62
+ Me.Label18.Text = "[V]"
+ '
+ 'Label26
+ '
+ Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(422, 7)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label26.Name = "Label26"
+ Me.Label26.Size = New System.Drawing.Size(30, 13)
+ Me.Label26.TabIndex = 65
+ Me.Label26.Text = "[sec]"
+ '
+ 'Label19
+ '
+ Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(94, 7)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(43, 13)
+ Me.Label19.TabIndex = 1
+ Me.Label19.Text = "Voltage"
+ '
+ 'tbOverloadTime2
+ '
+ Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime2.Name = "tbOverloadTime2"
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime2.TabIndex = 20
+ '
+ 'Label24
+ '
+ Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(281, 7)
+ Me.Label24.Name = "Label24"
+ Me.Label24.Size = New System.Drawing.Size(76, 13)
+ Me.Label24.TabIndex = 11
+ Me.Label24.Text = "Overload Time"
+ '
+ 'tbVoltage2
+ '
+ Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage2.Name = "tbVoltage2"
+ Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage2.TabIndex = 17
+ '
+ 'Label20
+ '
+ Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(40, 34)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(97, 13)
+ Me.Label20.TabIndex = 3
+ Me.Label20.Text = "Continuous Torque"
+ '
+ 'Label21
+ '
+ Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(6, 61)
+ Me.Label21.Name = "Label21"
+ Me.Label21.Size = New System.Drawing.Size(131, 13)
+ Me.Label21.TabIndex = 6
+ Me.Label21.Text = "Continuous Torque Speed"
+ '
+ 'tbContinousTorque2
+ '
+ Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorque2.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinousTorque2.Name = "tbContinousTorque2"
+ Me.tbContinousTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorque2.TabIndex = 18
+ '
+ 'tbContinousTorqueSpeed2
+ '
+ Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
+ Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorqueSpeed2.TabIndex = 19
+ '
+ 'Label27
+ '
+ Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(202, 61)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label27.Name = "Label27"
+ Me.Label27.Size = New System.Drawing.Size(30, 13)
+ Me.Label27.TabIndex = 67
+ Me.Label27.Text = "[rpm]"
+ '
+ 'Label23
+ '
+ Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label23.AutoSize = true
+ Me.Label23.Location = New System.Drawing.Point(236, 61)
+ Me.Label23.Name = "Label23"
+ Me.Label23.Size = New System.Drawing.Size(121, 13)
+ Me.Label23.TabIndex = 9
+ Me.Label23.Text = "Overload Torque Speed"
+ '
+ 'tbOverloadTorqueSpeed2
+ '
+ Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed2.TabIndex = 22
+ '
+ 'Label25
+ '
+ Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(422, 61)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(30, 13)
+ Me.Label25.TabIndex = 66
+ Me.Label25.Text = "[rpm]"
+ '
+ 'Label22
+ '
+ Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(270, 34)
+ Me.Label22.Name = "Label22"
+ Me.Label22.Size = New System.Drawing.Size(87, 13)
+ Me.Label22.TabIndex = 7
+ Me.Label22.Text = "Overload Torque"
+ '
+ 'tbOverloadTorque2
+ '
+ Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque2.TabIndex = 21
+ '
+ 'Label16
+ '
+ Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(422, 34)
+ Me.Label16.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(29, 13)
+ Me.Label16.TabIndex = 64
+ Me.Label16.Text = "[Nm]"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Dock = System.Windows.Forms.DockStyle.Top
+ Me.Label3.Location = New System.Drawing.Point(3, 6)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(181, 13)
+ Me.Label3.TabIndex = 54
+ Me.Label3.Text = "Design Type Wheel Motor Measured"
+ '
+ 'cbDesignTypeWheelMotor
+ '
+ Me.cbDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.cbDesignTypeWheelMotor.AutoSize = true
+ Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(190, 6)
+ Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(0, 6, 3, 6)
+ Me.cbDesignTypeWheelMotor.Name = "cbDesignTypeWheelMotor"
+ Me.cbDesignTypeWheelMotor.Size = New System.Drawing.Size(15, 14)
+ Me.cbDesignTypeWheelMotor.TabIndex = 4
+ Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = true
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(3, 6)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(101, 13)
+ Me.Label2.TabIndex = 53
+ Me.Label2.Text = "Differential Included"
+ '
+ 'cbDifferentialIncluded
+ '
+ Me.cbDifferentialIncluded.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.cbDifferentialIncluded.AutoSize = true
+ Me.cbDifferentialIncluded.Location = New System.Drawing.Point(190, 6)
+ Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(80, 6, 3, 6)
+ Me.cbDifferentialIncluded.Name = "cbDifferentialIncluded"
+ Me.cbDifferentialIncluded.Size = New System.Drawing.Size(15, 14)
+ Me.cbDifferentialIncluded.TabIndex = 6
+ Me.cbDifferentialIncluded.UseVisualStyleBackColor = true
+ '
+ 'GroupBox1
+ '
+ Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox1.Controls.Add(Me.TableLayoutPanel5)
+ Me.GroupBox1.Location = New System.Drawing.Point(539, 188)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Size = New System.Drawing.Size(314, 180)
+ Me.GroupBox1.TabIndex = 61
+ Me.GroupBox1.TabStop = false
+ Me.GroupBox1.Text = "Gears"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171!))
+ Me.TableLayoutPanel5.Controls.Add(Me.FlowLayoutPanel2, 0, 1)
+ Me.TableLayoutPanel5.Controls.Add(Me.Label6, 1, 1)
+ Me.TableLayoutPanel5.Controls.Add(Me.lvGear, 0, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(7, 16)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 2
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(300, 159)
+ Me.TableLayoutPanel5.TabIndex = 111
+ '
+ 'FlowLayoutPanel2
+ '
+ Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel2.TabIndex = 112
+ '
+ 'btAddGear
+ '
+ Me.btAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddGear.Location = New System.Drawing.Point(3, 3)
+ Me.btAddGear.Name = "btAddGear"
+ Me.btAddGear.Size = New System.Drawing.Size(24, 24)
+ Me.btAddGear.TabIndex = 25
+ Me.btAddGear.UseVisualStyleBackColor = true
+ '
+ 'btRemoveGear
+ '
+ Me.btRemoveGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btRemoveGear.Location = New System.Drawing.Point(33, 3)
+ Me.btRemoveGear.Name = "btRemoveGear"
+ Me.btRemoveGear.Size = New System.Drawing.Size(24, 24)
+ Me.btRemoveGear.TabIndex = 26
+ Me.btRemoveGear.UseVisualStyleBackColor = true
+ '
+ 'Label6
+ '
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(191, 125)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(106, 13)
+ Me.Label6.TabIndex = 6
+ Me.Label6.Text = "(Double-Click to Edit)"
+ '
+ 'lvGear
+ '
+ Me.lvGear.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
+ Me.TableLayoutPanel5.SetColumnSpan(Me.lvGear, 2)
+ Me.lvGear.FullRowSelect = true
+ Me.lvGear.GridLines = true
+ Me.lvGear.HideSelection = false
+ Me.lvGear.Location = New System.Drawing.Point(3, 3)
+ Me.lvGear.MultiSelect = false
+ Me.lvGear.Name = "lvGear"
+ Me.lvGear.Size = New System.Drawing.Size(294, 119)
+ Me.lvGear.TabIndex = 78
+ Me.lvGear.TabStop = false
+ Me.lvGear.UseCompatibleStateImageBehavior = false
+ Me.lvGear.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader1
+ '
+ Me.ColumnHeader1.Text = "Ratio"
+ Me.ColumnHeader1.Width = 45
+ '
+ 'ColumnHeader2
+ '
+ Me.ColumnHeader2.Text = "Max Out Shaft Torque"
+ Me.ColumnHeader2.Width = 120
+ '
+ 'ColumnHeader3
+ '
+ Me.ColumnHeader3.Text = "Max Out Shaft Speed"
+ Me.ColumnHeader3.Width = 120
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox3.Controls.Add(Me.TableLayoutPanel3)
+ Me.GroupBox3.Location = New System.Drawing.Point(539, 372)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Size = New System.Drawing.Size(314, 180)
+ Me.GroupBox3.TabIndex = 62
+ Me.GroupBox3.TabStop = false
+ Me.GroupBox3.Text = "Drag Curves"
+ '
+ 'TableLayoutPanel3
+ '
+ Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel3.ColumnCount = 2
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171!))
+ Me.TableLayoutPanel3.Controls.Add(Me.lvDragCurve, 0, 0)
+ Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
+ Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
+ Me.TableLayoutPanel3.Location = New System.Drawing.Point(7, 14)
+ Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
+ Me.TableLayoutPanel3.RowCount = 2
+ Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
+ Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
+ Me.TableLayoutPanel3.Size = New System.Drawing.Size(300, 159)
+ Me.TableLayoutPanel3.TabIndex = 113
+ '
+ 'lvDragCurve
+ '
+ Me.lvDragCurve.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvDragCurve.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
+ Me.TableLayoutPanel3.SetColumnSpan(Me.lvDragCurve, 2)
+ Me.lvDragCurve.FullRowSelect = true
+ Me.lvDragCurve.GridLines = true
+ Me.lvDragCurve.HideSelection = false
+ Me.lvDragCurve.Location = New System.Drawing.Point(3, 3)
+ Me.lvDragCurve.MultiSelect = false
+ Me.lvDragCurve.Name = "lvDragCurve"
+ Me.lvDragCurve.Size = New System.Drawing.Size(294, 119)
+ Me.lvDragCurve.TabIndex = 78
+ Me.lvDragCurve.TabStop = false
+ Me.lvDragCurve.UseCompatibleStateImageBehavior = false
+ Me.lvDragCurve.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader4
+ '
+ Me.ColumnHeader4.Text = "Gear #"
+ Me.ColumnHeader4.Width = 59
+ '
+ 'ColumnHeader5
+ '
+ Me.ColumnHeader5.Text = "Drag Curve Filename"
+ Me.ColumnHeader5.Width = 225
+ '
+ 'FlowLayoutPanel11
+ '
+ Me.FlowLayoutPanel11.Controls.Add(Me.btAddDragCurve)
+ Me.FlowLayoutPanel11.Controls.Add(Me.btRemoveDragCurve)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel11.TabIndex = 114
+ '
+ 'btAddDragCurve
+ '
+ Me.btAddDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddDragCurve.Location = New System.Drawing.Point(3, 3)
+ Me.btAddDragCurve.Name = "btAddDragCurve"
+ Me.btAddDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btAddDragCurve.TabIndex = 27
+ Me.btAddDragCurve.UseVisualStyleBackColor = true
+ '
+ 'btRemoveDragCurve
+ '
+ Me.btRemoveDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btRemoveDragCurve.Location = New System.Drawing.Point(33, 3)
+ Me.btRemoveDragCurve.Name = "btRemoveDragCurve"
+ Me.btRemoveDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btRemoveDragCurve.TabIndex = 28
+ Me.btRemoveDragCurve.UseVisualStyleBackColor = true
+ '
+ 'Label7
+ '
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(191, 125)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(106, 13)
+ Me.Label7.TabIndex = 6
+ Me.Label7.Text = "(Double-Click to Edit)"
+ '
+ 'ToolStrip1
+ '
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ 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.Size = New System.Drawing.Size(864, 31)
+ Me.ToolStrip1.TabIndex = 63
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripBtNew
+ '
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+ Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtNew.Name = "ToolStripBtNew"
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtNew.Text = "ToolStripButton1"
+ Me.ToolStripBtNew.ToolTipText = "New"
+ '
+ 'ToolStripBtOpen
+ '
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtOpen.Text = "ToolStripButton1"
+ Me.ToolStripBtOpen.ToolTipText = "Open..."
+ '
+ 'ToolStripBtSave
+ '
+ Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+ Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSave.Name = "ToolStripBtSave"
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSave.Text = "ToolStripButton1"
+ Me.ToolStripBtSave.ToolTipText = "Save"
+ '
+ 'ToolStripBtSaveAs
+ '
+ Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+ Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+ Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripBtSendTo
+ '
+ Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+ Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSendTo.Text = "Send to Vehicle Editor"
+ Me.ToolStripBtSendTo.ToolTipText = "Send to Vehicle Editor"
+ '
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripButton1
+ '
+ Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+ Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripButton1.Name = "ToolStripButton1"
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton1.Text = "Help"
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 31)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(864, 40)
+ Me.PictureBox1.TabIndex = 64
+ Me.PictureBox1.TabStop = false
+ '
+ 'lblTitle
+ '
+ Me.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top
+ 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(114, 36)
+ Me.lblTitle.Name = "lblTitle"
+ Me.lblTitle.Size = New System.Drawing.Size(68, 29)
+ Me.lblTitle.TabIndex = 65
+ Me.lblTitle.Text = "IEPC"
+ '
+ 'ButCancel
+ '
+ 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(778, 561)
+ Me.ButCancel.Name = "ButCancel"
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.TabIndex = 67
+ Me.ButCancel.Text = "Cancel"
+ Me.ButCancel.UseVisualStyleBackColor = true
+ '
+ '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(697, 561)
+ Me.ButOK.Name = "ButOK"
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.TabIndex = 66
+ Me.ButOK.Text = "Save"
+ Me.ButOK.UseVisualStyleBackColor = true
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
+ Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(242, 26)
+ Me.FlowLayoutPanel1.TabIndex = 101
+ '
+ 'FlowLayoutPanel4
+ '
+ Me.FlowLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.FlowLayoutPanel4.Controls.Add(Me.Label3)
+ Me.FlowLayoutPanel4.Controls.Add(Me.cbDesignTypeWheelMotor)
+ Me.FlowLayoutPanel4.Location = New System.Drawing.Point(12, 131)
+ Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
+ Me.FlowLayoutPanel4.Size = New System.Drawing.Size(210, 26)
+ Me.FlowLayoutPanel4.TabIndex = 104
+ '
+ 'FlowLayoutPanel5
+ '
+ Me.FlowLayoutPanel5.Controls.Add(Me.Label48)
+ Me.FlowLayoutPanel5.Controls.Add(Me.tbNumberOfDesignTypeWheelMotor)
+ Me.FlowLayoutPanel5.Controls.Add(Me.Label9)
+ Me.FlowLayoutPanel5.Location = New System.Drawing.Point(227, 131)
+ Me.FlowLayoutPanel5.Name = "FlowLayoutPanel5"
+ Me.FlowLayoutPanel5.Size = New System.Drawing.Size(298, 26)
+ Me.FlowLayoutPanel5.TabIndex = 105
+ '
+ 'Label9
+ '
+ Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(252, 6)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(16, 13)
+ Me.Label9.TabIndex = 66
+ Me.Label9.Text = "[-]"
+ '
+ 'FlowLayoutPanel6
+ '
+ Me.FlowLayoutPanel6.Controls.Add(Me.Label51)
+ Me.FlowLayoutPanel6.Controls.Add(Me.tbInertia)
+ Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
+ Me.FlowLayoutPanel6.Location = New System.Drawing.Point(12, 104)
+ Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
+ Me.FlowLayoutPanel6.Size = New System.Drawing.Size(210, 26)
+ Me.FlowLayoutPanel6.TabIndex = 102
+ '
+ 'lblinertiaUnit
+ '
+ Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.lblinertiaUnit.AutoSize = true
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(108, 6)
+ Me.lblinertiaUnit.Name = "lblinertiaUnit"
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.TabIndex = 64
+ Me.lblinertiaUnit.Text = "[kgm²]"
+ '
+ 'FlowLayoutPanel7
+ '
+ Me.FlowLayoutPanel7.Controls.Add(Me.Label2)
+ Me.FlowLayoutPanel7.Controls.Add(Me.cbDifferentialIncluded)
+ Me.FlowLayoutPanel7.Location = New System.Drawing.Point(12, 158)
+ Me.FlowLayoutPanel7.Name = "FlowLayoutPanel7"
+ Me.FlowLayoutPanel7.Size = New System.Drawing.Size(210, 26)
+ Me.FlowLayoutPanel7.TabIndex = 106
+ '
+ 'FlowLayoutPanel8
+ '
+ Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
+ Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
+ Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
+ Me.FlowLayoutPanel8.Location = New System.Drawing.Point(227, 104)
+ Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
+ Me.FlowLayoutPanel8.Size = New System.Drawing.Size(298, 26)
+ Me.FlowLayoutPanel8.TabIndex = 103
+ '
+ 'Label10
+ '
+ Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(278, 6)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(16, 13)
+ Me.Label10.TabIndex = 67
+ Me.Label10.Text = "[-]"
+ '
+ '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, 587)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Size = New System.Drawing.Size(864, 22)
+ Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.TabIndex = 74
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'LbStatus
+ '
+ Me.LbStatus.Name = "LbStatus"
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Text = "Status"
+ '
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ 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(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'IEPCForm
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(864, 609)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.FlowLayoutPanel7)
+ Me.Controls.Add(Me.FlowLayoutPanel5)
+ Me.Controls.Add(Me.FlowLayoutPanel8)
+ Me.Controls.Add(Me.GroupBox3)
+ Me.Controls.Add(Me.FlowLayoutPanel6)
+ Me.Controls.Add(Me.FlowLayoutPanel4)
+ Me.Controls.Add(Me.FlowLayoutPanel1)
+ Me.Controls.Add(Me.ButCancel)
+ Me.Controls.Add(Me.ButOK)
+ Me.Controls.Add(Me.lblTitle)
+ Me.Controls.Add(Me.PictureBox1)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.Controls.Add(Me.GroupBox1)
+ Me.Controls.Add(Me.tcVoltageLevels)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.MaximizeBox = false
+ Me.Name = "IEPCForm"
+ Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "IEPC Editor"
+ Me.tcVoltageLevels.ResumeLayout(false)
+ Me.tpFirstVoltageLevel.ResumeLayout(false)
+ Me.FlowLayoutPanel9.ResumeLayout(false)
+ Me.FlowLayoutPanel9.PerformLayout
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel1.PerformLayout
+ Me.GroupBox2.ResumeLayout(false)
+ Me.TableLayoutPanel6.ResumeLayout(false)
+ Me.TableLayoutPanel6.PerformLayout
+ Me.tpVoltageLevel.ResumeLayout(false)
+ Me.GroupBox4.ResumeLayout(false)
+ Me.TableLayoutPanel2.ResumeLayout(false)
+ Me.TableLayoutPanel2.PerformLayout
+ Me.FlowLayoutPanel10.ResumeLayout(false)
+ Me.FlowLayoutPanel10.PerformLayout
+ Me.TableLayoutPanel4.ResumeLayout(false)
+ Me.TableLayoutPanel4.PerformLayout
+ Me.GroupBox1.ResumeLayout(false)
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.TableLayoutPanel5.PerformLayout
+ Me.FlowLayoutPanel2.ResumeLayout(false)
+ Me.GroupBox3.ResumeLayout(false)
+ Me.TableLayoutPanel3.ResumeLayout(false)
+ Me.TableLayoutPanel3.PerformLayout
+ Me.FlowLayoutPanel11.ResumeLayout(false)
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.FlowLayoutPanel1.PerformLayout
+ Me.FlowLayoutPanel4.ResumeLayout(false)
+ Me.FlowLayoutPanel4.PerformLayout
+ Me.FlowLayoutPanel5.ResumeLayout(false)
+ Me.FlowLayoutPanel5.PerformLayout
+ Me.FlowLayoutPanel6.ResumeLayout(false)
+ Me.FlowLayoutPanel6.PerformLayout
+ Me.FlowLayoutPanel7.ResumeLayout(false)
+ Me.FlowLayoutPanel7.PerformLayout
+ Me.FlowLayoutPanel8.ResumeLayout(false)
+ Me.FlowLayoutPanel8.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.ResumeLayout(false)
+ Me.PerformLayout
+
+End Sub
+ Friend WithEvents btFLCurveFile1 As Button
+ Friend WithEvents tbThermalOverload As TextBox
+ Friend WithEvents Label52 As Label
+ Friend WithEvents Label48 As Label
+ Friend WithEvents tbNumberOfDesignTypeWheelMotor As TextBox
+ Friend WithEvents Label51 As Label
+ Friend WithEvents tbInertia As TextBox
+ Friend WithEvents Label49 As Label
+ Friend WithEvents tbModel As TextBox
+ Friend WithEvents tcVoltageLevels As TabControl
+ Friend WithEvents tpFirstVoltageLevel As TabPage
+ Friend WithEvents GroupBox2 As GroupBox
+ Friend WithEvents lvPowerMap1 As ListView
+ Friend WithEvents ColumnHeader13 As ColumnHeader
+ Friend WithEvents ColumnHeader14 As ColumnHeader
+ Friend WithEvents Label47 As Label
+ Friend WithEvents Label44 As Label
+ Friend WithEvents Label43 As Label
+ Friend WithEvents tbOverloadTime1 As TextBox
+ Friend WithEvents Label42 As Label
+ Friend WithEvents tboverloadTorqueSpeed1 As TextBox
+ Friend WithEvents Label41 As Label
+ Friend WithEvents tbOverloadTorque1 As TextBox
+ Friend WithEvents tbContinousTorqueSpeed1 As TextBox
+ Friend WithEvents Label39 As Label
+ Friend WithEvents tbContinousTorque1 As TextBox
+ Friend WithEvents Label37 As Label
+ Friend WithEvents tbVoltage1 As TextBox
+ Friend WithEvents tpVoltageLevel As TabPage
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents Label1 As Label
+ Friend WithEvents Label2 As Label
+ Friend WithEvents cbDesignTypeWheelMotor As CheckBox
+ Friend WithEvents cbDifferentialIncluded As CheckBox
+ Friend WithEvents Label3 As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label12 As Label
+ Friend WithEvents Label11 As Label
+ Friend WithEvents Label14 As Label
+ Friend WithEvents Label13 As Label
+ Friend WithEvents Label15 As Label
+ Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
+ Friend WithEvents Label16 As Label
+ Friend WithEvents Label17 As Label
+ Friend WithEvents Label18 As Label
+ Friend WithEvents Label19 As Label
+ Friend WithEvents tbVoltage2 As TextBox
+ Friend WithEvents Label20 As Label
+ Friend WithEvents Label21 As Label
+ Friend WithEvents tbContinousTorque2 As TextBox
+ Friend WithEvents tbContinousTorqueSpeed2 As TextBox
+ Friend WithEvents tbOverloadTorque2 As TextBox
+ Friend WithEvents tbOverloadTorqueSpeed2 As TextBox
+ Friend WithEvents tbOverloadTime2 As TextBox
+ Friend WithEvents Label22 As Label
+ Friend WithEvents Label23 As Label
+ Friend WithEvents Label24 As Label
+ Friend WithEvents Label25 As Label
+ Friend WithEvents Label26 As Label
+ Friend WithEvents Label27 As Label
+ Friend WithEvents tbFLCurve2 As TextBox
+ Friend WithEvents btFLCurveFile2 As Button
+ Friend WithEvents Label28 As Label
+ Friend WithEvents TableLayoutPanel6 As TableLayoutPanel
+ Friend WithEvents tbFLCurve1 As TextBox
+ Friend WithEvents GroupBox1 As GroupBox
+ Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
+ Friend WithEvents btAddGear As Button
+ Friend WithEvents btRemoveGear As Button
+ Friend WithEvents lvGear As ListView
+ Friend WithEvents ColumnHeader1 As ColumnHeader
+ Friend WithEvents ColumnHeader2 As ColumnHeader
+ Friend WithEvents ColumnHeader3 As ColumnHeader
+ Friend WithEvents GroupBox3 As GroupBox
+ Friend WithEvents btAddDragCurve As Button
+ Friend WithEvents btRemoveDragCurve As Button
+ Friend WithEvents ToolStrip1 As ToolStrip
+ Friend WithEvents ToolStripBtNew As ToolStripButton
+ Friend WithEvents ToolStripBtOpen As ToolStripButton
+ Friend WithEvents ToolStripBtSave As ToolStripButton
+ Friend WithEvents ToolStripBtSaveAs As ToolStripButton
+ Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
+ Friend WithEvents ToolStripBtSendTo As ToolStripButton
+ Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+ Friend WithEvents ToolStripButton1 As ToolStripButton
+ Friend WithEvents PictureBox1 As PictureBox
+ Friend WithEvents lblTitle As Label
+ Friend WithEvents ButCancel As Button
+ Friend WithEvents ButOK As Button
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel4 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel5 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel6 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel7 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel8 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel9 As FlowLayoutPanel
+ Friend WithEvents lblinertiaUnit As Label
+ Friend WithEvents Label9 As Label
+ Friend WithEvents Label10 As Label
+ Friend WithEvents FlowLayoutPanel10 As FlowLayoutPanel
+ Friend WithEvents GroupBox4 As GroupBox
+ Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
+ Friend WithEvents Label5 As Label
+ Friend WithEvents lvPowerMap2 As ListView
+ Friend WithEvents ColumnHeader6 As ColumnHeader
+ Friend WithEvents ColumnHeader7 As ColumnHeader
+ Friend WithEvents StatusStrip1 As StatusStrip
+ Friend WithEvents LbStatus As ToolStripStatusLabel
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents Label6 As Label
+ Friend WithEvents TableLayoutPanel3 As TableLayoutPanel
+ Friend WithEvents lvDragCurve As ListView
+ Friend WithEvents ColumnHeader4 As ColumnHeader
+ Friend WithEvents ColumnHeader5 As ColumnHeader
+ Friend WithEvents FlowLayoutPanel11 As FlowLayoutPanel
+ Friend WithEvents Label7 As Label
+ Friend WithEvents btShowFLCurve1 As Button
+ Friend WithEvents btShowFLCurve2 As Button
+ Friend WithEvents CmOpenFile As ContextMenuStrip
+ Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
+End Class
diff --git a/VECTO/GUI/IEPCForm.resx b/VECTO/GUI/IEPCForm.resx
new file mode 100644
index 0000000000000000000000000000000000000000..50021e8dee392b488a1cf238c54469d8f1de2343
--- /dev/null
+++ b/VECTO/GUI/IEPCForm.resx
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btFLCurveFile1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btFLCurveFile2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>231, 20</value>
+ </metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>462, 18</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>62</value>
+ </metadata>
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/QLg6NsG/v7+AgAA
+ AAAAAAAAAAAAAAAAAAAAAAAA////////////////////////////////////////////////////////
+ /////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4B1uDQEIil
+ di319/MQ////AQAAAAAAAAAAAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+
+ /gudtI5FRHEmhMbUvS7+/v4CAAAAAAAAAAAAAAAAAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP8AAAD/AAAA//////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD///8B7PDpJmOJS5s4aBnEjal8Wf39/A8AAAAAAAAAAAAAAAAAAAAA/////wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP7+/ga3ya0+PGsexzdnGO9Vfjut4OfcLP///wIAAAAAAAAAAAAAAAD/////AAAA/wAA
+ AP8AAAD/AAAA////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAD///8B+vv6Fn+ea3E2ZhfeN2cY/DhnGc+nvJpJ/v7+CQAAAAAAAAAAAAAAAP//
+ //8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/+/gLU3s0vSHQstTZmF/Y2Zhf+NmYX6G2QV4zy9fAg////AQAA
+ AAAAAAAA/////wAAAP8AAAD/AAAA/wAAAP//////////////////////////////////////AAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+DJqyilI1ZhbTNmYW/TZmF/82Zhf5P20hwMDP
+ tzj+/v4EAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
+ //8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wLr7+cpX4ZFpTVmFfA2ZhX/NmYW/zZm
+ Fv42ZhfZh6N0ZPz9/BL+/v4BAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+B7TGqEI6ahnMNmcV/DZn
+ Ff82ZhX/NmYV/zVlF/RPeTOw2+TWLf7+/gIAAAAA/////wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wH4+vgZeppleTVm
+ FOE2ZxX+NmcV/zZnFf82ZhX/NmYV/TZmFtGhuJNO/v7+CgAAAAD/////AAAA/wAAAP8AAAD/AAAA////
+ //////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+As/b
+ yDBGcyi3NWYU9zVmFP82ZxX/NmcV/zZnFf82ZxX+NWYV7GeMT5fv8+0k////Af////8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD+/v4Mlq+FVDRlE9Q1ZhT9NWYU/zVmFP82ZxX/NmcV/zZnFf82ZxX7PWwdxbzMsTz+/v4F/////wAA
+ AP8AAAD/AAAA/wAAAP///////////////////////////////////////////wAAAAAAAAAAAAAAAAAA
+ AAAAAAAA////Auju5Stbg0GqNWUU8jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZnFf41ZhTdgqBubfv8
+ +hX/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP//////AAAAAAAA
+ AAAAAAAAAAAAAAAAAAD+/v4HscOlRThoGM41ZhT9NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zVm
+ FPVLdy6z1+DQL/7+/v8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
+ //8AAAAAAAAAAAAAAAAAAAAA////Afj59xt2l2F+NGUT4zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zVm
+ FP82ZxX/NmcV/TVmFdOctI1R/v7+/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAD+/v4CzdnFMURxJbo1ZhT4NWYU/zVmFP81ZhT/NWYU/zVm
+ FP81ZhT/NWYU/zVmFP82ZxX/NWYU7mKISZ/8/Pv/////////////////////////////////////////
+ ////////////////////////AAAAAAAAAAAAAAAAAAAAAP7+/gyUroNUNGUT1DVmFP01ZhT/NWYU/zVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX8O2obybfIq0L+/v4I/v7+Av39/QL9/v0C/f79Av3+
+ /QL9/v0C/f79Av3+/QL9/v0C/f79Av3+/QL9/v0C/f79AgAAAAD///8C5uziK1mBPqs0ZRPzNWYU/zVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFf41ZhThepplhNTezUPZ4tM12eLTNdni
+ 0zXZ4tM12eLTNdni1DXZ4tQ12eLUNdrj1DXa49U12eLUNdrj1DXa49U1AAAAAP7+/givwqJGN2cWzjVm
+ FP01ZhT/NWYU/zVmFP81ZhT/NGYT/zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFfg1ZhThRHImz0Rx
+ JspEcSfKRXEoykVyKMpFcinKRnMqykd0K8pIdCvKSXUsykt3LspIdCvKSXUsykt3Lsr//v8B9vj1HXSW
+ XoM0ZRPlNWYU/jVmFP81ZhT/NWYU/zVmFP82ZhX0U3w34DRlE/Q1ZhT/NWYU/zVmFP81ZhT/NWYU/zZn
+ Ff42ZxX9NmYV/TZmFv02Zhf9NmYX/TdnGP03Zxj9OWgZ/TppGv06ahv9PGwd/TppGv06ahv9PGwd/f7/
+ /gLK1sIyQnAkuzRlE/g1ZhT/NWYU/zVmFP81ZhT/NWYU+0dzKc2gt5GGP24g0zVmFP01ZhT/NWYU/zVm
+ FP81ZhT/NmcV/zZnFf82ZxX/NmYW/zZmF/82Zhf/N2cY/zdnGP84aBn/Omka/zpqG/87axz/Omka/zpq
+ G/87axz//f79DY+qflc0ZRPVNWYU/TVmFP81ZhT/NWYU/zVmFP41ZRTraY1RluLp3k1fhkWnNGUT8TVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhX/NmYW/zZmF/83Zxf/N2cY/zhoGf85aRr/Omob/ztr
+ HP85aRr/Omob/ztrHP/j6t8rVn88rDRlFPM1ZhT/NWYU/zVmFP81ZhT/NWYU/jRlE9KWr4VN/f39F5Cq
+ flU0ZRPVNWYU/jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZmFf82Zhb/NmYX/zZmF/83Zxj/N2cY/zlp
+ Gv86ahv/O2sc/zlpGv86ahv/O2sc/6zAn0c3ZxbPNWYU/TVmFP81ZhT/NWYU/zVmFP81ZhT9PWwdycPS
+ ujb+/v4EwtC4Nz1sHco1ZhT9NWYU/zVmFP81ZhT/NWYU/zZnFf82ZxX/NmYV/zZmFv82Zhf/NmYX/zdn
+ GP83Zxj/OWka/zpqG/86ahv/OWka/zpqG/86ahv/cpRchjRlE+Y1ZhT+NWYU/zVmFP81ZhT/NWYU/zVm
+ FPZXgDyz6e7mLv///wPp7uYsWYE+rzVmFPQ1ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhT/NmYV/zZm
+ F/82Zhf/N2cX/zdnGP85aRr/Omob/zpqG/85aRr/Omob/zpqG/9BbyK6NGUU9jVmFP01ZhT9NWYU/TVm
+ FP01ZhT8NGUT3IGgbW78/PwW////Af39/RGJpXZiNGUT2DVmFPw1ZhT9NGUT/TVmFP02ZxX9NmcV/TZm
+ Ff02ZhX9NmYX/TZmF/03Zxf9N2cY/ThoGf06aRr9Omob/ThoGf06aRr9Omob/TZnFaE2ZxXINmcVyjZn
+ Fco2ZxXKNmcVyjZnFck4aBijr8KiNP7+/gUAAAAA/v7+A7rKrzA7ahuiNmcVyTZnFco2ZxXKN2cWyjdo
+ Fso3aBbKN2gWyjdnF8o3ZxjKOGcZyjhoGco5aBrKOmobyjtrHMo8ax3KOmobyjtrHMo8ax3KscSkKrHE
+ pDWxxKQ1scSkNbHEpDWxxKQ1scSkNbTGqCru8uwM///+AQAAAAAAAAAA8/bxC7bHqiqxxKQ1scSkNbHE
+ pDWxxKQ1scSlNbHEpTWxxKU1scSlNbHEpTWxxKU1scSmNbLEpjWyxaY1s8WnNbPFpzWyxaY1s8WnNbPF
+ pzX///8C////Av///wL///8C////Av///wL///8C////AgAAAAAAAAAAAAAAAAAAAAAAAAAA////Av//
+ /wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////AgAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAA////////gAP//4AD/9+AA/+fgAP/j4AD/4+B//8HgAf/B4AH/geAB/4D
+ gAf+A4AH/AGB//wBgAP4AYAD+ACAA/gAgAPwAAAD8AB//+AAP//gAAAAwAAAAMAAAADAIAAAgHAAAIBw
+ AAAAcAAAAPgAAAD4AAD///////////////8=
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
new file mode 100644
index 0000000000000000000000000000000000000000..3cd291fedb5bb28f1d0cac67a60feff35498b10e
--- /dev/null
+++ b/VECTO/GUI/IEPCForm.vb
@@ -0,0 +1,815 @@
+Imports System.IO
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+
+Public Class IEPCForm
+
+ Public JobDir As String = ""
+ Private _iepcFilePath as String = ""
+ Private _powerMapDlg As IEPCInputDialog
+ Private _dragCurveDlg As IEPCInputDialog
+ Private _gearDlg As IEPCGearInputDialog
+ Private _flcFilePath1 as String
+ Private _flcFilePath2 as String
+ Private _changed as Boolean
+
+ Private _contextMenuFiles As String()
+
+
+ Private Sub IEPCForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ _powerMapDlg = New IEPCInputDialog(IEPCDialogType.PowerMapDialog)
+ _dragCurveDlg = New IEPCInputDialog(IEPCDialogType.DragCurveDialog)
+ _gearDlg = New IEPCGearInputDialog()
+ End Sub
+
+#Region "Set IEPC Data"
+
+ Public Sub ReadIEPCFile(file As String)
+ Dim inputData = JSONInputDataFactory.ReadIEPCEngineeringInputData(file, True)
+
+ tbModel.Text = inputData.Model
+ tbInertia.Text = inputData.Inertia.ToGUIFormat()
+ cbDifferentialIncluded.Checked = inputData.DifferentialIncluded
+ cbDesignTypeWheelMotor.Checked = inputData.DesignTypeWheelMotor
+ tbNumberOfDesignTypeWheelMotor.Text = inputData.NrOfDesignTypeWheelMotorMeasured.Value.ToGUIFormat()
+ tbThermalOverload.Text = inputData.OverloadRecoveryFactor.ToGUIFormat()
+
+ Dim voltageLevel = inputData.VoltageLevels.First()
+ SetFirstVoltageLevel(voltageLevel)
+ voltageLevel = inputData.VoltageLevels.Last()
+ SetSecondaryVoltageLevel(voltageLevel)
+ SetGearEntries(inputData.Gears)
+ SetDragEntries(inputData.DragCurves)
+ _iepcFilePath = file
+
+ LbStatus.Text = ""
+ _changed = False
+ End Sub
+
+ Private Sub SetFirstVoltageLevel(voltageLevel As IElectricMotorVoltageLevel)
+ tbVoltage1.Text = voltageLevel.VoltageLevel.ToGUIFormat()
+ tbContinousTorque1.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinousTorqueSpeed1.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTime1.Text = voltageLevel.OverloadTime.ToGUIFormat()
+ tbOverloadTorque1.Text = voltageLevel.OverloadTorque.ToGUIFormat()
+ tboverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbFLCurve1.Text = voltageLevel.FullLoadCurve.Source
+ SetPowerMapEntries(_lvPowerMap1, voltageLevel.PowerMap)
+ End Sub
+
+ Private Sub SetSecondaryVoltageLevel(voltageLevel As IElectricMotorVoltageLevel)
+ tbVoltage2.Text = voltageLevel.VoltageLevel.ToGUIFormat()
+ tbContinousTorque2.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinousTorqueSpeed2.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTime2.Text = voltageLevel.OverloadTime.ToGUIFormat()
+ tbOverloadTorque2.Text = voltageLevel.OverloadTorque.ToGUIFormat()
+ tbOverloadTorqueSpeed2.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbFLCurve2.Text = voltageLevel.FullLoadCurve.Source
+ SetPowerMapEntries(_lvPowerMap2, voltageLevel.PowerMap)
+ End Sub
+
+ Private Sub SetGearEntries(entries As IList(Of IGearEntry))
+ For Each entry As IGearEntry In entries
+ Dim listEntry = CreateListViewItem(entry.Ratio, entry.MaxOutputShaftTorque, entry.MaxOutputShaftSpeed)
+ _lvGear.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Sub SetDragEntries(entries As IList(Of IDragCurve))
+ For Each entry As IDragCurve In entries
+ Dim listEntry = CreateListViewItem(entry.Gear.Value, entry.DragCurve.Source)
+ _lvDragCurve.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Sub SetPowerMapEntries(powerMapListView As ListView, entries As IList(Of IElectricMotorPowerMap))
+ For Each entry As IElectricMotorPowerMap In entries
+ Dim listEntry = CreateListViewItem(entry.Gear, entry.PowerMap.Source)
+ powerMapListView.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Function CreateListViewItem(axleNumber As Integer, filepath As String) As ListViewItem
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = axleNumber.ToGUIFormat()
+ retVal.SubItems.Add(filepath)
+ Return retVal
+ End Function
+
+ Private Function CreateListViewItem(ratio As Double, outputShaftTorque As NewtonMeter, outputShaftSpeed As PerSecond) As ListViewItem
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = ratio.ToGUIFormat()
+ If Not outputShaftTorque = Nothing Then
+ retVal.SubItems.Add(outputShaftTorque.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+
+ If Not outputShaftSpeed = Nothing Then
+ retVal.SubItems.Add(outputShaftSpeed.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+
+ Return retVal
+ End Function
+
+ Private Function CreateListViewItem(ratio As Double, outputShaftTorque As Double?, outputShaftSpeed As Double?) As ListViewItem
+
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = ratio.ToGUIFormat()
+
+ If outputShaftTorque.HasValue Then
+ retVal.SubItems.Add(outputShaftTorque.Value.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+ If outputShaftSpeed.HasValue Then
+ retVal.SubItems.Add(outputShaftSpeed.Value.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+ Return retVal
+
+ End Function
+
+#End Region
+
+ Private Sub btAddDragCurve_Click(sender As Object, e As EventArgs) Handles btAddDragCurve.Click
+ AddListViewItem(_dragCurveDlg, _lvDragCurve)
+ End Sub
+
+ Private Sub AddListViewItem(dialog As IEPCInputDialog, listView As ListView)
+ dialog.Clear()
+ If dialog.ShowDialog() = DialogResult.OK Then
+ Dim gear = Convert.ToInt32(dialog.tbGear.Text)
+ Dim filePath = dialog.tbInputFile.Text
+ listView.Items.Add(CreateListViewItem(gear, filePath))
+ Change()
+ End If
+ End Sub
+
+ Private Sub btRemoveDragCurve_Click(sender As Object, e As EventArgs) Handles btRemoveDragCurve.Click
+ RemoveListEntry(_lvDragCurve)
+ End Sub
+
+ Private Sub btRemoveGear_Click(sender As Object, e As EventArgs) Handles btRemoveGear.Click
+ RemoveListEntry(_lvGear)
+ RemoveListEntry(_lvPowerMap1)
+ RemoveListEntry(_lvPowerMap2)
+ End Sub
+
+ Private Sub RemoveListEntry(listView As ListView)
+ If listView.Items.Count = 0 Then
+ Exit Sub
+ Else
+ listView.Items(listView.Items.Count - 1).Remove()
+ Change()
+ End If
+ End Sub
+
+ Private Sub btAddGear_Click(sender As Object, e As EventArgs) Handles btAddGear.Click
+ _gearDlg.Clear()
+
+ If _gearDlg.ShowDialog() = DialogResult.OK Then
+ Dim ratio = Convert.ToDouble(_gearDlg.tbRatio.Text)
+ Dim outputShaftTorque As Double?
+ Dim outputShaftSpeed As Double?
+ If _gearDlg.tbMaxOutShaftTorque.Text.Length > 0 Then
+ outputShaftTorque = _gearDlg.tbMaxOutShaftTorque.Text.ToDouble(0)
+ End If
+ If _gearDlg.tbMaxOutShaftSpeed.Text.Length > 0 Then
+ outputShaftSpeed = _gearDlg.tbMaxOutShaftSpeed.Text.ToDouble(0)
+ End If
+
+ Dim entry = CreateListViewItem(ratio, outputShaftTorque, outputShaftSpeed)
+ _lvGear.Items.Add(entry)
+ AddPowerMapEntry(lvPowerMap1, _lvGear.Items.Count)
+ AddPowerMapEntry(lvPowerMap2, _lvGear.Items.Count)
+
+ Change()
+ End If
+ End Sub
+
+ Private Sub AddPowerMapEntry(powerMapListView As ListView, gearIndex As Integer)
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = gearIndex.ToString()
+ retVal.SubItems.Add(String.Empty)
+ powerMapListView.Items.Add(retVal)
+ End Sub
+
+ Private Sub lvGear_DoubleClick(sender As Object, e As EventArgs) Handles lvGear.DoubleClick
+
+ If lvGear.SelectedItems.Count = 0 Then Exit Sub
+
+ Dim entry As ListViewItem = lvGear.SelectedItems(0)
+
+ _gearDlg.tbRatio.Text = entry.SubItems(0).Text
+ _gearDlg.tbMaxOutShaftTorque.Text = entry.SubItems(1).Text
+ _gearDlg.tbMaxOutShaftSpeed.Text = entry.SubItems(2).Text
+ _gearDlg.tbRatio.Focus()
+
+ If _gearDlg.ShowDialog() = DialogResult.OK Then
+ entry.SubItems(0).Text = _gearDlg.tbRatio.Text
+ entry.SubItems(1).Text = _gearDlg.tbMaxOutShaftTorque.Text
+ entry.SubItems(2).Text = _gearDlg.tbMaxOutShaftSpeed.Text
+ Change()
+ End If
+
+ End Sub
+
+ Private Sub lvDragCurve_DoubleClick(sender As Object, e As EventArgs) Handles lvDragCurve.DoubleClick
+ EditEntry(_dragCurveDlg, lvDragCurve)
+ End Sub
+
+ Private Sub lvPowerMap1_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap1.DoubleClick
+ _powerMapDlg.tbGear.Enabled = False
+ EditEntry(_powerMapDlg, lvPowerMap1)
+ End Sub
+
+ Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
+ _powerMapDlg.tbGear.Enabled = False
+ EditEntry(_powerMapDlg, lvPowerMap2)
+ End Sub
+
+ Private Sub EditEntry(dialog As IEPCInputDialog, listView As ListView)
+
+ If listView.SelectedItems.Count = 0 Then Exit Sub
+ dialog.Clear()
+
+ Dim entry As ListViewItem = listView.SelectedItems(0)
+ dialog.tbGear.Text = entry.SubItems(0).Text
+ dialog.tbInputFile.Text = entry.SubItems(1).Text
+ dialog.tbGear.Focus()
+
+ If dialog.ShowDialog() = DialogResult.OK Then
+ entry.SubItems(0).Text = dialog.tbGear.Text
+ entry.SubItems(1).Text = dialog.tbInputFile.Text
+ End If
+
+ End Sub
+
+ Private Sub btFLCurveFile1_Click(sender As Object, e As EventArgs) Handles btFLCurveFile1.Click
+ If IEPCFLCFileBrowser.OpenDialog(FileRepl(tbFLCurve1.Text, GetPath(_flcFilePath1))) Then
+ tbFLCurve1.Text = GetFilenameWithoutDirectory(IEPCFLCFileBrowser.Files(0), GetPath(_flcFilePath1))
+ End If
+ End Sub
+
+ Private Sub btFLCurveFile2_Click(sender As Object, e As EventArgs) Handles btFLCurveFile2.Click
+ If IEPCFLCFileBrowser.OpenDialog(FileRepl(tbFLCurve2.Text, GetPath(_flcFilePath2))) Then
+ tbFLCurve2.Text = GetFilenameWithoutDirectory(IEPCFLCFileBrowser.Files(0), GetPath(_flcFilePath2))
+ End If
+ End Sub
+
+ Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click
+ NewIEPC()
+ End Sub
+
+ Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
+ If IEPCFileBrowser.OpenDialog(_iepcFilePath) Then
+ Try
+ ReadIEPCFile(IEPCFileBrowser.Files(0))
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, $"Error loading IEPC(.{IEPCFileBrowser.Extensions}) File")
+ End Try
+ End If
+ End Sub
+
+ #Region "Toolbar"
+
+ Public Sub NewIEPC()
+ tbModel.Text = ""
+ tbInertia.Text = ""
+ cbDifferentialIncluded.Checked = False
+ cbDesignTypeWheelMotor.Checked = False
+ tbNumberOfDesignTypeWheelMotor.Text = ""
+ tbThermalOverload.Text = ""
+
+ tbVoltage1.Text = ""
+ tbContinousTorque1.Text = ""
+ tbContinousTorqueSpeed1.Text = ""
+ tbOverloadTime1.Text = ""
+ tbOverloadTorque1.Text = ""
+ tboverloadTorqueSpeed1.Text = ""
+ tbFLCurve1.Text = ""
+ _flcFilePath1 = ""
+ RemoveAllListViewItems(lvPowerMap1)
+
+ tbVoltage2.Text = ""
+ tbContinousTorque2.Text = ""
+ tbContinousTorqueSpeed2.Text = ""
+ tbOverloadTime2.Text = ""
+ tbOverloadTorque2.Text = ""
+ tboverloadTorqueSpeed2.Text = ""
+ tbFLCurve2.Text = ""
+ _flcFilePath2 = ""
+ RemoveAllListViewItems(lvPowerMap2)
+
+ RemoveAllListViewItems(lvDragCurve)
+ RemoveAllListViewItems(lvGear)
+ LbStatus.Text = ""
+
+ _changed = False
+ End Sub
+
+ Private Sub RemoveAllListViewItems(listView As ListView)
+ If listView.Items.Count = 0 Then
+ Exit Sub
+ Else
+ For Each listItem As ListViewItem In listView.Items
+ listItem.Remove()
+ Next
+ End If
+ End Sub
+
+ Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click
+ SaveOrSaveAs(False)
+ End Sub
+
+ Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click
+ SaveOrSaveAs(True)
+ End Sub
+
+ Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click
+ If ChangeCheckCancel() Then Exit Sub
+
+ If _iepcFilePath = "" Then
+ If MsgBox("Save file now?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ If Not SaveOrSaveAs(True) Then Exit Sub
+ Else
+ Exit Sub
+ End If
+ End If
+
+ If Not VectoJobForm.Visible Then
+ JobDir = ""
+ VectoJobForm.Show()
+ VectoJobForm.VectoNew()
+ Else
+ VectoJobForm.WindowState = FormWindowState.Normal
+ End If
+
+ VehicleForm.tbIEPCFilePath.Text = GetFilenameWithoutDirectory(_iepcFilePath, JobDir)
+ End Sub
+
+ Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+ If File.Exists(Path.Combine(MyAppPath, "User Manual\help.html")) Then
+ Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath()
+ Process.Start(defaultBrowserPath,
+ $"""file://{Path.Combine(MyAppPath, "User Manual\help.html#iepc-editor")}""")
+ Else
+ MsgBox("User Manual not found!", MsgBoxStyle.Critical)
+ End If
+ End Sub
+
+ #End Region
+
+ #Region "Save Methods"
+
+ Private Function ChangeCheckCancel() As Boolean
+ If _changed Then
+ Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
+ Case MsgBoxResult.Yes
+ Return Not SaveOrSaveAs(False)
+ Case MsgBoxResult.Cancel
+ Return True
+ Case Else
+ _changed = False
+ Return False
+ End Select
+ Else
+ Return False
+ End If
+ End Function
+
+ Private Function SaveOrSaveAs(ByVal saveAs As Boolean) As Boolean
+ If ValidateData() = False Then _
+ Return False
+
+ If _iepcFilePath = "" Or saveAs Then
+ If IEPCFileBrowser.SaveDialog(_iepcFilePath) Then
+ _iepcFilePath = IEPCFileBrowser.Files(0)
+ Else
+ Return False
+ End If
+ End If
+ Return SaveIEPCToFile(_iepcFilePath)
+ End Function
+
+ Private Function SaveIEPCToFile(ByVal file As String) As Boolean
+ Dim iepc = New IEPCInputData
+
+ iepc.SetCommonEntries(tbModel.Text, tbInertia.Text, cbDesignTypeWheelMotor.Checked,
+ tbNumberOfDesignTypeWheelMotor.Text, cbDifferentialIncluded.Checked,
+ tbThermalOverload.Text)
+
+ iepc.SetVoltageLevelEntries(tbVoltage1.Text, tbContinousTorque1.Text, tbContinousTorqueSpeed1.Text,
+ tbOverloadTime1.Text, tbOverloadTorque1.Text, tboverloadTorqueSpeed1.Text,
+ tbFLCurve1.Text, lvPowerMap1)
+
+ iepc.SetVoltageLevelEntries(tbVoltage2.Text, tbContinousTorque2.Text, tbContinousTorqueSpeed2.Text,
+ tbOverloadTime2.Text, tbOverloadTorque2.Text, tboverloadTorqueSpeed2.Text,
+ tbFLCurve2.Text, lvPowerMap2)
+
+ iepc.SetGearsEntries(lvGear)
+ iepc.SetDragCurveEntries(lvDragCurve)
+
+
+ If Not iepc.SaveFile(file) Then
+ MsgBox("Cannot save to " & file, MsgBoxStyle.Critical)
+ Return False
+ End If
+
+ _changed = False
+ LbStatus.Text = ""
+
+ Return True
+ End Function
+
+
+ #End Region
+
+
+
+ Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
+ If SaveOrSaveAs(False) Then Close()
+ End Sub
+
+ Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
+ Close()
+ End Sub
+
+
+#Region "Validate Input"
+
+ Private Function ValidateData() As Boolean
+
+ If ValidateModel() = False Then Return False
+ If ValidateInertia() = False Then Return False
+ If ValidateNrDesignTypeWheelMotorMeasured() = False Then Return False
+ If ValidateOverloadRecoveryFactor() = False Then Return False
+
+ If ValidateVoltage(tbVoltage1) = False Then Return False
+ If ValidateContinuousTorque(tbContinousTorque1) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinousTorqueSpeed1) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime1) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTorque1) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tboverloadTorqueSpeed1) = False Then Return False
+
+ If ValidateVoltage(tbVoltage2) = False Then Return False
+ If ValidateContinuousTorque(tbContinousTorque2) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinousTorqueSpeed2) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime2) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTorque2) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tboverloadTorqueSpeed2) = False Then Return False
+
+ If ValidateAmountOfEntries() = False Then Return False
+ If ValidateFullLoadCurve1() = False Then Return False
+ If ValidateFullLoadCurve2() = False Then Return False
+
+ If ValidatePowerMapEntries(_lvPowerMap1) = False Then Return False
+ If ValidatePowerMapEntries(_lvPowerMap2) = False Then Return False
+
+ Return True
+ End Function
+
+ Private Function ValidateModel() As Boolean
+ If String.IsNullOrEmpty(tbModel.Text) Then
+ ShowErrorMessageBox("Model", tbModel)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateInertia() As Boolean
+ If Not ValidDoubleValue(tbInertia.Text) Then
+ ShowErrorMessageBox("Inertia", tbInertia)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateNrDesignTypeWheelMotorMeasured() As Boolean
+ If Not cbDesignTypeWheelMotor.Checked AND Not ValidDoubleValue(tbNumberOfDesignTypeWheelMotor.Text) Then
+ ShowErrorMessageBox("Nr of Design Type Wheel Motor Measured", tbNumberOfDesignTypeWheelMotor)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadRecoveryFactor() As Boolean
+ If Not ValidDoubleValue(tbThermalOverload.Text) Then
+ ShowErrorMessageBox("Thermal Overload Recovery Factor", tbThermalOverload)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateVoltage(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Voltage", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorque(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTime(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Time", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorque(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque Speed", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateAmountOfEntries() As Boolean
+ If _lvGear.Items.Count = 0 Then
+ ShowErrorMessageBox("Invalid input no Gear given")
+ Return False
+ End If
+
+ If Not _lvPowerMap1.Items.Count = _lvGear.Items.Count Then
+ ShowErrorMessageBox("Invalid number of Power Map entries at Voltage Level Low")
+ Return False
+ End If
+
+ If Not _lvPowerMap2.Items.Count = _lvGear.Items.Count Then
+ ShowErrorMessageBox("Invalid number of Power Map entries at Voltage Level High")
+ Return False
+ End If
+
+ If _lvDragCurve.Items.Count = 0
+ ShowErrorMessageBox("Invalid input no Drag Curve given")
+ Return False
+ End If
+
+ If Not _lvDragCurve.Items.Count = _lvGear.Items.Count And _lvDragCurve.Items.Count > 1
+ ShowErrorMessageBox("Invalid numbers of Drag Curves given")
+ Return False
+ End If
+
+ Return True
+ End Function
+
+ Private Function ValidateFullLoadCurve1() As Boolean
+ If Not File.Exists(tbFLCurve1.Text) Then
+ ShowErrorMessageBox("No valid file path given", tbFLCurve1, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tbFLCurve1.Text).Extension
+ If Not $".{IEPCFLCFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Full Load Curve file(.{IEPCFLCFileBrowser.Extensions.First()}) has the wrong extension",
+ tbFLCurve1, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateFullLoadCurve2() As Boolean
+ If Not File.Exists(tbFLCurve2.Text) Then
+ ShowErrorMessageBox("Invalid input no valid file path given", tbFLCurve2, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tbFLCurve2.Text).Extension
+ If Not $".{IEPCFLCFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Full Load Curve file(.{IEPCFLCFileBrowser.Extensions.First()}) has the wrong file extension",
+ tbFLCurve2, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidatePowerMapEntries(powerMap as ListView) As Boolean
+
+ For Each entry As ListViewItem In powerMap.Items
+ If entry.SubItems.Count = 1 Then
+ ShowErrorMessageBox("Invalid input missing Power Map files")
+ Return False
+ End If
+
+ If entry.SubItems.Count = 2 Then
+ If String.IsNullOrEmpty(entry.SubItems(1).Text)
+ ShowErrorMessageBox($"Missing Power Map file entry at Gear {entry.SubItems(0).Text}")
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(entry.SubItems(1).Text).Extension
+ If Not $".{IEPCPowerMapFileBrowser.Extensions.First()}" = fileExtension
+ ShowErrorMessageBox($"The selected Power Map file(.{IEPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return False
+ End If
+ End If
+ Next
+ Return True
+
+ End Function
+
+ Private Sub ShowErrorMessageBox(message As string, textbox As TextBox, Optional defaultMessage As Boolean = True)
+ If Not message = Nothing And defaultMessage Then
+ MsgBox($"Invalid input for {message}")
+ textbox.Focus()
+ Return
+ Else
+ MsgBox($"{message}")
+ textbox.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub ShowErrorMessageBox(message As string)
+ If Not message = Nothing Then
+ MsgBox($"{message}")
+ Return
+ End If
+ End Sub
+
+ Private Function ValidDoubleValue(value As string) As Boolean
+ If String.IsNullOrEmpty(value)
+ Return false
+ End If
+ Return IsNumeric(value)
+ End Function
+
+#End Region
+
+#Region "Track changes"
+
+ Private Sub Change()
+ If Not _changed Then
+ LbStatus.Text = "Unsaved changes in current file"
+ _changed = True
+ End If
+ End Sub
+
+ Private Sub tbModel_TextChanged(sender As Object, e As EventArgs) Handles tbModel.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbInertia_TextChanged(sender As Object, e As EventArgs) Handles tbInertia.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbThermalOverload_TextChanged(sender As Object, e As EventArgs) Handles tbThermalOverload.TextChanged
+ Change()
+ End Sub
+
+ Private Sub cbDifferentialIncluded_CheckedChanged(sender As Object, e As EventArgs) Handles cbDifferentialIncluded.CheckedChanged
+ Change()
+ End Sub
+
+ Private Sub cbDesignTypeWheelMotor_CheckedChanged(sender As Object, e As EventArgs) Handles cbDesignTypeWheelMotor.CheckedChanged
+ tbNumberOfDesignTypeWheelMotor.Enabled = cbDesignTypeWheelMotor.Checked
+ If tbNumberOfDesignTypeWheelMotor.Enabled = False Then _
+ tbNumberOfDesignTypeWheelMotor.Text = "0"
+ Change()
+ End Sub
+
+ Private Sub tbNumberOfDesignTypeWheelMotor_TextChanged(sender As Object, e As EventArgs) Handles tbNumberOfDesignTypeWheelMotor.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage1_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tboverloadTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tboverloadTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve1_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage2_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve2_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub IEPCForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+ If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then
+ e.Cancel = ChangeCheckCancel()
+ End If
+ End Sub
+
+
+
+#End Region
+
+ Private Sub btShowFLCurve1_Click(sender As Object, e As EventArgs) Handles btShowFLCurve1.Click
+ Dim theFile = FileRepl(tbFLCurve1.Text, GetPath(_iepcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub btShowFLCurve2_Click(sender As Object, e As EventArgs) Handles btShowFLCurve2.Click
+ Dim theFile = FileRepl(tbFLCurve2.Text, GetPath(_iepcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ _contextMenuFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+
+ If File.Exists(_contextMenuFiles(0)) Then
+ Try
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
+ End Sub
+
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCGearInputDialog.Designer.vb b/VECTO/GUI/IEPCGearInputDialog.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..53ad8c37ea0649a6ab4bdea20ef6e68f930652e6
--- /dev/null
+++ b/VECTO/GUI/IEPCGearInputDialog.Designer.vb
@@ -0,0 +1,227 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class IEPCGearInputDialog
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()> _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.tbRatio = New System.Windows.Forms.TextBox()
+ Me.tbMaxOutShaftTorque = New System.Windows.Forms.TextBox()
+ Me.tbMaxOutShaftSpeed = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btnOk = New System.Windows.Forms.Button()
+ Me.btnCancel = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 6
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20!))
+ Me.TableLayoutPanel1.Controls.Add(Me.Label5, 3, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label4, 3, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label6, 3, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbRatio, 2, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbMaxOutShaftTorque, 2, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbMaxOutShaftSpeed, 2, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label3, 1, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label1, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label2, 1, 2)
+ Me.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 3
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(295, 91)
+ Me.TableLayoutPanel1.TabIndex = 0
+ '
+ 'Label5
+ '
+ Me.Label5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(241, 8)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(16, 13)
+ Me.Label5.TabIndex = 64
+ Me.Label5.Text = "[-]"
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(234, 38)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(29, 13)
+ Me.Label4.TabIndex = 64
+ Me.Label4.Text = "[Nm]"
+ '
+ 'Label6
+ '
+ Me.Label6.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(234, 69)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(30, 13)
+ Me.Label6.TabIndex = 65
+ Me.Label6.Text = "[rpm]"
+ '
+ 'tbRatio
+ '
+ Me.tbRatio.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbRatio.Location = New System.Drawing.Point(149, 5)
+ Me.tbRatio.Name = "tbRatio"
+ Me.tbRatio.Size = New System.Drawing.Size(77, 20)
+ Me.tbRatio.TabIndex = 1
+ '
+ 'tbMaxOutShaftTorque
+ '
+ Me.tbMaxOutShaftTorque.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbMaxOutShaftTorque.Location = New System.Drawing.Point(149, 35)
+ Me.tbMaxOutShaftTorque.Name = "tbMaxOutShaftTorque"
+ Me.tbMaxOutShaftTorque.Size = New System.Drawing.Size(77, 20)
+ Me.tbMaxOutShaftTorque.TabIndex = 2
+ '
+ 'tbMaxOutShaftSpeed
+ '
+ Me.tbMaxOutShaftSpeed.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbMaxOutShaftSpeed.Location = New System.Drawing.Point(149, 65)
+ Me.tbMaxOutShaftSpeed.Name = "tbMaxOutShaftSpeed"
+ Me.tbMaxOutShaftSpeed.Size = New System.Drawing.Size(77, 20)
+ Me.tbMaxOutShaftSpeed.TabIndex = 3
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(113, 8)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(32, 13)
+ Me.Label3.TabIndex = 9
+ Me.Label3.Text = "Ratio"
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(41, 38)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(104, 13)
+ Me.Label1.TabIndex = 9
+ Me.Label1.Text = "Max out shaft torque"
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(42, 69)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(103, 13)
+ Me.Label2.TabIndex = 9
+ Me.Label2.Text = "Max out shaft speed"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel5.Controls.Add(Me.btnOk, 0, 0)
+ Me.TableLayoutPanel5.Controls.Add(Me.btnCancel, 1, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(147, 106)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 1
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(148, 29)
+ Me.TableLayoutPanel5.TabIndex = 5
+ '
+ 'btnOk
+ '
+ Me.btnOk.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnOk.Location = New System.Drawing.Point(3, 3)
+ Me.btnOk.Name = "btnOk"
+ Me.btnOk.Size = New System.Drawing.Size(67, 23)
+ Me.btnOk.TabIndex = 4
+ Me.btnOk.Text = "OK"
+ '
+ 'btnCancel
+ '
+ Me.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btnCancel.Location = New System.Drawing.Point(77, 3)
+ Me.btnCancel.Name = "btnCancel"
+ Me.btnCancel.Size = New System.Drawing.Size(67, 23)
+ Me.btnCancel.TabIndex = 5
+ Me.btnCancel.Text = "Cancel"
+ '
+ 'IEPCGearInputDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(295, 140)
+ Me.Controls.Add(Me.TableLayoutPanel5)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "IEPCGearInputDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Gear"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel1.PerformLayout
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.ResumeLayout(false)
+
+End Sub
+
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents Label1 As Label
+ Friend WithEvents tbMaxOutShaftTorque As TextBox
+ Friend WithEvents Label2 As Label
+ Friend WithEvents tbMaxOutShaftSpeed As TextBox
+ Friend WithEvents Label3 As Label
+ Friend WithEvents tbRatio As TextBox
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label6 As Label
+ Friend WithEvents Label5 As Label
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents btnOk As Button
+ Friend WithEvents btnCancel As Button
+End Class
diff --git a/VECTO/GUI/IEPCGearInputDialog.resx b/VECTO/GUI/IEPCGearInputDialog.resx
new file mode 100644
index 0000000000000000000000000000000000000000..1af7de150c99c12dd67a509fe57c10d63e4eeb04
--- /dev/null
+++ b/VECTO/GUI/IEPCGearInputDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCGearInputDialog.vb b/VECTO/GUI/IEPCGearInputDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..1587dcce4d3ec9f5f4de0ad99d8c4d3ea002b32c
--- /dev/null
+++ b/VECTO/GUI/IEPCGearInputDialog.vb
@@ -0,0 +1,42 @@
+Public Class IEPCGearInputDialog
+ Public Sub Clear()
+ _tbRatio.Text = ""
+ _tbMaxOutShaftSpeed.Text = ""
+ _tbMaxOutShaftTorque.Text = ""
+ _tbRatio.Focus()
+ End Sub
+
+ Private Sub btnOk_Click(sender As Object, e As EventArgs) Handles btnOk.Click
+ If Not IsNumeric(_tbRatio.Text) Then
+ MsgBox("Invalid input for Ratio")
+ _tbRatio.Focus()
+ Return
+ End If
+
+ If tbMaxOutShaftTorque.Text.Length > 0 And Not IsNumeric(_tbMaxOutShaftTorque.Text) Then
+ MsgBox("Invalid input for Max Out Shaft Torque")
+ _tbMaxOutShaftTorque.Focus()
+ Return
+ End If
+
+ If _tbMaxOutShaftSpeed.Text.Length > 0 And Not IsNumeric(_tbMaxOutShaftSpeed.Text) Then
+ MsgBox("Invalid input for Max Out Shaft Speed")
+ _tbMaxOutShaftSpeed.Focus()
+ Return
+ End If
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ Clear()
+ End Sub
+
+ Private Sub IEPCGearInputDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ Show()
+ _tbRatio.Focus()
+ End Sub
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCInputDialog.Designer.vb b/VECTO/GUI/IEPCInputDialog.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..c1055049930ca4010fcb59fa4ec0714715d27a1b
--- /dev/null
+++ b/VECTO/GUI/IEPCInputDialog.Designer.vb
@@ -0,0 +1,185 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class IEPCInputDialog
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()>
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()>
+ Private Sub InitializeComponent()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IEPCInputDialog))
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btnOk = New System.Windows.Forms.Button()
+ Me.btnCancel = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btAddFilePath = New System.Windows.Forms.Button()
+ Me.tbInputFile = New System.Windows.Forms.TextBox()
+ Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
+ Me.tbGear = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.btnOk, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.btnCancel, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(353, 45)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(148, 29)
+ Me.TableLayoutPanel1.TabIndex = 105
+ '
+ 'btnOk
+ '
+ Me.btnOk.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnOk.Location = New System.Drawing.Point(3, 3)
+ Me.btnOk.Name = "btnOk"
+ Me.btnOk.Size = New System.Drawing.Size(67, 23)
+ Me.btnOk.TabIndex = 16
+ Me.btnOk.Text = "OK"
+ '
+ 'btnCancel
+ '
+ Me.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btnCancel.Location = New System.Drawing.Point(77, 3)
+ Me.btnCancel.Name = "btnCancel"
+ Me.btnCancel.Size = New System.Drawing.Size(67, 23)
+ Me.btnCancel.TabIndex = 17
+ Me.btnCancel.Text = "Cancel"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 316!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40!))
+ Me.TableLayoutPanel5.Controls.Add(Me.btAddFilePath, 1, 0)
+ Me.TableLayoutPanel5.Controls.Add(Me.tbInputFile, 0, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(140, 3)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 1
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(356, 39)
+ Me.TableLayoutPanel5.TabIndex = 103
+ '
+ 'btAddFilePath
+ '
+ Me.btAddFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btAddFilePath.Image = CType(resources.GetObject("btAddFilePath.Image"),System.Drawing.Image)
+ Me.btAddFilePath.Location = New System.Drawing.Point(324, 6)
+ Me.btAddFilePath.Name = "btAddFilePath"
+ Me.btAddFilePath.Size = New System.Drawing.Size(24, 26)
+ Me.btAddFilePath.TabIndex = 12
+ Me.btAddFilePath.UseVisualStyleBackColor = true
+ '
+ 'tbInputFile
+ '
+ Me.tbInputFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbInputFile.Location = New System.Drawing.Point(3, 9)
+ Me.tbInputFile.Name = "tbInputFile"
+ Me.tbInputFile.Size = New System.Drawing.Size(310, 20)
+ Me.tbInputFile.TabIndex = 11
+ '
+ 'TableLayoutPanel4
+ '
+ Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel4.ColumnCount = 2
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.8!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.2!))
+ Me.TableLayoutPanel4.Controls.Add(Me.tbGear, 1, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label3, 0, 0)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 8)
+ Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(6, 3, 3, 3)
+ Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
+ Me.TableLayoutPanel4.RowCount = 1
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(128, 28)
+ Me.TableLayoutPanel4.TabIndex = 100
+ '
+ 'tbGear
+ '
+ Me.tbGear.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbGear.Location = New System.Drawing.Point(46, 4)
+ Me.tbGear.Name = "tbGear"
+ Me.tbGear.Size = New System.Drawing.Size(77, 20)
+ Me.tbGear.TabIndex = 10
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(5, 7)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(30, 13)
+ Me.Label3.TabIndex = 9
+ Me.Label3.Text = "Gear"
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel4)
+ Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel5)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(501, 45)
+ Me.FlowLayoutPanel1.TabIndex = 102
+ '
+ 'IEPCInputDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(503, 78)
+ Me.Controls.Add(Me.FlowLayoutPanel1)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "IEPCInputDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Gear"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.TableLayoutPanel5.PerformLayout
+ Me.TableLayoutPanel4.ResumeLayout(false)
+ Me.TableLayoutPanel4.PerformLayout
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.ResumeLayout(false)
+
+End Sub
+
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents btnOk As Button
+ Friend WithEvents btnCancel As Button
+ Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
+ Friend WithEvents Label3 As Label
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents tbInputFile As TextBox
+ Friend WithEvents btAddFilePath As Button
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents tbGear As TextBox
+End Class
diff --git a/VECTO/GUI/IEPCInputDialog.resx b/VECTO/GUI/IEPCInputDialog.resx
new file mode 100644
index 0000000000000000000000000000000000000000..d7df802e6a121253252b1d61a2a6a094ca6be3eb
--- /dev/null
+++ b/VECTO/GUI/IEPCInputDialog.resx
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btAddFilePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCInputDialog.vb b/VECTO/GUI/IEPCInputDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..3cbd2c4db0658c5acc8f08fd9ec33ae1fbe3c040
--- /dev/null
+++ b/VECTO/GUI/IEPCInputDialog.vb
@@ -0,0 +1,115 @@
+Imports System.IO
+
+Public Enum IEPCDialogType
+ DragCurveDialog
+ PowerMapDialog
+End Enum
+
+Public Class IEPCInputDialog
+
+ Private ReadOnly _dialogType As IEPCDialogType
+ Private _dragCurveFilePath As String
+ Private _powerMapFilePath As String
+
+ Public Sub New(dialogType As IEPCDialogType)
+
+ ' This call is required by the designer.
+ InitializeComponent()
+
+ ' Add any initialization after the InitializeComponent() call.
+ SetDialogTitle(dialogType)
+ _dialogType = dialogType
+
+ End Sub
+
+ Public Sub Clear()
+ _tbGear.Text = ""
+ _tbInputFile.Text = ""
+ _tbGear.Focus()
+ End Sub
+
+
+#Region "Button Handling"
+
+ Private Sub btnOk_Click(sender As Object, e As EventArgs) Handles btnOk.Click
+ Dim gear As Integer
+ If Not Integer.TryParse(tbGear.Text, gear) Then
+ MsgBox("Invalid input for Gear")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If gear < 0 Then
+ MsgBox("Invalid input for Gear")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If tbInputFile.Text.Length = 0 Then
+ MsgBox("Invalid input no file path given")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If Not File.Exists(tbInputFile.Text) Then
+ MsgBox("Invalid input no valid file path given")
+ _tbInputFile.Focus()
+ Return
+ End If
+
+ Dim fileExtension = new FileInfo(tbInputFile.Text).Extension
+ Select Case _dialogType
+ Case IEPCDialogType.DragCurveDialog
+ If Not $".{IEPCDragFileBrowser.Extensions.First()}"= fileExtension Then
+ MsgBox($"The Selected Drag Curve file(.{IEPCDragFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return
+ End If
+ Case IEPCDialogType.PowerMapDialog
+ If Not $".{IEPCPowerMapFileBrowser.Extensions.First()}" = fileExtension Then
+ MsgBox($"The Selected Power Map file(.{IEPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return
+ End If
+ End Select
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ Clear()
+ End Sub
+
+ Private Sub btAddFilePath_Click(sender As Object, e As EventArgs) Handles btAddFilePath.Click
+ Select Case _dialogType
+ Case IEPCDialogType.DragCurveDialog
+ SelectInputFileDialog(IEPCDragFileBrowser, _dragCurveFilePath)
+ Case IEPCDialogType.PowerMapDialog
+ SelectInputFileDialog(IEPCDragFileBrowser, _powerMapFilePath)
+ End Select
+ End Sub
+
+#End Region
+
+ Private Sub SelectInputFileDialog(fileBrowser As FileBrowser, filePath As String )
+ If fileBrowser.OpenDialog(FileRepl(tbInputFile.Text, GetPath(filePath))) Then
+ tbInputFile.Text = GetFilenameWithoutDirectory(fileBrowser.Files(0), GetPath(filePath))
+ End If
+ End Sub
+
+ Private Sub SetDialogTitle(dialogType As IEPCDialogType)
+ Select Case dialogType
+ Case IEPCDialogType.DragCurveDialog
+ Text = "Drag Curve"
+ Case IEPCDialogType.PowerMapDialog
+ Text = "Power Map"
+ End Select
+ End Sub
+
+ Private Sub IEPCInputDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ Show()
+ _tbGear.Focus()
+ End Sub
+
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCForm.Designer.vb b/VECTO/GUI/IHPCForm.Designer.vb
index 62d335a78dd87d64c34d807fcb1129db44236980..dae432d61737b4d5b2c35ab8cf61c6173b2ab474 100644
--- a/VECTO/GUI/IHPCForm.Designer.vb
+++ b/VECTO/GUI/IHPCForm.Designer.vb
@@ -22,6 +22,7 @@ Partial Class IHPCForm
'Do not modify it using the code editor.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IHPCForm))
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.Label49 = New System.Windows.Forms.Label()
@@ -38,6 +39,7 @@ Partial Class IHPCForm
Me.Label1 = New System.Windows.Forms.Label()
Me.tbDragCurve = New System.Windows.Forms.TextBox()
Me.btDragCurve = New System.Windows.Forms.Button()
+ Me.btDragCurveOpen = New System.Windows.Forms.Button()
Me.tcVoltageLevels = New System.Windows.Forms.TabControl()
Me.tpFirstVoltageLevel = New System.Windows.Forms.TabPage()
Me.lvPowerMap = New System.Windows.Forms.GroupBox()
@@ -53,6 +55,7 @@ Partial Class IHPCForm
Me.Label2 = New System.Windows.Forms.Label()
Me.tbFLCurve1 = New System.Windows.Forms.TextBox()
Me.btFLCurveFile1 = New System.Windows.Forms.Button()
+ Me.btFLCurve1 = New System.Windows.Forms.Button()
Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
Me.Label11 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
@@ -63,12 +66,12 @@ Partial Class IHPCForm
Me.tbVoltage1 = New System.Windows.Forms.TextBox()
Me.Label39 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label()
- Me.tbContinousTorque1 = New System.Windows.Forms.TextBox()
- Me.tbContinousTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.tbContinuousTorque1 = New System.Windows.Forms.TextBox()
+ Me.tbContinuousTorqueSpeed1 = New System.Windows.Forms.TextBox()
Me.Label15 = New System.Windows.Forms.Label()
Me.Label42 = New System.Windows.Forms.Label()
Me.Label14 = New System.Windows.Forms.Label()
- Me.tboverloadTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.tbOverloadTorqueSpeed1 = New System.Windows.Forms.TextBox()
Me.Label41 = New System.Windows.Forms.Label()
Me.tbOverloadTorque1 = New System.Windows.Forms.TextBox()
Me.Label12 = New System.Windows.Forms.Label()
@@ -86,6 +89,7 @@ Partial Class IHPCForm
Me.Label28 = New System.Windows.Forms.Label()
Me.tbFLCurve2 = New System.Windows.Forms.TextBox()
Me.btFLCurveFile2 = New System.Windows.Forms.Button()
+ Me.btFLCurve2 = New System.Windows.Forms.Button()
Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
Me.Label17 = New System.Windows.Forms.Label()
Me.Label18 = New System.Windows.Forms.Label()
@@ -96,8 +100,8 @@ Partial Class IHPCForm
Me.tbVoltage2 = New System.Windows.Forms.TextBox()
Me.Label20 = New System.Windows.Forms.Label()
Me.Label21 = New System.Windows.Forms.Label()
- Me.tbContinousTorque2 = New System.Windows.Forms.TextBox()
- Me.tbContinousTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.tbContinuousTorque2 = New System.Windows.Forms.TextBox()
+ Me.tbContinuousTorqueSpeed2 = New System.Windows.Forms.TextBox()
Me.Label27 = New System.Windows.Forms.Label()
Me.Label23 = New System.Windows.Forms.Label()
Me.tbOverloadTorqueSpeed2 = New System.Windows.Forms.TextBox()
@@ -120,6 +124,9 @@ Partial Class IHPCForm
Me.btSave = New System.Windows.Forms.Button()
Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.FlowLayoutPanel1.SuspendLayout
Me.FlowLayoutPanel6.SuspendLayout
Me.FlowLayoutPanel8.SuspendLayout
@@ -140,6 +147,7 @@ Partial Class IHPCForm
Me.ToolStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
Me.StatusStrip1.SuspendLayout
+ Me.CmOpenFile.SuspendLayout
Me.SuspendLayout
'
'FlowLayoutPanel1
@@ -149,7 +157,7 @@ Partial Class IHPCForm
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
Me.FlowLayoutPanel1.Size = New System.Drawing.Size(242, 26)
- Me.FlowLayoutPanel1.TabIndex = 69
+ Me.FlowLayoutPanel1.TabIndex = 100
'
'Label49
'
@@ -168,7 +176,7 @@ Partial Class IHPCForm
Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
Me.tbModel.Name = "tbModel"
Me.tbModel.Size = New System.Drawing.Size(194, 20)
- Me.tbModel.TabIndex = 44
+ Me.tbModel.TabIndex = 0
'
'FlowLayoutPanel6
'
@@ -177,8 +185,8 @@ Partial Class IHPCForm
Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
Me.FlowLayoutPanel6.Location = New System.Drawing.Point(12, 106)
Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
- Me.FlowLayoutPanel6.Size = New System.Drawing.Size(158, 26)
- Me.FlowLayoutPanel6.TabIndex = 72
+ Me.FlowLayoutPanel6.Size = New System.Drawing.Size(147, 26)
+ Me.FlowLayoutPanel6.TabIndex = 101
'
'Label51
'
@@ -196,7 +204,7 @@ Partial Class IHPCForm
Me.tbInertia.Location = New System.Drawing.Point(45, 3)
Me.tbInertia.Name = "tbInertia"
Me.tbInertia.Size = New System.Drawing.Size(57, 20)
- Me.tbInertia.TabIndex = 46
+ Me.tbInertia.TabIndex = 1
'
'lblinertiaUnit
'
@@ -213,17 +221,17 @@ Partial Class IHPCForm
Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
- Me.FlowLayoutPanel8.Location = New System.Drawing.Point(176, 106)
+ Me.FlowLayoutPanel8.Location = New System.Drawing.Point(162, 106)
Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
Me.FlowLayoutPanel8.Size = New System.Drawing.Size(305, 26)
- Me.FlowLayoutPanel8.TabIndex = 74
+ Me.FlowLayoutPanel8.TabIndex = 102
'
'Label52
'
Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label52.AutoSize = true
Me.Label52.Location = New System.Drawing.Point(3, 6)
- Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 10, 0)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 0, 0)
Me.Label52.Name = "Label52"
Me.Label52.Size = New System.Drawing.Size(173, 13)
Me.Label52.TabIndex = 50
@@ -232,17 +240,18 @@ Partial Class IHPCForm
'tbThermalOverload
'
Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbThermalOverload.Location = New System.Drawing.Point(216, 3)
- Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(30, 3, 3, 3)
+ Me.tbThermalOverload.Location = New System.Drawing.Point(181, 3)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(5, 3, 3, 3)
Me.tbThermalOverload.Name = "tbThermalOverload"
Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
- Me.tbThermalOverload.TabIndex = 51
+ Me.tbThermalOverload.TabIndex = 2
'
'Label10
'
Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(278, 6)
+ Me.Label10.Location = New System.Drawing.Point(242, 6)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(2, 0, 3, 0)
Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(16, 13)
Me.Label10.TabIndex = 67
@@ -253,18 +262,19 @@ Partial Class IHPCForm
Me.FlowLayoutPanel2.Controls.Add(Me.Label1)
Me.FlowLayoutPanel2.Controls.Add(Me.tbDragCurve)
Me.FlowLayoutPanel2.Controls.Add(Me.btDragCurve)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btDragCurveOpen)
Me.FlowLayoutPanel2.Location = New System.Drawing.Point(12, 135)
Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(0)
Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
Me.FlowLayoutPanel2.Size = New System.Drawing.Size(469, 26)
- Me.FlowLayoutPanel2.TabIndex = 76
+ Me.FlowLayoutPanel2.TabIndex = 103
'
'Label1
'
Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label1.AutoSize = true
Me.Label1.Location = New System.Drawing.Point(3, 6)
- Me.Label1.Margin = New System.Windows.Forms.Padding(3, 0, 22, 0)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(3, 0, 6, 0)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(99, 13)
Me.Label1.TabIndex = 59
@@ -273,32 +283,44 @@ Partial Class IHPCForm
'tbDragCurve
'
Me.tbDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbDragCurve.Location = New System.Drawing.Point(127, 3)
+ Me.tbDragCurve.Location = New System.Drawing.Point(111, 3)
Me.tbDragCurve.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
Me.tbDragCurve.Name = "tbDragCurve"
Me.tbDragCurve.Size = New System.Drawing.Size(277, 20)
- Me.tbDragCurve.TabIndex = 60
+ Me.tbDragCurve.TabIndex = 3
'
'btDragCurve
'
Me.btDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btDragCurve.Image = CType(resources.GetObject("btDragCurve.Image"),System.Drawing.Image)
- Me.btDragCurve.Location = New System.Drawing.Point(410, 1)
+ Me.btDragCurve.Location = New System.Drawing.Point(394, 1)
Me.btDragCurve.Margin = New System.Windows.Forms.Padding(0)
Me.btDragCurve.Name = "btDragCurve"
Me.btDragCurve.Size = New System.Drawing.Size(24, 24)
- Me.btDragCurve.TabIndex = 29
+ Me.btDragCurve.TabIndex = 4
Me.btDragCurve.UseVisualStyleBackColor = true
'
+ 'btDragCurveOpen
+ '
+ Me.btDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btDragCurveOpen.Location = New System.Drawing.Point(418, 1)
+ Me.btDragCurveOpen.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btDragCurveOpen.Name = "btDragCurveOpen"
+ Me.btDragCurveOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btDragCurveOpen.TabIndex = 84
+ Me.btDragCurveOpen.TabStop = false
+ Me.btDragCurveOpen.UseVisualStyleBackColor = true
+ '
'tcVoltageLevels
'
Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 175)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(0)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 339)
- Me.tcVoltageLevels.TabIndex = 77
+ Me.tcVoltageLevels.TabIndex = 104
'
'tpFirstVoltageLevel
'
@@ -320,7 +342,7 @@ Partial Class IHPCForm
Me.lvPowerMap.Location = New System.Drawing.Point(6, 126)
Me.lvPowerMap.Name = "lvPowerMap"
Me.lvPowerMap.Size = New System.Drawing.Size(500, 180)
- Me.lvPowerMap.TabIndex = 81
+ Me.lvPowerMap.TabIndex = 107
Me.lvPowerMap.TabStop = false
Me.lvPowerMap.Text = "Power Map Per Gear"
'
@@ -339,7 +361,7 @@ Partial Class IHPCForm
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
Me.TableLayoutPanel3.Size = New System.Drawing.Size(488, 159)
- Me.TableLayoutPanel3.TabIndex = 76
+ Me.TableLayoutPanel3.TabIndex = 108
'
'lvPowerMap1
'
@@ -377,7 +399,7 @@ Partial Class IHPCForm
Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 128)
Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
- Me.FlowLayoutPanel11.TabIndex = 54
+ Me.FlowLayoutPanel11.TabIndex = 109
'
'btAddPowerMap1
'
@@ -385,7 +407,7 @@ Partial Class IHPCForm
Me.btAddPowerMap1.Location = New System.Drawing.Point(3, 3)
Me.btAddPowerMap1.Name = "btAddPowerMap1"
Me.btAddPowerMap1.Size = New System.Drawing.Size(24, 24)
- Me.btAddPowerMap1.TabIndex = 4
+ Me.btAddPowerMap1.TabIndex = 38
Me.btAddPowerMap1.UseVisualStyleBackColor = true
'
'btRemovePowerMap1
@@ -394,7 +416,7 @@ Partial Class IHPCForm
Me.btRemovePowerMap1.Location = New System.Drawing.Point(33, 3)
Me.btRemovePowerMap1.Name = "btRemovePowerMap1"
Me.btRemovePowerMap1.Size = New System.Drawing.Size(24, 24)
- Me.btRemovePowerMap1.TabIndex = 5
+ Me.btRemovePowerMap1.TabIndex = 39
Me.btRemovePowerMap1.UseVisualStyleBackColor = true
'
'Label7
@@ -413,10 +435,11 @@ Partial Class IHPCForm
Me.FlowLayoutPanel3.Controls.Add(Me.Label2)
Me.FlowLayoutPanel3.Controls.Add(Me.tbFLCurve1)
Me.FlowLayoutPanel3.Controls.Add(Me.btFLCurveFile1)
+ Me.FlowLayoutPanel3.Controls.Add(Me.btFLCurve1)
Me.FlowLayoutPanel3.Location = New System.Drawing.Point(6, 94)
Me.FlowLayoutPanel3.Name = "FlowLayoutPanel3"
Me.FlowLayoutPanel3.Size = New System.Drawing.Size(496, 26)
- Me.FlowLayoutPanel3.TabIndex = 74
+ Me.FlowLayoutPanel3.TabIndex = 106
'
'Label2
'
@@ -436,7 +459,7 @@ Partial Class IHPCForm
Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
Me.tbFLCurve1.Name = "tbFLCurve1"
Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
- Me.tbFLCurve1.TabIndex = 60
+ Me.tbFLCurve1.TabIndex = 36
'
'btFLCurveFile1
'
@@ -446,9 +469,20 @@ Partial Class IHPCForm
Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile1.Name = "btFLCurveFile1"
Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
- Me.btFLCurveFile1.TabIndex = 29
+ Me.btFLCurveFile1.TabIndex = 37
Me.btFLCurveFile1.UseVisualStyleBackColor = true
'
+ 'btFLCurve1
+ '
+ Me.btFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btFLCurve1.Location = New System.Drawing.Point(450, 1)
+ Me.btFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btFLCurve1.Name = "btFLCurve1"
+ Me.btFLCurve1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurve1.TabIndex = 85
+ Me.btFLCurve1.TabStop = false
+ Me.btFLCurve1.UseVisualStyleBackColor = true
+ '
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 7
@@ -468,12 +502,12 @@ Partial Class IHPCForm
Me.TableLayoutPanel1.Controls.Add(Me.tbVoltage1, 1, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label39, 0, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label3, 0, 2)
- Me.TableLayoutPanel1.Controls.Add(Me.tbContinousTorque1, 1, 1)
- Me.TableLayoutPanel1.Controls.Add(Me.tbContinousTorqueSpeed1, 1, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinuousTorque1, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinuousTorqueSpeed1, 1, 2)
Me.TableLayoutPanel1.Controls.Add(Me.Label15, 2, 2)
Me.TableLayoutPanel1.Controls.Add(Me.Label42, 3, 2)
Me.TableLayoutPanel1.Controls.Add(Me.Label14, 5, 2)
- Me.TableLayoutPanel1.Controls.Add(Me.tboverloadTorqueSpeed1, 4, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorqueSpeed1, 4, 2)
Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
@@ -484,7 +518,7 @@ Partial Class IHPCForm
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
- Me.TableLayoutPanel1.TabIndex = 61
+ Me.TableLayoutPanel1.TabIndex = 105
'
'Label11
'
@@ -546,7 +580,7 @@ Partial Class IHPCForm
Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
Me.tbOverloadTime1.Name = "tbOverloadTime1"
Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
- Me.tbOverloadTime1.TabIndex = 12
+ Me.tbOverloadTime1.TabIndex = 33
'
'tbVoltage1
'
@@ -555,7 +589,7 @@ Partial Class IHPCForm
Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
Me.tbVoltage1.Name = "tbVoltage1"
Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
- Me.tbVoltage1.TabIndex = 2
+ Me.tbVoltage1.TabIndex = 30
'
'Label39
'
@@ -577,23 +611,23 @@ Partial Class IHPCForm
Me.Label3.TabIndex = 6
Me.Label3.Text = "Continuous Torque Speed"
'
- 'tbContinousTorque1
+ 'tbContinuousTorque1
'
- Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque1.Location = New System.Drawing.Point(143, 30)
- Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
- Me.tbContinousTorque1.Name = "tbContinousTorque1"
- Me.tbContinousTorque1.Size = New System.Drawing.Size(56, 20)
- Me.tbContinousTorque1.TabIndex = 4
+ Me.tbContinuousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorque1.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinuousTorque1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinuousTorque1.Name = "tbContinuousTorque1"
+ Me.tbContinuousTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorque1.TabIndex = 31
'
- 'tbContinousTorqueSpeed1
+ 'tbContinuousTorqueSpeed1
'
- Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
- Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
- Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
- Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
- Me.tbContinousTorqueSpeed1.TabIndex = 6
+ Me.tbContinuousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinuousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinuousTorqueSpeed1.Name = "tbContinuousTorqueSpeed1"
+ Me.tbContinuousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorqueSpeed1.TabIndex = 32
'
'Label15
'
@@ -627,13 +661,13 @@ Partial Class IHPCForm
Me.Label14.TabIndex = 66
Me.Label14.Text = "[rpm]"
'
- 'tboverloadTorqueSpeed1
+ 'tbOverloadTorqueSpeed1
'
- Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
- Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
- Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
- Me.tboverloadTorqueSpeed1.TabIndex = 10
+ Me.tbOverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed1.Name = "tbOverloadTorqueSpeed1"
+ Me.tbOverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed1.TabIndex = 35
'
'Label41
'
@@ -651,7 +685,7 @@ Partial Class IHPCForm
Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
- Me.tbOverloadTorque1.TabIndex = 8
+ Me.tbOverloadTorque1.TabIndex = 34
'
'Label12
'
@@ -684,7 +718,7 @@ Partial Class IHPCForm
Me.GroupBox1.Location = New System.Drawing.Point(6, 126)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(496, 180)
- Me.GroupBox1.TabIndex = 82
+ Me.GroupBox1.TabIndex = 122
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Power Map Per Gear"
'
@@ -703,7 +737,7 @@ Partial Class IHPCForm
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
Me.TableLayoutPanel2.Size = New System.Drawing.Size(488, 159)
- Me.TableLayoutPanel2.TabIndex = 76
+ Me.TableLayoutPanel2.TabIndex = 123
'
'lvPowerMap2
'
@@ -741,7 +775,7 @@ Partial Class IHPCForm
Me.FlowLayoutPanel4.Location = New System.Drawing.Point(3, 128)
Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
Me.FlowLayoutPanel4.Size = New System.Drawing.Size(61, 28)
- Me.FlowLayoutPanel4.TabIndex = 54
+ Me.FlowLayoutPanel4.TabIndex = 124
'
'btAddPowerMap2
'
@@ -749,7 +783,7 @@ Partial Class IHPCForm
Me.btAddPowerMap2.Location = New System.Drawing.Point(3, 3)
Me.btAddPowerMap2.Name = "btAddPowerMap2"
Me.btAddPowerMap2.Size = New System.Drawing.Size(24, 24)
- Me.btAddPowerMap2.TabIndex = 4
+ Me.btAddPowerMap2.TabIndex = 48
Me.btAddPowerMap2.UseVisualStyleBackColor = true
'
'btRemovePowerMap2
@@ -758,7 +792,7 @@ Partial Class IHPCForm
Me.btRemovePowerMap2.Location = New System.Drawing.Point(33, 3)
Me.btRemovePowerMap2.Name = "btRemovePowerMap2"
Me.btRemovePowerMap2.Size = New System.Drawing.Size(24, 24)
- Me.btRemovePowerMap2.TabIndex = 5
+ Me.btRemovePowerMap2.TabIndex = 49
Me.btRemovePowerMap2.UseVisualStyleBackColor = true
'
'Label5
@@ -776,10 +810,11 @@ Partial Class IHPCForm
Me.FlowLayoutPanel10.Controls.Add(Me.Label28)
Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurve2)
Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
- Me.FlowLayoutPanel10.TabIndex = 74
+ Me.FlowLayoutPanel10.TabIndex = 121
'
'Label28
'
@@ -799,7 +834,7 @@ Partial Class IHPCForm
Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
Me.tbFLCurve2.Name = "tbFLCurve2"
Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
- Me.tbFLCurve2.TabIndex = 57
+ Me.tbFLCurve2.TabIndex = 46
'
'btFLCurveFile2
'
@@ -809,9 +844,20 @@ Partial Class IHPCForm
Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile2.Name = "btFLCurveFile2"
Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
- Me.btFLCurveFile2.TabIndex = 29
+ Me.btFLCurveFile2.TabIndex = 47
Me.btFLCurveFile2.UseVisualStyleBackColor = true
'
+ 'btFLCurve2
+ '
+ Me.btFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btFLCurve2.Location = New System.Drawing.Point(450, 1)
+ Me.btFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btFLCurve2.Name = "btFLCurve2"
+ Me.btFLCurve2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurve2.TabIndex = 86
+ Me.btFLCurve2.TabStop = false
+ Me.btFLCurve2.UseVisualStyleBackColor = true
+ '
'TableLayoutPanel4
'
Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
@@ -832,8 +878,8 @@ Partial Class IHPCForm
Me.TableLayoutPanel4.Controls.Add(Me.tbVoltage2, 1, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label20, 0, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label21, 0, 2)
- Me.TableLayoutPanel4.Controls.Add(Me.tbContinousTorque2, 1, 1)
- Me.TableLayoutPanel4.Controls.Add(Me.tbContinousTorqueSpeed2, 1, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinuousTorque2, 1, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinuousTorqueSpeed2, 1, 2)
Me.TableLayoutPanel4.Controls.Add(Me.Label27, 2, 2)
Me.TableLayoutPanel4.Controls.Add(Me.Label23, 3, 2)
Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorqueSpeed2, 4, 2)
@@ -848,7 +894,7 @@ Partial Class IHPCForm
Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
- Me.TableLayoutPanel4.TabIndex = 62
+ Me.TableLayoutPanel4.TabIndex = 120
'
'Label17
'
@@ -899,7 +945,7 @@ Partial Class IHPCForm
Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
Me.tbOverloadTime2.Name = "tbOverloadTime2"
Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
- Me.tbOverloadTime2.TabIndex = 12
+ Me.tbOverloadTime2.TabIndex = 43
'
'Label24
'
@@ -917,7 +963,7 @@ Partial Class IHPCForm
Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
Me.tbVoltage2.Name = "tbVoltage2"
Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
- Me.tbVoltage2.TabIndex = 2
+ Me.tbVoltage2.TabIndex = 40
'
'Label20
'
@@ -939,21 +985,21 @@ Partial Class IHPCForm
Me.Label21.TabIndex = 6
Me.Label21.Text = "Continuous Torque Speed"
'
- 'tbContinousTorque2
+ 'tbContinuousTorque2
'
- Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque2.Location = New System.Drawing.Point(143, 30)
- Me.tbContinousTorque2.Name = "tbContinousTorque2"
- Me.tbContinousTorque2.Size = New System.Drawing.Size(56, 20)
- Me.tbContinousTorque2.TabIndex = 4
+ Me.tbContinuousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorque2.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinuousTorque2.Name = "tbContinuousTorque2"
+ Me.tbContinuousTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorque2.TabIndex = 41
'
- 'tbContinousTorqueSpeed2
+ 'tbContinuousTorqueSpeed2
'
- Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
- Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
- Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
- Me.tbContinousTorqueSpeed2.TabIndex = 6
+ Me.tbContinuousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinuousTorqueSpeed2.Name = "tbContinuousTorqueSpeed2"
+ Me.tbContinuousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorqueSpeed2.TabIndex = 42
'
'Label27
'
@@ -982,7 +1028,7 @@ Partial Class IHPCForm
Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
- Me.tbOverloadTorqueSpeed2.TabIndex = 10
+ Me.tbOverloadTorqueSpeed2.TabIndex = 45
'
'Label25
'
@@ -1011,7 +1057,7 @@ Partial Class IHPCForm
Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
- Me.tbOverloadTorque2.TabIndex = 8
+ Me.tbOverloadTorque2.TabIndex = 44
'
'Label16
'
@@ -1087,8 +1133,8 @@ Partial Class IHPCForm
Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripBtSendTo.Text = "Send to Job Editor"
- Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
+ Me.ToolStripBtSendTo.Text = "Send to Vehicle Editor"
+ Me.ToolStripBtSendTo.ToolTipText = "Send to Vehicle Editor"
'
'ToolStripSeparator1
'
@@ -1132,7 +1178,7 @@ Partial Class IHPCForm
Me.btCancel.Location = New System.Drawing.Point(454, 520)
Me.btCancel.Name = "btCancel"
Me.btCancel.Size = New System.Drawing.Size(75, 23)
- Me.btCancel.TabIndex = 82
+ Me.btCancel.TabIndex = 51
Me.btCancel.Text = "Cancel"
Me.btCancel.UseVisualStyleBackColor = true
'
@@ -1141,7 +1187,7 @@ Partial Class IHPCForm
Me.btSave.Location = New System.Drawing.Point(373, 520)
Me.btSave.Name = "btSave"
Me.btSave.Size = New System.Drawing.Size(75, 23)
- Me.btSave.TabIndex = 81
+ Me.btSave.TabIndex = 50
Me.btSave.Text = "Save"
Me.btSave.UseVisualStyleBackColor = true
'
@@ -1162,6 +1208,25 @@ Partial Class IHPCForm
Me.LbStatus.Size = New System.Drawing.Size(39, 17)
Me.LbStatus.Text = "Status"
'
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ 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(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
'IHPCForm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -1184,7 +1249,7 @@ Partial Class IHPCForm
Me.Name = "IHPCForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "IHPCForm"
+ Me.Text = "IHPC"
Me.FlowLayoutPanel1.ResumeLayout(false)
Me.FlowLayoutPanel1.PerformLayout
Me.FlowLayoutPanel6.ResumeLayout(false)
@@ -1217,6 +1282,7 @@ Partial Class IHPCForm
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
Me.StatusStrip1.ResumeLayout(false)
Me.StatusStrip1.PerformLayout
+ Me.CmOpenFile.ResumeLayout(false)
Me.ResumeLayout(false)
Me.PerformLayout
@@ -1253,12 +1319,12 @@ End Sub
Friend WithEvents tbVoltage1 As TextBox
Friend WithEvents Label39 As Label
Friend WithEvents Label3 As Label
- Friend WithEvents tbContinousTorque1 As TextBox
- Friend WithEvents tbContinousTorqueSpeed1 As TextBox
+ Friend WithEvents tbContinuousTorque1 As TextBox
+ Friend WithEvents tbContinuousTorqueSpeed1 As TextBox
Friend WithEvents Label15 As Label
Friend WithEvents Label42 As Label
Friend WithEvents Label14 As Label
- Friend WithEvents tboverloadTorqueSpeed1 As TextBox
+ Friend WithEvents tbOverloadTorqueSpeed1 As TextBox
Friend WithEvents Label41 As Label
Friend WithEvents tbOverloadTorque1 As TextBox
Friend WithEvents Label12 As Label
@@ -1277,8 +1343,8 @@ End Sub
Friend WithEvents tbVoltage2 As TextBox
Friend WithEvents Label20 As Label
Friend WithEvents Label21 As Label
- Friend WithEvents tbContinousTorque2 As TextBox
- Friend WithEvents tbContinousTorqueSpeed2 As TextBox
+ Friend WithEvents tbContinuousTorque2 As TextBox
+ Friend WithEvents tbContinuousTorqueSpeed2 As TextBox
Friend WithEvents Label27 As Label
Friend WithEvents Label23 As Label
Friend WithEvents tbOverloadTorqueSpeed2 As TextBox
@@ -1319,4 +1385,10 @@ End Sub
Friend WithEvents btSave As Button
Friend WithEvents StatusStrip1 As StatusStrip
Friend WithEvents LbStatus As ToolStripStatusLabel
+ Friend WithEvents btDragCurveOpen As Button
+ Friend WithEvents btFLCurve1 As Button
+ Friend WithEvents CmOpenFile As ContextMenuStrip
+ Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents btFLCurve2 As Button
End Class
diff --git a/VECTO/GUI/IHPCForm.resx b/VECTO/GUI/IHPCForm.resx
index 6a7a6b297c07e5891cde2795e98eefb160931553..6beee2d38eb9de43c25eb98c893c851e7afdc849 100644
--- a/VECTO/GUI/IHPCForm.resx
+++ b/VECTO/GUI/IHPCForm.resx
@@ -176,7 +176,10 @@
<value>17, 17</value>
</metadata>
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>348, 20</value>
+ <value>142, 15</value>
+ </metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>344, 18</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>52</value>
diff --git a/VECTO/GUI/IHPCForm.vb b/VECTO/GUI/IHPCForm.vb
index 9bcf0e163084e7fe28f8124c6c3236d8d492fb0f..3e7404fc653ee46ed2f1567ef664718076c6109e 100644
--- a/VECTO/GUI/IHPCForm.vb
+++ b/VECTO/GUI/IHPCForm.vb
@@ -1,20 +1,23 @@
-Imports TUGraz.VectoCommon.InputData
+Imports System.IO
+Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Public Class IHPCForm
+ Public JobDir As String = ""
+ Private _ihpcFilePath as String = ""
Private _changed as Boolean
Private _dragCurveFilePath as String
Private _flCurveFilePath1 as String
Private _flCurveFilePath2 as String
+ Private _contextMenuFiles As String()
+
#Region "Set JSON Data"
Public Sub ReadIHPCFile(file As String)
-
- Dim inputProvider = New JSONComponentInputData(file, Nothing)
- Dim ihpcData = inputProvider.ElectricMachines.Entries.First().ElectricMachine
+ Dim ihpcData = JSONInputDataFactory.ReadIHPCEngineeringInputData(file, True)
tbModel.Text = ihpcData.Model
tbInertia.Text = ihpcData.Inertia.ToGUIFormat()
@@ -23,16 +26,19 @@ Public Class IHPCForm
SetVoltageLevelLow(ihpcData.VoltageLevels.First())
SetVoltageLevelHigh(ihpcData.VoltageLevels.Last())
+
+ LbStatus.Text = ""
+ _changed = False
End Sub
Private Sub SetVoltageLevelLow(voltageLevel as IElectricMotorVoltageLevel)
tbVoltage1.Text = voltageLevel.VoltageLevel.ToGUIFormat()
- tbContinousTorque1.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
- tbContinousTorqueSpeed1.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbContinuousTorque1.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinuousTorqueSpeed1.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadTime1.Text = voltageLevel.OverloadTime.ToGUIFormat()
tbOverloadTorque1.Text = voltageLevel.OverloadTorque.ToGUIFormat()
- tboverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
tbFLCurve1.Text = voltageLevel.FullLoadCurve.Source
SetPowerMapEntries(_lvPowerMap1, voltageLevel.PowerMap)
@@ -41,11 +47,11 @@ Public Class IHPCForm
Private Sub SetVoltageLevelHigh(voltageLevel as IElectricMotorVoltageLevel)
tbVoltage2.Text = voltageLevel.VoltageLevel.ToGUIFormat()
- tbContinousTorque2.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
- tbContinousTorqueSpeed2.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbContinuousTorque2.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinuousTorqueSpeed2.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadTime2.Text = voltageLevel.OverloadTime.ToGUIFormat()
tbOverloadTorque2.Text = voltageLevel.OverloadTorque.ToGUIFormat()
- tboverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTorqueSpeed2.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
tbFLCurve2.Text = voltageLevel.FullLoadCurve.Source
SetPowerMapEntries(_lvPowerMap2, voltageLevel.PowerMap)
@@ -75,20 +81,20 @@ Public Class IHPCForm
tbDragCurve.Text = ""
tbVoltage1.Text = ""
- tbContinousTorque1.Text = ""
- tbContinousTorqueSpeed1.Text = ""
+ tbContinuousTorque1.Text = ""
+ tbContinuousTorqueSpeed1.Text = ""
tbOverloadTime1.Text = ""
tbOverloadTorque1.Text = ""
- tboverloadTorqueSpeed1.Text = ""
+ tbOverloadTorqueSpeed1.Text = ""
tbFLCurve1.Text = ""
RemoveAllListViewItems(_lvPowerMap1)
tbVoltage2.Text = ""
- tbContinousTorque2.Text = ""
- tbContinousTorqueSpeed2.Text = ""
+ tbContinuousTorque2.Text = ""
+ tbContinuousTorqueSpeed2.Text = ""
tbOverloadTime2.Text = ""
tbOverloadTorque2.Text = ""
- tboverloadTorqueSpeed1.Text = ""
+ tbOverloadTorqueSpeed2.Text = ""
tbFLCurve2.Text = ""
RemoveAllListViewItems(_lvPowerMap2)
@@ -136,10 +142,13 @@ Public Class IHPCForm
End Sub
Private Sub AddListViewItem(listView As ListView)
+ IHPCPowerMapInputDialog.Clear()
+
If IHPCPowerMapInputDialog.ShowDialog() = DialogResult.OK Then
Dim gear = Convert.ToInt32(IHPCPowerMapInputDialog.tbGear.Text)
Dim filePath = IHPCPowerMapInputDialog.tbInputFile.Text
listView.Items.Add(CreateListViewItem(gear, filePath))
+ Change()
End If
End Sub
@@ -156,6 +165,7 @@ Public Class IHPCForm
Exit Sub
Else
listView.Items(listView.Items.Count - 1).Remove()
+ Change()
End If
End Sub
@@ -166,16 +176,13 @@ Public Class IHPCForm
Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
EditEntry(lvPowerMap2)
End Sub
-
-
+
Private Sub EditEntry( listView As ListView)
If listView.SelectedItems.Count = 0 Then Exit Sub
Dim entry As ListViewItem = listView.SelectedItems(0)
IHPCPowerMapInputDialog.tbGear.Text = entry.SubItems(0).Text
- If entry.SubItems.Count = 2 Then
- IHPCPowerMapInputDialog.tbInputFile.Text = entry.SubItems(1).Text
- End If
+ IHPCPowerMapInputDialog.tbInputFile.Text = entry.SubItems(1).Text
IHPCPowerMapInputDialog.tbGear.Focus()
If IHPCPowerMapInputDialog.ShowDialog() = DialogResult.OK Then
@@ -186,13 +193,429 @@ Public Class IHPCForm
End Sub
Private Sub btSave_Click(sender As Object, e As EventArgs) Handles btSave.Click
-
+ If SaveOrSaveAs(False) Then Close()
End Sub
Private Sub btCancel_Click(sender As Object, e As EventArgs) Handles btCancel.Click
+ Close()
+ End Sub
+ Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click
+ ClearIHPC()
End Sub
+ Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
+ If IHPCFileBrowser.OpenDialog(_ihpcFilePath) Then
+ Try
+ ReadIHPCFile(IHPCFileBrowser.Files(0))
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, $"Error loading IHPC(.{IHPCFileBrowser.Extensions}) File")
+ End Try
+ End If
+ End Sub
+ Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click
+ SaveOrSaveAs(False)
+ End Sub
+
+ Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click
+ SaveOrSaveAs(True)
+ End Sub
+ Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click
+ If ChangeCheckCancel() Then Exit Sub
+
+ If _ihpcFilePath= "" Then
+ If MsgBox("Save file now?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ If Not SaveOrSaveAs(True) Then Exit Sub
+ Else
+ Exit Sub
+ End If
+ End If
+
+ If Not VectoJobForm.Visible Then
+ JobDir = ""
+ VectoJobForm.Show()
+ VectoJobForm.VectoNew()
+ Else
+ VectoJobForm.WindowState = FormWindowState.Normal
+ End If
+
+ VehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(_ihpcFilePath, JobDir)
+ End Sub
+
+
+ Private Function ChangeCheckCancel() As Boolean
+ If _changed Then
+ Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
+ Case MsgBoxResult.Yes
+ Return Not SaveOrSaveAs(False)
+ Case MsgBoxResult.Cancel
+ Return True
+ Case Else
+ _changed = False
+ Return False
+ End Select
+ Else
+ Return False
+ End If
+ End Function
+
+
+ Private Function SaveOrSaveAs(ByVal saveAs As Boolean) As Boolean
+ If ValidateData() = False Then _
+ Return False
+
+ If _ihpcFilePath = "" Or saveAs Then
+ If IHPCFileBrowser.SaveDialog(_ihpcFilePath) Then
+ _ihpcFilePath = IHPCFileBrowser.Files(0)
+ Else
+ Return False
+ End If
+ End If
+ Return SaveIHPCToFile(_ihpcFilePath)
+ End Function
+
+ Private Function SaveIHPCToFile(ByVal ihpcFilePath As String) As Boolean
+ Dim ihpcInputData = New IHPCInputData
+
+ ihpcInputData.SetCommonEntries(tbModel.Text, tbInertia.Text, tbDragCurve.Text, tbThermalOverload.Text)
+ ihpcInputData.SetVoltageLevelEntries(tbVoltage1.Text, tbContinuousTorque1.Text, tbContinuousTorqueSpeed1.Text,
+ tbOverloadTime1.Text, tbOverloadTorque1.Text, tbOverloadTorqueSpeed1.Text,
+ tbFLCurve1.Text, lvPowerMap1)
+ ihpcInputData.SetVoltageLevelEntries(tbVoltage2.Text, tbContinuousTorque2.Text, tbContinuousTorqueSpeed2.Text,
+ tbOverloadTime2.Text, tbOverloadTorque2.Text, tbOverloadTorqueSpeed2.Text,
+ tbFLCurve2.Text, lvPowerMap2)
+
+
+ If Not ihpcInputData.SaveFile(ihpcFilePath) Then
+ MsgBox("Cannot save to " & ihpcFilePath, MsgBoxStyle.Critical)
+ Return False
+ End If
+
+ _changed = False
+ LbStatus.Text = ""
+
+ Return True
+ End Function
+
+
#End Region
+#Region "Validation"
+
+ Private Function ValidateData() As Boolean
+
+ If ValidateModel() = False Then Return False
+ If ValidateInertia() = False Then Return False
+ If ValidateThermalOverloadFactor() = False Then Return False
+ If ValidateDragCurve() = False Then Return False
+
+ If ValidateVoltage(tbVoltage1) = False Then Return False
+ If ValidateContinuousTorque(tbContinuousTorque1) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinuousTorqueSpeed1) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime1) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTime1) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tbOverloadTorqueSpeed1) = False Then Return False
+ If ValidateFullLoadCurve(tbFLCurve1) = False Then Return False
+ If ValidatePowerMapEntry(lvPowerMap1) = False Then Return False
+
+ If ValidateVoltage(tbVoltage2) = False Then Return False
+ If ValidateContinuousTorque(tbContinuousTorque2) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinuousTorqueSpeed2) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime2) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTime2) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tbOverloadTorqueSpeed2) = False Then Return False
+ If ValidateFullLoadCurve(tbFLCurve2) = False Then Return False
+ If ValidatePowerMapEntry(lvPowerMap2) = False Then Return False
+
+ Return True
+ End Function
+
+ Private Function ValidateModel() As Boolean
+ If String.IsNullOrEmpty(tbModel.Text) Then
+ ShowErrorMessageBox("Model", tbModel)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateInertia() As Boolean
+ If Not ValidDoubleValue(tbInertia.Text) Then
+ ShowErrorMessageBox("Inertia", tbInertia)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateThermalOverloadFactor() As Boolean
+ If Not ValidDoubleValue(tbThermalOverload.Text) Then
+ ShowErrorMessageBox("Thermal Overload Recovery Factor", tbThermalOverload)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateDragCurve() As Boolean
+ If Not File.Exists(tbDragCurve.Text) Then
+ ShowErrorMessageBox("No valid Drag Curve file path given", tbDragCurve, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tbDragCurve.Text).Extension
+ If Not $".{IHPCDragCurveFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Drag Curve file(.{IHPCDragCurveFileBrowser.Extensions.First()}) has the wrong extension",
+ tbDragCurve, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateVoltage(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Voltage", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorque(tb As TextBox) as Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque Speed", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTime(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Time", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorque(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque Speed", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateFullLoadCurve(tb As TextBox) As Boolean
+ If Not File.Exists(tb.Text) Then
+ ShowErrorMessageBox("No valid Full Load Curve file path given", tb, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tb.Text).Extension
+ If Not $".{IHPCFullLoadCurveFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Full Load file(.{IHPCFullLoadCurveFileBrowser.Extensions.First()}) has the wrong extension",
+ tb, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidatePowerMapEntry(tb As ListView) As Boolean
+ If tb.Items.Count = 0 Then
+ ShowErrorMessageBox("Invalid input missing Power Map files")
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidDoubleValue(value As string) As Boolean
+ If String.IsNullOrEmpty(value)
+ Return false
+ End If
+ Return IsNumeric(value)
+ End Function
+
+
+ Private Sub ShowErrorMessageBox(message As string, textbox As TextBox, Optional defaultMessage As Boolean = True)
+ If Not message = Nothing And defaultMessage Then
+ MsgBox($"Invalid input for {message}")
+ textbox.Focus()
+ Return
+ Else
+ MsgBox($"{message}")
+ textbox.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub ShowErrorMessageBox(message As string)
+ If Not message = Nothing Then
+ MsgBox($"{message}")
+ Return
+ End If
+ End Sub
+
+#End Region
+
+#Region "Track Changes"
+
+ Private Sub Change()
+ If Not _changed Then
+ LbStatus.Text = "Unsaved changes in current file"
+ _changed = True
+ End If
+ End Sub
+
+ Private Sub tbModel_TextChanged(sender As Object, e As EventArgs) Handles tbModel.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbInertia_TextChanged(sender As Object, e As EventArgs) Handles tbInertia.TextChanged
+ Change()
+ End Sub
+ Private Sub tbThermalOverload_TextChanged(sender As Object, e As EventArgs) Handles tbThermalOverload.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbDragCurve_TextChanged(sender As Object, e As EventArgs) Handles tbDragCurve.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage1_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve1_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage2_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve2_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub IHPCForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+ If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then
+ e.Cancel = ChangeCheckCancel()
+ End If
+ End Sub
+
+ Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+ If File.Exists(Path.Combine(MyAppPath, "User Manual\help.html")) Then
+ Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath()
+ Process.Start(defaultBrowserPath,
+ $"""file://{Path.Combine(MyAppPath, "User Manual\help.html#ihpc-editor")}""")
+ Else
+ MsgBox("User Manual not found!", MsgBoxStyle.Critical)
+ End If
+ End Sub
+ Private Sub btDragCurveOpen_Click(sender As Object, e As EventArgs) Handles btDragCurveOpen.Click
+ Dim theFile = FileRepl(tbDragCurve.Text, GetPath(_ihpcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub btFLCurve1_Click(sender As Object, e As EventArgs) Handles btFLCurve1.Click
+ Dim theFile = FileRepl(tbFLCurve1.Text, GetPath(_ihpcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub btFLCurve2_Click(sender As Object, e As EventArgs) Handles btFLCurve2.Click
+ Dim theFile = FileRepl(tbFLCurve1.Text, GetPath(_ihpcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ _contextMenuFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Windows.Forms.Cursor.Position)
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+
+ If File.Exists(_contextMenuFiles(0)) Then
+ Try
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
+ End Sub
+
+#End Region
End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb b/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb
index c32e38c3ec2f66dab4b7f46396f585356731f393..ae9b58663ddf17312ed7b15453b35d6782f256f9 100644
--- a/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb
+++ b/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb
@@ -71,7 +71,7 @@ Partial Class IHPCPowerMapInputDialog
Me.tbGear.Location = New System.Drawing.Point(46, 4)
Me.tbGear.Name = "tbGear"
Me.tbGear.Size = New System.Drawing.Size(77, 20)
- Me.tbGear.TabIndex = 9
+ Me.tbGear.TabIndex = 1
'
'Label3
'
@@ -96,7 +96,7 @@ Partial Class IHPCPowerMapInputDialog
Me.TableLayoutPanel5.RowCount = 1
Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100!))
Me.TableLayoutPanel5.Size = New System.Drawing.Size(356, 39)
- Me.TableLayoutPanel5.TabIndex = 8
+ Me.TableLayoutPanel5.TabIndex = 11
'
'btAddFilePath
'
@@ -105,7 +105,7 @@ Partial Class IHPCPowerMapInputDialog
Me.btAddFilePath.Location = New System.Drawing.Point(324, 6)
Me.btAddFilePath.Name = "btAddFilePath"
Me.btAddFilePath.Size = New System.Drawing.Size(24, 26)
- Me.btAddFilePath.TabIndex = 30
+ Me.btAddFilePath.TabIndex = 13
Me.btAddFilePath.UseVisualStyleBackColor = true
'
'tbInputFile
@@ -114,7 +114,7 @@ Partial Class IHPCPowerMapInputDialog
Me.tbInputFile.Location = New System.Drawing.Point(3, 9)
Me.tbInputFile.Name = "tbInputFile"
Me.tbInputFile.Size = New System.Drawing.Size(310, 20)
- Me.tbInputFile.TabIndex = 0
+ Me.tbInputFile.TabIndex = 12
'
'TableLayoutPanel1
'
@@ -136,7 +136,7 @@ Partial Class IHPCPowerMapInputDialog
Me.btAddInput.Location = New System.Drawing.Point(3, 3)
Me.btAddInput.Name = "btAddInput"
Me.btAddInput.Size = New System.Drawing.Size(67, 23)
- Me.btAddInput.TabIndex = 0
+ Me.btAddInput.TabIndex = 14
Me.btAddInput.Text = "OK"
'
'btCancel
@@ -146,7 +146,7 @@ Partial Class IHPCPowerMapInputDialog
Me.btCancel.Location = New System.Drawing.Point(77, 3)
Me.btCancel.Name = "btCancel"
Me.btCancel.Size = New System.Drawing.Size(67, 23)
- Me.btCancel.TabIndex = 1
+ Me.btCancel.TabIndex = 15
Me.btCancel.Text = "Cancel"
'
'IHPCPowerMapInputDialog
@@ -162,7 +162,7 @@ Partial Class IHPCPowerMapInputDialog
Me.Name = "IHPCPowerMapInputDialog"
Me.ShowInTaskbar = false
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "IHPCPowerMapInputDialog"
+ Me.Text = "Power Map"
Me.FlowLayoutPanel1.ResumeLayout(false)
Me.TableLayoutPanel4.ResumeLayout(false)
Me.TableLayoutPanel4.PerformLayout
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index 52bfb572e5bc82d36feac19dccdf143e96421825..595230059b9c53437d36296f5ce6cff7fb476c52 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -99,6 +99,8 @@ Partial Class MainForm
Me.JobEditorSerialHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorParallelHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorBatteryElectricVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorIHPCVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorEngineOnlyModeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.EPTPJobEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -721,7 +723,7 @@ Partial Class MainForm
'
'ToolStripDrDnBtTools
'
- Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorIHPCVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
+ Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorIEPC_E_VehicleToolStripMenuItem, Me.JobEditorIEPC_S_VehicleToolStripMenuItem, Me.JobEditorIHPCVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
@@ -732,94 +734,108 @@ Partial Class MainForm
'
Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
- Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(262, 30)
+ Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(255, 22)
Me.GENEditorToolStripMenuItem1.Text = "Job Editor - Conventional Vehicle"
'
'JobEditorSerialHybridVehicleToolStripMenuItem
'
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
- Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
'
'JobEditorParallelHybridVehicleToolStripMenuItem
'
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Name = "JobEditorParallelHybridVehicleToolStripMenuItem"
- Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Text = "Job Editor - Parallel Hybrid Vehicle"
'
'JobEditorBatteryElectricVehicleToolStripMenuItem
'
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Name = "JobEditorBatteryElectricVehicleToolStripMenuItem"
- Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
- Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "JobEditor - Battery Electric Vehicle"
+ Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
+ Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "Job Editor - Battery Electric Vehicle"
+ '
+ 'JobEditorIEPC_E_VehicleToolStripMenuItem
+ '
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Name = "JobEditorIEPC_E_VehicleToolStripMenuItem"
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Text = "Job Editor - IEPC-E Vehicle"
+ '
+ 'JobEditorIEPC_S_VehicleToolStripMenuItem
+ '
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Name = "JobEditorIEPC_S_VehicleToolStripMenuItem"
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Text = "Job Editor - IEPC-S Vehicle"
'
'JobEditorIHPCVehicleToolStripMenuItem
'
Me.JobEditorIHPCVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorIHPCVehicleToolStripMenuItem.Name = "JobEditorIHPCVehicleToolStripMenuItem"
- Me.JobEditorIHPCVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
- Me.JobEditorIHPCVehicleToolStripMenuItem.Text = "JobEditor - IHPC Vehicle"
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Text = "Job Editor - IHPC Vehicle"
'
'JobEditorEngineOnlyModeToolStripMenuItem
'
Me.JobEditorEngineOnlyModeToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorEngineOnlyModeToolStripMenuItem.Name = "JobEditorEngineOnlyModeToolStripMenuItem"
- Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorEngineOnlyModeToolStripMenuItem.Text = "Job Editor - Engine Only Mode"
'
'EPTPJobEditorToolStripMenuItem
'
Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
- Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
'
'VEHEditorToolStripMenuItem
'
Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
- Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
'
'EngineEditorToolStripMenuItem
'
Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
- Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
'
'GearboxEditorToolStripMenuItem
'
Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
- Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
'
'GraphToolStripMenuItem
'
Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
- Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.GraphToolStripMenuItem.Text = "Graph"
'
'ToolStripSeparator6
'
Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
- Me.ToolStripSeparator6.Size = New System.Drawing.Size(259, 6)
+ Me.ToolStripSeparator6.Size = New System.Drawing.Size(252, 6)
'
'OpenLogToolStripMenuItem
'
Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
- Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.OpenLogToolStripMenuItem.Text = "Open Log"
'
'SettingsToolStripMenuItem
'
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
- Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.SettingsToolStripMenuItem.Text = "Settings"
'
'ToolStripDrDnBtInfo
@@ -1035,5 +1051,8 @@ End Sub
Friend WithEvents JobEditorBatteryElectricVehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorEngineOnlyModeToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorSerialHybridVehicleToolStripMenuItem As ToolStripMenuItem
+
+ Friend WithEvents JobEditorIEPC_E_VehicleToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents JobEditorIEPC_S_VehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorIHPCVehicleToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 5516da4e7761db1194dce49d2401ade32195a08c..9d4b8bbf9f08607ebce5a002a8bc9afa7711677f 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -138,6 +138,10 @@ Public Class MainForm
TorqueConverterShiftPolygonFileBrowser = New FileBrowser("vgbs")
CrossWindCorrectionFileBrowser = New FileBrowser("vcdx")
ElectricMotorFileBrowser = New FileBrowser("vem")
+ IEPCFileBrowser = New FileBrowser("viepc")
+ IEPCFLCFileBrowser = New FileBrowser("viepcp")
+ IEPCDragFileBrowser = new FileBrowser("viepcd")
+ IEPCPowerMapFileBrowser = New FileBrowser("viepco")
REESSFileBrowser = New FileBrowser("vreess")
EmADCLossMapFileBrowser = New FileBrowser("vtlm")
DriverDecisionFactorVelocityDropFileBrowser = New FileBrowser("DfVelocityDrop")
@@ -157,6 +161,7 @@ Public Class MainForm
PropulsionTorqueLimitFileBrowser = New FileBrowser("vtqp")
ModalResultsFileBrowser = New FileBrowser("vmod")
+ IHPCFileBrowser = new FileBrowser("vem")
IHPCPowerMapFileBrowser = new FileBrowser("vemo")
IHPCFullLoadCurveFileBrowser = new FileBrowser("vemp")
IHPCDragCurveFileBrowser = new FileBrowser("vemd")
@@ -202,9 +207,15 @@ Public Class MainForm
ModalResultsFileBrowser.Extensions = New String() {"vmod"}
+ IHPCFileBrowser.Extensions = New String(){"vem"}
IHPCPowerMapFileBrowser.Extensions = New String(){"vemo"}
IHPCFullLoadCurveFileBrowser.Extensions = New String(){"vemp"}
IHPCDragCurveFileBrowser.Extensions = New String(){"vemd"}
+
+ IEPCFileBrowser.Extensions = New String () {"viepc"}
+ IEPCFLCFileBrowser.Extensions = New String() {"viepcp"}
+ IEPCDragFileBrowser.Extensions = New String() {"viepcd"}
+ IEPCPowerMapFileBrowser.Extensions = New String() {"viepco"}
End Sub
Private Sub FB_Close()
@@ -2187,8 +2198,15 @@ lbFound:
Private Sub JobEditorSerialHybridVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorSerialHybridVehicleToolStripMenuItem.Click
OpenVECTOeditor("<New>", VectoSimulationJobType.SerialHybridVehicle)
End Sub
+ Private Sub JobEditorIEPC_E_VehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorIEPC_E_VehicleToolStripMenuItem.Click
+ OpenVECTOeditor("<New>", VectoSimulationJobType.IEPC_E)
+ End Sub
- Private Sub JobEditorIHPCVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorIHPCVehicleToolStripMenuItem.Click
+ Private Sub JobEditorIHPCVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorIHPCVehicleToolStripMenuItem.Click
OpenVECTOeditor("<New>", VectoSimulationJobType.IHPC)
End Sub
+
+ Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles JobEditorIEPC_S_VehicleToolStripMenuItem.Click
+ OpenVECTOeditor("<New>", VectoSimulationJobType.IEPC_S)
+ End Sub
End Class
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 50b382bc2aec489410654f71bd0162de543fa4d7..aa723c3532a6236104417963f1b0c941ee5b026f 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -115,6 +115,18 @@ Public Class VectoJobForm
GrAuxMech.Enabled = True
Case VectoSimulationJobType.EngineOnlySimulation
lblTitle.Text = prefix + "Engine Only"
+ Case VectoSimulationJobType.IEPC_E
+ lblTitle.Text = prefix + "IEPC-E Vehicle"
+ gbElectricAux.Enabled = True
+ GrAuxMech.Enabled = False
+ case VectoSimulationJobType.IEPC_S
+ lblTitle.Text = prefix + "IEPC-S Vehicle"
+ gbElectricAux.Enabled = True
+ GrAuxMech.Enabled = False
+ Case VectoSimulationJobType.IHPC
+ lblTitle.Text = prefix + "IHPC Vehicle"
+ gbElectricAux.Enabled = True
+ GrAuxMech.Enabled = False
End Select
End Sub
@@ -1046,6 +1058,25 @@ Public Class VectoJobForm
GrAuxMech.Enabled = False
pnShiftParams.Enabled = True
gbEngineStopStart.Visible = False
+ Case VectoSimulationJobType.IHPC
+ pnEngine.Enabled = False
+ pnGearbox.Enabled = True
+ GrAuxMech.Enabled = False
+ pnShiftParams.Enabled = True
+ gbEngineStopStart.Visible = False
+ Case VectoSimulationJobType.IEPC_E
+ pnEngine.Enabled = False
+ pnGearbox.Enabled = True
+ GrAuxMech.Enabled = False
+ pnShiftParams.Enabled = True
+ gbEngineStopStart.Visible = False
+ Case VectoSimulationJobType.IEPC_S
+ pnEngine.Enabled = False
+ pnGearbox.Enabled = True
+ GrAuxMech.Enabled = False
+ pnShiftParams.Enabled = True
+ gbEngineStopStart.Visible = False
+
End Select
End Sub
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index df870239864f3cd9e628ce70f7c1620f7c7a16bf..4c8f8783a495532442ab66891bd4fdcf3f40c350 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -136,18 +136,7 @@ Partial Class VehicleForm
Me.gbTankSystem = New System.Windows.Forms.GroupBox()
Me.cbTankSystem = New System.Windows.Forms.ComboBox()
Me.Label23 = New System.Windows.Forms.Label()
- Me.tpElectricComponents = New System.Windows.Forms.TabPage()
- Me.gbBattery = New System.Windows.Forms.GroupBox()
- Me.lvREESSPacks = New System.Windows.Forms.ListView()
- Me.chReessPackPack = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.chReessPackCount = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.chReessPackStringId = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.btnAddReessPack = New System.Windows.Forms.Button()
- Me.lblEditReessPack = New System.Windows.Forms.Label()
- Me.btnRemoveReessPack = New System.Windows.Forms.Button()
- Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
- Me.tbInitialSoC = New System.Windows.Forms.TextBox()
- Me.lblInitialSoC = New System.Windows.Forms.Label()
+ Me.tpElectricMachine = New System.Windows.Forms.TabPage()
Me.gpElectricMotor = New System.Windows.Forms.GroupBox()
Me.Label33 = New System.Windows.Forms.Label()
Me.Label32 = New System.Windows.Forms.Label()
@@ -171,6 +160,26 @@ Partial Class VehicleForm
Me.btnOpenElectricMotor = New System.Windows.Forms.Button()
Me.btnBrowseElectricMotor = New System.Windows.Forms.Button()
Me.tbElectricMotor = New System.Windows.Forms.TextBox()
+ Me.tpIEPC = New System.Windows.Forms.TabPage()
+ Me.btIEPCFilePath = New System.Windows.Forms.Button()
+ Me.tbIEPCFilePath = New System.Windows.Forms.TextBox()
+ Me.btnIEPC = New System.Windows.Forms.Button()
+ Me.tbIHPC = New System.Windows.Forms.TabPage()
+ Me.btIHPC = New System.Windows.Forms.Button()
+ Me.btIHPCFile = New System.Windows.Forms.Button()
+ Me.tbIHPCFilePath = New System.Windows.Forms.TextBox()
+ Me.tpReess = New System.Windows.Forms.TabPage()
+ Me.gbBattery = New System.Windows.Forms.GroupBox()
+ Me.lvREESSPacks = New System.Windows.Forms.ListView()
+ Me.chReessPackPack = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.chReessPackCount = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.chReessPackStringId = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.btnAddReessPack = New System.Windows.Forms.Button()
+ Me.lblEditReessPack = New System.Windows.Forms.Label()
+ Me.btnRemoveReessPack = New System.Windows.Forms.Button()
+ Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
+ Me.tbInitialSoC = New System.Windows.Forms.TextBox()
+ Me.lblInitialSoC = New System.Windows.Forms.Label()
Me.tpGensetComponents = New System.Windows.Forms.TabPage()
Me.Label30 = New System.Windows.Forms.Label()
Me.gbGenSet = New System.Windows.Forms.GroupBox()
@@ -229,11 +238,8 @@ Partial Class VehicleForm
Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.lblTitle = New System.Windows.Forms.Label()
- Me.tbIHPC = New System.Windows.Forms.TabPage()
- Me.Panel2 = New System.Windows.Forms.Panel()
- Me.btIHPC = New System.Windows.Forms.Button()
- Me.btIHPCFile = New System.Windows.Forms.Button()
- Me.tbIHPCFilePath = New System.Windows.Forms.TextBox()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
Me.GroupBox6.SuspendLayout
Me.ToolStrip1.SuspendLayout
Me.gbRetarderLosses.SuspendLayout
@@ -257,11 +263,14 @@ Partial Class VehicleForm
Me.gbVehicleIdlingSpeed.SuspendLayout
Me.Panel1.SuspendLayout
Me.gbTankSystem.SuspendLayout
- Me.tpElectricComponents.SuspendLayout
- Me.gbBattery.SuspendLayout
+ Me.tpElectricMachine.SuspendLayout
Me.gpElectricMotor.SuspendLayout
Me.gbRatiosPerGear.SuspendLayout
Me.pnElectricMotor.SuspendLayout
+ Me.tpIEPC.SuspendLayout
+ Me.tbIHPC.SuspendLayout
+ Me.tpReess.SuspendLayout
+ Me.gbBattery.SuspendLayout
Me.tpGensetComponents.SuspendLayout
Me.gbGenSet.SuspendLayout
Me.pnGenSetEM.SuspendLayout
@@ -276,8 +285,8 @@ Partial Class VehicleForm
Me.pnPTO.SuspendLayout
Me.gbPTODrive.SuspendLayout
Me.gbPTO.SuspendLayout
- Me.tbIHPC.SuspendLayout
- Me.Panel2.SuspendLayout
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.FlowLayoutPanel2.SuspendLayout
Me.SuspendLayout
'
'Label1
@@ -1136,12 +1145,14 @@ Partial Class VehicleForm
'
Me.tcVehicleComponents.Controls.Add(Me.tpGeneral)
Me.tcVehicleComponents.Controls.Add(Me.tpPowertrain)
- Me.tcVehicleComponents.Controls.Add(Me.tpElectricComponents)
+ Me.tcVehicleComponents.Controls.Add(Me.tpElectricMachine)
+ Me.tcVehicleComponents.Controls.Add(Me.tpIEPC)
+ Me.tcVehicleComponents.Controls.Add(Me.tbIHPC)
+ Me.tcVehicleComponents.Controls.Add(Me.tpReess)
Me.tcVehicleComponents.Controls.Add(Me.tpGensetComponents)
Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
- Me.tcVehicleComponents.Controls.Add(Me.tbIHPC)
Me.tcVehicleComponents.Location = New System.Drawing.Point(5, 173)
Me.tcVehicleComponents.Name = "tcVehicleComponents"
Me.tcVehicleComponents.SelectedIndex = 0
@@ -1256,118 +1267,16 @@ Partial Class VehicleForm
Me.Label23.TabIndex = 0
Me.Label23.Text = "Only applicable for NG engines!"
'
- 'tpElectricComponents
- '
- Me.tpElectricComponents.Controls.Add(Me.gbBattery)
- Me.tpElectricComponents.Controls.Add(Me.gpElectricMotor)
- Me.tpElectricComponents.Location = New System.Drawing.Point(4, 22)
- Me.tpElectricComponents.Name = "tpElectricComponents"
- Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(3)
- Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
- Me.tpElectricComponents.TabIndex = 4
- Me.tpElectricComponents.Text = "Electric Powertrain Components"
- Me.tpElectricComponents.UseVisualStyleBackColor = true
- '
- 'gbBattery
- '
- Me.gbBattery.Controls.Add(Me.lvREESSPacks)
- Me.gbBattery.Controls.Add(Me.btnAddReessPack)
- Me.gbBattery.Controls.Add(Me.lblEditReessPack)
- Me.gbBattery.Controls.Add(Me.btnRemoveReessPack)
- Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
- Me.gbBattery.Controls.Add(Me.tbInitialSoC)
- Me.gbBattery.Controls.Add(Me.lblInitialSoC)
- Me.gbBattery.Location = New System.Drawing.Point(6, 175)
- Me.gbBattery.Name = "gbBattery"
- Me.gbBattery.Size = New System.Drawing.Size(633, 187)
- Me.gbBattery.TabIndex = 2
- Me.gbBattery.TabStop = false
- Me.gbBattery.Text = "Electric Energy Storage system"
- '
- 'lvREESSPacks
- '
- Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
- Me.lvREESSPacks.FullRowSelect = true
- Me.lvREESSPacks.GridLines = true
- Me.lvREESSPacks.HideSelection = false
- Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
- Me.lvREESSPacks.MultiSelect = false
- Me.lvREESSPacks.Name = "lvREESSPacks"
- Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
- Me.lvREESSPacks.TabIndex = 31
- Me.lvREESSPacks.TabStop = false
- Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
- Me.lvREESSPacks.View = System.Windows.Forms.View.Details
- '
- 'chReessPackPack
- '
- Me.chReessPackPack.Text = "REESS Pack"
- Me.chReessPackPack.Width = 350
- '
- 'chReessPackCount
- '
- Me.chReessPackCount.Text = "Count"
- Me.chReessPackCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'chReessPackStringId
- '
- Me.chReessPackStringId.Text = "Stream #"
- Me.chReessPackStringId.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'btnAddReessPack
- '
- Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
- Me.btnAddReessPack.Name = "btnAddReessPack"
- Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
- Me.btnAddReessPack.TabIndex = 1
- Me.btnAddReessPack.UseVisualStyleBackColor = true
- '
- 'lblEditReessPack
- '
- Me.lblEditReessPack.AutoSize = true
- Me.lblEditReessPack.Location = New System.Drawing.Point(452, 148)
- Me.lblEditReessPack.Name = "lblEditReessPack"
- Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
- Me.lblEditReessPack.TabIndex = 30
- Me.lblEditReessPack.Text = "(Double-Click to Edit)"
- '
- 'btnRemoveReessPack
- '
- Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
- Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
- Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
- Me.btnRemoveReessPack.TabIndex = 2
- Me.btnRemoveReessPack.UseVisualStyleBackColor = true
- '
- 'lblInitialSoCUnit
- '
- Me.lblInitialSoCUnit.AutoSize = true
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
- Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
- Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
- Me.lblInitialSoCUnit.TabIndex = 27
- Me.lblInitialSoCUnit.Text = "[%]"
- '
- 'tbInitialSoC
- '
- Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
- Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
- Me.tbInitialSoC.TabIndex = 0
+ 'tpElectricMachine
'
- 'lblInitialSoC
- '
- Me.lblInitialSoC.AutoSize = true
- Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
- Me.lblInitialSoC.Name = "lblInitialSoC"
- Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
- Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
- Me.lblInitialSoC.TabIndex = 25
- Me.lblInitialSoC.Text = "Initial SoC"
+ Me.tpElectricMachine.Controls.Add(Me.gpElectricMotor)
+ Me.tpElectricMachine.Location = New System.Drawing.Point(4, 22)
+ Me.tpElectricMachine.Name = "tpElectricMachine"
+ Me.tpElectricMachine.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpElectricMachine.Size = New System.Drawing.Size(648, 374)
+ Me.tpElectricMachine.TabIndex = 6
+ Me.tpElectricMachine.Text = "Electric Machine"
+ Me.tpElectricMachine.UseVisualStyleBackColor = true
'
'gpElectricMotor
'
@@ -1387,7 +1296,7 @@ Partial Class VehicleForm
Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
Me.gpElectricMotor.Name = "gpElectricMotor"
Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
- Me.gpElectricMotor.TabIndex = 0
+ Me.gpElectricMotor.TabIndex = 1
Me.gpElectricMotor.TabStop = false
Me.gpElectricMotor.Text = "Electric Machine"
'
@@ -1594,6 +1503,201 @@ Partial Class VehicleForm
Me.tbElectricMotor.Size = New System.Drawing.Size(300, 20)
Me.tbElectricMotor.TabIndex = 1
'
+ 'tpIEPC
+ '
+ Me.tpIEPC.Controls.Add(Me.FlowLayoutPanel1)
+ Me.tpIEPC.Location = New System.Drawing.Point(4, 22)
+ Me.tpIEPC.Name = "tpIEPC"
+ Me.tpIEPC.Size = New System.Drawing.Size(648, 374)
+ Me.tpIEPC.TabIndex = 8
+ Me.tpIEPC.Text = "IEPC"
+ Me.tpIEPC.UseVisualStyleBackColor = true
+ '
+ 'btIEPCFilePath
+ '
+ Me.btIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btIEPCFilePath.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btIEPCFilePath.Location = New System.Drawing.Point(399, 1)
+ Me.btIEPCFilePath.Margin = New System.Windows.Forms.Padding(1)
+ Me.btIEPCFilePath.Name = "btIEPCFilePath"
+ Me.btIEPCFilePath.Size = New System.Drawing.Size(24, 24)
+ Me.btIEPCFilePath.TabIndex = 58
+ Me.btIEPCFilePath.UseVisualStyleBackColor = true
+ '
+ 'tbIEPCFilePath
+ '
+ Me.tbIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbIEPCFilePath.Location = New System.Drawing.Point(97, 3)
+ Me.tbIEPCFilePath.Margin = New System.Windows.Forms.Padding(1)
+ Me.tbIEPCFilePath.Name = "tbIEPCFilePath"
+ Me.tbIEPCFilePath.Size = New System.Drawing.Size(300, 20)
+ Me.tbIEPCFilePath.TabIndex = 28
+ '
+ 'btnIEPC
+ '
+ Me.btnIEPC.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnIEPC.Location = New System.Drawing.Point(1, 2)
+ Me.btnIEPC.Margin = New System.Windows.Forms.Padding(1)
+ Me.btnIEPC.Name = "btnIEPC"
+ Me.btnIEPC.Size = New System.Drawing.Size(94, 21)
+ Me.btnIEPC.TabIndex = 27
+ Me.btnIEPC.Text = "IEPC"
+ Me.btnIEPC.UseVisualStyleBackColor = true
+ '
+ 'tbIHPC
+ '
+ Me.tbIHPC.Controls.Add(Me.FlowLayoutPanel2)
+ Me.tbIHPC.Location = New System.Drawing.Point(4, 22)
+ Me.tbIHPC.Name = "tbIHPC"
+ Me.tbIHPC.Padding = New System.Windows.Forms.Padding(3)
+ Me.tbIHPC.Size = New System.Drawing.Size(648, 374)
+ Me.tbIHPC.TabIndex = 9
+ Me.tbIHPC.Text = "IHPC"
+ Me.tbIHPC.UseVisualStyleBackColor = true
+ '
+ 'btIHPC
+ '
+ Me.btIHPC.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btIHPC.Location = New System.Drawing.Point(1, 2)
+ Me.btIHPC.Margin = New System.Windows.Forms.Padding(1)
+ Me.btIHPC.Name = "btIHPC"
+ Me.btIHPC.Size = New System.Drawing.Size(94, 21)
+ Me.btIHPC.TabIndex = 0
+ Me.btIHPC.Text = "IHPC"
+ Me.btIHPC.UseVisualStyleBackColor = true
+ '
+ 'btIHPCFile
+ '
+ Me.btIHPCFile.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btIHPCFile.Image = CType(resources.GetObject("btIHPCFile.Image"),System.Drawing.Image)
+ Me.btIHPCFile.Location = New System.Drawing.Point(399, 1)
+ Me.btIHPCFile.Margin = New System.Windows.Forms.Padding(1)
+ Me.btIHPCFile.Name = "btIHPCFile"
+ Me.btIHPCFile.Size = New System.Drawing.Size(24, 24)
+ Me.btIHPCFile.TabIndex = 2
+ Me.btIHPCFile.UseVisualStyleBackColor = true
+ '
+ 'tbIHPCFilePath
+ '
+ Me.tbIHPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbIHPCFilePath.Location = New System.Drawing.Point(97, 3)
+ Me.tbIHPCFilePath.Margin = New System.Windows.Forms.Padding(1)
+ Me.tbIHPCFilePath.Name = "tbIHPCFilePath"
+ Me.tbIHPCFilePath.Size = New System.Drawing.Size(300, 20)
+ Me.tbIHPCFilePath.TabIndex = 1
+ '
+ 'tpReess
+ '
+ Me.tpReess.Controls.Add(Me.gbBattery)
+ Me.tpReess.Location = New System.Drawing.Point(4, 22)
+ Me.tpReess.Name = "tpReess"
+ Me.tpReess.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpReess.Size = New System.Drawing.Size(648, 374)
+ Me.tpReess.TabIndex = 7
+ Me.tpReess.Text = "REESS"
+ Me.tpReess.UseVisualStyleBackColor = true
+ '
+ 'gbBattery
+ '
+ Me.gbBattery.Controls.Add(Me.lvREESSPacks)
+ Me.gbBattery.Controls.Add(Me.btnAddReessPack)
+ Me.gbBattery.Controls.Add(Me.lblEditReessPack)
+ Me.gbBattery.Controls.Add(Me.btnRemoveReessPack)
+ Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
+ Me.gbBattery.Controls.Add(Me.tbInitialSoC)
+ Me.gbBattery.Controls.Add(Me.lblInitialSoC)
+ Me.gbBattery.Location = New System.Drawing.Point(6, 6)
+ Me.gbBattery.Name = "gbBattery"
+ Me.gbBattery.Size = New System.Drawing.Size(633, 187)
+ Me.gbBattery.TabIndex = 3
+ Me.gbBattery.TabStop = false
+ Me.gbBattery.Text = "Electric Energy Storage system"
+ '
+ 'lvREESSPacks
+ '
+ Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
+ Me.lvREESSPacks.FullRowSelect = true
+ Me.lvREESSPacks.GridLines = true
+ Me.lvREESSPacks.HideSelection = false
+ Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
+ Me.lvREESSPacks.MultiSelect = false
+ Me.lvREESSPacks.Name = "lvREESSPacks"
+ Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
+ Me.lvREESSPacks.TabIndex = 31
+ Me.lvREESSPacks.TabStop = false
+ Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
+ Me.lvREESSPacks.View = System.Windows.Forms.View.Details
+ '
+ 'chReessPackPack
+ '
+ Me.chReessPackPack.Text = "REESS Pack"
+ Me.chReessPackPack.Width = 350
+ '
+ 'chReessPackCount
+ '
+ Me.chReessPackCount.Text = "Count"
+ Me.chReessPackCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'chReessPackStringId
+ '
+ Me.chReessPackStringId.Text = "Stream #"
+ Me.chReessPackStringId.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'btnAddReessPack
+ '
+ Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
+ Me.btnAddReessPack.Name = "btnAddReessPack"
+ Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
+ Me.btnAddReessPack.TabIndex = 1
+ Me.btnAddReessPack.UseVisualStyleBackColor = true
+ '
+ 'lblEditReessPack
+ '
+ Me.lblEditReessPack.AutoSize = true
+ Me.lblEditReessPack.Location = New System.Drawing.Point(452, 148)
+ Me.lblEditReessPack.Name = "lblEditReessPack"
+ Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
+ Me.lblEditReessPack.TabIndex = 30
+ Me.lblEditReessPack.Text = "(Double-Click to Edit)"
+ '
+ 'btnRemoveReessPack
+ '
+ Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
+ Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
+ Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
+ Me.btnRemoveReessPack.TabIndex = 2
+ Me.btnRemoveReessPack.UseVisualStyleBackColor = true
+ '
+ 'lblInitialSoCUnit
+ '
+ Me.lblInitialSoCUnit.AutoSize = true
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
+ Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
+ Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
+ Me.lblInitialSoCUnit.TabIndex = 27
+ Me.lblInitialSoCUnit.Text = "[%]"
+ '
+ 'tbInitialSoC
+ '
+ Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
+ Me.tbInitialSoC.Name = "tbInitialSoC"
+ Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
+ Me.tbInitialSoC.TabIndex = 0
+ '
+ 'lblInitialSoC
+ '
+ Me.lblInitialSoC.AutoSize = true
+ Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
+ Me.lblInitialSoC.Name = "lblInitialSoC"
+ Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+ Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
+ Me.lblInitialSoC.TabIndex = 25
+ Me.lblInitialSoC.Text = "Initial SoC"
+ '
'tpGensetComponents
'
Me.tpGensetComponents.Controls.Add(Me.Label30)
@@ -2183,54 +2287,25 @@ Partial Class VehicleForm
Me.lblTitle.TabIndex = 43
Me.lblTitle.Text = "Vehicle TITLE"
'
- 'tbIHPC
- '
- Me.tbIHPC.Controls.Add(Me.Panel2)
- Me.tbIHPC.Location = New System.Drawing.Point(4, 22)
- Me.tbIHPC.Name = "tbIHPC"
- Me.tbIHPC.Padding = New System.Windows.Forms.Padding(3)
- Me.tbIHPC.Size = New System.Drawing.Size(648, 374)
- Me.tbIHPC.TabIndex = 6
- Me.tbIHPC.Text = "IHPC"
- Me.tbIHPC.UseVisualStyleBackColor = true
- '
- 'Panel2
- '
- Me.Panel2.Controls.Add(Me.btIHPC)
- Me.Panel2.Controls.Add(Me.btIHPCFile)
- Me.Panel2.Controls.Add(Me.tbIHPCFilePath)
- Me.Panel2.Location = New System.Drawing.Point(16, 18)
- Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(432, 27)
- Me.Panel2.TabIndex = 1
+ 'FlowLayoutPanel1
'
- 'btIHPC
+ Me.FlowLayoutPanel1.Controls.Add(Me.btnIEPC)
+ Me.FlowLayoutPanel1.Controls.Add(Me.tbIEPCFilePath)
+ Me.FlowLayoutPanel1.Controls.Add(Me.btIEPCFilePath)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(25, 19)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(430, 27)
+ Me.FlowLayoutPanel1.TabIndex = 61
'
- Me.btIHPC.Location = New System.Drawing.Point(4, 3)
- Me.btIHPC.Name = "btIHPC"
- Me.btIHPC.Size = New System.Drawing.Size(94, 21)
- Me.btIHPC.TabIndex = 0
- Me.btIHPC.Text = "IHPC"
- Me.btIHPC.UseVisualStyleBackColor = true
+ 'FlowLayoutPanel2
'
- 'btIHPCFile
- '
- Me.btIHPCFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.btIHPCFile.Image = CType(resources.GetObject("btIHPCFile.Image"),System.Drawing.Image)
- Me.btIHPCFile.Location = New System.Drawing.Point(406, 2)
- Me.btIHPCFile.Name = "btIHPCFile"
- Me.btIHPCFile.Size = New System.Drawing.Size(24, 24)
- Me.btIHPCFile.TabIndex = 2
- Me.btIHPCFile.UseVisualStyleBackColor = true
- '
- 'tbIHPCFilePath
- '
- Me.tbIHPCFilePath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbIHPCFilePath.Location = New System.Drawing.Point(104, 4)
- Me.tbIHPCFilePath.Name = "tbIHPCFilePath"
- Me.tbIHPCFilePath.Size = New System.Drawing.Size(300, 20)
- Me.tbIHPCFilePath.TabIndex = 1
+ Me.FlowLayoutPanel2.Controls.Add(Me.btIHPC)
+ Me.FlowLayoutPanel2.Controls.Add(Me.tbIHPCFilePath)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btIHPCFile)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(25, 19)
+ Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(427, 27)
+ Me.FlowLayoutPanel2.TabIndex = 3
'
'VehicleForm
'
@@ -2297,15 +2372,18 @@ Partial Class VehicleForm
Me.Panel1.PerformLayout
Me.gbTankSystem.ResumeLayout(false)
Me.gbTankSystem.PerformLayout
- Me.tpElectricComponents.ResumeLayout(false)
- Me.gbBattery.ResumeLayout(false)
- Me.gbBattery.PerformLayout
+ Me.tpElectricMachine.ResumeLayout(false)
Me.gpElectricMotor.ResumeLayout(false)
Me.gpElectricMotor.PerformLayout
Me.gbRatiosPerGear.ResumeLayout(false)
Me.gbRatiosPerGear.PerformLayout
Me.pnElectricMotor.ResumeLayout(false)
Me.pnElectricMotor.PerformLayout
+ Me.tpIEPC.ResumeLayout(false)
+ Me.tbIHPC.ResumeLayout(false)
+ Me.tpReess.ResumeLayout(false)
+ Me.gbBattery.ResumeLayout(false)
+ Me.gbBattery.PerformLayout
Me.tpGensetComponents.ResumeLayout(false)
Me.tpGensetComponents.PerformLayout
Me.gbGenSet.ResumeLayout(false)
@@ -2330,9 +2408,10 @@ Partial Class VehicleForm
Me.gbPTODrive.ResumeLayout(false)
Me.gbPTODrive.PerformLayout
Me.gbPTO.ResumeLayout(false)
- Me.tbIHPC.ResumeLayout(false)
- Me.Panel2.ResumeLayout(false)
- Me.Panel2.PerformLayout
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.FlowLayoutPanel1.PerformLayout
+ Me.FlowLayoutPanel2.ResumeLayout(false)
+ Me.FlowLayoutPanel2.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -2462,30 +2541,12 @@ End Sub
Friend WithEvents cbTankSystem As ComboBox
Friend WithEvents Label23 As Label
Friend WithEvents cbAtEcoRollReleaseLockupClutch As CheckBox
- Friend WithEvents tpElectricComponents As TabPage
- Friend WithEvents gpElectricMotor As GroupBox
- Friend WithEvents gbBattery As GroupBox
- Friend WithEvents tbEmADCLossMap As TextBox
- Friend WithEvents lblEmADCLossmap As Label
- Friend WithEvents tbRatioEm As TextBox
- Friend WithEvents lblRatioEm As Label
- Friend WithEvents tbEmCount As TextBox
- Friend WithEvents cbEmPos As ComboBox
- Friend WithEvents lblEmCount As Label
- Friend WithEvents lblEmPosition As Label
- Friend WithEvents pnElectricMotor As Panel
- Friend WithEvents btnOpenElectricMotor As Button
- Friend WithEvents btnBrowseElectricMotor As Button
- Friend WithEvents tbElectricMotor As TextBox
Friend WithEvents lblTitle As Label
Friend WithEvents gbVehicleIdlingSpeed As GroupBox
Friend WithEvents Panel1 As Panel
Friend WithEvents tbVehIdlingSpeed As TextBox
Friend WithEvents Label18 As Label
Friend WithEvents Label19 As Label
- Friend WithEvents lblInitialSoCUnit As Label
- Friend WithEvents tbInitialSoC As TextBox
- Friend WithEvents lblInitialSoC As Label
Friend WithEvents gbEMTorqueLimits As GroupBox
Friend WithEvents btnEmTorqueLimits As Button
Friend WithEvents tbEmTorqueLimits As TextBox
@@ -2493,7 +2554,6 @@ End Sub
Friend WithEvents gbPropulsionTorque As GroupBox
Friend WithEvents btnPropulsionTorqueLimit As Button
Friend WithEvents tbPropulsionTorqueLimit As TextBox
- Friend WithEvents btnEmADCLossMap As Button
'=======
Friend WithEvents tpRoadSweeper As TabPage
Friend WithEvents gbPTODrive As GroupBox
@@ -2515,20 +2575,6 @@ End Sub
Friend WithEvents btPTOCycleDrive As Button
Friend WithEvents Label28 As Label
Friend WithEvents tbPTODrive As TextBox
- Friend WithEvents gbRatiosPerGear As GroupBox
- Friend WithEvents lvRatioPerGear As ListView
- Friend WithEvents ColumnHeader11 As ColumnHeader
- Friend WithEvents ColumnHeader12 As ColumnHeader
- Friend WithEvents btnAddEMRatio As Button
- Friend WithEvents Label29 As Label
- Friend WithEvents btnRemoveEMRatio As Button
- Friend WithEvents lvREESSPacks As ListView
- Friend WithEvents chReessPackPack As ColumnHeader
- Friend WithEvents chReessPackCount As ColumnHeader
- Friend WithEvents chReessPackStringId As ColumnHeader
- Friend WithEvents btnAddReessPack As Button
- Friend WithEvents lblEditReessPack As Label
- Friend WithEvents btnRemoveReessPack As Button
Friend WithEvents tpGensetComponents As TabPage
Friend WithEvents gbGenSet As GroupBox
Friend WithEvents btnGenSetLossMap As Button
@@ -2543,15 +2589,54 @@ End Sub
Friend WithEvents btnBrowseGenSetEM As Button
Friend WithEvents tbGenSetEM As TextBox
Friend WithEvents Label30 As Label
- Friend WithEvents Label33 As Label
- Friend WithEvents Label32 As Label
Friend WithEvents Label36 As Label
Friend WithEvents Label34 As Label
Friend WithEvents pnEcoRoll As Panel
+ Friend WithEvents tpElectricMachine As TabPage
+ Friend WithEvents tpReess As TabPage
+ Friend WithEvents gpElectricMotor As GroupBox
+ Friend WithEvents Label33 As Label
+ Friend WithEvents Label32 As Label
+ Friend WithEvents gbRatiosPerGear As GroupBox
+ Friend WithEvents lvRatioPerGear As ListView
+ Friend WithEvents ColumnHeader11 As ColumnHeader
+ Friend WithEvents ColumnHeader12 As ColumnHeader
+ Friend WithEvents btnAddEMRatio As Button
+ Friend WithEvents Label29 As Label
+ Friend WithEvents btnRemoveEMRatio As Button
+ Friend WithEvents btnEmADCLossMap As Button
+ Friend WithEvents tbEmADCLossMap As TextBox
+ Friend WithEvents lblEmADCLossmap As Label
+ Friend WithEvents tbRatioEm As TextBox
+ Friend WithEvents lblRatioEm As Label
+ Friend WithEvents tbEmCount As TextBox
+ Friend WithEvents cbEmPos As ComboBox
+ Friend WithEvents lblEmCount As Label
+ Friend WithEvents lblEmPosition As Label
+ Friend WithEvents pnElectricMotor As Panel
+ Friend WithEvents btnOpenElectricMotor As Button
+ Friend WithEvents btnBrowseElectricMotor As Button
+ Friend WithEvents tbElectricMotor As TextBox
+ Friend WithEvents gbBattery As GroupBox
+ Friend WithEvents lvREESSPacks As ListView
+ Friend WithEvents chReessPackPack As ColumnHeader
+ Friend WithEvents chReessPackCount As ColumnHeader
+ Friend WithEvents chReessPackStringId As ColumnHeader
+ Friend WithEvents btnAddReessPack As Button
+ Friend WithEvents lblEditReessPack As Label
+ Friend WithEvents btnRemoveReessPack As Button
+ Friend WithEvents lblInitialSoCUnit As Label
+ Friend WithEvents tbInitialSoC As TextBox
+ Friend WithEvents lblInitialSoC As Label
+ Friend WithEvents tpIEPC As TabPage
+ Friend WithEvents btIEPCFilePath As Button
+ Friend WithEvents btnIEPC As Button
+ Friend WithEvents tbIEPCFilePath As TextBox
Friend WithEvents tbIHPC As TabPage
- Friend WithEvents Panel2 As Panel
Friend WithEvents btIHPC As Button
Friend WithEvents btIHPCFile As Button
Friend WithEvents tbIHPCFilePath As TextBox
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
'>>>>>>> VECTO_CERT/master
End Class
diff --git a/VECTO/GUI/VehicleForm.resx b/VECTO/GUI/VehicleForm.resx
index b166ff2e43711a9b448fdb8d8a6b64f225ea02f4..72954ee2478b5b39e958cec2a52b2dbce32ac23e 100644
--- a/VECTO/GUI/VehicleForm.resx
+++ b/VECTO/GUI/VehicleForm.resx
@@ -148,7 +148,7 @@
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
- <data name="btnBrowseGenSetEM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btIHPCFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
@@ -166,7 +166,7 @@
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
- <data name="btIHPCFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnBrowseGenSetEM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
@@ -185,7 +185,7 @@
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>77</value>
+ <value>46</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 0874ea85670253f6001fcad2b0eae888a3ed5e74..90795dab3ad5db4101f9021bfaa607b5797cec0c 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -521,16 +521,22 @@ Public Class VehicleForm
Private Sub UpdateForm(vehType As VectoSimulationJobType)
VehicleType = vehType
- If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
- tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
- tpElectricComponents.BindingContext = BindingContext
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricMachine) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricMachine)
+ tpElectricMachine.BindingContext = BindingContext
End If
+
+ If Not tcVehicleComponents.TabPages.Contains(tpReess) Then
+ tcVehicleComponents.TabPages.Insert(3, tpReess)
+ tpReess.BindingContext = BindingContext
+ End If
+
If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
- tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+ tcVehicleComponents.TabPages.Insert(4, tpGensetComponents)
tpGensetComponents.BindingContext = BindingContext
End If
If Not tcVehicleComponents.TabPages.Contains(tpTorqueLimits) Then
- tcVehicleComponents.TabPages.Insert(4, tpTorqueLimits)
+ tcVehicleComponents.TabPages.Insert(5, tpTorqueLimits)
tpTorqueLimits.BindingContext = BindingContext
End If
@@ -546,7 +552,8 @@ Public Class VehicleForm
gbAngledrive.Enabled = True
'Electric Powertrain Components -------------------------------------------
- tcVehicleComponents.TabPages.Remove(tpElectricComponents)
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tpReess)
'GenSet Components --------------------------------------------------------
tcVehicleComponents.TabPages.Remove(tpGensetComponents)
@@ -559,6 +566,12 @@ Public Class VehicleForm
cbAtEcoRollReleaseLockupClutch.Visible = True
pnEcoRoll.Visible = True
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
Case VectoSimulationJobType.ParallelHybridVehicle
lblTitle.Text = "Parallel Hybrid Vehicle"
@@ -584,6 +597,12 @@ Public Class VehicleForm
pnEcoRoll.Visible = False
cbEcoRoll.SelectedIndex = 0
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
Case VectoSimulationJobType.SerialHybridVehicle
lblTitle.Text = "Serial Hybrid Vehicle"
@@ -610,6 +629,12 @@ Public Class VehicleForm
pnEcoRoll.Visible = False
cbEcoRoll.SelectedIndex = 0
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
Case VectoSimulationJobType.BatteryElectricVehicle
lblTitle.Text = "Battery Electric Vehicle"
@@ -636,13 +661,44 @@ Public Class VehicleForm
pnEcoRoll.Visible = False
cbEcoRoll.SelectedIndex = 0
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ Case VectoSimulationJobType.IEPC_E
+ lblTitle.Text = "IEPC-E Vehicle"
+
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ Case VectoSimulationJobType.IEPC_S
+ lblTitle.Text = "IEPC-S Vehicle"
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ Case VectoSimulationJobType.IHPC
+ lblTitle.Text = "IHPC Vehicle"
+
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
Case Else
- If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
- tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
- tpElectricComponents.BindingContext = BindingContext
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricMachine) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricMachine)
+ tpElectricMachine.BindingContext = BindingContext
+ End If
+
+ If Not tcVehicleComponents.TabPages.Contains(tpReess) Then
+ tcVehicleComponents.TabPages.Insert(3, tpReess)
+ tpReess.BindingContext = BindingContext
End If
+
If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
- tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+ tcVehicleComponents.TabPages.Insert(4, tpGensetComponents)
tpGensetComponents.BindingContext = BindingContext
End If
pnEcoRoll.Visible = True
@@ -746,21 +802,25 @@ Public Class VehicleForm
If tbElectricMotor.Text = "" Then
MsgBox("Electric Motor File is required.")
- tcVehicleComponents.SelectedTab = tpElectricComponents
+ tcVehicleComponents.SelectedTab = tpElectricMachine
tbElectricMotor.Focus()
Return False
End If
+
veh.ElectricMotorFile.Init(GetPath(file), tbElectricMotor.Text)
veh.ElectricMotorPosition = CType(cbEmPos.SelectedValue, PowertrainPosition)
veh.ElectricMotorCount = tbEmCount.Text.ToInt(1)
veh.ElectricMotorRatio = tbRatioEm.Text.ToDouble(1)
'veh.ElectricMotorMechEff = tbEmADCLossMap.Text.ToDouble()
+
If tbEmADCLossMap.Text = "" Then
MsgBox("Loss Map EM ADC is required.")
- tcVehicleComponents.SelectedTab = tpElectricComponents
+ tcVehicleComponents.SelectedTab = tpElectricMachine
tbEmADCLossMap.Focus()
Return False
End If
+
+
veh.ElectricMotorMechLossMap.Init(GetPath(file), tbEmADCLossMap.Text)
If (veh.ElectricMotorPosition = PowertrainPosition.HybridP2_5) Then
veh.ElectricMotorPerGearRatios = lvRatioPerGear.Items.Cast(Of ListViewItem).Select(Function(item) item.SubItems(RatiosPerGearTbl.Ratio).Text.ToDouble(0)).ToArray()
@@ -1233,7 +1293,6 @@ Public Class VehicleForm
If ElectricMotorFileBrowser.OpenDialog(FileRepl(tbElectricMotor.Text, GetPath(_vehFile))) Then
tbElectricMotor.Text = GetFilenameWithoutDirectory(ElectricMotorFileBrowser.Files(0), GetPath(_vehFile))
End If
-
End Sub
@@ -1467,26 +1526,72 @@ Public Class VehicleForm
Change()
End Sub
- Private Sub btIHPC_Click(sender As Object, e As EventArgs) Handles btIHPC.Click
- Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
+ Private Sub btIEPCFilePath_Click(sender As Object, e As EventArgs) Handles btIEPCFilePath.Click
+ If IEPCFileBrowser.OpenDialog(FileRepl(tbIEPCFilePath.Text, GetPath(_vehFile))) Then
+ tbIEPCFilePath.Text = GetFilenameWithoutDirectory(IEPCFileBrowser.Files(0), GetPath(_vehFile))
+ End If
+ End Sub
- If Not IHPCForm.Visible Then
- IHPCForm.ClearIHPC()
- IHPCForm.Show()
- Else
- If IHPCForm.WindowState = FormWindowState.Minimized Then IHPCForm.WindowState = FormWindowState.Normal
- IHPCForm.BringToFront()
- End If
+ Private Sub btnIEPC_Click(sender As Object, e As EventArgs) Handles btnIEPC.Click
+ Dim f = FileRepl(tbIEPCFilePath.Text, GetPath(_vehFile))
- If Not Trim(f) = "" Then
- Try
- IHPCForm.ReadIHPCFile(f)
- Catch ex As Exception
- MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IEPC File")
- End Try
- End If
+ IEPCForm.JobDir = GetPath(_vehFile)
+ If Not Trim(f) = "" Then
+ If Not File.Exists(f) Then
+ MsgBox("File not found!")
+ Exit Sub
+ End If
+ End If
+
+ If Not IEPCForm.Visible Then
+ IEPCForm.NewIEPC()
+ IEPCForm.Show()
+ Else
+ If IEPCForm.WindowState = FormWindowState.Minimized Then IEPCForm.WindowState = FormWindowState.Normal
+ IEPCForm.BringToFront()
+ End If
- End Sub
-End Class
+ If Not Trim(f) = "" Then
+ Try
+ IEPCForm.ReadIEPCFile(f)
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IEPC File")
+ End Try
+ End If
+ End Sub
+ Private Sub btIHPCFile_Click(sender As Object, e As EventArgs) Handles btIHPCFile.Click
+ If IHPCFileBrowser.OpenDialog(FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))) Then
+ tbIHPCFilePath.Text = GetFilenameWithoutDirectory(IHPCFileBrowser.Files(0), GetPath(_vehFile))
+ End If
+ End Sub
+
+ Private Sub btIHPC_Click(sender As Object, e As EventArgs) Handles btIHPC.Click
+ Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
+
+ IHPCForm.JobDir = GetPath(_vehFile)
+ If Not Trim(f) = "" Then
+ If Not File.Exists(f) Then
+ MsgBox("File not found!")
+ Exit Sub
+ End If
+ End If
+
+ If Not IHPCForm.Visible Then
+ IHPCForm.ClearIHPC()
+ IHPCForm.Show()
+ Else
+ If IHPCForm.WindowState = FormWindowState.Minimized Then IHPCForm.WindowState = FormWindowState.Normal
+ IHPCForm.BringToFront()
+ End If
+
+ If Not Trim(f) = "" Then
+ Try
+ IHPCForm.ReadIHPCFile(f)
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IHPC File")
+ End Try
+ End If
+ End Sub
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/XMLImportJobDialog.vb b/VECTO/GUI/XMLImportJobDialog.vb
index d462a579bde57f6623279b9fab1c509caee61582..9afc8e727a07b7f5cbfec479b2754284c04863e6 100644
--- a/VECTO/GUI/XMLImportJobDialog.vb
+++ b/VECTO/GUI/XMLImportJobDialog.vb
@@ -1,27 +1,27 @@
-Imports System.IO
-
-Public Class XMLImportJobDialog
- Private Sub btnBrowseJob_Click(sender As Object, e As EventArgs) Handles btnBrowseJob.Click
- Dim dialog As OpenFileDialog = New OpenFileDialog()
- If (dialog.ShowDialog() = DialogResult.OK) Then
- tbJobFile.Text = Path.GetFullPath(dialog.FileName)
- End If
- End Sub
-
- Private Sub btnBrowseOutput_Click(sender As Object, e As EventArgs) Handles btnBrowseOutput.Click
+Imports System.IO
+
+Public Class XMLImportJobDialog
+ Private Sub btnBrowseJob_Click(sender As Object, e As EventArgs) Handles btnBrowseJob.Click
+ Dim dialog As OpenFileDialog = New OpenFileDialog()
+ If (dialog.ShowDialog() = DialogResult.OK) Then
+ tbJobFile.Text = Path.GetFullPath(dialog.FileName)
+ End If
+ End Sub
+
+ Private Sub btnBrowseOutput_Click(sender As Object, e As EventArgs) Handles btnBrowseOutput.Click
If Not FolderFileBrowser.OpenDialog("") Then
Exit Sub
- End If
+ End If
Dim filePath As String = FolderFileBrowser.Files(0)
tbDestination.Text = Path.GetFullPath(filePath)
- End Sub
-
- Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
- Close()
- End Sub
-
- Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
- ' TODO!
- End Sub
+ End Sub
+
+ Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+ Close()
+ End Sub
+
+ Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
+ ' TODO!
+ End Sub
End Class
\ No newline at end of file
diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb
index 4671c0d8960ca6f9a44448cdb3fd73ac6d2adfa0..14bf115c329bb1356f8793dc277fd458ab91bb43 100644
--- a/VECTO/Input Files/ElectricMachine.vb
+++ b/VECTO/Input Files/ElectricMachine.vb
@@ -97,7 +97,7 @@ Public Class ElectricMachine
writer.SaveElectricMotor(Me, _filePath, Cfg.DeclMode)
Catch ex As Exception
- MsgBox("Faled to write Engine file: " + ex.Message)
+ MsgBox("Failed to write Engine file: " + ex.Message)
Return False
End Try
Return True
diff --git a/VECTO/Input Files/IEPCInputData.vb b/VECTO/Input Files/IEPCInputData.vb
new file mode 100644
index 0000000000000000000000000000000000000000..3457bf1912648f63313a3ab2478aa52e768402c9
--- /dev/null
+++ b/VECTO/Input Files/IEPCInputData.vb
@@ -0,0 +1,254 @@
+Imports System.IO
+Imports TUGraz.VectoCommon.Exceptions
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Models
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+Imports TUGraz.VectoCore.InputData.Impl
+Imports TUGraz.VectoCore.Utils
+
+Public Class IEPCInputData
+ Implements IIEPCEngineeringInputData
+
+ Private _model As String
+ Private _inertia As KilogramSquareMeter
+ Private _wheelMotorMeasured As Boolean
+ Private _nrDesignTypeWheelMotor As Integer?
+ Private _differentialIncluded As Boolean
+ Private _overloadRecoverFactor As Double
+ Private _gears As IList(Of IGearEntry)
+ Private _voltageLevels As IList(Of IElectricMotorVoltageLevel)
+ Private _dragCurves As IList(Of IDragCurve)
+ private _filePath As String
+
+
+ public Sub New()
+ _voltageLevels = New List(Of IElectricMotorVoltageLevel)
+ End Sub
+
+ Public Function SaveFile(filePath As String) As Boolean
+ _filePath = filePath
+
+ Try
+ Dim writer = New JSONFileWriter()
+ writer.SaveIEPC(Me, filePath, Cfg.DeclMode)
+ Catch ex As Exception
+ MsgBox("Failed to write IEPC file: " + ex.Message)
+ Return False
+ End Try
+
+ Return True
+ End Function
+
+ Public Sub SetCommonEntries(model As String, inertia As String, designTypeWheelMotorMeasured As Boolean,
+ nrOfDesignTypeWheelMotorMeasured As string, differentialIncluded as Boolean,
+ thermalOverloadRecoverFactor As String)
+
+ _model = model
+ _inertia = inertia.ToDouble().SI(Of KilogramSquareMeter)
+ _wheelMotorMeasured = designTypeWheelMotorMeasured
+ _nrDesignTypeWheelMotor = nrOfDesignTypeWheelMotorMeasured.ToInt(Nothing)
+ _differentialIncluded = differentialIncluded
+ _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble()
+
+ End Sub
+
+ Public Sub SetVoltageLevelEntries(voltage As String, continuousTorque As String, continuousTorqueSpeed As String,
+ overloadTime As String, overloadTorque As String, overloadTorqueSpeed As String,
+ fullLoadCurve As string, powerMap As ListView)
+
+ Dim level = New ElectricMotorVoltageLevel()
+ level.VoltageLevel = voltage.ToDouble().SI(Of Volt)
+ level.ContinuousTorque = continuousTorque.ToDouble().SI(Of NewtonMeter)
+ level.ContinuousTorqueSpeed = continuousTorqueSpeed.ToDouble().RPMtoRad()
+ level.OverloadTime = overloadTime.ToDouble().SI(Of Second)
+ level.OverloadTorque = overloadTorque.ToDouble().SI(Of NewtonMeter)
+ level.OverloadTestSpeed = overloadTorqueSpeed.ToDouble().RPMtoRad()
+ If Not File.Exists(fullLoadCurve) Then
+ Throw New VectoException("Full-Load Curve is missing or invalid")
+ Else
+ level.FullLoadCurve = VectoCSVFile.Read(fullLoadCurve)
+ End If
+ level.PowerMap = GetPowerMap(powerMap)
+
+ _voltageLevels.Add(level)
+ End Sub
+
+ Private Function GetPowerMap(powerMap As ListView) As IList(of IElectricMotorPowerMap)
+ Dim powerMaps = new List(Of IElectricMotorPowerMap)
+
+ For Each entry As ListViewItem In powerMap.Items
+ Dim currentEntry = New JSONElectricMotorPowerMap
+ currentEntry.Gear = entry.SubItems(0).Text.ToInt()
+
+ If Not File.Exists(entry.SubItems(1).Text) Then
+ Throw New VectoException("Power Map is missing or invalid")
+ Else
+ currentEntry.PowerMap = VectoCSVFile.Read(entry.SubItems(1).Text)
+ End If
+ powerMaps.Add(currentEntry)
+ Next
+
+ Return powerMaps
+ End Function
+
+ Public Sub SetGearsEntries(gearsListView As ListView)
+ _gears = New List(Of IGearEntry)
+
+ Dim gearNumber = 1
+ For Each entry As ListViewItem In gearsListView.Items
+
+ Dim currentEntry = new GearEntry
+ currentEntry.GearNumber = gearNumber
+ gearNumber += 1
+
+ currentEntry.Ratio = entry.SubItems(0).Text.ToDouble()
+ If Not entry.SubItems(1).Text = Nothing Then _
+ currentEntry.MaxOutputShaftTorque = entry.SubItems(1).Text.ToDouble().SI(Of NewtonMeter)
+ If Not entry.SubItems(2).Text = Nothing Then _
+ currentEntry.MaxOutputShaftSpeed = entry.SubItems(2).Text.ToDouble().SI(Of PerSecond)
+
+ _gears.Add(currentEntry)
+ Next
+ End Sub
+
+ Public Sub SetDragCurveEntries(dragCurveListView As ListView)
+ _dragCurves = New List(Of IDragCurve)
+
+ For Each entry As ListViewItem In dragCurveListView.Items
+ Dim currentEntry = New DragCurveEntry
+ currentEntry.Gear = entry.SubItems(0).Text.ToInt()
+
+ If Not File.Exists(entry.SubItems(1).Text) Then
+ Throw New VectoException("Drag Curve is missing or invalid")
+ Else
+ currentEntry.DragCurve = VectoCSVFile.Read(entry.SubItems(1).Text)
+ End If
+ _dragCurves.Add(currentEntry)
+ Next
+ End Sub
+
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ Get
+ Dim retVal = New DataSource()
+ retVal.SourceType = DataSourceType.JSONFile
+ retVal.SourceFile = _filePath
+ Return retVal
+ End Get
+ End Property
+
+ Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
+ Get
+ Return Cfg.DeclMode
+ End Get
+ End Property
+
+ Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Model As String Implements IComponentInputData.Model
+ Get
+ Return _model
+ End Get
+ End Property
+
+ Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
+ Get
+ Return Now.ToUniversalTime()
+ End Get
+ End Property
+
+ Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
+ Get
+ Return "VECTO-GUI"
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
+ Get
+ Return CertificationMethod.NotCertified
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+ Get
+ Return VectoCore.Configuration.Constants.NOT_AVAILABLE
+ End Get
+ End Property
+
+ Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IIEPCDeclarationInputData.ElectricMachineType
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property R85RatedPower As Watt Implements IIEPCDeclarationInputData.R85RatedPower
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Inertia As KilogramSquareMeter Implements IIEPCDeclarationInputData.Inertia
+ Get
+ Return _inertia
+ End Get
+ End Property
+
+ Public ReadOnly Property DifferentialIncluded As Boolean Implements IIEPCDeclarationInputData.DifferentialIncluded
+ Get
+ Return _differentialIncluded
+ End Get
+ End Property
+
+ Public ReadOnly Property DesignTypeWheelMotor As Boolean Implements IIEPCDeclarationInputData.DesignTypeWheelMotor
+ Get
+ Return _wheelMotorMeasured
+ End Get
+ End Property
+
+ Public ReadOnly Property NrOfDesignTypeWheelMotorMeasured As Integer? Implements IIEPCDeclarationInputData.NrOfDesignTypeWheelMotorMeasured
+ Get
+ Return _nrDesignTypeWheelMotor
+ End Get
+ End Property
+
+ Public ReadOnly Property Gears As IList(Of IGearEntry) Implements IIEPCDeclarationInputData.Gears
+ Get
+ Return _gears
+ End Get
+ End Property
+
+ Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IIEPCDeclarationInputData.VoltageLevels
+ Get
+ Return _voltageLevels
+ End Get
+ End Property
+
+ Public ReadOnly Property DragCurves As IList(Of IDragCurve) Implements IIEPCDeclarationInputData.DragCurves
+ Get
+ Return _dragCurves
+ End Get
+ End Property
+
+ Public ReadOnly Property Conditioning As TableData Implements IIEPCDeclarationInputData.Conditioning
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IIEPCEngineeringInputData.OverloadRecoveryFactor
+ Get
+ Return _overloadRecoverFactor
+ End Get
+ End Property
+
+End Class
diff --git a/VECTO/Input Files/IHPCInputData.vb b/VECTO/Input Files/IHPCInputData.vb
new file mode 100644
index 0000000000000000000000000000000000000000..80eef70e03bd75ef399b52a1cd49083d3d6cf283
--- /dev/null
+++ b/VECTO/Input Files/IHPCInputData.vb
@@ -0,0 +1,195 @@
+Imports System.IO
+Imports TUGraz.VectoCommon.Exceptions
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Models
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+Imports TUGraz.VectoCore.InputData.Impl
+Imports TUGraz.VectoCore.Utils
+
+Public Class IHPCInputData
+ Implements IElectricMotorEngineeringInputData
+
+ Private _model As String
+ Private _inertia As KilogramSquareMeter
+ Private _voltageLevels As IList(Of IElectricMotorVoltageLevel)
+ Private _dragCurve As TableData
+ Private _overloadRecoveryFactor As Double
+ private _filePath As String
+
+ Public Sub New ()
+ _voltageLevels = New List(Of IElectricMotorVoltageLevel)()
+ End Sub
+
+ Public Function SaveFile(filePath As String) As Boolean
+ _filePath = filePath
+
+ Try
+ Dim writer = New JSONFileWriter()
+ writer.SaveIHPC(Me, filePath, Cfg.DeclMode)
+ Catch ex As Exception
+ MsgBox("Failed to write IHPC file: " + ex.Message)
+ Return False
+ End Try
+ Return True
+ End Function
+
+
+ Public Sub SetCommonEntries(model As String, inertia As String, dragCurveFilePath As string,
+ thermalOverloadRecoverFactor As String )
+ _model = model
+ _inertia = inertia.ToDouble().SI(Of KilogramSquareMeter)
+ If Not File.Exists(dragCurveFilePath) Then
+ Throw New VectoException("Drag Curve is missing or invalid")
+ Else
+ _dragCurve = VectoCSVFile.Read(dragCurveFilePath)
+ End If
+
+ _overloadRecoveryFactor = thermalOverloadRecoverFactor.ToDouble()
+ End Sub
+
+ Public Sub SetVoltageLevelEntries(voltage As String, continuousTorque As String, continuousTorqueSpeed As String,
+ overloadTime As String, overloadTorque As String, overloadTorqueSpeed As String,
+ fullLoadCurve As string, powerMap As ListView)
+
+
+ Dim level = New ElectricMotorVoltageLevel()
+ level.VoltageLevel = voltage.ToDouble().SI(Of Volt)
+ level.ContinuousTorque = continuousTorque.ToDouble().SI(Of NewtonMeter)
+ level.ContinuousTorqueSpeed = continuousTorqueSpeed.ToDouble().RPMtoRad()
+ level.OverloadTime = overloadTime.ToDouble().SI(Of Second)
+ level.OverloadTorque = overloadTorque.ToDouble().SI(Of NewtonMeter)
+ level.OverloadTestSpeed = overloadTorqueSpeed.ToDouble().RPMtoRad()
+ If Not File.Exists(fullLoadCurve) Then
+ Throw New VectoException("Full-Load Curve is missing or invalid")
+ Else
+ level.FullLoadCurve = VectoCSVFile.Read(fullLoadCurve)
+ End If
+ level.PowerMap = GetPowerMap(powerMap)
+
+ _voltageLevels.Add(level)
+
+ End Sub
+
+ Private Function GetPowerMap(powerMap As ListView) As IList(of IElectricMotorPowerMap)
+ Dim powerMaps = new List(Of IElectricMotorPowerMap)
+
+ For Each entry As ListViewItem In powerMap.Items
+ Dim currentEntry = New JSONElectricMotorPowerMap
+ currentEntry.Gear = entry.SubItems(0).Text.ToInt()
+
+ If Not File.Exists(entry.SubItems(1).Text) Then
+ Throw New VectoException("Power Map is missing or invalid")
+ Else
+ currentEntry.PowerMap = VectoCSVFile.Read(entry.SubItems(1).Text)
+ End If
+ powerMaps.Add(currentEntry)
+ Next
+
+ Return powerMaps
+ End Function
+
+
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ Get
+ Dim retVal = New DataSource()
+ retVal.SourceType = DataSourceType.JSONFile
+ retVal.SourceFile = _filePath
+ Return retVal
+ End Get
+ End Property
+
+ Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
+ Get
+ Return Cfg.DeclMode
+ End Get
+ End Property
+
+ Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Model As String Implements IComponentInputData.Model
+ Get
+ Return _model
+ End Get
+ End Property
+
+ Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
+ Get
+ Return Now.ToUniversalTime()
+ End Get
+ End Property
+
+ Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
+ Get
+ Return "VECTO-GUI"
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
+ Get
+ Return CertificationMethod.NotCertified
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+ Get
+ Return VectoCore.Configuration.Constants.NOT_AVAILABLE
+ End Get
+ End Property
+
+ Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
+ Get
+ Return _inertia
+ End Get
+ End Property
+
+ Public ReadOnly Property DcDcConverterIncluded As Boolean Implements IElectricMotorDeclarationInputData.DcDcConverterIncluded
+
+ Public ReadOnly Property IHPCType As String Implements IElectricMotorDeclarationInputData.IHPCType
+
+ Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IElectricMotorDeclarationInputData.VoltageLevels
+ Get
+ Return _voltageLevels
+ End Get
+ End Property
+
+ Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
+ Get
+ Return _dragCurve
+ End Get
+ End Property
+
+ Public ReadOnly Property Conditioning As TableData Implements IElectricMotorDeclarationInputData.Conditioning
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IElectricMotorEngineeringInputData.OverloadRecoveryFactor
+ Get
+ Return _overloadRecoveryFactor
+ End Get
+ End Property
+End Class
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index 83816ced3a487e074ae8ba31cd7c65d3641fdc8e..950eb28af3d32daa64c3e718325d869e968974de 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -258,5 +258,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
throw new VectoException("Engineering IEPC: Unsupported FileVersion. Got {0}", version);
}
}
+
+ public static IElectricMotorEngineeringInputData ReadIHPCEngineeringInputData(string filename,
+ bool tolerateMissing = false)
+ {
+ var json = ReadFile(filename);
+ var version = ReadVersion(json);
+ switch (version)
+ {
+ case 5:
+ return ReadElectricMotorData(filename, tolerateMissing);
+ default:
+ throw new VectoException("Engineering IHPC: Unsupported FileVersion. Got {0}", version);
+ }
+ }
}
}
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 49fa5c3a17d1eeb48ff72c6fbe4a095b99fda1a7..3f77db7c020d56af14f843b9e46d07c08c765883 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -38,6 +38,8 @@ public class JSONFileWriter : IOutputFileWriter
private const int ElectricMotorFormatVersion = 5;
+
+ private const int IEPCFormatVersion = 1;
private const int REESSFormatVersion = 1;
@@ -128,6 +130,69 @@ public class JSONFileWriter : IOutputFileWriter
}
+ public void SaveIEPC(IIEPCEngineeringInputData iepc, string filename, bool declMode)
+ {
+ var header = GetHeader(IEPCFormatVersion);
+
+ var body = new Dictionary<string, object>
+ {
+ {JsonKeys.SavedInDeclMode, declMode},
+ {JsonKeys.Component_Model, iepc.Model},
+ {JsonKeys.IEPC_Inertia, iepc.Inertia.Value()},
+ {JsonKeys.IEPC_DifferentialIncluded, iepc.DifferentialIncluded},
+ {JsonKeys.IEPC_DesignTypeWheelMotor, iepc.DesignTypeWheelMotor},
+ {JsonKeys.IEPC_NrOfDesignTypeWheelMotorMeasured, iepc.NrOfDesignTypeWheelMotorMeasured},
+ {JsonKeys.IEPC_ThermalOverloadRecoveryFactor, iepc.OverloadRecoveryFactor}
+ };
+
+ var gears = new List<Dictionary<string, object>>();
+
+ foreach (var gear in iepc.Gears) {
+ var currentGear = new Dictionary<string, object> {
+ { JsonKeys.Gearbox_Gear_Ratio, gear.Ratio }
+ };
+ if(gear.MaxOutputShaftSpeed != null)
+ currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftTorque, gear.MaxOutputShaftTorque.Value());
+ if(gear.MaxOutputShaftSpeed != null)
+ currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftSpeed, gear.MaxOutputShaftSpeed.Value());
+ gears.Add(currentGear);
+ }
+
+ var voltageLevels = new List<Dictionary<string, object>>();
+ foreach (var voltageLevel in iepc.VoltageLevels) {
+ var currentLevel = new Dictionary<string, object>
+ {
+ {JsonKeys.IEPC_Voltage, voltageLevel.VoltageLevel.Value()},
+ {JsonKeys.IEPC_ContinuousTorque, voltageLevel.ContinuousTorque.Value()},
+ {JsonKeys.IEPC_ContinuousTorqueSpeed, Convert.ToDouble(voltageLevel.ContinuousTorqueSpeed.AsRPM.ToString())},
+ {JsonKeys.IEPC_OverloadTorque, voltageLevel.OverloadTorque.Value()},
+ {JsonKeys.IEPC_OverloadTorqueSpeed,Convert.ToDouble(voltageLevel.OverloadTestSpeed.AsRPM.ToString())},
+ {JsonKeys.IEPC_OverloadTime, voltageLevel.OverloadTime.Value()},
+ {JsonKeys.IEPC_FullLoadCurve, GetRelativePath(voltageLevel.FullLoadCurve.Source, Path.GetDirectoryName(filename))},
+
+ };
+ var powerMaps = new Dictionary<string, object>();
+ foreach (var pMap in voltageLevel.PowerMap)
+ {
+ powerMaps.Add(pMap.Gear.ToString(), GetRelativePath(pMap.PowerMap.Source, Path.GetDirectoryName(filename)));
+ }
+ currentLevel.Add(JsonKeys.IEPC_PowerMaps, powerMaps); //PowerMap
+ voltageLevels.Add(currentLevel);
+ }
+
+ var dragCurves = new Dictionary<string, object>();
+ foreach (var dragCurveEntry in iepc.DragCurves) {
+ dragCurves.Add(dragCurveEntry.Gear.ToString(),
+ GetRelativePath(dragCurveEntry.DragCurve.Source, Path.GetDirectoryName(filename)));
+ }
+
+ body.Add(JsonKeys.Gearbox_Gears, gears);
+ body.Add(JsonKeys.IEPC_VoltageLevels, voltageLevels);
+ body.Add(JsonKeys.IEPC_DragCurves, dragCurves);
+
+ WriteFile(header, body, filename);
+ }
+
public void SaveBattery(IBatteryPackEngineeringInputData battery, string filename, bool declMode)
{
var header = GetHeader(REESSFormatVersion);