Release: VECTO 1.1 beta

- Removed ivtlic.dll
- added DemoData
- added User Manual source files

See VECTO Changelog.txt for more details

VECTO/GUI/F_GEN.vb

@@ -1040,27 +1040,27 @@ Public Class F_GEN
     End Sub
 
 
-    Private Sub TBhinauf_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBhinauf.TextChanged
+    Private Sub TBhinauf_TextChanged(sender As System.Object, e As System.EventArgs)
         Change()
     End Sub
 
-    Private Sub TBlhinauf_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBlhinauf.TextChanged
+    Private Sub TBlhinauf_TextChanged(sender As System.Object, e As System.EventArgs)
         Change()
     End Sub
 
-    Private Sub TBhinunter_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBhinunter.TextChanged
+    Private Sub TBhinunter_TextChanged(sender As System.Object, e As System.EventArgs)
         Change()
     End Sub
 
-    Private Sub TBlhinunter_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBlhinunter.TextChanged
+    Private Sub TBlhinunter_TextChanged(sender As System.Object, e As System.EventArgs)
         Change()
     End Sub
 
-    Private Sub TBpfast_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBpfast.TextChanged
+    Private Sub TBpfast_TextChanged(sender As System.Object, e As System.EventArgs)
         Change()
     End Sub
 
-    Private Sub TBpspar_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBpspar.TextChanged
+    Private Sub TBpspar_TextChanged(sender As System.Object, e As System.EventArgs)
         Change()
     End Sub
 
@@ -1186,6 +1186,7 @@ lbDlog:
     End Sub
 
     Private Sub RemoveAuxItem()
+        Dim i As Integer
 
         If LvAux.SelectedItems.Count = 0 Then
             If LvAux.Items.Count = 0 Then
@@ -1195,10 +1196,16 @@ lbDlog:
             End If
         End If
 
+        i = LvAux.SelectedItems(0).Index
+
         LvAux.SelectedItems(0).Remove()
 
         If LvAux.Items.Count > 0 Then
+            If i < LvAux.Items.Count Then
+                LvAux.Items(i).Selected = True
+            Else
                 LvAux.Items(LvAux.Items.Count - 1).Selected = True
+            End If
             LvAux.Focus()
         End If
 
@@ -1262,6 +1269,7 @@ lbDlog:
     End Sub
 
     Private Sub RemoveCycle()
+        Dim i As Integer
 
         If LvCycles.SelectedItems.Count = 0 Then
             If LvCycles.Items.Count = 0 Then
@@ -1271,10 +1279,17 @@ lbDlog:
             End If
         End If
 
+        i = LvCycles.SelectedItems(0).Index
+
         LvCycles.SelectedItems(0).Remove()
 
         If LvCycles.Items.Count > 0 Then
+            If i < LvCycles.Items.Count Then
+                LvCycles.Items(i).Selected = True
+            Else
                 LvCycles.Items(LvCycles.Items.Count - 1).Selected = True
+            End If
+
             LvCycles.Focus()
         End If
 

VECTO/GUI/F_MAINForm.vb

@@ -566,7 +566,7 @@ Public Class F_MAINForm
         End If
 
         'VECTO Init
-        VEC.Init()
+        'VEC.Init()
 
         'Command Line Args
         If Command() <> "" Then
@@ -612,11 +612,11 @@ Public Class F_MAINForm
                 Case Else
                     Select Case UCase(fEXT(str))
                         Case ".VECTO"
-                            vecFiles.Add(str)
+                            vecFiles.Add(fFileRepl(str))
                         Case ".VDRI"
-                            driFiles.Add(str)
+                            driFiles.Add(fFileRepl(str))
                         Case Else
-                            ComFile = str
+                            ComFile = fFileRepl(str)
                     End Select
             End Select
         Next
@@ -681,6 +681,14 @@ Public Class F_MAINForm
 #End Region
 
     Private Sub OpenVectoFile(ByVal File As String)
+
+        If Not IO.File.Exists(File) Then
+
+            GUImsg(tMsgID.Err, "File not found! (" & File & ")")
+            MsgBox("File not found! (" & File & ")", MsgBoxStyle.Critical)
+
+        Else
+
             Select Case UCase(fEXT(File))
                 Case ".VGBX"
                     If Not F_GBX.Visible Then
@@ -714,6 +722,9 @@ Public Class F_MAINForm
                 Case Else
                     MsgBox("Type '" & fEXT(File) & "' unknown!", MsgBoxStyle.Critical)
             End Select
+
+        End If
+
     End Sub
 
 #Region "GEN Liste"

VECTO/GUI/GUI_Subs.vb

@@ -213,6 +213,7 @@
     End Function
 
 #Region "Dateipfad Funktionen"
+
     'When no path is specified, then insert either WorkDir or MainDir   Special-folders
     Public Function fFileRepl(ByVal file As String, Optional ByVal MainDir As String = "") As String
 

VECTO/MODcalc/cMOD.vb

@@ -408,8 +408,8 @@ Public Class cMOD
 
         Else
 
-            s.Append(",engine speed,Pe,n_norm,Pe_norm,Pe_full,Pe_drag,Pe_clutch")
-            sU.Append(",[rpm],[kW],[-],[-],[kW],[kW],[kW]")
+            s.Append(",engine speed,torque,Pe,n_norm,Pe_norm,Pe_full,Pe_drag,Pe_clutch")
+            sU.Append(",[rpm],[Nm],[kW],[-],[-],[kW],[kW],[kW]")
 
         End If
 
@@ -569,6 +569,9 @@ Public Class cMOD
                     'Revolutions
                     s.Append(Sepp & .nn(t) * (VEH.nNenn - VEH.nLeerl) + VEH.nLeerl)
 
+                    'Torque
+                    s.Append(Sepp & 1000 * .Pe(t) * VEH.Pnenn / (2 * Math.PI * (.nn(t) * (VEH.nNenn - VEH.nLeerl) + VEH.nLeerl) / 60))
+
                     'Power
                     s.Append(Sepp & .Pe(t) * VEH.Pnenn)
 

VECTO/MODcalc/cVh.vb

@@ -252,7 +252,7 @@ Public Class cVh
         End If
     End Sub
 
-    Public Sub DistCorrection(ByVal t As Integer)
+    Public Sub DistCorrection(ByVal t As Integer, ByVal VehState As tVehState)
 
         'TODO: If veh faster than cycle ...
 
@@ -271,7 +271,7 @@ Public Class cVh
 
 
             'Falls Zeitschritt wiederholen näher an Wegvorgabe als aktueller Weg => Zeitschritt wiederholen |@@| If the repeating Time-step is closer to the Specified-route than the Actual-route => Repeat Time-step
-            If (Math.Abs(WegIst + Vsoll(t) - Weg(WegX)) < Math.Abs(WegIst - Weg(WegX))) And v > 0.1 Then
+            If (VehState = tVehState.Acc Or VehState = tVehState.Cruise) AndAlso (Math.Abs(WegIst + Vsoll(t) - Weg(WegX)) < Math.Abs(WegIst - Weg(WegX))) And v > 0.1 Then
 
                 Duplicate(t + 1)
                 MODdata.tDim += 1