diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
index bb117b7b7befd624dc211180d236dfbf2936de05..901c96aba28c8c0c0b1918c6155f2f65dc4b19e7 100644
--- a/VECTO/GUI/IEPCForm.Designer.vb
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -34,7 +34,7 @@ Partial Class IEPCForm
Me.tbModel = New System.Windows.Forms.TextBox()
Me.tcVoltageLevels = New System.Windows.Forms.TabControl()
Me.tpFirstVoltageLevel = New System.Windows.Forms.TabPage()
- Me.TableLayoutPanel7 = New System.Windows.Forms.TableLayoutPanel()
+ Me.FlowLayoutPanel9 = New System.Windows.Forms.FlowLayoutPanel()
Me.Label44 = New System.Windows.Forms.Label()
Me.tbFLCurve1 = New System.Windows.Forms.TextBox()
Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
@@ -64,15 +64,15 @@ Partial Class IEPCForm
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.TableLayoutPanel9 = New System.Windows.Forms.TableLayoutPanel()
- Me.Label31 = New System.Windows.Forms.Label()
+ 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.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ 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.Label28 = New System.Windows.Forms.Label()
Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
Me.Label17 = New System.Windows.Forms.Label()
Me.Label18 = New System.Windows.Forms.Label()
@@ -92,36 +92,29 @@ Partial Class IEPCForm
Me.Label22 = New System.Windows.Forms.Label()
Me.tbOverloadTorque2 = New System.Windows.Forms.TextBox()
Me.Label16 = New System.Windows.Forms.Label()
- Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.cbDifferentialIncluded = New System.Windows.Forms.CheckBox()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.Label10 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label()
Me.cbDesignTypeWheelMotor = New System.Windows.Forms.CheckBox()
- Me.Label8 = New System.Windows.Forms.Label()
- Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.cbDifferentialIncluded = New System.Windows.Forms.CheckBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
- Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
+ 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.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
- Me.btAddGear = New System.Windows.Forms.Button()
- Me.btRemoveGear = New System.Windows.Forms.Button()
- Me.Label30 = New System.Windows.Forms.Label()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
- Me.TableLayoutPanel8 = New System.Windows.Forms.TableLayoutPanel()
+ 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.Label29 = New System.Windows.Forms.Label()
- Me.FlowLayoutPanel3 = New System.Windows.Forms.FlowLayoutPanel()
+ 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()
@@ -135,33 +128,51 @@ Partial Class IEPCForm
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.tcVoltageLevels.SuspendLayout
Me.tpFirstVoltageLevel.SuspendLayout
- Me.TableLayoutPanel7.SuspendLayout
+ Me.FlowLayoutPanel9.SuspendLayout
Me.TableLayoutPanel1.SuspendLayout
Me.GroupBox2.SuspendLayout
Me.TableLayoutPanel6.SuspendLayout
Me.tpVoltageLevel.SuspendLayout
Me.GroupBox4.SuspendLayout
- Me.TableLayoutPanel9.SuspendLayout
- Me.TableLayoutPanel5.SuspendLayout
- Me.TableLayoutPanel4.SuspendLayout
Me.TableLayoutPanel2.SuspendLayout
+ Me.FlowLayoutPanel10.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
Me.GroupBox1.SuspendLayout
- Me.TableLayoutPanel3.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
Me.FlowLayoutPanel2.SuspendLayout
Me.GroupBox3.SuspendLayout
- Me.TableLayoutPanel8.SuspendLayout
- Me.FlowLayoutPanel3.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.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(295, 24)
+ 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 = 29
@@ -170,18 +181,20 @@ Partial Class IEPCForm
'tbThermalOverload
'
Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbThermalOverload.Location = New System.Drawing.Point(666, 32)
+ 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(57, 20)
+ Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
Me.tbThermalOverload.TabIndex = 51
'
'Label52
'
Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label52.AutoSize = true
- Me.Label52.Location = New System.Drawing.Point(517, 29)
+ 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(143, 26)
+ Me.Label52.Size = New System.Drawing.Size(173, 13)
Me.Label52.TabIndex = 50
Me.Label52.Text = "Thermal Overload Recovery Factor"
'
@@ -189,7 +202,7 @@ Partial Class IEPCForm
'
Me.Label48.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label48.AutoSize = true
- Me.Label48.Location = New System.Drawing.Point(176, 35)
+ 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
@@ -199,16 +212,16 @@ Partial Class IEPCForm
'
Me.tbNumberOfDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Left
Me.tbNumberOfDesignTypeWheelMotor.Enabled = false
- Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(389, 32)
+ Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(216, 3)
Me.tbNumberOfDesignTypeWheelMotor.Name = "tbNumberOfDesignTypeWheelMotor"
- Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(57, 20)
+ Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(30, 20)
Me.tbNumberOfDesignTypeWheelMotor.TabIndex = 49
'
'Label51
'
Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label51.AutoSize = true
- Me.Label51.Location = New System.Drawing.Point(13, 35)
+ 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
@@ -217,7 +230,7 @@ Partial Class IEPCForm
'tbInertia
'
Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbInertia.Location = New System.Drawing.Point(55, 32)
+ 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
@@ -226,7 +239,7 @@ Partial Class IEPCForm
'
Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label49.AutoSize = true
- Me.Label49.Location = New System.Drawing.Point(13, 7)
+ 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
@@ -235,9 +248,10 @@ Partial Class IEPCForm
'tbModel
'
Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbModel.Location = New System.Drawing.Point(55, 3)
+ 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(86, 20)
+ Me.tbModel.Size = New System.Drawing.Size(194, 20)
Me.tbModel.TabIndex = 44
'
'tcVoltageLevels
@@ -245,47 +259,42 @@ Partial Class IEPCForm
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(14, 184)
+ 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, 368)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 322)
Me.tcVoltageLevels.TabIndex = 41
'
'tpFirstVoltageLevel
'
- Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel7)
+ 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, 342)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 296)
Me.tpFirstVoltageLevel.TabIndex = 0
- Me.tpFirstVoltageLevel.Text = "First Voltage Level"
+ Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
'
- 'TableLayoutPanel7
- '
- Me.TableLayoutPanel7.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.TableLayoutPanel7.ColumnCount = 2
- Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 292!))
- Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 31!))
- Me.TableLayoutPanel7.Controls.Add(Me.Label44, 0, 0)
- Me.TableLayoutPanel7.Controls.Add(Me.btFLCurveFile1, 1, 1)
- Me.TableLayoutPanel7.Controls.Add(Me.tbFLCurve1, 0, 1)
- Me.TableLayoutPanel7.Location = New System.Drawing.Point(6, 91)
- Me.TableLayoutPanel7.Name = "TableLayoutPanel7"
- Me.TableLayoutPanel7.RowCount = 2
- Me.TableLayoutPanel7.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35.71429!))
- Me.TableLayoutPanel7.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 64.28571!))
- Me.TableLayoutPanel7.Size = New System.Drawing.Size(323, 54)
- Me.TableLayoutPanel7.TabIndex = 53
+ '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.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel9.Name = "FlowLayoutPanel9"
+ Me.FlowLayoutPanel9.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel9.TabIndex = 74
'
'Label44
'
- Me.Label44.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.Label44.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label44.AutoSize = true
- Me.Label44.Location = New System.Drawing.Point(3, 6)
+ 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
@@ -294,21 +303,22 @@ Partial Class IEPCForm
'tbFLCurve1
'
Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve1.Location = New System.Drawing.Point(3, 26)
+ 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(286, 20)
+ Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
Me.tbFLCurve1.TabIndex = 60
'
'TableLayoutPanel1
'
- Me.TableLayoutPanel1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.TableLayoutPanel1.ColumnCount = 6
- 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, 65!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40!))
+ 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, 65!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 46!))
+ 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)
@@ -327,7 +337,7 @@ Partial Class IEPCForm
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, 6)
+ 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!))
@@ -340,7 +350,8 @@ Partial Class IEPCForm
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(210, 34)
+ 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
@@ -350,7 +361,8 @@ Partial Class IEPCForm
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(215, 7)
+ 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
@@ -360,7 +372,8 @@ Partial Class IEPCForm
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(458, 7)
+ 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
@@ -370,7 +383,7 @@ Partial Class IEPCForm
'
Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label43.AutoSize = true
- Me.Label43.Location = New System.Drawing.Point(306, 7)
+ 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
@@ -389,17 +402,19 @@ Partial Class IEPCForm
'tbOverloadTime1
'
Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime1.Location = New System.Drawing.Point(389, 3)
+ 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(57, 20)
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTime1.TabIndex = 12
'
'tbVoltage1
'
Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage1.Location = New System.Drawing.Point(144, 3)
+ 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(57, 20)
+ Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
Me.tbVoltage1.TabIndex = 2
'
'Label39
@@ -425,24 +440,27 @@ Partial Class IEPCForm
'tbContinousTorque1
'
Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque1.Location = New System.Drawing.Point(144, 30)
+ 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(57, 20)
+ Me.tbContinousTorque1.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorque1.TabIndex = 4
'
'tbContinousTorqueSpeed1
'
Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(144, 58)
+ 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(57, 20)
+ Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorqueSpeed1.TabIndex = 6
'
'Label15
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label15.AutoSize = true
- Me.Label15.Location = New System.Drawing.Point(210, 61)
+ 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
@@ -452,7 +470,7 @@ Partial Class IEPCForm
'
Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label42.AutoSize = true
- Me.Label42.Location = New System.Drawing.Point(261, 61)
+ 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
@@ -462,7 +480,8 @@ Partial Class IEPCForm
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(458, 61)
+ 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
@@ -471,16 +490,16 @@ Partial Class IEPCForm
'tboverloadTorqueSpeed1
'
Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(389, 58)
+ Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
- Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(57, 20)
+ Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
Me.tboverloadTorqueSpeed1.TabIndex = 10
'
'Label41
'
Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label41.AutoSize = true
- Me.Label41.Location = New System.Drawing.Point(295, 34)
+ 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
@@ -489,16 +508,17 @@ Partial Class IEPCForm
'tbOverloadTorque1
'
Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque1.Location = New System.Drawing.Point(389, 30)
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
- Me.tbOverloadTorque1.Size = New System.Drawing.Size(57, 20)
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTorque1.TabIndex = 8
'
'Label12
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label12.AutoSize = true
- Me.Label12.Location = New System.Drawing.Point(458, 34)
+ 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
@@ -506,9 +526,9 @@ Partial Class IEPCForm
'
'GroupBox2
'
- Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox2.Controls.Add(Me.TableLayoutPanel6)
- Me.GroupBox2.Location = New System.Drawing.Point(6, 151)
+ 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
@@ -574,53 +594,53 @@ Partial Class IEPCForm
'tpVoltageLevel
'
Me.tpVoltageLevel.Controls.Add(Me.GroupBox4)
- Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel5)
+ 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, 342)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 296)
Me.tpVoltageLevel.TabIndex = 1
- Me.tpVoltageLevel.Text = "Secondary Voltage Level"
+ Me.tpVoltageLevel.Text = "Voltage Level High"
Me.tpVoltageLevel.UseVisualStyleBackColor = true
'
'GroupBox4
'
- Me.GroupBox4.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.GroupBox4.Controls.Add(Me.TableLayoutPanel9)
- Me.GroupBox4.Location = New System.Drawing.Point(6, 149)
+ 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(329, 184)
- Me.GroupBox4.TabIndex = 64
+ Me.GroupBox4.Size = New System.Drawing.Size(315, 162)
+ Me.GroupBox4.TabIndex = 75
Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Power Map Per Gear"
'
- 'TableLayoutPanel9
- '
- Me.TableLayoutPanel9.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.TableLayoutPanel9.ColumnCount = 2
- Me.TableLayoutPanel9.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
- Me.TableLayoutPanel9.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 164!))
- Me.TableLayoutPanel9.Controls.Add(Me.Label31, 1, 1)
- Me.TableLayoutPanel9.Controls.Add(Me.lvPowerMap2, 0, 0)
- Me.TableLayoutPanel9.Location = New System.Drawing.Point(9, 18)
- Me.TableLayoutPanel9.Name = "TableLayoutPanel9"
- Me.TableLayoutPanel9.RowCount = 2
- Me.TableLayoutPanel9.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.125!))
- Me.TableLayoutPanel9.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.875!))
- Me.TableLayoutPanel9.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
- Me.TableLayoutPanel9.Size = New System.Drawing.Size(293, 160)
- Me.TableLayoutPanel9.TabIndex = 53
- '
- 'Label31
- '
- Me.Label31.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label31.AutoSize = true
- Me.Label31.Location = New System.Drawing.Point(184, 141)
- Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(106, 13)
- Me.Label31.TabIndex = 6
- Me.Label31.Text = "(Double-Click to Edit)"
+ '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, 126)
+ 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
'
@@ -628,14 +648,14 @@ Partial Class IEPCForm
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.TableLayoutPanel9.SetColumnSpan(Me.lvPowerMap2, 2)
+ 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(287, 135)
+ Me.lvPowerMap2.Size = New System.Drawing.Size(292, 120)
Me.lvPowerMap2.TabIndex = 7
Me.lvPowerMap2.TabStop = false
Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
@@ -651,60 +671,58 @@ Partial Class IEPCForm
Me.ColumnHeader7.Text = "Power Map Filename"
Me.ColumnHeader7.Width = 223
'
- 'TableLayoutPanel5
+ 'FlowLayoutPanel10
'
- 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, 297!))
- Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
- Me.TableLayoutPanel5.Controls.Add(Me.tbFLCurve2, 0, 1)
- Me.TableLayoutPanel5.Controls.Add(Me.btFLCurveFile2, 1, 1)
- Me.TableLayoutPanel5.Controls.Add(Me.Label28, 0, 0)
- Me.TableLayoutPanel5.Location = New System.Drawing.Point(7, 94)
- Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
- Me.TableLayoutPanel5.RowCount = 2
- Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
- Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25!))
- Me.TableLayoutPanel5.Size = New System.Drawing.Size(329, 49)
- Me.TableLayoutPanel5.TabIndex = 63
+ Me.FlowLayoutPanel10.Controls.Add(Me.Label28)
+ Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
+ 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
+ '
+ '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(3, 24)
+ 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(291, 20)
+ Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
Me.tbFLCurve2.TabIndex = 57
'
'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(300, 23)
+ 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, 23)
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
Me.btFLCurveFile2.TabIndex = 29
Me.btFLCurveFile2.UseVisualStyleBackColor = true
'
- 'Label28
- '
- Me.Label28.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.Label28.AutoSize = true
- Me.Label28.Location = New System.Drawing.Point(3, 7)
- Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(125, 13)
- Me.Label28.TabIndex = 59
- Me.Label28.Text = "Full Load Curve (.viepcp)"
- '
'TableLayoutPanel4
'
Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.TableLayoutPanel4.ColumnCount = 6
+ 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, 65!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40!))
- 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, 65!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 46!))
+ 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)
@@ -723,7 +741,7 @@ Partial Class IEPCForm
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, 6)
+ 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!))
@@ -736,7 +754,8 @@ Partial Class IEPCForm
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(210, 34)
+ 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
@@ -746,7 +765,8 @@ Partial Class IEPCForm
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(215, 7)
+ 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
@@ -756,7 +776,8 @@ Partial Class IEPCForm
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(458, 7)
+ 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
@@ -775,16 +796,16 @@ Partial Class IEPCForm
'tbOverloadTime2
'
Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime2.Location = New System.Drawing.Point(389, 3)
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
Me.tbOverloadTime2.Name = "tbOverloadTime2"
- Me.tbOverloadTime2.Size = New System.Drawing.Size(57, 20)
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTime2.TabIndex = 12
'
'Label24
'
Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label24.AutoSize = true
- Me.Label24.Location = New System.Drawing.Point(306, 7)
+ 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
@@ -793,9 +814,9 @@ Partial Class IEPCForm
'tbVoltage2
'
Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage2.Location = New System.Drawing.Point(144, 3)
+ Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
Me.tbVoltage2.Name = "tbVoltage2"
- Me.tbVoltage2.Size = New System.Drawing.Size(57, 20)
+ Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
Me.tbVoltage2.TabIndex = 2
'
'Label20
@@ -821,24 +842,25 @@ Partial Class IEPCForm
'tbContinousTorque2
'
Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque2.Location = New System.Drawing.Point(144, 30)
+ Me.tbContinousTorque2.Location = New System.Drawing.Point(143, 30)
Me.tbContinousTorque2.Name = "tbContinousTorque2"
- Me.tbContinousTorque2.Size = New System.Drawing.Size(57, 20)
+ Me.tbContinousTorque2.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorque2.TabIndex = 4
'
'tbContinousTorqueSpeed2
'
Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(144, 58)
+ Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
- Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(57, 20)
+ Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorqueSpeed2.TabIndex = 6
'
'Label27
'
Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(210, 61)
+ 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
@@ -848,7 +870,7 @@ Partial Class IEPCForm
'
Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label23.AutoSize = true
- Me.Label23.Location = New System.Drawing.Point(261, 61)
+ 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
@@ -857,16 +879,17 @@ Partial Class IEPCForm
'tbOverloadTorqueSpeed2
'
Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(389, 58)
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
- Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(57, 20)
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTorqueSpeed2.TabIndex = 10
'
'Label25
'
Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(458, 61)
+ 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
@@ -876,7 +899,7 @@ Partial Class IEPCForm
'
Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(295, 34)
+ 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
@@ -885,125 +908,28 @@ Partial Class IEPCForm
'tbOverloadTorque2
'
Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque2.Location = New System.Drawing.Point(389, 30)
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
- Me.tbOverloadTorque2.Size = New System.Drawing.Size(57, 20)
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTorque2.TabIndex = 8
'
'Label16
'
Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label16.AutoSize = true
- Me.Label16.Location = New System.Drawing.Point(458, 34)
+ 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]"
'
- 'TableLayoutPanel2
- '
- Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.Top
- Me.TableLayoutPanel2.ColumnCount = 9
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 52!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 92!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 215!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 76!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 24!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 177!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 87!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70!))
- Me.TableLayoutPanel2.Controls.Add(Me.Label6, 2, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.Label5, 2, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.tbModel, 1, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.Label49, 0, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.tbInertia, 1, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.Label51, 0, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.cbDifferentialIncluded, 7, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.Label2, 6, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.Label7, 8, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.Label52, 6, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.tbThermalOverload, 7, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.Label10, 8, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.Label3, 3, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.cbDesignTypeWheelMotor, 4, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.Label8, 5, 0)
- Me.TableLayoutPanel2.Controls.Add(Me.Label48, 3, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.tbNumberOfDesignTypeWheelMotor, 4, 1)
- Me.TableLayoutPanel2.Controls.Add(Me.Label9, 5, 1)
- Me.TableLayoutPanel2.Location = New System.Drawing.Point(12, 98)
- Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
- Me.TableLayoutPanel2.RowCount = 2
- Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel2.Size = New System.Drawing.Size(820, 57)
- Me.TableLayoutPanel2.TabIndex = 52
- '
- 'Label6
- '
- Me.Label6.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(149, 35)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(16, 13)
- Me.Label6.TabIndex = 63
- Me.Label6.Text = "[-]"
- '
- 'Label5
- '
- Me.Label5.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(149, 7)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(16, 13)
- Me.Label5.TabIndex = 63
- Me.Label5.Text = "[-]"
- '
- 'cbDifferentialIncluded
- '
- Me.cbDifferentialIncluded.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.cbDifferentialIncluded.AutoSize = true
- Me.cbDifferentialIncluded.Location = New System.Drawing.Point(699, 6)
- Me.cbDifferentialIncluded.Name = "cbDifferentialIncluded"
- Me.cbDifferentialIncluded.Size = New System.Drawing.Size(15, 14)
- Me.cbDifferentialIncluded.TabIndex = 47
- Me.cbDifferentialIncluded.UseVisualStyleBackColor = true
- '
- 'Label2
- '
- Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(559, 7)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(101, 13)
- Me.Label2.TabIndex = 53
- Me.Label2.Text = "Differential Included"
- '
- 'Label7
- '
- Me.Label7.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(777, 7)
- Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(16, 13)
- Me.Label7.TabIndex = 68
- Me.Label7.Text = "[-]"
- '
- 'Label10
- '
- Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(777, 35)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(16, 13)
- Me.Label10.TabIndex = 67
- Me.Label10.Text = "[-]"
- '
'Label3
'
- Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(202, 7)
+ 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
@@ -1013,60 +939,99 @@ Partial Class IEPCForm
'
Me.cbDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.None
Me.cbDesignTypeWheelMotor.AutoSize = true
- Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(416, 6)
+ 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 = 53
Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = true
'
- 'Label8
+ 'Label2
'
- Me.Label8.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(466, 7)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(16, 13)
- Me.Label8.TabIndex = 65
- Me.Label8.Text = "[-]"
+ 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"
'
- 'Label9
+ 'cbDifferentialIncluded
'
- Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(466, 35)
- Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(16, 13)
- Me.Label9.TabIndex = 66
- Me.Label9.Text = "[-]"
+ 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 = 47
+ Me.cbDifferentialIncluded.UseVisualStyleBackColor = true
'
'GroupBox1
'
Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
- Me.GroupBox1.Controls.Add(Me.TableLayoutPanel3)
- Me.GroupBox1.Location = New System.Drawing.Point(538, 171)
+ 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, 187)
+ Me.GroupBox1.Size = New System.Drawing.Size(314, 180)
Me.GroupBox1.TabIndex = 61
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Gears"
'
- 'TableLayoutPanel3
+ 'TableLayoutPanel5
'
- Me.TableLayoutPanel3.ColumnCount = 2
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 199!))
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160!))
- Me.TableLayoutPanel3.Controls.Add(Me.lvGear, 0, 0)
- Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel2, 0, 1)
- Me.TableLayoutPanel3.Controls.Add(Me.Label30, 1, 1)
- Me.TableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Top
- Me.TableLayoutPanel3.Location = New System.Drawing.Point(3, 16)
- Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
- Me.TableLayoutPanel3.RowCount = 2
- Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 77.5!))
- Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 22.5!))
- Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
- Me.TableLayoutPanel3.Size = New System.Drawing.Size(308, 160)
- Me.TableLayoutPanel3.TabIndex = 53
+ 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 = 75
+ '
+ 'FlowLayoutPanel2
+ '
+ Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 127)
+ Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(61, 29)
+ Me.FlowLayoutPanel2.TabIndex = 54
+ '
+ '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 = 4
+ 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 = 5
+ 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, 124)
+ 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
'
@@ -1074,14 +1039,14 @@ Partial Class IEPCForm
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.TableLayoutPanel3.SetColumnSpan(Me.lvGear, 2)
+ 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(353, 118)
+ Me.lvGear.Size = New System.Drawing.Size(294, 118)
Me.lvGear.TabIndex = 7
Me.lvGear.TabStop = false
Me.lvGear.UseCompatibleStateImageBehavior = false
@@ -1090,7 +1055,7 @@ Partial Class IEPCForm
'ColumnHeader1
'
Me.ColumnHeader1.Text = "Ratio"
- Me.ColumnHeader1.Width = 59
+ Me.ColumnHeader1.Width = 45
'
'ColumnHeader2
'
@@ -1102,70 +1067,33 @@ Partial Class IEPCForm
Me.ColumnHeader3.Text = "Max Out Shaft Speed"
Me.ColumnHeader3.Width = 120
'
- 'FlowLayoutPanel2
- '
- Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
- Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
- Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 127)
- Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
- Me.FlowLayoutPanel2.Size = New System.Drawing.Size(61, 30)
- Me.FlowLayoutPanel2.TabIndex = 54
- '
- '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 = 4
- 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 = 5
- Me.btRemoveGear.UseVisualStyleBackColor = true
- '
- 'Label30
- '
- Me.Label30.AutoSize = true
- Me.Label30.Location = New System.Drawing.Point(202, 124)
- Me.Label30.Name = "Label30"
- Me.Label30.Size = New System.Drawing.Size(106, 13)
- Me.Label30.TabIndex = 55
- Me.Label30.Text = "(Double-Click to Edit)"
- '
'GroupBox3
'
Me.GroupBox3.Anchor = System.Windows.Forms.AnchorStyles.Top
- Me.GroupBox3.Controls.Add(Me.TableLayoutPanel8)
- Me.GroupBox3.Location = New System.Drawing.Point(538, 366)
+ 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, 184)
+ Me.GroupBox3.Size = New System.Drawing.Size(314, 180)
Me.GroupBox3.TabIndex = 62
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Drag Curves"
'
- 'TableLayoutPanel8
- '
- Me.TableLayoutPanel8.ColumnCount = 2
- Me.TableLayoutPanel8.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 199!))
- Me.TableLayoutPanel8.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160!))
- Me.TableLayoutPanel8.Controls.Add(Me.lvDragCurve, 0, 0)
- Me.TableLayoutPanel8.Controls.Add(Me.Label29, 0, 1)
- Me.TableLayoutPanel8.Controls.Add(Me.FlowLayoutPanel3, 0, 1)
- Me.TableLayoutPanel8.Dock = System.Windows.Forms.DockStyle.Top
- Me.TableLayoutPanel8.Location = New System.Drawing.Point(3, 16)
- Me.TableLayoutPanel8.Name = "TableLayoutPanel8"
- Me.TableLayoutPanel8.RowCount = 2
- Me.TableLayoutPanel8.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 77.5!))
- Me.TableLayoutPanel8.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 22.5!))
- Me.TableLayoutPanel8.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
- Me.TableLayoutPanel8.Size = New System.Drawing.Size(308, 160)
- Me.TableLayoutPanel8.TabIndex = 53
+ '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 = 76
'
'lvDragCurve
'
@@ -1173,15 +1101,15 @@ Partial Class IEPCForm
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.TableLayoutPanel8.SetColumnSpan(Me.lvDragCurve, 2)
+ 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(353, 118)
- Me.lvDragCurve.TabIndex = 7
+ Me.lvDragCurve.Size = New System.Drawing.Size(294, 118)
+ Me.lvDragCurve.TabIndex = 77
Me.lvDragCurve.TabStop = false
Me.lvDragCurve.UseCompatibleStateImageBehavior = false
Me.lvDragCurve.View = System.Windows.Forms.View.Details
@@ -1194,25 +1122,16 @@ Partial Class IEPCForm
'ColumnHeader5
'
Me.ColumnHeader5.Text = "Drag Curve Filename"
- Me.ColumnHeader5.Width = 240
- '
- 'Label29
- '
- Me.Label29.AutoSize = true
- Me.Label29.Location = New System.Drawing.Point(202, 124)
- Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(106, 13)
- Me.Label29.TabIndex = 55
- Me.Label29.Text = "(Double-Click to Edit)"
+ Me.ColumnHeader5.Width = 225
'
- 'FlowLayoutPanel3
+ 'FlowLayoutPanel11
'
- Me.FlowLayoutPanel3.Controls.Add(Me.btAddDragCurve)
- Me.FlowLayoutPanel3.Controls.Add(Me.btRemoveDragCurve)
- Me.FlowLayoutPanel3.Location = New System.Drawing.Point(3, 127)
- Me.FlowLayoutPanel3.Name = "FlowLayoutPanel3"
- Me.FlowLayoutPanel3.Size = New System.Drawing.Size(61, 30)
- Me.FlowLayoutPanel3.TabIndex = 54
+ Me.FlowLayoutPanel11.Controls.Add(Me.btAddDragCurve)
+ Me.FlowLayoutPanel11.Controls.Add(Me.btRemoveDragCurve)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 127)
+ Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 29)
+ Me.FlowLayoutPanel11.TabIndex = 54
'
'btAddDragCurve
'
@@ -1232,6 +1151,16 @@ Partial Class IEPCForm
Me.btRemoveDragCurve.TabIndex = 5
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, 124)
+ 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
@@ -1325,11 +1254,11 @@ Partial Class IEPCForm
'
'lblTitle
'
- Me.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.None
+ 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, 37)
+ 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
@@ -1339,7 +1268,7 @@ Partial Class IEPCForm
'
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(777, 563)
+ 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
@@ -1349,34 +1278,149 @@ Partial Class IEPCForm
'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(696, 563)
+ 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 = 68
+ '
+ '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 = 69
+ '
+ '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 = 70
+ '
+ '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 = 71
+ '
+ '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 = 72
+ '
+ '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 = 73
+ '
+ '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"
+ '
'IEPCForm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(864, 598)
+ 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.GroupBox3)
Me.Controls.Add(Me.GroupBox1)
- Me.Controls.Add(Me.TableLayoutPanel2)
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.TableLayoutPanel7.ResumeLayout(false)
- Me.TableLayoutPanel7.PerformLayout
+ Me.FlowLayoutPanel9.ResumeLayout(false)
+ Me.FlowLayoutPanel9.PerformLayout
Me.TableLayoutPanel1.ResumeLayout(false)
Me.TableLayoutPanel1.PerformLayout
Me.GroupBox2.ResumeLayout(false)
@@ -1384,25 +1428,37 @@ Partial Class IEPCForm
Me.TableLayoutPanel6.PerformLayout
Me.tpVoltageLevel.ResumeLayout(false)
Me.GroupBox4.ResumeLayout(false)
- Me.TableLayoutPanel9.ResumeLayout(false)
- Me.TableLayoutPanel9.PerformLayout
- Me.TableLayoutPanel5.ResumeLayout(false)
- Me.TableLayoutPanel5.PerformLayout
- Me.TableLayoutPanel4.ResumeLayout(false)
- Me.TableLayoutPanel4.PerformLayout
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.TableLayoutPanel3.ResumeLayout(false)
- Me.TableLayoutPanel3.PerformLayout
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.TableLayoutPanel5.PerformLayout
Me.FlowLayoutPanel2.ResumeLayout(false)
Me.GroupBox3.ResumeLayout(false)
- Me.TableLayoutPanel8.ResumeLayout(false)
- Me.TableLayoutPanel8.PerformLayout
- Me.FlowLayoutPanel3.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.ResumeLayout(false)
Me.PerformLayout
@@ -1438,17 +1494,11 @@ End Sub
Friend WithEvents tpVoltageLevel As TabPage
Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
Friend WithEvents Label1 As Label
- Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
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 Label5 As Label
- Friend WithEvents Label6 As Label
- Friend WithEvents Label10 As Label
- Friend WithEvents Label9 As Label
- Friend WithEvents Label8 As Label
Friend WithEvents Label12 As Label
Friend WithEvents Label11 As Label
Friend WithEvents Label14 As Label
@@ -1473,15 +1523,12 @@ End Sub
Friend WithEvents Label25 As Label
Friend WithEvents Label26 As Label
Friend WithEvents Label27 As Label
- Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
Friend WithEvents tbFLCurve2 As TextBox
Friend WithEvents btFLCurveFile2 As Button
Friend WithEvents Label28 As Label
Friend WithEvents TableLayoutPanel6 As TableLayoutPanel
- Friend WithEvents TableLayoutPanel7 As TableLayoutPanel
Friend WithEvents tbFLCurve1 As TextBox
Friend WithEvents GroupBox1 As GroupBox
- Friend WithEvents TableLayoutPanel3 As TableLayoutPanel
Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
Friend WithEvents btAddGear As Button
Friend WithEvents btRemoveGear As Button
@@ -1489,23 +1536,9 @@ End Sub
Friend WithEvents ColumnHeader1 As ColumnHeader
Friend WithEvents ColumnHeader2 As ColumnHeader
Friend WithEvents ColumnHeader3 As ColumnHeader
- Friend WithEvents Label30 As Label
Friend WithEvents GroupBox3 As GroupBox
- Friend WithEvents TableLayoutPanel8 As TableLayoutPanel
- Friend WithEvents lvDragCurve As ListView
- Friend WithEvents ColumnHeader4 As ColumnHeader
- Friend WithEvents ColumnHeader5 As ColumnHeader
- Friend WithEvents Label29 As Label
- Friend WithEvents FlowLayoutPanel3 As FlowLayoutPanel
Friend WithEvents btAddDragCurve As Button
Friend WithEvents btRemoveDragCurve As Button
- Friend WithEvents GroupBox4 As GroupBox
- Friend WithEvents TableLayoutPanel9 As TableLayoutPanel
- Friend WithEvents Label31 As Label
- Friend WithEvents lvPowerMap2 As ListView
- Friend WithEvents ColumnHeader6 As ColumnHeader
- Friend WithEvents ColumnHeader7 As ColumnHeader
- Friend WithEvents Label7 As Label
Friend WithEvents ToolStrip1 As ToolStrip
Friend WithEvents ToolStripBtNew As ToolStripButton
Friend WithEvents ToolStripBtOpen As ToolStripButton
@@ -1519,4 +1552,31 @@ End Sub
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
End Class
diff --git a/VECTO/GUI/IEPCForm.resx b/VECTO/GUI/IEPCForm.resx
index e6cfa50aa61f13229c536197fb01814c1de7d8f1..ceb8b403c09eccbc6d6531bc69b4ecb13ff711d2 100644
--- a/VECTO/GUI/IEPCForm.resx
+++ b/VECTO/GUI/IEPCForm.resx
@@ -157,7 +157,86 @@
<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="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</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
index e8d14ab7db27955c7a2e6c0817caf6ae4ab72c97..1d0cdbc0e92cb4def86912486748346013ed272a 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -3,7 +3,6 @@ Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
-
Public Class IEPCForm
Public JobDir As String = ""
@@ -39,6 +38,8 @@ Public Class IEPCForm
SetDragEntries(inputData.DragCurves)
_iepcFilePath = file
+ LbStatus.Text = ""
+ _changed = False
End Sub
Private Sub SetFirstVoltageLevel(voltageLevel As IElectricMotorVoltageLevel)
@@ -78,38 +79,32 @@ Public Class IEPCForm
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()
retVal.SubItems.Add(outputShaftTorque?.ToGUIFormat())
retVal.SubItems.Add(outputShaftSpeed?.ToGUIFormat())
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 outputShaftSpeed.HasValue Then
+ If outputShaftTorque.HasValue Then
retVal.SubItems.Add(outputShaftTorque.Value.ToGUIFormat())
End If
If outputShaftSpeed.HasValue Then
@@ -124,13 +119,11 @@ Public Class IEPCForm
End Sub
Private Sub AddListViewItem(dialog As IEPCInputDialog, listView As ListView)
-
- If (dialog.ShowDialog() = DialogResult.OK) Then
+ If dialog.ShowDialog() = DialogResult.OK Then
Dim gear = Convert.ToInt32(dialog.tbGear.Text)
Dim filePath = dialog.tbInputFile.Text
listView.Items.Add(CreateListViewItem(gear, filePath))
-
- dialog.Clear()
+ Change()
End If
End Sub
@@ -149,28 +142,31 @@ Public Class IEPCForm
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 = Convert.ToDouble(_gearDlg.tbMaxOutShaftTorque.Text)
+ outputShaftTorque = _gearDlg.tbMaxOutShaftTorque.Text.ToDouble(0)
End If
If _gearDlg.tbMaxOutShaftSpeed.Text.Length > 0 Then
- outputShaftSpeed = Convert.ToDouble(_gearDlg.tbMaxOutShaftSpeed.Text)
+ outputShaftSpeed = _gearDlg.tbMaxOutShaftTorque.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)
- _gearDlg.Clear()
+
+ Change()
End If
-
End Sub
Private Sub AddPowerMapEntry(powerMapListView As ListView, gearIndex As Integer)
@@ -178,9 +174,7 @@ Public Class IEPCForm
retVal.SubItems(0).Text = gearIndex.ToString()
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
@@ -199,8 +193,8 @@ Public Class IEPCForm
End If
End Sub
-
- Private Sub lvDragCurve_DoubleClick(sender As Object, e As EventArgs) Handles lvDragCurve.DoubleClick
+
+ Private Sub lvDragCurve_DoubleClick(sender As Object, e As EventArgs) Handles lvDragCurve.DoubleClick
EditEntry(_dragCurveDlg, lvDragCurve)
End Sub
@@ -208,7 +202,7 @@ Public Class IEPCForm
EditEntry(_powerMapDlg, lvPowerMap1)
End Sub
- Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
+ Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
EditEntry(_powerMapDlg, lvPowerMap2)
End Sub
@@ -258,7 +252,7 @@ Public Class IEPCForm
#Region "Toolbar"
- Private Sub NewIEPC()
+ Public Sub NewIEPC()
tbModel.Text = ""
tbInertia.Text = ""
cbDifferentialIncluded.Checked = False
@@ -288,6 +282,7 @@ Public Class IEPCForm
RemoveAllListViewItems(lvDragCurve)
RemoveAllListViewItems(lvGear)
+ LbStatus.Text = ""
_changed = False
End Sub
@@ -342,9 +337,31 @@ Public Class IEPCForm
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
@@ -354,37 +371,6 @@ Public Class IEPCForm
Return SaveIEPCToFile(_iepcFilePath)
End Function
- Private Function ValidateData() As IEPCInputData
-
- If ValidateModel() = False Then Return Nothing
- If ValidateInertia() = False Then Return Nothing
- If ValidateNrDesignTypeWheelMotorMeasured() = False Then Return Nothing
- If ValidateOverloadRecoveryFactor() = False Then Return Nothing
-
- If ValidateVoltage(tbVoltage1) = False Then Return Nothing
- If ValidateContinuousTorque(tbContinousTorque1) = False Then Return Nothing
- If ValidateContinuousTorqueSpeed(tbContinousTorqueSpeed1) = False Then Return Nothing
- If ValidateOverloadTime(tbOverloadTime1) = False Then Return Nothing
- If ValidateOverloadTorque(tbOverloadTorque1) = False Then Return Nothing
- If ValidateOverloadTorqueSpeed(tboverloadTorqueSpeed1) = False Then Return Nothing
-
- If ValidateVoltage(tbVoltage2) = False Then Return Nothing
- If ValidateContinuousTorque(tbContinousTorque2) = False Then Return Nothing
- If ValidateContinuousTorqueSpeed(tbContinousTorqueSpeed2) = False Then Return Nothing
- If ValidateOverloadTime(tbOverloadTime2) = False Then Return Nothing
- If ValidateOverloadTorque(tbOverloadTorque2) = False Then Return Nothing
- If ValidateOverloadTorqueSpeed(tboverloadTorqueSpeed2) = False Then Return Nothing
-
- If ValidateAmountOfEntries() = False Then Return Nothing
- If ValidateFullLoadCurve1() = False Then Return Nothing
- If ValidateFullLoadCurve2() = False Then Return Nothing
-
- If ValidatePowerMapEntries(_lvPowerMap1) = False Then Return Nothing
- If ValidatePowerMapEntries(_lvPowerMap2) = False Then Return Nothing
-
- Return Nothing
- End Function
-
Private Function SaveIEPCToFile(ByVal file As String) As Boolean
Dim iepc = New IEPCInputData
@@ -410,61 +396,58 @@ Public Class IEPCForm
End If
_changed = False
+ LbStatus.Text = ""
Return True
End Function
- Private Sub ShowErrorMessageBox(variableName As string, textbox As TextBox)
- If Not variableName = Nothing Then
- MsgBox($"Invalid input for {variableName}")
- textbox.Focus()
- Return
- End If
- End Sub
- Private Sub ShowErrorMessageBox(variableName As string)
- If Not variableName = Nothing Then
- MsgBox($"Invalid input for {variableName}")
- Return
- End If
- End Sub
-
-#End Region
-
-
- 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 Region
- End Function
Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
- 'ValidateData()
SaveOrSaveAs(true)
-
End Sub
Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
Close()
- _changed = False
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)
@@ -552,12 +535,12 @@ Public Class IEPCForm
End If
If Not _lvPowerMap1.Items.Count = _lvGear.Items.Count Then
- ShowErrorMessageBox("Invalid number of Power Map entries at First Voltage Level")
+ 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 Secondary Voltage Level")
+ ShowErrorMessageBox("Invalid number of Power Map entries at Voltage Level High")
Return False
End If
@@ -576,14 +559,14 @@ Public Class IEPCForm
Private Function ValidateFullLoadCurve1() As Boolean
If Not File.Exists(tbFLCurve1.Text) Then
- ShowErrorMessageBox("Invalid input no valid file path given", tbFLCurve1)
+ 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
+ If Not $".{IEPCFLCFileBrowser.Extensions.First()}" = fileExtension Then
ShowErrorMessageBox($"The Selected Full Load Curve file(.{IEPCFLCFileBrowser.Extensions.First()}) has the wrong extension",
- tbFLCurve1)
+ tbFLCurve1, False)
Return False
End If
Return True
@@ -591,14 +574,14 @@ Public Class IEPCForm
Private Function ValidateFullLoadCurve2() As Boolean
If Not File.Exists(tbFLCurve2.Text) Then
- ShowErrorMessageBox("Invalid input no valid file path given", tbFLCurve2)
+ 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
+ If Not $".{IEPCFLCFileBrowser.Extensions.First()}" = fileExtension Then
ShowErrorMessageBox($"The Selected Full Load Curve file(.{IEPCFLCFileBrowser.Extensions.First()}) has the wrong file extension",
- tbFLCurve2)
+ tbFLCurve2, False)
Return False
End If
Return True
@@ -608,13 +591,13 @@ Public Class IEPCForm
For Each entry As ListViewItem In powerMap.Items
If entry.SubItems.Count = 1 Then
- MsgBox("Invalid input missing Power Map files")
- Return false
+ ShowErrorMessageBox("Invalid input missing Power Map files")
+ Return False
End If
If entry.SubItems.Count = 2 Then
Dim fileExtension = new FileInfo(entry.SubItems(1).Text).Extension
- If Not IEPCPowerMapFileBrowser.Extensions.First() = fileExtension
+ If Not $".{IEPCPowerMapFileBrowser.Extensions.First()}" = fileExtension
ShowErrorMessageBox($"The Selected Full Load Curve file(.{IEPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
Return false
End If
@@ -624,7 +607,24 @@ Public Class IEPCForm
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)
@@ -634,11 +634,105 @@ Public Class IEPCForm
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 = ""
+ 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
+
End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCGearInputDialog.Designer.vb b/VECTO/GUI/IEPCGearInputDialog.Designer.vb
index e1720da1c426b5dc760dedea234b59004ad3a296..1739d87795ed6bef9b0f4b5f480f086b9db95f11 100644
--- a/VECTO/GUI/IEPCGearInputDialog.Designer.vb
+++ b/VECTO/GUI/IEPCGearInputDialog.Designer.vb
@@ -72,6 +72,7 @@ Partial Class IEPCGearInputDialog
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
@@ -82,6 +83,7 @@ Partial Class IEPCGearInputDialog
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
@@ -92,6 +94,7 @@ Partial Class IEPCGearInputDialog
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
@@ -104,7 +107,6 @@ Partial Class IEPCGearInputDialog
Me.tbRatio.Name = "tbRatio"
Me.tbRatio.Size = New System.Drawing.Size(77, 20)
Me.tbRatio.TabIndex = 8
- Me.tbRatio.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'tbMaxOutShaftTorque
'
@@ -113,7 +115,6 @@ Partial Class IEPCGearInputDialog
Me.tbMaxOutShaftTorque.Name = "tbMaxOutShaftTorque"
Me.tbMaxOutShaftTorque.Size = New System.Drawing.Size(77, 20)
Me.tbMaxOutShaftTorque.TabIndex = 8
- Me.tbMaxOutShaftTorque.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'tbMaxOutShaftSpeed
'
@@ -122,7 +123,6 @@ Partial Class IEPCGearInputDialog
Me.tbMaxOutShaftSpeed.Name = "tbMaxOutShaftSpeed"
Me.tbMaxOutShaftSpeed.Size = New System.Drawing.Size(77, 20)
Me.tbMaxOutShaftSpeed.TabIndex = 8
- Me.tbMaxOutShaftSpeed.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'Label3
'
@@ -197,12 +197,13 @@ Partial Class IEPCGearInputDialog
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 = "IEPCGearInputDialog"
+ Me.Text = "Gear"
Me.TableLayoutPanel1.ResumeLayout(false)
Me.TableLayoutPanel1.PerformLayout
Me.TableLayoutPanel5.ResumeLayout(false)
diff --git a/VECTO/GUI/IEPCGearInputDialog.vb b/VECTO/GUI/IEPCGearInputDialog.vb
index a665f8c913121e03ac7aade686f5f00fb153f51c..1fcc688b265411ab23cec7a79fc379e8f56594a3 100644
--- a/VECTO/GUI/IEPCGearInputDialog.vb
+++ b/VECTO/GUI/IEPCGearInputDialog.vb
@@ -36,6 +36,7 @@
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
index 23ea47bfbce34d5258fd12cf6541bbc51b277819..b691477596bf89a1c5a23ec0ee610851ee34e4ed 100644
--- a/VECTO/GUI/IEPCInputDialog.Designer.vb
+++ b/VECTO/GUI/IEPCInputDialog.Designer.vb
@@ -22,170 +22,164 @@ Partial Class IEPCInputDialog
'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.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
- 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.Label3 = New System.Windows.Forms.Label()
- Me.tbGear = New System.Windows.Forms.TextBox()
- Me.TableLayoutPanel1.SuspendLayout()
- Me.TableLayoutPanel3.SuspendLayout()
- Me.TableLayoutPanel5.SuspendLayout()
- Me.TableLayoutPanel4.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.btnOk, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.btnCancel, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(356, 57)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(148, 29)
- Me.TableLayoutPanel1.TabIndex = 4
- '
- '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 = 0
- 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 = 1
- Me.btnCancel.Text = "Cancel"
- '
- 'TableLayoutPanel3
- '
- Me.TableLayoutPanel3.ColumnCount = 2
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.3906!))
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.60941!))
- Me.TableLayoutPanel3.Controls.Add(Me.TableLayoutPanel5, 1, 0)
- Me.TableLayoutPanel3.Controls.Add(Me.TableLayoutPanel4, 0, 0)
- Me.TableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Top
- Me.TableLayoutPanel3.Location = New System.Drawing.Point(0, 0)
- Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
- Me.TableLayoutPanel3.RowCount = 1
- Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel3.Size = New System.Drawing.Size(509, 49)
- Me.TableLayoutPanel3.TabIndex = 7
- '
- '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.0!))
- Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40.0!))
- Me.TableLayoutPanel5.Controls.Add(Me.btAddFilePath, 1, 0)
- Me.TableLayoutPanel5.Controls.Add(Me.tbInputFile, 0, 0)
- Me.TableLayoutPanel5.Location = New System.Drawing.Point(148, 5)
- Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
- Me.TableLayoutPanel5.RowCount = 1
- Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
- Me.TableLayoutPanel5.Size = New System.Drawing.Size(356, 39)
- Me.TableLayoutPanel5.TabIndex = 8
- '
- '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 = 30
- 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 = 0
- '
- '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.Label3, 0, 0)
- Me.TableLayoutPanel4.Controls.Add(Me.tbGear, 1, 0)
- Me.TableLayoutPanel4.Location = New System.Drawing.Point(9, 10)
- Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
- Me.TableLayoutPanel4.RowCount = 1
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel4.Size = New System.Drawing.Size(125, 28)
- Me.TableLayoutPanel4.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"
- '
- 'tbGear
- '
- Me.tbGear.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbGear.Location = New System.Drawing.Point(44, 4)
- Me.tbGear.Name = "tbGear"
- Me.tbGear.Size = New System.Drawing.Size(77, 20)
- Me.tbGear.TabIndex = 8
- Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'IEPCInputDialog
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(509, 98)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.Controls.Add(Me.TableLayoutPanel3)
- 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 = "IEPCInputDialog"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.TableLayoutPanel3.ResumeLayout(False)
- Me.TableLayoutPanel5.ResumeLayout(False)
- Me.TableLayoutPanel5.PerformLayout()
- Me.TableLayoutPanel4.ResumeLayout(False)
- Me.TableLayoutPanel4.PerformLayout()
- Me.ResumeLayout(False)
+ 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.Label3 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.tbGear = New System.Windows.Forms.TextBox()
+ 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 = 4
+ '
+ '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 = 0
+ 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 = 1
+ 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 = 8
+ '
+ '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 = 30
+ 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 = 0
+ '
+ '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 = 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 = 8
+ '
+ '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 = 9
+ '
+ '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
+End Sub
Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
Friend WithEvents btnOk As Button
Friend WithEvents btnCancel As Button
- Friend WithEvents TableLayoutPanel3 As TableLayoutPanel
Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
Friend WithEvents Label3 As Label
- Friend WithEvents tbGear As TextBox
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.vb b/VECTO/GUI/IEPCInputDialog.vb
index 0a0701e69588bf6d9318519c2d0a3dd8ca32a716..e8a53db946343c748021284a6140592025d398cb 100644
--- a/VECTO/GUI/IEPCInputDialog.vb
+++ b/VECTO/GUI/IEPCInputDialog.vb
@@ -25,7 +25,7 @@ Public Class IEPCInputDialog
Public Sub Clear()
_tbGear.Text = ""
_tbInputFile.Text = ""
- tbGear.Focus()
+ _tbGear.Focus()
End Sub
@@ -35,37 +35,37 @@ Public Class IEPCInputDialog
Dim gear As Integer
If Not Integer.TryParse(tbGear.Text, gear) Then
MsgBox("Invalid input for Gear")
- tbGear.Focus()
+ _tbGear.Focus()
Return
End If
If gear < 0 Then
MsgBox("Invalid input for Gear")
- tbGear.Focus()
+ _tbGear.Focus()
Return
End If
If tbInputFile.Text.Length = 0 Then
MsgBox("Invalid input no file path given")
- tbGear.Focus()
+ _tbGear.Focus()
Return
End If
If Not File.Exists(tbInputFile.Text) Then
MsgBox("Invalid input no valid file path given")
- tbInputFile.Focus()
+ _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
+ 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
+ If Not $".{IEPCPowerMapFileBrowser.Extensions.First()}" = fileExtension Then
MsgBox($"The Selected Power Map file(.{IEPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
Return
End If
@@ -107,4 +107,9 @@ Public Class IEPCInputDialog
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/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 565174ba9b28672d054b0ce0c131745ac971d640..feea689be518a07b8c9d6fe5189fcad65b9bebd0 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -1513,19 +1513,16 @@ Public Class VehicleForm
End Sub
Private Sub btnIEPC_Click(sender As Object, e As EventArgs) Handles btnIEPC.Click
-
Dim f = FileRepl(tbIEPCFilePath.Text, GetPath(_vehFile))
- 'IEPCForm.IEPCFilePath = GetPath(_vehFile)
-
- If Not IEPCForm.Visible Then
- IEPCForm.Show()
+ If Not IEPCForm.Visible Then
+ IEPCForm.NewIEPC()
+ IEPCForm.Show()
Else
If IEPCForm.WindowState = FormWindowState.Minimized Then IEPCForm.WindowState = FormWindowState.Normal
IEPCForm.BringToFront()
End If
- 'f = "G:\_Work\VECTO\EU_Code\fk_vecto-dev\VectoCore\VectoCoreTest\TestData\BatteryElectric\IEPC\GenericIEPC.viepc"
- f = "E:\VECTO_DEV\EU_Code\fk_vecto-dev\VectoCore\VectoCoreTest\TestData\BatteryElectric\IEPC\GenericIEPC.viepc"
+
If Not Trim(f) = "" Then
Try
IEPCForm.ReadIEPCFile(f)
@@ -1533,36 +1530,6 @@ Public Class VehicleForm
MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IEPC File")
End Try
End If
-
- ''Thus Veh-file is returned
- 'ElectricMotorForm.JobDir = GetPath(_vehFile)
- 'ElectricMotorForm.AutoSendTo = Sub(file, vehicleForm)
- ' If UCase(FileRepl(vehicleForm.tbElectricMotor.Text, JobDir)) <> UCase(file) Then _
- ' vehicleForm.tbElectricMotor.Text = GetFilenameWithoutDirectory(file, JobDir)
- ' VectoJobForm.UpdatePic()
- 'End Sub
-
- 'If Not Trim(f) = "" Then
- ' If Not File.Exists(f) Then
- ' MsgBox("File not found!")
- ' Exit Sub
- ' End If
- 'End If
-
- 'If Not ElectricMotorForm.Visible Then
- ' ElectricMotorForm.Show()
- 'Else
- ' If ElectricMotorForm.WindowState = FormWindowState.Minimized Then ElectricMotorForm.WindowState = FormWindowState.Normal
- ' ElectricMotorForm.BringToFront()
- 'End If
-
- 'If Not Trim(f) = "" Then
- ' Try
- ' ElectricMotorForm.OpenElectricMachineFile(f)
- ' Catch ex As Exception
- ' MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading Vehicle File")
- ' End Try
- 'End If
End Sub
End Class