Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit bbbbddf3 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Pull request #32: Master

Merge in VECTO/vecto-engine from VECTO/mq_vecto-engine:master to master

* commit 'da40e204':
  only set clipboard text if there is some text in the message window
  surround backgroundworker calculation with try/catch block and show dialog in case of an error
  bugfix writing/formatting values for XML caused by changing properties to nullable double
parents 7e21a1ac da40e204
Branches
Tags v0.0.3
No related merge requests found
......@@ -257,6 +257,7 @@ Public Class Form1
End If
'Calc mode 1 = only precalculation
Try
If CalcMode = 1 Then
JobPrecalc.Run()
Else
......@@ -270,10 +271,14 @@ Public Class Form1
newline &
newline &
"Nevertheless, causes for warnings shall be analyzed together with the Technical Service or Type Approval Authority.",
MsgBoxStyle.Information, MsgBoxStyle.OkOnly)
MsgBoxStyle.Information or MsgBoxStyle.OkOnly, "Error")
End If
End If
Catch ex As Exception
MsgBox("Error during data evaluation!" & Environment.NewLine & Environment.NewLine & ex.Message, MsgBoxStyle.Critical or MsgBoxStyle.OkOnly, "Error")
'ShowMsgDirect(ex.Message, tMsgID.Err)
End Try
End Sub
Private Sub BgWorker_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) _
......@@ -1085,7 +1090,9 @@ Public Class Form1
strText = strText & vbNewLine
Next iCopyLvMsg
End With
If Not String.IsNullOrWhiteSpace(strText) then
Clipboard.SetText(strText)
End If
End Sub
Private Sub JobFileButton_Click(sender As Object, e As EventArgs) Handles JobFileButton.Click
......
......@@ -1128,11 +1128,11 @@ Public Class cMAP0
Private Function GetEngineElementV10(job As cJob) As XElement
Dim fuelType = job.FuelType
Dim whtcUrban = job.WHTCurbanFactor.ToString("f4")
Dim whtcRural = job.WHTCruralFactor.ToString("f4")
Dim whtcMotorway = job.WHTCmotorwayFactor.ToString("f4")
Dim bfColdHot = job.ColdHotBalancingFactor.ToString("f4")
Dim cfRegPer = job.CF_RegPer.ToString("f4")
Dim whtcUrban = job.WHTCurbanFactor.Value.ToString("f4")
Dim whtcRural = job.WHTCruralFactor.Value.ToString("f4")
Dim whtcMotorway = job.WHTCmotorwayFactor.Value.ToString("f4")
Dim bfColdHot = job.ColdHotBalancingFactor.Value.ToString("f4")
Dim cfRegPer = job.CF_RegPer.Value.ToString("f4")
Dim cfncv = NCV_CorrectionFactor.ToString("f4")
Return New XElement(tnsV10 + XMLNames.Engine,
......@@ -1241,20 +1241,20 @@ Public Class cMAP0
Dim whrCorrectionFactors = If(WriteWHRData, GetWHRCorrectionFactorElements(xmlNamespace, job), Nothing)
Dim fuelType = job.FuelType
Dim whtcUrban = job.WHTCurbanFactor.ToString("f4")
Dim whtcRural = job.WHTCruralFactor.ToString("f4")
Dim whtcMotorway = job.WHTCmotorwayFactor.ToString("f4")
Dim bfColdHot = job.ColdHotBalancingFactor.ToString("f4")
Dim cfRegPer = job.CF_RegPer.ToString("f4")
Dim whtcUrban = job.WHTCurbanFactor.Value.ToString("f4")
Dim whtcRural = job.WHTCruralFactor.Value.ToString("f4")
Dim whtcMotorway = job.WHTCmotorwayFactor.Value.ToString("f4")
Dim bfColdHot = job.ColdHotBalancingFactor.Value.ToString("f4")
Dim cfRegPer = job.CF_RegPer.Value.ToString("f4")
Dim cfncv = NCV_CorrectionFactor.ToString("f4")
If (WriteFirstFuel = False) Then
fuelType = job.FuelType2
whtcUrban = job.WHTCurbanFactor2.ToString("f4")
whtcRural = job.WHTCruralFactor2.ToString("f4")
whtcMotorway = job.WHTCmotorwayFactor2.ToString("f4")
bfColdHot = job.ColdHotBalancingFactor2.ToString("f4")
cfRegPer = job.CF_RegPer2.ToString("f4")
whtcUrban = job.WHTCurbanFactor2.Value.ToString("f4")
whtcRural = job.WHTCruralFactor2.Value.ToString("f4")
whtcMotorway = job.WHTCmotorwayFactor2.Value.ToString("f4")
bfColdHot = job.ColdHotBalancingFactor2.Value.ToString("f4")
cfRegPer = job.CF_RegPer2.Value.ToString("f4")
cfncv = NCV_CorrectionFactor2.ToString("f4")
End If
......@@ -1291,28 +1291,28 @@ Public Class cMAP0
If (job.WHR_El)
whrCorrectionFactors.Add(New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Electrical,
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Urban,
job.WHTCurbanFactorWHREl.ToString("f4")),
job.WHTCurbanFactorWHREl.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Rural,
job.WHTCruralFactorWHREl.ToString("f4")),
job.WHTCruralFactorWHREl.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Motorway,
job.WHTCmotorwayFactorWHREl.ToString("f4")),
job.WHTCmotorwayFactorWHREl.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_BFColdHot,
job.ColdHotBalancingFactorWHREl.ToString("f4")),
job.ColdHotBalancingFactorWHREl.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_CFRegPer,
job.CF_RegPerWHREl.ToString("f4"))))
job.CF_RegPerWHREl.Value.ToString("f4"))))
End If
If (job.WHR_Mech) Then
whrCorrectionFactors.Add(New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Mechanical,
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Urban,
job.WHTCurbanFactorWHRMech.ToString("f4")),
job.WHTCurbanFactorWHRMech.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Rural,
job.WHTCruralFactorWHRMech.ToString("f4")),
job.WHTCruralFactorWHRMech.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_Motorway,
job.WHTCmotorwayFactorWHRMech.ToString("f4")),
job.WHTCmotorwayFactorWHRMech.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_WHRCorrectionFactors_BFColdHot,
job.ColdHotBalancingFactorWHRMech.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_CFRegPer, job.CF_RegPerWHRMech.ToString("f4"))))
job.ColdHotBalancingFactorWHRMech.Value.ToString("f4")),
New XElement(xmlNamespace + XMLNames.Engine_CFRegPer, job.CF_RegPerWHRMech.Value.ToString("f4"))))
End If
Return whrCorrectionFactors
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment