diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb index 897c3179f8dbf5957e3be193cf2370d85c05b0b4..54e7839d598fe4615bfbecdf9ef2b217b1fb0bce 100644 --- a/VECTO/GUI/F_GBX.Designer.vb +++ b/VECTO/GUI/F_GBX.Designer.vb @@ -50,7 +50,7 @@ Partial Class F_GBX Me.TbTracInt = New System.Windows.Forms.TextBox() Me.LvGears = New System.Windows.Forms.ListView() Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + 'Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) 'TC Column 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.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) @@ -257,7 +257,7 @@ Partial Class F_GBX ' 'LvGears ' - Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader4, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6}) + Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6}) Me.LvGears.FullRowSelect = True Me.LvGears.GridLines = True Me.LvGears.HideSelection = False @@ -273,32 +273,32 @@ Partial Class F_GBX 'ColumnHeader1 ' Me.ColumnHeader1.Text = "Gear" - Me.ColumnHeader1.Width = 40 + Me.ColumnHeader1.Width = 46 ' - 'ColumnHeader4 - ' - Me.ColumnHeader4.Text = "TC" - Me.ColumnHeader4.Width = 31 + ''ColumnHeader4 + '' + 'Me.ColumnHeader4.Text = "TC" + 'Me.ColumnHeader4.Width = 31 ' 'ColumnHeader2 ' Me.ColumnHeader2.Text = "Ratio" - Me.ColumnHeader2.Width = 43 + Me.ColumnHeader2.Width = 50 ' 'ColumnHeader3 ' Me.ColumnHeader3.Text = "Loss Map or Efficiency" - Me.ColumnHeader3.Width = 122 + Me.ColumnHeader3.Width = 128 ' 'ColumnHeader5 ' Me.ColumnHeader5.Text = "Shift Polygons" - Me.ColumnHeader5.Width = 88 + Me.ColumnHeader5.Width = 94 ' 'ColumnHeader6 ' Me.ColumnHeader6.Text = "Full Load Curve" - Me.ColumnHeader6.Width = 89 + Me.ColumnHeader6.Width = 95 ' 'TBI_getr ' diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb index 6383367db95d11e78fbb581bb4f11d8d692ac4b2..c034e2940ac1e14180ac1d2cabb4d1373a4e3069 100644 --- a/VECTO/GUI/F_GBX.vb +++ b/VECTO/GUI/F_GBX.vb @@ -27,11 +27,11 @@ Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox Public Class F_GBX Private Enum GearboxTbl GearNr = 0 - TorqueConverter = 1 - Ratio = 2 - LossMapEfficiency = 3 - ShiftPolygons = 4 - FullLoadCurve = 5 + 'TorqueConverter = 1 + Ratio = 1 + LossMapEfficiency = 2 + ShiftPolygons = 3 + FullLoadCurve = 4 End Enum Private GbxFile As String = "" @@ -243,29 +243,14 @@ Public Class F_GBX If i = 0 Then 'lv0 = New ListViewItem("Axle") - Me.LvGears.Items.Add(CreateListviewItem("Axle", "-", GBX.Igetr(i), GBX.GetrMap(i, True), GBX.gsFile(i, True), + Me.LvGears.Items.Add(CreateListviewItem("Axle", "-", GBX0.Igetr(i), GBX0.GetrMap(i, True), GBX0.gsFile(i, True), GBX0.FldFile(i, True))) Else 'lv0 = New ListViewItem(i.ToString("00")) - Me.LvGears.Items.Add(CreateListviewItem("Axle", "-", GBX.Igetr(i), GBX.GetrMap(i, True), GBX.gsFile(i, True), + Me.LvGears.Items.Add(CreateListviewItem(i.ToString("00"), "-", GBX0.Igetr(i), GBX0.GetrMap(i, True), GBX0.gsFile(i, True), GBX0.FldFile(i, True))) End If - ''If Me.ChTCon.Checked And i > 0 Then - '' If False Then ' GBX0.IsTCgear(i) Then - '' lv0.SubItems.Add("on") - '' Else - '' lv0.SubItems.Add("off") - '' End If - ''Else - 'lv0.SubItems.Add("-") - ''End If - 'lv0.SubItems.Add(GBX0.Igetr(i)) - 'lv0.SubItems.Add(GBX0.GetrMap(i, True)) - 'lv0.SubItems.Add(GBX0.gsFile(i, True)) - 'lv0.SubItems.Add(GBX0.FldFile(i, True)) - - Next Me.ChSkipGears.Checked = GBX0.gs_SkipGears @@ -306,7 +291,7 @@ Public Class F_GBX Private Function CreateListviewItem(gear As String, tc As String, ratio As Single, getrMap As String, shiftPolygon As String, fldFile As String) As ListViewItem Dim retVal As ListViewItem = New ListViewItem(gear) - retVal.SubItems.Add(tc) + 'retVal.SubItems.Add(tc) retVal.SubItems.Add(ratio) retVal.SubItems.Add(getrMap) retVal.SubItems.Add(shiftPolygon) @@ -584,15 +569,8 @@ Public Class F_GBX If GearDia.ShowDialog = Windows.Forms.DialogResult.OK Then - 'If GearDia.ChIsTCgear.Checked Then - ' Me.LvGears.SelectedItems(0).SubItems(1).Text = "on" - 'Else - ' If Me.ChTCon.Checked Then - ' Me.LvGears.SelectedItems(0).SubItems(1).Text = "off" - ' Else - Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.TorqueConverter).Text = "-" - ' End If - 'End If + 'Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.TorqueConverter).Text = "-" + Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text = GearDia.TbRatio.Text Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = GearDia.TbMapPath.Text @@ -626,16 +604,7 @@ Public Class F_GBX Dim lvi As ListViewItem lvi = CreateListviewItem(Me.LvGears.Items.Count.ToString("00"), "-", 1, "", "", "") - 'New ListViewItem(Me.LvGears.Items.Count.ToString("00")) - ''If Me.ChTCon.Checked Then - '' lvi.SubItems.Add("off") - ''Else - 'lvi.SubItems.Add("-") - ''End If - 'lvi.SubItems.Add("") - 'lvi.SubItems.Add("") - 'lvi.SubItems.Add("") - 'lvi.SubItems.Add("") + Me.LvGears.Items.Add(lvi) lvi.EnsureVisible() @@ -998,15 +967,7 @@ Public Class F_GBX If lv0.SubItems(GearboxTbl.GearNr).Text = "Axle" Then Continue For - 'If Me.ChTCon.Checked Then - ' If lv0.Index = 1 Then - ' lv0.SubItems(1).Text = "on" - ' Else - ' lv0.SubItems(1).Text = "off" - ' End If - 'Else - lv0.SubItems(GearboxTbl.TorqueConverter).Text = "-" - 'End If + 'lv0.SubItems(GearboxTbl.TorqueConverter).Text = "-" Next End Sub