From 2c06efd8bf0fd3667eefd4ef6af8d665a8f94dd8 Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Tue, 28 May 2013 11:11:12 +0200
Subject: [PATCH] - Fixed some spelling errors in User Manual - Changed
 "Retarder" to "Retarder Losses" in Vehicle Editor to avoid misunderstandings

---
 User Manual/GUI/ENG-Editor.html          | 9 +++++++--
 User Manual/GUI/GBX-Editor.html          | 6 +++---
 User Manual/GUI/VECTO-Editor_Aux.html    | 6 +++---
 User Manual/GUI/VECTO-Editor_Driver.html | 2 +-
 User Manual/GUI/mainform.html            | 2 +-
 VECTO Changelog.txt                      | 3 ++-
 VECTO/GUI/F_VEH.Designer.vb              | 2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/User Manual/GUI/ENG-Editor.html b/User Manual/GUI/ENG-Editor.html
index 9d003e6568..b593866bc8 100644
--- a/User Manual/GUI/ENG-Editor.html	
+++ b/User Manual/GUI/ENG-Editor.html	
@@ -115,7 +115,7 @@ with "<span style="font-weight: bold;">c</span> "</span><br>
 <br><div style="margin-left: 40px;">The PT1 approach to calculate the dynamic full load is applied using this formula:<br><img style="width: 555px; height: 65px;" alt="" src="pics/ENG-PT1.png"><br>with:<br><div style="margin-left: 40px;">n<sub>i</sub> = current engine speed<br>T(n<sub>i</sub>) = PT1 time constant&nbsp;at engine speed&nbsp;n<sub>i</sub> (col. 4 in .vfld file)<br>P_fld_stat(n<sub>i</sub>) = Static full load at engine speed&nbsp;n<sub>i</sub> (col. 2 in .vfld file)<br>P_act<sub>i-1</sub> = Engine power in previous time stet</div><br></div><br>
 <a name="map"></a><span style="font-weight: bold;">Fuel Consumption Map</span>
 (.vmap)<br>
-<div style="margin-left: 40px;">Fuel Consumption Map measued in stationary conditions.<br>The following rules apply:<br><ul><li>The map must cover the full engine range between full load and motoring curve. <span style="font-weight: bold; color: red;">Extrapolation is not possible and will abort the calculation!</span></li><li>At least four points are required.</li></ul></div><br>
+<div style="margin-left: 40px;">Fuel Consumption Map measured in stationary conditions.<br>The following rules apply:<br><ul><li>The map must cover the full engine range between full load and motoring curve. <span style="font-weight: bold; color: red;">Extrapolation is not possible and will abort the calculation!</span></li><li>At least four points are required.</li></ul></div><br>
 <div style="margin-left: 40px;"><span style="font-weight: bold;">Format</span>
 (comma-separated, dot = decimal-mark):
 </div>
@@ -150,7 +150,12 @@ Consumption</th>
 <div style="margin-left: 40px;"><span style="font-weight: bold; font-style: italic; color: rgb(51, 102, 255);">Note:</span><span style="font-style: italic; color: rgb(51, 102, 255);"> text
 lines (header, comments,
 etc.) </span><span style="text-decoration: underline; font-style: italic; color: rgb(51, 102, 255);">must</span><span style="font-style: italic; color: rgb(51, 102, 255);"> start
-with "<span style="font-weight: bold;">c</span> "</span><br><h2>Fuel Map Interpolation</h2>The interpolation is based on <a href="http://en.wikipedia.org/wiki/Delaunay_triangulation">Delaunay Triangulation&nbsp;</a><a href="http://en.wikipedia.org/wiki/Delaunay_triangulation"><img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a> and works as follows:<br><ol><li>Triangulate the given rpm/torque/fuel&nbsp;points (= x,y,z)&nbsp; to create a network of triangles with each point of the map being part of at least one triangle.</li><li>Find the triangle where the to-be-interpolated load point (x,y) is inside. If no triangle meets the criterion the calculation will be aborted.</li><li>Calculate the z-value (= fuel) of the given x,y-point in the plane of the triangle</li></ol>
+with "<span style="font-weight: bold;">c</span> "</span><br><h2>Fuel Map Interpolation</h2>The interpolation is based on <a href="http://en.wikipedia.org/wiki/Delaunay_triangulation">Delaunay Triangulation&nbsp;</a><a href="http://en.wikipedia.org/wiki/Delaunay_triangulation"><img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a> and works as follows:<br><ol><li>Triangulate
+the given rpm/torque/fuel&nbsp;points (= x,y,z)&nbsp; to create a
+network of triangles with each point of the map being part of at least
+one triangle.</li><li>Find the triangle where the to-be-interpolated
+load point (x,y) is inside. If no triangle meets the criterion the
+calculation will be aborted.</li><li>Calculate the z-value (= fuel) of the given x,y-point in the plane of the triangle</li></ol>
 </div>
 <br><br>
 <a name="cal"></a><span style="font-weight: bold;">Calibration Test Cycle</span><br>
diff --git a/User Manual/GUI/GBX-Editor.html b/User Manual/GUI/GBX-Editor.html
index 59be173c9a..92bd2d5113 100644
--- a/User Manual/GUI/GBX-Editor.html	
+++ b/User Manual/GUI/GBX-Editor.html	
@@ -113,7 +113,7 @@ ratio and efficiency of the selected gear. </li>
 <li>Gear "A" defines the ratio of the axle transmission /
 differential.</li>
 <li>Gear
-"TC" (AT only): For AT gearboxes with torque converter a seperate
+"TC" (AT only): For AT gearboxes with torque converter a separate
 (fictional) gear
 is defined for cases where the lock-up clutch is open.
 This&nbsp;gear
@@ -229,14 +229,14 @@ a gear change is initiated (by crossing the up- or down-shift line)
 VECTO may skip one or several gears as long as the required <a href="#torqres">torque reserve</a> is provided.<br>
 <img style="width: 568px; height: 341px;" alt="" src="pics/GBX-Editor-shift3.PNG"></div>
 <br><br>
-<a name="torqres"></a><span style="font-weight: bold;">Torque Reserve</span><br>
+<a name="torqres"></a><span style="font-weight: bold;">Torque Reserve</span> [%]<br>
 <div style="margin-left: 40px;">This parameter is required
 for the "<span style="font-weight: bold;">Allow shift-up
 inside polygons</span>" and "<span style="font-weight: bold;">Skip
 Gears</span>" options.</div>
 <br><br>
 <a style="font-weight: bold;" name="mintime"></a><span style="font-weight: bold;">Minimum time between two gear
-shifts</span><br>
+shifts</span> [s]<br>
 <div style="margin-left: 40px;">Limits
 the time between two gear shifts in whole seconds. This rule will be
 ignored if rpms are too high or too low. Note that high values may
diff --git a/User Manual/GUI/VECTO-Editor_Aux.html b/User Manual/GUI/VECTO-Editor_Aux.html
index 5b9a260956..2c4216c9e3 100644
--- a/User Manual/GUI/VECTO-Editor_Aux.html	
+++ b/User Manual/GUI/VECTO-Editor_Aux.html	
@@ -47,8 +47,8 @@ Format</span> (comma-separated, dot = decimal-mark):<br>
 <table style="text-align: left; width: 510px; height: 247px; margin-left: 40px;" border="1" cellpadding="2" cellspacing="1">
 <tbody>
 <tr>
-<td><span style="color: rgb(51, 102, 255); font-weight: bold;">c </span><span style="font-weight: bold;">Transmission ration to engine
-speed</span></td>
+<td><span style="color: rgb(51, 102, 255); font-weight: bold;">c </span><span style="font-weight: bold;">Transmission ratio to engine
+speed</span><span style="font-weight: bold;"> [-]</span></td>
 <td></td>
 <td></td>
 </tr>
@@ -58,7 +58,7 @@ speed</span></td>
 <td></td>
 </tr>
 <tr>
-<td><span style="color: rgb(51, 102, 255); font-weight: bold;">c </span><span style="font-weight: bold;">Efficiency to engine</span></td>
+<td><span style="color: rgb(51, 102, 255); font-weight: bold;">c </span><span style="font-weight: bold;">Efficiency to engine&nbsp;</span><span style="font-weight: bold;">[-]</span></td>
 <td></td>
 <td></td>
 </tr>
diff --git a/User Manual/GUI/VECTO-Editor_Driver.html b/User Manual/GUI/VECTO-Editor_Driver.html
index f2ff2ab858..890abd8911 100644
--- a/User Manual/GUI/VECTO-Editor_Driver.html	
+++ b/User Manual/GUI/VECTO-Editor_Driver.html	
@@ -78,7 +78,7 @@ if target speed + allowed overspeed is reached. Normal driving if
 target speed + allowed underspeed is reached.<br>Parameters:<br></div><ul style="margin-left: 80px;"><li><span style="font-weight: bold;">Minimum Target Speed</span></li><li><span style="font-weight: bold;">Allowed Overspeed</span></li><li><span style="font-weight: bold;">Allowed Underspeed</span></li></ul><div style="margin-left: 40px;"><div style="margin-left: 40px;"><span style="font-weight: bold;"><img style="width: 700px; height: 657px;" alt="" src="pics/Eco-Roll.png"></span><br></div><span style="font-weight: bold;"></span></div><br><span style="font-weight: bold;"><br></span><span style="font-weight: bold;"><br><br><a name="look"></a>Look-Ahead Coasting<br></span><div style="margin-left: 40px;">Enables
 coasting before each braking phase. Coasting will begin at T seconds
 before new lower target speed (see picture below). Braking deceleration
-is defined by the <a href="#vacc">.vacc file</a>.<br>Parameters:<br><ul><li><span style="font-weight: bold;">Target Retardation</span> =&nbsp;<span style="font-size: 12pt; font-family: Arial; color: black;">a</span><sub><span style="font-size: 12pt; font-family: Arial; color: black; vertical-align: sub;">lookahead</span></sub></li><li><span style="font-weight: bold;">Minimum Target Speed</span></li></ul><span style="font-weight: bold;">Note: </span>If&nbsp;road
+is defined by the <a href="#vacc">.vacc file</a>. Look-Ahead Coasting is disabled if target speed is below <span style="font-weight: bold;">Minimum Target Speed.</span><br>Parameters:<br><ul><li><span style="font-weight: bold;">Target Retardation</span> =&nbsp;<span style="font-size: 12pt; font-family: Arial; color: black;">a</span><sub><span style="font-size: 12pt; font-family: Arial; color: black; vertical-align: sub;">lookahead</span></sub></li><li><span style="font-weight: bold;">Minimum Target Speed</span></li></ul><span style="font-weight: bold;">Note: </span>If&nbsp;road
 gradient &gt; 0 the coasting deceleration will not be affected, i.e.
 coasting deceleration is calculated for road gradient=0. This should
 prevent the vehicle from decelerating too fast. If road gradient &lt; 0
diff --git a/User Manual/GUI/mainform.html b/User Manual/GUI/mainform.html
index d4b392a987..afcddba887 100644
--- a/User Manual/GUI/mainform.html	
+++ b/User Manual/GUI/mainform.html	
@@ -27,7 +27,7 @@ New
 Job File</span><br>
 </div>
 <div style="margin-left: 80px;">Create a new .vecto file
-using the VECTO Editor<br>
+using the <a href="VECTO-Editor.html">VECTO Editor</a><br>
 </div>
 <div style="margin-left: 40px;"><br>
 <br>
diff --git a/VECTO Changelog.txt b/VECTO Changelog.txt
index 28cb4b86f0..caf09ab7dd 100644
--- a/VECTO Changelog.txt	
+++ b/VECTO Changelog.txt	
@@ -1,6 +1,7 @@
 VECTO ?.? (future release)
 - Gearbox Rules must be set when loading .gbx file to aviod invalid settings (e.g. AT with Skip Gears)
-
+- Eaux	[kWh] for all single auxiliaries.
+- User Manual: Don't use secondary retarder if retarder losses are already defined in transmission loss maps
 
 
 VECTO x.x (current source - next release)
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index 532cd855b9..b3a55da946 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -435,7 +435,7 @@ Partial Class F_VEH
         Me.GroupBox7.Size = New System.Drawing.Size(527, 81)
         Me.GroupBox7.TabIndex = 7
         Me.GroupBox7.TabStop = False
-        Me.GroupBox7.Text = "Retarder"
+        Me.GroupBox7.Text = "Retarder Losses"
         '
         'PnRt
         '
-- 
GitLab