From a7bc2ad19fbfc1ab0fe8b9512b429dcdf86c37bf Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Thu, 5 Feb 2015 09:10:46 +0100
Subject: [PATCH] Bugfixes
---
VECTO/MODcalc/cPower.vb | 12 +++++++-----
VECTO/VECTO_Global.vb | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index 28f846d15b..a5395ecb8b 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -573,7 +573,7 @@ Public Class cPower
FirstSecItar = True
'Secondary Progressbar
- ProgBarCtrl.ProgJobInt = CInt((100 / ProgBarShare) * jz / MODdata.tDim + (100 - 100 / ProgBarShare))
+ ProgBarCtrl.ProgJobInt = CInt((100 / ProgBarShare) * (jz + 1) / (MODdata.tDim + 1) + (100 - 100 / ProgBarShare))
' Determine State
@@ -762,6 +762,12 @@ lbGschw:
End If
+
+ If PwheelVorg Then
+ nU = MODdata.nUvorg(jz)
+ Vact = fV(nU, Gear)
+ End If
+
If Gear = -1 Then
WorkerMsg(tMsgID.Err, "Error in Gear Shift Model!", MsgSrc & "/t= " & jz + 1)
Return False
@@ -955,10 +961,6 @@ lb_nOK:
'************************************ Determine Engine-state ************************************
' nU is final here!
- If PwheelVorg Then
- Vact = fV(nU, Gear)
- End If
-
'Power at clutch
Select Case Clutch
Case tEngClutch.Opened
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index ffe16bd9dd..5418b9e63f 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -12,7 +12,7 @@ Imports System.Collections.Generic
Module VECTO_Global
- Public Const VECTOvers As String = "2.0.4-beta3 PwheelTest-1"
+ Public Const VECTOvers As String = "2.0.4-beta3 PwheelTest-2"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String
--
GitLab