Merge pull request #7 in VECTO/vecto-engine from...

Merge pull request #7 in VECTO/vecto-engine from ~EMQUARIMA/vecto-engine:bugfix/VECTO-554-ouput-xml-of-vecto-engine-rated to master

* commit '3c3f593b':
  write rated power in W to XML output

VECTO-Engine/My Project/AssemblyInfo.vb

@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("VECTO-Engine")> 
-<Assembly: AssemblyCopyright("Copyright ©  2015")> 
+<Assembly: AssemblyCopyright("Copyright ©  2015 - 2017")> 
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>

VECTO-Engine/VECTO-Engine.vbproj

@@ -49,6 +49,9 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\F_ENG.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ivtlic">
       <HintPath>J:\TE-Em\Emissionsmodelle\Lizenzen\Lizenz-DLL\bin\Release\ivtlic.dll</HintPath>

VECTO-Engine/cJob.vb

@@ -237,9 +237,13 @@ Public Class cJob
 		'Write output files
 		WorkerMsg(tMsgID.Normal, "Writing XML output file")
 		'If Not MAP.WriteMap(OutPath & fFILE(MapFile, False) & "_mod.vmap") Then Return False
-		'If Not MAP.WriteMap(OutPath & "UNOFFICIAL_OUTPUT_" & Manufacturer & "_" & Model & "_" & CertNumber & "_FCmap.vmap") Then Return False
+#If DEBUG Then
+        If Not MAP.WriteMap(OutPath & "UNOFFICIAL_OUTPUT_" & Manufacturer & "_" & Model & "_" & CertNumber & "_FCmap.vmap") Then Return False
+#End If
 		'If Not MAP.WriteFLD(OutPath & fFILE(MapFile, False) & "_" & fFILE(FlcFile, False) & ".vfld") Then Return False
-		'If Not MAP.WriteFLD(OutPath & "UNOFFICIAL_OUTPUT_" & Manufacturer & "_" & Model & "_" & CertNumber & "_FLC.vfld", True) Then Return False
+#If DEBUG Then
+        If Not MAP.WriteFLD(OutPath & "UNOFFICIAL_OUTPUT_" & Manufacturer & "_" & Model & "_" & CertNumber & "_FLC.vfld", True) Then Return False
+#End If
 		'If Not WriteTransFile(OutPath & "WHTC-Correction-Factors.xml") Then Return False
 		MAP.WriteXmlComponentFile(OutPath & Manufacturer & "_" & Model & ".xml",
 								  fFILE(FlcFile, False), Me)

VECTO-Engine/cMAP0.vb

@@ -1129,7 +1129,7 @@ lbEr:
 														  New XElement(tns + "Displacement", job.Displacement),
 														  New XElement(tns + "IdlingSpeed", job.Idle),
 														  New XElement(tns + "RatedSpeed", job.RatedSpeed),
-														  New XElement(tns + "RatedPower", job.RatedPower),
+														  New XElement(tns + "RatedPower", job.RatedPower * 1000),
 														  New XElement(tns + "MaxEngineTorque", FLC.TqMax.ToString("F0")),
 														  New XElement(tns + "WHTCUrban", job.WHTCurbanFactor.ToString("f4")),
 														  New XElement(tns + "WHTCRural", job.WHTCruralFactor.ToString("f4")),