diff --git a/User Manual Source/material User Manual.pptx b/User Manual Source/material User Manual.pptx
index c7fdd7fa25472f0d504ab900dc459e6dcbc82c77..b40ca1bddcbfcecfa36169699088d9dca6912ee2 100644
Binary files a/User Manual Source/material User Manual.pptx and b/User Manual Source/material User Manual.pptx differ
diff --git a/User Manual/GUI/ENG-Editor.html b/User Manual/GUI/ENG-Editor.html
index b104131d9196ea1874754720d053217386cc45b4..b3587eaad4551eeeba033cb49e13c220a612e414 100644
--- a/User Manual/GUI/ENG-Editor.html
+++ b/User Manual/GUI/ENG-Editor.html
@@ -18,7 +18,7 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<div style="text-align: left; font-family: Verdana;">
<h2>Engine Editor</h2>
</div>
-<img src="pics/ENG-Editor.PNG" style="width: 525px; height: 450px;" alt="eng" usemap="#linkmap"><br>
+<img src="pics/ENG-Editor.PNG" style="width: 524px; height: 449px;" alt="eng" usemap="#linkmap"><br>
<span style="font-family: Verdana;"><br>
<br>
</span>
@@ -162,12 +162,7 @@ with "<span style="font-weight: bold;">c</span> "</span><br>
transient calibration test cycle and model internal calculation of
correction factor(s) to be applied to stationary fuel consumption map.<br>
</div>
-<br><br>
-<img src="../pics/misc/browse.png" style="width: 28px; height: 21px;" alt="browse"><span style="font-weight: bold;"> Browse for files</span><br>
-<div style="margin-left: 40px;">Using the VECTO File
-Browser<br>
-</div>
-<br><br>
+<br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br><br>
<img src="../pics/misc/OK.png" style="width: 75px; height: 23px;" alt="OK"><a name="ok"></a><span style="font-weight: bold;">Save
and close file</span><br>
<div style="margin-left: 40px;">If necessary the file path
diff --git a/User Manual/GUI/GBX-Editor.html b/User Manual/GUI/GBX-Editor.html
index dde1f849616505c055ee3d15d6d3ed28ce11dea5..99fec94775328afac77f3a56f4f226e0d5d9f761 100644
--- a/User Manual/GUI/GBX-Editor.html
+++ b/User Manual/GUI/GBX-Editor.html
@@ -2,7 +2,7 @@
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Gearbox Editor - VECTO User Manual</title></head>
<body>
-<map name="linkmap"><area shape="rect" coords="11,34,30,52"" href="#new"><area shape="rect" coords="33,33,51,53"" href="#open"><area shape="rect" coords="59,34,76,53"" href="#save"><area shape="rect" coords="85,33,102,52"" href="#saveas"><area shape="rect" coords="112,32,131,54"" href="#sendto"><area shape="rect" coords="36,117,401,134"" href="#make"><area shape="rect" coords="34,149,176,170"" href="#inertia"><area shape="rect" coords="218,148,401,172"" href="#trint"><area shape="rect" coords="21,179,400,379"" href="#gears"><area shape="rect" coords="22,383,52,408"" href="#remgear"><area shape="rect" coords="239,403,319,424"" href="#ok"><area shape="rect" coords="324,404,398,425"" href="#cancel"></map>
+<map name="linkmap"><area shape="rect" coords="11,34,30,52"" href="#new"><area shape="rect" coords="33,33,51,53"" href="#open"><area shape="rect" coords="59,34,76,53"" href="#save"><area shape="rect" coords="85,33,102,52"" href="#saveas"><area shape="rect" coords="112,32,131,54"" href="#sendto"><area shape="rect" coords="36,117,401,134"" href="#make"><area shape="rect" coords="129,140,357,161"" href="#type"><area shape="rect" coords="20,174,465,325"" href="#gears"><area shape="rect" coords="20,329,50,353"" href="#remgear"><area shape="rect" coords="149,330,209,353"" href="#inertia"><area shape="rect" coords="399,331,445,353"" href="#trint"><area shape="rect" coords="25,400,460,422"" href="#polyfile"><area shape="rect" coords="25,430,225,451"" href="#shiftinside"><area shape="rect" coords="25,457,161,479"" href="#skipgear"><area shape="rect" coords="365,432,422,456"" href="#torqres"><area shape="rect" coords="365,458,423,481"" href="#mintime"><area shape="rect" coords="24,486,457,582"" href="#startgear"><area shape="rect" coords="26,615,115,638"" href="#tcon"><area shape="rect" coords="26,656,458,679"" href="#tcfile"><area shape="rect" coords="323,684,393,707"" href="#tcrefspeed"><area shape="rect" coords="308,723,382,746"" href="#ok"><area shape="rect" coords="391,723,466,748"" href="#cancel"></map>
<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
@@ -16,13 +16,15 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<hr style="width: 100%; height: 2px;"><a href="usermanual.html"><span style="font-family: Verdana;"></span></a><span style="font-family: Verdana;"></span>
<div style="text-align: center;">
<div style="text-align: left; font-family: Verdana;">
-<h2>Gearbox Editor</h2><big><big><big><span style="font-weight: bold; color: red;">!! This page is not up-to-date with the current Beta release !!<br><br></span></big></big></big>
-</div>
-<img style="width: 422px; height: 462px;" alt="gbx" usemap="#linkmap" src="pics/GBX-Editor.PNG"><br>
+<h2>Gearbox Editor</h2>
+<big><big><big><span style="font-weight: bold; color: red;">
+</span></big></big></big></div>
+<img style="width: 486px; height: 781px;" alt="gbx" usemap="#linkmap" src="pics/GBX-Editor.PNG"><br>
<span style="font-family: Verdana;"><br>
</span>
<div style="text-align: left;">
-<div style="margin-left: 40px;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;"><a name="new"></a> New
+<div style="margin-left: 40px;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;"><a name="new"></a>
+New
file</span><br>
</div>
<div style="margin-left: 80px;">Create a new empty .vgbx
@@ -59,12 +61,11 @@ Editor</a> the file will be sent automatically when saved.<br>
</div>
</div>
<div style="margin-left: 40px;"><br>
-<span style="font-weight: bold;"><a name="make"></a>
-Make and Model</span><br>
+<span style="font-weight: bold;"><a name="make"></a> Make and Model</span><br>
<div style="margin-left: 40px;">Free text defining the
gearbox model, type, etc.<br>
</div>
-<br>
+<br><a name="type"></a><span style="font-weight: bold;"> Transmission Type</span><br><div style="margin-left: 40px;">Depending on the transmission type some options below are not available. The following types are available:<ul><li><span style="font-weight: bold;">Manual Transmission</span> (MT)</li><ul><li>Activates the "<span style="font-weight: bold;">Skip Gears</span>" option. No torque converter.</li></ul><li><span style="font-weight: bold;">Automated Manual Transmission</span> (AMT)</li><ul><li>Activates the <span style="font-weight: bold;">"Allow shift-up inside polygons"</span> and "<span style="font-weight: bold;">Skip Gears</span>" option. No torque converter.</li></ul><li><span style="font-weight: bold;">Automatic Transmission</span> (AT)</li><ul><li>Torque converter ist set and must be parameterized.<span style="font-weight: bold;"></span></li></ul><li style="font-weight: bold;">Custom</li><ul><li style="font-weight: bold;"><span style="font-weight: normal;">Enables all options for user-defined settings.</span></li></ul></ul></div>
<a name="inertia"></a> <span style="font-weight: bold;">Inertia</span> [kgm<sup>2</sup>]
<div style="margin-left: 40px;">Rotational inertia of the
gearbox (constant for all gears).<br>
@@ -77,9 +78,15 @@ gear shift event.<br>
<br>
</div>
<a name="gears"></a> <span style="font-weight: bold;">Gears</span><br>
-<div style="margin-left: 40px;">Doubleclick items to edit
-ratio and efficiency of the selected gear. <br>Gear "A" defines the ratio of the axle transmission / differential.<br>Set ratio=0 for unused gears.<br>
-Alternatively to setting a constant efficiency value it is possible to
+<div style="margin-left: 40px;"><ul><li>Doubleclick items to edit
+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 (fictional) gear
+is defined for cases where the lock-up clutch is open. This gear
+is used at vehicle start; when the up-shift rpm is reached VECTO
+will shift to the next gear (Gear 1) which means the lock-up clutch is
+closed. In the <a href="../fileformat/VMOD.html">modal result files (.vmod)</a> the "TC" gear will be output as "0.5" (to avoid non-numeric characters). </li><li>
+Set ratio=0 for unused gears.</li></ul>Alternatively to setting a constant efficiency value it is possible to
define a Torque Loss Map in the following format:<br>
<br>
<span style="font-weight: bold;">Torque Loss
@@ -117,7 +124,79 @@ with "<span style="font-weight: bold;">c</span> "</span><br>
<br>
<img style="width: 16px; height: 16px;" alt="rem" src="../pics/icons/minus-circle-icon.png"><a name="remgear"></a> Remove Gear (i.e. Ratio=0)<br>
</div>
-<br>
+<br><br><big><big><span style="font-weight: bold;">Gear shift parameters</span></big></big><br><div style="margin-left: 40px;"><span style="font-weight: bold;"><br><a name="polyfile"></a>Shift polygons file</span> (.vgbs)<br><div style="margin-left: 40px;">This
+file contains the up- and down- shift curves that control the gear
+shift behaviour. Whenever the actual engine speed crosses the up- or
+down-shift line a gear-shift is initiated.<br><img style="width: 485px; height: 341px;" alt="" src="pics/GBX-Editor-shift1.PNG"><br><br><br><span style="font-weight: bold;">Shift Polygons File Format</span> (comma-separated, dot = decimal-mark):
+<table style="background-color: white; text-align: left; height: 115px; margin-left: 0px; width: 541px;" border="1" cellpadding="2" cellspacing="1">
+<tbody>
+<tr>
+<th style="text-align: center; width: 163px;"><span style="color: rgb(51, 102, 255);">c </span>Engine Torque</th>
+<th style="text-align: center; width: 180px;">Downshift rpm</th>
+<th style="text-align: center; width: 176px;">Upshift rpm</th>
+</tr>
+<tr>
+<td style="text-align: center; width: 163px;"><span style="color: rgb(51, 102, 255);"><span style="font-weight: bold;">c</span> </span>[Nm]</td>
+<td style="text-align: center; width: 180px;">[1/min]</td>
+<td style="text-align: center; width: 176px;">[1/min]</td>
+</tr>
+<tr>
+<td style="width: 163px;">...</td>
+<td style="width: 180px;">...</td>
+<td style="width: 176px;">...</td>
+</tr>
+<tr>
+<td style="width: 163px;">...</td>
+<td style="width: 180px;">...</td>
+<td style="width: 176px;">...</td>
+</tr>
+</tbody>
+</table>
+<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>
+<br></div></div><div style="margin-left: 40px;"><a name="shiftinside"></a><span style="font-weight: bold;">Allow shift-up inside polygons</span><br><div style="margin-left: 40px;">If the next higher gear provides the required <a href="#torqres">torque reserve</a> and it's rpm is still above down-shift-rpm VECTO will shift up.<br><img style="width: 567px; height: 341px;" alt="" src="pics/GBX-Editor-shift2.PNG"></div><br><a name="skipgear"></a><span style="font-weight: bold;">Skip Gears</span><br><div style="margin-left: 40px;">Whenever
+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><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><a style="font-weight: bold;" name="mintime"></a><span style="font-weight: bold;">Minimum time between two gear shifts</span><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
+cause high rpms during acceleration.<br></div><br><a name="startgear"></a><span style="font-weight: bold;">Start Gear</span><br><div style="margin-left: 40px;">In order to calculate an appropriate
+gear for vehicle start (first gear after vehicle standstill) a
+fictional load case is calculated using a specified <span style="font-weight: bold;">reference vehicle speed</span> and <span style="font-weight: bold;">reference acceleration</span>
+together with the actual road gradient, transmission losses and
+auxiliary power demand. This way the start gear is independent from the
+target speed. VECTO uses the highest possible gear which provides the
+defined <span style="font-weight: bold;">torque reserve</span>.</div><br></div><br><big><big><span style="font-weight: bold;">Torque Converter</span></big></big><br><br><div style="margin-left: 40px;"><a name="tcon"></a><span style="font-weight: bold;">Torque Converter installed</span><br><div style="margin-left: 40px;">This option is only available if <a href="#type">transmission type</a> is set to <span style="font-weight: bold;">Custom</span>. For AT this option is always On, for MT and AMT always Off.</div></div><br><div style="margin-left: 40px;"><a name="tcfile"></a><span style="font-weight: bold;">Torque converter characteristics file</span> (.vtcc)<br><div style="margin-left: 40px;">This file defines the torque converter characteristics as described in VDI 2153:<br><span style="font-weight: bold;">Speed Ratio (</span>ν) = Output Speed / Input Speed<br><span style="font-weight: bold;">Torque Ratio</span> (μ) = Output Torque / Input Torque<br><span style="font-weight: bold;">Input Torque</span> is the input torque (over ν) for a specific reference engine speed (see below).<br><br>The torque converter characteristics must also be defined for speed ratios of more than one (<span style="font-weight: bold;"></span>ν>1) in order to calculate overrun conditions (torque<0).<br><br><span style="font-weight: bold;">Torque Loss
+Map Format</span> (comma-separated, dot = decimal-mark):
+<table style="background-color: white; text-align: left; height: 115px; width: 560px; margin-left: 0px;" border="1" cellpadding="2" cellspacing="1">
+<tbody>
+<tr>
+<th style="text-align: center; width: 179px;"><span style="color: rgb(51, 102, 255);">c </span>Speed Ratio ν</th>
+<th style="text-align: center; width: 187px;">Torque Ratio μ</th>
+<th style="text-align: center; width: 170px;">Input Torque at reference rpm</th>
+</tr>
+<tr>
+<td style="text-align: center; width: 179px;"><span style="color: rgb(51, 102, 255);"><span style="font-weight: bold;">c</span> </span>[-]</td>
+<td style="text-align: center; width: 187px;">[-]</td>
+<td style="text-align: center; width: 170px;">[Nm]</td>
+</tr>
+<tr>
+<td style="width: 179px;">...</td>
+<td style="width: 187px;">...</td>
+<td style="width: 170px;">...</td>
+</tr>
+<tr>
+<td style="width: 179px;">...</td>
+<td style="width: 187px;">...</td>
+<td style="width: 170px;">...</td>
+</tr>
+</tbody>
+</table>
+<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></div><br><a name="tcrefspeed"></a><span style="font-weight: bold;">Reference rpm for torque characteristic</span><br><div style="margin-left: 40px;">Reference engine speed associated with the <span style="font-weight: bold;">Input Torque</span> curve in the .vtcc file.</div></div><br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br><br>
</div>
<div style="margin-left: 40px;"><img style="width: 75px; height: 23px;" alt="OK" src="../pics/misc/OK.png"><a name="ok"></a><span style="font-weight: bold;">Save and close file</span><br>
<div style="margin-left: 40px;">If necessary the file path
@@ -127,7 +206,13 @@ will be updated.<br>
</div>
</div>
<div style="margin-left: 40px;"><img style="width: 75px; height: 23px;" alt="Cancel" src="../pics/misc/Cancel.png"><a name="cancel"></a><span style="font-weight: bold;"> Cancel without saving</span></div>
-<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2"><tbody><tr><td></td></tr></tbody></table>
+<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td></td>
+</tr>
+</tbody>
+</table>
<div style="text-align: left;">
<hr style="width: 100%; height: 2px;"><a href="../contact.html">Contact</a>
</div>
diff --git a/User Manual/GUI/VECTO-Editor.html b/User Manual/GUI/VECTO-Editor.html
index 7801b34d3cf99cac889109c9fa5ed14533e71be8..980595c53b0b44f8c0b518cfc86dac74781b7685 100644
--- a/User Manual/GUI/VECTO-Editor.html
+++ b/User Manual/GUI/VECTO-Editor.html
@@ -2,7 +2,7 @@
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>VECTO Editor - VECTO User Manual</title></head>
<body>
-<map name="linkmap"><area shape="rect" coords="10,34,30,53"" href="#new" title="New File"><area shape="rect" coords="33,34,52,53"" href="#open" title="Open File"><area shape="rect" coords="57,34,77,53"" href="#save" title="Save"><area shape="rect" coords="85,34,102,53"" href="#saveas" title="Save As..."><area shape="rect" coords="113,33,130,54"" href="#sendto" title="Send current file to Job List in Main Form"><area shape="rect" coords="117,108,213,130"" href="VECTO-Editor_Driver.html" title="Driver Tab"><area shape="rect" coords="20,140,96,161"" href="#veh" title="Open Vehicle Editor"><area shape="rect" coords="20,167,93,188"" href="#eng" title="Open Engine Editor"><area shape="rect" coords="21,197,94,216"" href="#gbx" title="Open Gearbox Editor"><area shape="rect" coords="654,141,683,220"" href="#browse" title="Open VECTO File Browser"><area shape="rect" coords="24,226,684,380"" href="#aux" title="Auxiliaries"><area shape="rect" coords="25,390,684,578"" href="#cycles" title="Cycles"><area shape="rect" coords="531,593,609,613"" href="#ok" title="Save and close"><area shape="rect" coords="616,593,694,612"" href="#cancel" title="Close without saving"></map>
+<map name="linkmap"><area shape="rect" coords="10,34,30,53"" href="#new" title="New File"><area shape="rect" coords="33,34,52,53"" href="#open" title="Open File"><area shape="rect" coords="57,34,77,53"" href="#save" title="Save"><area shape="rect" coords="85,34,102,53"" href="#saveas" title="Save As..."><area shape="rect" coords="113,33,130,54"" href="#sendto" title="Send current file to Job List in Main Form"><area shape="rect" coords="24,117,138,136"" href="#engonly"><area shape="rect" coords="111,144,209,165"" href="VECTO-Editor_Driver.html"><area shape="rect" coords="18,172,95,192"" href="#veh"><area shape="rect" coords="19,201,94,220"" href="#eng"><area shape="rect" coords="18,228,96,249"" href="#gbx"><area shape="rect" coords="22,258,682,410"" href="#aux"><area shape="rect" coords="531,640,607,663"" href="#ok"><area shape="rect" coords="617,642,690,663"" href="#cancel"><area shape="rect" coords="22,424,684,605"" href="#cycles"><area shape="rect" coords="653,172,683,250"" href="#browse"></map>
<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
@@ -18,34 +18,39 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<div style="text-align: left; font-family: Verdana;">
<h2>VECTO Editor</h2>
</div>
-<img src="pics/VECTO-Editor.PNG" usemap="#linkmap" style="width: 710px; height: 649px;" alt="VECTO Editor"><br>
+<img src="pics/VECTO-Editor.PNG" usemap="#linkmap" style="width: 710px; height: 699px;" alt="VECTO Editor"><br>
<span style="font-family: Verdana;"><br>
</span>
<div style="text-align: left;">
-<div style="margin-left: 40px;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;"><a name="new"></a> New
+<div style="margin-left: 40px;"><img src="../pics/icons/blue-document-icon.png" style="width: 16px; height: 16px;" alt="new"><span style="font-weight: bold;"><a name="new"></a>New
Job File</span><br>
</div>
<div style="margin-left: 80px;">Create a new empty .vecto
file<br>
</div>
-<div style="margin-left: 40px;"><br><br>
-<img src="../pics/icons/Open-icon.png" style="width: 16px; height: 16px;" alt="open"><span style="font-weight: bold;"><a name="open"></a> Open
+<div style="margin-left: 40px;"><br>
+<br>
+<img src="../pics/icons/Open-icon.png" style="width: 16px; height: 16px;" alt="open"><span style="font-weight: bold;"><a name="open"></a>
+Open
existing Job File</span><br>
</div>
<div style="text-align: left;">
<div style="margin-left: 80px;">Open an existing .vecto
file<br>
-<br><br>
+<br>
+<br>
</div>
<div style="margin-left: 40px;"><img src="../pics/icons/Actions-document-save-icon.png" style="width: 16px; height: 16px;" alt="save"><a name="save"></a> <span style="font-weight: bold;">Save
current Job File</span></div>
-<div style="margin-left: 80px;"><br><br>
+<div style="margin-left: 80px;"><br>
+<br>
</div>
<div style="margin-left: 40px;"><img src="../pics/icons/Actions-document-save-as-icon.png" style="width: 16px; height: 16px;" alt="SaveAs"><a name="saveas"></a> <span style="font-weight: bold;">Save
Job File as...</span><br>
<div style="margin-left: 40px;">Using the VECTO File
Browser<br>
-<br><br>
+<br>
+<br>
</div>
</div>
<div style="margin-left: 40px;"><img src="../pics/icons/export-icon.png" style="width: 16px; height: 16px;" alt="sendto"><a name="sendto"></a> <span style="font-weight: bold;">Send
@@ -55,12 +60,17 @@ Form</a></span><br>
be sent to the Job List automatically when saved.<br>
</div>
</div>
-<div style="margin-left: 40px;"><br><br>
-<span style="font-weight: bold;">Driver Tab</span><br>
+<div style="margin-left: 40px;"><br>
+<a name="engonly"></a> <span style="font-weight: bold;">Engine Only Mode</span><br><div style="margin-left: 40px;">This
+mode is used to calculate fuel consumption from a given load cycle
+(engine speed and torque). Vehicle (.vveh), Gearbox (.vgbx) and
+Auxiliary (.vaux) files are notrequired. <br>The <a href="../fileformat/VDRI.html">driving cylce (.vdri)</a> must contain:<br><ul><li>Engine speed: header: <n></li><li>Engine torque <Me> <span style="text-decoration: underline;">or</span> engine power <Pe> at clutch. <span style="font-weight: bold; color: red;">Note that VECTO adds engine inertia power demand!</span></li><li>[Optional] Additional power demand (aux) <Padd></li></ul></div><span style="font-weight: bold;">Driver Tab</span><br>
<div style="margin-left: 40px;">Open <a href="VECTO-Editor_Driver.html">Driver Tab</a></div>
</div>
-<br><br>
-<div style="margin-left: 40px;"><img src="pics/VECTO/Veh.png" style="width: 72px; height: 21px;" alt="veh"><a name="veh"></a> <span style="font-weight: bold;">Open <a href="VEH-Editor.html">Vehicle Editor</a></span><br>
+<br>
+<br>
+<div style="margin-left: 40px;"><img src="pics/VECTO/Veh.png" style="width: 72px; height: 21px;" alt="veh"><a name="veh"></a> <span style="font-weight: bold;">Open <a href="VEH-Editor.html">Vehicle
+Editor</a></span><br>
<br>
<img style="width: 72px; height: 21px;" alt="eng" src="pics/VECTO/Eng.png"><a name="eng"></a>
<span style="font-weight: bold;">Open <a href="ENG-Editor.html">Engine Editor</a></span><br>
@@ -68,31 +78,41 @@ be sent to the Job List automatically when saved.<br>
<img style="width: 72px; height: 21px;" alt="gbx" src="pics/VECTO/Gbx.png"><a name="gbx"></a>
<span style="font-weight: bold;">Open <a href="GBX-Editor.html">Gearbox Editor</a></span><br>
<br>
-<img style="width: 28px; height: 21px;" alt="brw" src="../pics/misc/browse.png"><a name="browse"></a>
+ <a name="browse"></a>
<span style="font-weight: bold;">Browse for
vehicle/engine/gearbox files</span><br>
<div style="margin-left: 40px;">...using the VECTO File
Browser<br>
-<br><br>
+<br>
+<br>
</div>
</div>
<div style="margin-left: 40px;"><span style="font-weight: bold;"><a name="aux"></a>Auxiliaries</span><br>
<div style="margin-left: 40px;">This list contains all
-auxiliaries (.vaux files) used for calculation.<br><span style="font-weight: bold;">Double-click</span> entries to edit with the <a href="VECTO-Editor_Aux.html">Aux Dialog</a>.<br>
+auxiliaries (.vaux files) used for calculation.<br>
+<span style="font-weight: bold;">Double-click</span>
+entries to edit with the <a href="VECTO-Editor_Aux.html">Aux
+Dialog</a>.<br>
<img style="width: 16px; height: 16px;" alt="addaux" src="../pics/icons/plus-circle-icon.png"> Add new Auxiliary<br>
<img style="width: 16px; height: 16px;" alt="remaux" src="../pics/icons/minus-circle-icon.png"> Remove the
selected Auxiliary from the list<br>
-The .vaux format is described <a href="VECTO-Editor_Aux.html#file">here</a>.<br><br>
+The .vaux format is described <a href="VECTO-Editor_Aux.html#file">here</a>.<br>
+<br>
</div>
</div>
<div style="margin-left: 40px;"><span style="font-weight: bold;"><a name="cycles"></a>Cycles</span><br>
<div style="margin-left: 40px;">List of cycles used for
-calculation.<br><span style="font-weight: bold;">Double-click</span> entries to open using the <a href="settings.html">File Open Command</a>.<br><span style="font-weight: bold;">Click</span> selected items to edit file paths.<br>
+calculation.<br>
+<span style="font-weight: bold;">Double-click</span> an entry to open the file (see <a href="settings.html#opencmd">File
+Open Command</a>).<br>
+<span style="font-weight: bold;">Click</span>
+selected items to edit file paths.<br>
<img style="width: 16px; height: 16px;" alt="addcycle" src="../pics/icons/plus-circle-icon.png"> Add cycle (.vdri)
using the VECTO file browser<br>
<img style="width: 16px; height: 16px;" alt="remcycle" src="../pics/icons/minus-circle-icon.png"> Remove the
selected cycle from the list<br>
-The .vdri format is described <a href="../fileformat/VDRI.html">here</a>.<br><br>
+The .vdri format is described <a href="../fileformat/VDRI.html">here</a>.<br>
+<br>
</div>
</div>
<div style="margin-left: 40px;"><img style="width: 75px; height: 23px;" alt="OK" src="../pics/misc/OK.png"><a name="ok"></a>
@@ -104,7 +124,14 @@ List in the <a href="mainform.html">Main Form</a><br>
</div>
<div style="margin-left: 40px;"><img style="width: 75px; height: 23px;" alt="Cancel" src="../pics/misc/Cancel.png"><a name="cancel"></a><span style="font-weight: bold;"> Cancel without saving</span></div>
<br>
-<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2"><tbody><tr><td></td></tr></tbody></table><br>
+<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td></td>
+</tr>
+</tbody>
+</table>
+<br>
<br>
<div style="text-align: left;">
<hr style="width: 100%; height: 2px;"><a href="../contact.html">Contact</a>
diff --git a/User Manual/GUI/VECTO-Editor_Driver.html b/User Manual/GUI/VECTO-Editor_Driver.html
index 08fc5282e482650451fe25044790044a34cfa3ec..7ecf99f9f7076acbe9f55c349655cc0fbd388713 100644
--- a/User Manual/GUI/VECTO-Editor_Driver.html
+++ b/User Manual/GUI/VECTO-Editor_Driver.html
@@ -2,7 +2,7 @@
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>VECTO Editor Driver Tab - VECTO User Manual</title></head>
<body>
-<map name="linkmap"><area shape="rect" coords="16,108,114,130"" href="VECTO-Editor.html"><area shape="rect" coords="20,160,683,187"" href="#vacc"><area shape="rect" coords="23,201,218,338"" href="#gear"></map>
+<map name="linkmap"><area shape="rect" coords="11,142,110,164"" href="VECTO-Editor.html"><area shape="rect" coords="20,196,680,218"" href="#vacc"></map>
<table style="width: 100%; height: 54px; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
@@ -19,21 +19,26 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<h2><a href="VECTO-Editor.html">VECTO Editor</a>
/ Driver Tab</h2>
</div>
-<img src="pics/VECTO-Editor_Driver.PNG" usemap="#linkmap" style="width: 712px; height: 652px;" alt="Driver"><br>
+<img src="pics/VECTO-Editor_Driver.PNG" usemap="#linkmap" style="width: 712px; height: 700px;" alt="Driver"><br>
<span style="font-family: Verdana;"><br>
</span>
<div style="text-align: left;"><span style="font-family: Verdana;"></span><span style="font-weight: bold;"><a name="vacc"></a>Max.
acceleration and brake curves </span>(.vacc Input File)<br>
<div style="margin-left: 40px;">Limits vehicle
acceleration and deceleration depending on vehicle speed.<br>
-<span style="font-weight: bold;"><br>Input File Format</span>
-(comma-separated, dot = decimal-mark):<br><br></div>
+<span style="font-weight: bold;"><br>
+Input File Format</span>
+(comma-separated, dot = decimal-mark):<br>
+</div>
<table style="background-color: white; margin-left: 40px; text-align: left; height: 115px; width: 534px;" border="1" cellpadding="2" cellspacing="1">
<tbody>
<tr>
-<th style="text-align: center; width: 150px;"><span style="color: rgb(51, 102, 255);">c </span>vehicle speed</th>
-<th style="text-align: center; width: 159px;">Max. acceleration</th>
-<th style="text-align: center; width: 161px;">Max. deceleration</th>
+<th style="text-align: center; width: 150px;"><span style="color: rgb(51, 102, 255);">c </span>vehicle
+speed</th>
+<th style="text-align: center; width: 159px;">Max.
+acceleration</th>
+<th style="text-align: center; width: 161px;">Max.
+deceleration</th>
</tr>
<tr>
<td style="text-align: center; width: 150px;"><span style="color: rgb(51, 102, 255);"><span style="font-weight: bold;">c</span> </span>[km/h]</td>
@@ -44,15 +49,32 @@ acceleration and deceleration depending on vehicle speed.<br>
<td style="width: 150px;">...</td>
<td style="width: 159px;">...</td>
<td style="width: 161px;">...</td>
-</tr><tr><td style="width: 150px;">...</td><td style="width: 159px;">...</td><td style="width: 161px;">...</td></tr>
+</tr>
+<tr>
+<td style="width: 150px;">...</td>
+<td style="width: 159px;">...</td>
+<td style="width: 161px;">...</td>
+</tr>
</tbody>
</table>
-<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></div>
+<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><br><img style="width: 28px; height: 21px;" alt="" src="../pics/misc/browse.png"> <span style="font-weight: bold;">Open file browser</span>.<br><br><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br>
+</div>
+<br>
+<span style="font-weight: bold;"><br></span><div style="margin-left: 40px;"><br>
<br>
-<span style="font-weight: bold;"><a name="gear"></a>Gear
-Shift Parameters</span><br>
-<div style="margin-left: 40px;">[No description yet]<br><br><br><table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2"><tbody><tr><td></td></tr></tbody></table><br></div>
+<br>
+<table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td></td>
+</tr>
+</tbody>
+</table>
+<br>
+</div>
<span style="font-family: Verdana;"></span></div>
<span style="font-family: Verdana;"></span>
<div style="text-align: left;">
@@ -61,7 +83,6 @@ Shift Parameters</span><br>
<hr style="width: 100%; height: 2px;"><a href="../contact.html">Contact</a>
</div>
</div>
-
</div>
<ul style="text-align: left; font-family: Tahoma;">
</ul>
diff --git a/User Manual/GUI/VEH-Editor.html b/User Manual/GUI/VEH-Editor.html
index 567e0d5a0f06f232ab4caad9d4c6175216cc5a0e..602fdfd289ddb716301837399fe3196fc7ed4782 100644
--- a/User Manual/GUI/VEH-Editor.html
+++ b/User Manual/GUI/VEH-Editor.html
@@ -18,7 +18,7 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<div style="text-align: left; font-family: Verdana;">
<h2>Vehicle Editor</h2>
</div>
-<img src="pics/VEH-Editor.PNG" style="width: 588px; height: 644px;" alt="eng" usemap="#linkmap"><br>
+<img src="pics/VEH-Editor.PNG" style="width: 589px; height: 644px;" alt="eng" usemap="#linkmap"><br>
<span style="font-family: Verdana;"><br>
<br>
</span>
@@ -239,7 +239,7 @@ for .vcdv/.vcdb files</span><br>
<div style="margin-left: 80px;">Using the VECTO File
Browser<br>
</div>
-<br>
+<br><div style="margin-left: 40px;"><img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG"> <span style="font-weight: bold;">Open file</span> with GRAPHi or an user-defined tool (see <a href="settings.html#opencmd">File Open Command)</a>.<br></div><br>
<a name="retard"></a><span style="font-weight: bold;">Retarder</span><br>
<div style="margin-left: 40px;">If available a <span style="font-weight: bold;">Retarder Torque Loss Map</span> can be defined here. Three options are available:<br>
<ul>
diff --git a/User Manual/GUI/mainform.html b/User Manual/GUI/mainform.html
index dbfb9f9b3d7b6e758946093d4ea667fe70825934..17d64eaabc0a59cd59c6c06d5a7b6676d5654c56 100644
--- a/User Manual/GUI/mainform.html
+++ b/User Manual/GUI/mainform.html
@@ -63,7 +63,7 @@ editor</li>
<li>Change the current Working Directory (using the
VECTO File
Browser)</li>
-</ul>
+</ul><li style="font-weight: bold;">Settings</li><ul><li>Opens the <a href="settings.html">Settings</a> dialog.</li></ul>
</ul>
</div>
<div style="margin-left: 40px;"><br>
diff --git a/User Manual/GUI/pics/ENG-Editor.PNG b/User Manual/GUI/pics/ENG-Editor.PNG
index 30022beb45ba21de6c514758e7ac7b5da68e85d1..29a55494963660f118a068efe781b0c73663c034 100644
Binary files a/User Manual/GUI/pics/ENG-Editor.PNG and b/User Manual/GUI/pics/ENG-Editor.PNG differ
diff --git a/User Manual/GUI/pics/GBX-Editor-shift1.PNG b/User Manual/GUI/pics/GBX-Editor-shift1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..d4401d39fcb5e80aaf451358bae308638f382828
Binary files /dev/null and b/User Manual/GUI/pics/GBX-Editor-shift1.PNG differ
diff --git a/User Manual/GUI/pics/GBX-Editor-shift2.PNG b/User Manual/GUI/pics/GBX-Editor-shift2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..5c7cc6b10b3a121ac6c77a1612857462137c4236
Binary files /dev/null and b/User Manual/GUI/pics/GBX-Editor-shift2.PNG differ
diff --git a/User Manual/GUI/pics/GBX-Editor-shift3.PNG b/User Manual/GUI/pics/GBX-Editor-shift3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..a6fe8cdcd77ac47d07528b548578038fc46b6c5d
Binary files /dev/null and b/User Manual/GUI/pics/GBX-Editor-shift3.PNG differ
diff --git a/User Manual/GUI/pics/GBX-Editor.PNG b/User Manual/GUI/pics/GBX-Editor.PNG
index 8df3714ed4569e756fb6a81a575c187b9ad80261..11ce4ad66b0ed558e48485cce1919dfedfd96713 100644
Binary files a/User Manual/GUI/pics/GBX-Editor.PNG and b/User Manual/GUI/pics/GBX-Editor.PNG differ
diff --git a/User Manual/GUI/pics/VECTO-Editor.PNG b/User Manual/GUI/pics/VECTO-Editor.PNG
index a333923d64a4b9451a3e5e07b46f2e66e802a8a2..2151574906e9449868a984eda01fd50a93e29829 100644
Binary files a/User Manual/GUI/pics/VECTO-Editor.PNG and b/User Manual/GUI/pics/VECTO-Editor.PNG differ
diff --git a/User Manual/GUI/pics/VECTO-Editor_Driver.PNG b/User Manual/GUI/pics/VECTO-Editor_Driver.PNG
index d685fdf986e82d6381a86730b736ef05ab3b5275..195b9946f0e9d241ae9aa5595f76f5d5584b04fc 100644
Binary files a/User Manual/GUI/pics/VECTO-Editor_Driver.PNG and b/User Manual/GUI/pics/VECTO-Editor_Driver.PNG differ
diff --git a/User Manual/GUI/pics/VEH-Editor.PNG b/User Manual/GUI/pics/VEH-Editor.PNG
index 549bc030881701b97bbafd7aee74fd013700b278..de3c09f60e57c8cfd2455e89e983259696660440 100644
Binary files a/User Manual/GUI/pics/VEH-Editor.PNG and b/User Manual/GUI/pics/VEH-Editor.PNG differ
diff --git a/User Manual/GUI/settings.html b/User Manual/GUI/settings.html
index 07e18b352285c803abe149834656ad053846f195..051d11612e00225cbab7248af3bec4f9a2ea782d 100644
--- a/User Manual/GUI/settings.html
+++ b/User Manual/GUI/settings.html
@@ -16,7 +16,7 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
<hr style="width: 100%; height: 2px;"><a href="usermanual.html"><span style="font-family: Verdana;"></span></a><span style="font-family: Verdana;"></span>
<div style="text-align: center;">
<div style="text-align: left; font-family: Verdana;">
-<h2>Settings<span style="font-family: Verdana;"></span></h2>
+<h2><a href="mainform.html">Main Form</a> / Settings<span style="font-family: Verdana;"></span></h2>
</div>
<div style="text-align: left;">
<div style="text-align: left;">
@@ -31,7 +31,7 @@ relative file paths in the job list and cycle list (BATCH Mode) of the
Main Form. In input files you can point to this directory using
the <span style="font-weight: bold;"><WORKDIR></span> wildcard<br><span style="font-weight: bold; font-style: italic;">Example</span><span style="font-style: italic;">: In "<WORKDIR>\VECTO\Job1.vecto"</span> the <span style="font-style: italic;"><WORKDIR> part will be replaced by the actual Working Directory.</span><br></div><br><br><a name="log"></a><span style="font-weight: bold;">Logfile Size Limit</span> [MB]<br><div style="margin-left: 40px;">Whenever
the logfile (LOG.txt in the application folder) reaches this size it
-will be restarted. One backup is always stored as LOG_backup.txt.<br></div><br><br><span style="font-weight: bold;"><a name="opencmd"></a>File Open Command</span><br><div style="margin-left: 40px;">This command will be used to open CSV Input Files like Driving Cycles (.vdri). See: <a href="http://en.wikipedia.org/wiki/Run_command">Run command <img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a><br><span style="font-style: italic;"><span style="font-weight: bold;">Example</span>: If the command is <span style="font-weight: bold;">excel</span> and the file <span style="font-weight: bold;">C:\VECTO\cycle1.vdri</span> then VECTO will run: <span style="font-weight: bold;">excel "</span></span><span style="font-style: italic; font-weight: bold;">C:\VECTO\cycle1.vdri"</span><br></div><span style="font-weight: bold;"><br><br><a name="air"></a>Air Density</span> [kg/m<sup>3</sup>]<br><div style="margin-left: 40px;">The Air Density is needed to calculate the air resistance together with the <span style="font-weight: bold;">Drag Coefficient</span> and the <span style="font-weight: bold;">Cross Sectional Area</span> (see <a href="VEH-Editor.html">Vehicle Editor</a>).<br></div><br><br><a name="fuel"></a><span style="font-weight: bold;">Fuel Density</span> [kg/l<sup></sup>]<br><div style="margin-left: 40px;">The Fuel Density is used to calculate the l/km results.<br></div><br><br><a name="pi"></a><span style="font-weight: bold;">CO</span><sub style="font-weight: bold;">2</sub><span style="font-weight: bold;">-to-Fuel Ratio</span> [-]<br><div style="margin-left: 40px;">Mass ratio (kg<sub>CO2</sub> / kg<sub>FC</sub>) used to calculate CO<sub>2</sub> emissions.<br></div><br><br><a name="reset"></a><span style="font-weight: bold;">Reset All Settings</span><br><div style="margin-left: 40px;">Alle values in the Settings dialog and <a href="mainform_options.html">Options</a> tab will be restored to default values.<br></div><br><br><img style="width: 75px; height: 23px;" alt="" src="../pics/misc/OK.png"> <span style="font-weight: bold;">Save and close dialog</span><br><br><br><img style="width: 75px; height: 23px;" alt="" src="../pics/misc/Cancel.png"> <span style="font-weight: bold;">Close without saving</span><br style="font-weight: bold;"><br></div><div style="text-align: left;"><table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
+will be restarted. One backup is always stored as LOG_backup.txt.<br></div><br><br><span style="font-weight: bold;"><a name="opencmd"></a>File Open Command</span><br><div style="margin-left: 40px;">This command will be used to open CSV Input Files like Driving Cycles (.vdri). See: <a href="http://en.wikipedia.org/wiki/Run_command">Run command <img style="border: 0px solid ; width: 12px; height: 12px;" alt="" src="../pics/misc/external-icon%2012x12.png"></a><br><span style="font-weight: bold;">Name</span>: Name of the command as it will be shown in the menu when clicking the <img style="width: 22px; height: 22px;" alt="" src="../pics/misc/OpenFile.PNG" align="top"> button.<br><span style="font-weight: bold;">Command</span>: The actual command.<br><br><span style="font-style: italic;"><span style="font-weight: bold;">Example</span>: If the command is <span style="font-weight: bold;">excel</span> and the file <span style="font-weight: bold;">C:\VECTO\cycle1.vdri</span> then VECTO will run: <span style="font-weight: bold;">excel "</span></span><span style="font-style: italic; font-weight: bold;">C:\VECTO\cycle1.vdri"</span><br></div><span style="font-weight: bold;"><br><br><a name="air"></a>Air Density</span> [kg/m<sup>3</sup>]<br><div style="margin-left: 40px;">The Air Density is needed to calculate the air resistance together with the <span style="font-weight: bold;">Drag Coefficient</span> and the <span style="font-weight: bold;">Cross Sectional Area</span> (see <a href="VEH-Editor.html">Vehicle Editor</a>).<br></div><br><br><a name="fuel"></a><span style="font-weight: bold;">Fuel Density</span> [kg/l<sup></sup>]<br><div style="margin-left: 40px;">The Fuel Density is used to calculate the l/km results.<br></div><br><br><a name="pi"></a><span style="font-weight: bold;">CO</span><sub style="font-weight: bold;">2</sub><span style="font-weight: bold;">-to-Fuel Ratio</span> [-]<br><div style="margin-left: 40px;">Mass ratio (kg<sub>CO2</sub> / kg<sub>FC</sub>) used to calculate CO<sub>2</sub> emissions.<br></div><br><br><a name="reset"></a><span style="font-weight: bold;">Reset All Settings</span><br><div style="margin-left: 40px;">Alle values in the Settings dialog and <a href="mainform_options.html">Options</a> tab will be restored to default values.<br></div><br><br><img style="width: 75px; height: 23px;" alt="" src="../pics/misc/OK.png"> <span style="font-weight: bold;">Save and close dialog</span><br><br><br><img style="width: 75px; height: 23px;" alt="" src="../pics/misc/Cancel.png"> <span style="font-weight: bold;">Close without saving</span><br style="font-weight: bold;"><br></div><div style="text-align: left;"><table style="text-align: left; width: 100%; height: 1200px;" border="0" cellpadding="2" cellspacing="2">
<tbody>
<tr>
<td></td>
diff --git a/User Manual/fileformat/VDRI.html b/User Manual/fileformat/VDRI.html
index 911ed5fcce27a3e9738c2b88dd64194296343c2a..b1be5e88b1c08fe54a1ca715846e2f52b32a3f0c 100644
--- a/User Manual/fileformat/VDRI.html
+++ b/User Manual/fileformat/VDRI.html
@@ -20,7 +20,7 @@ Manual</span></a><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman
Driving Cycle defines vehicle speed, road gradient and other parameters
either time- or distance-based. It's open format requires <span style="color: rgb(0, 0, 0); font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Idenfiers<span class="Apple-converted-space"> to</span></span> define the content of each column. <br><br><br><br><br><span style="font-weight: bold;">Supported Identifiers:</span><br><table style="text-align: left; width: 100%; height: 116px;" border="1" cellpadding="5" cellspacing="0"><tbody><tr><td style="font-weight: bold; width: 95px;">Identifier</td><td style="width: 112px;"><span style="font-weight: bold;">Quantity</span></td><td style="width: 58px;"><span style="font-weight: bold;">Unit</span></td><td style="width: 665px;"><span style="font-weight: bold;">Description</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><s></td><td style="width: 112px;">Distance</td><td style="width: 58px;">[m]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Travelled distance used for distance-based cycles. If <t> is also defined this column will be ignored.</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"></span></td></tr><tr><td style="font-weight: bold; width: 95px;"><t></td><td style="width: 112px;">Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Used for time-based cycles. If neither this nor the distance <s> is defined the data will be <span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">interpreted as 1Hz.</span></td></tr><tr><td style="font-weight: bold; width: 95px;"><grad></td><td style="width: 112px;">Road Gradient</td><td style="width: 58px;">[%]</td><td style="width: 665px;">Optional.</td></tr><tr><td style="font-weight: bold; width: 95px;"><stop></td><td style="width: 112px;">Stopping Time</td><td style="width: 58px;">[s]</td><td style="width: 665px;">Required
for distance-based cycles. Not used in time based cycles. <stop>
-defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font-weight: bold; width: 95px;"><Aux_xxx></td><td style="width: 112px;">Auxiliary Supply Power</td><td style="width: 58px;">[kW]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Supply Power input for each auxiliary defined in the <a href="../GUI/VECTO-Editor.html">.vecto file</a> where<span class="Apple-converted-space"> </span></span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; font-style: italic; font-weight: bold;">xxx</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space"> </span>matches the ID of the corresponding <a href="../GUI/VECTO-Editor_Aux.html">Auxiliary</a>. </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">ID's are not case sensitive and must not contain space or special characters.</span></td></tr><tr><td><span style="font-weight: bold;"><n></span></td><td style="width: 112px;">Engine Speed</td><td style="width: 58px;">[rpm]</td><td style="width: 665px;">If <n> is defined VECTO uses that instead of the calculated engine speed value.</td></tr><tr><td><span style="font-weight: bold;"><gear></span></td><td style="width: 112px;">Gear</td><td style="width: 58px;">[-]</td><td style="width: 665px;">Gear input. Overwrites the gear shift model.</td></tr><tr><td><span style="font-weight: bold;"><Padd></span></td><td style="width: 112px;">Additional Aux Power Demand</td><td style="width: 58px;">[kW]</td><td style="width: 665px;">This power input will be directly added to the engine power in addition to possible other auxiliaries.</td></tr><tr><td><span style="font-weight: bold;"><vair_res></span></td><td style="width: 112px;">Air speed relative to vehicle</td><td style="width: 58px;">[km/h]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td style="font-weight: bold;"><vair_beta></td><td style="width: 112px;">Wind Yaw Angle</td><td style="width: 58px;">[�]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr></tbody></table><span style="color: red;">Note: The Identifiers line is no comment line and therefore does not start with "c"</span><br><span style="font-family: Verdana;"><br></span><big><big><small><small><span style="font-weight: bold;">Example 1: </span></small></small></big></big>Distance-based cycle with<span style="font-weight: bold;"> Road Gradient</span> and two <span style="font-weight: bold;">Auxiliaries</span> (as provided in the demo data)<span style="font-family: Verdana;"></span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 590px; height: 219px;" alt="" src="pics/VDRI01.png"></span><br><big><big><small><small><span style="font-weight: bold;">Example 2:</span> Time</small></small></big></big>-based cycle with Engine Speed, <span style="font-weight: bold;">Vair & Beta Input</span>, one <span style="font-weight: bold;">Auxiliary</span> and <span style="font-weight: bold;">Additional Aux Demand</span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 632px; height: 189px;" alt="" src="pics/VDRI02.png"></span><br><br>The demo data provided with VECTO contains several .vdri files that may be used as template.<br><span style="font-family: Verdana;"></span></div><span style="font-family: Verdana;"></span><br>
+defines the time the vehicle spends in stop phases.</td></tr><tr><td style="font-weight: bold; width: 95px;"><Aux_xxx></td><td style="width: 112px;">Auxiliary Supply Power</td><td style="width: 58px;">[kW]</td><td style="width: 665px;"><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">Supply Power input for each auxiliary defined in the <a href="../GUI/VECTO-Editor.html">.vecto file</a> where<span class="Apple-converted-space"> </span></span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; font-style: italic; font-weight: bold;">xxx</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;"><span class="Apple-converted-space"> </span>matches the ID of the corresponding <a href="../GUI/VECTO-Editor_Aux.html">Auxiliary</a>. </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">ID's are not case sensitive and must not contain space or special characters.</span></td></tr><tr><td><span style="font-weight: bold;"><n></span></td><td style="width: 112px;">Engine Speed</td><td style="width: 58px;">[rpm]</td><td style="width: 665px;">If <n> is defined VECTO uses that instead of the calculated engine speed value.</td></tr><tr><td><span style="font-weight: bold;"><gear></span></td><td style="width: 112px;">Gear</td><td style="width: 58px;">[-]</td><td style="width: 665px;">Gear input. Overwrites the gear shift model.</td></tr><tr><td><span style="font-weight: bold;"><Padd></span></td><td style="width: 112px;">Additional Aux Power Demand</td><td style="width: 58px;">[kW]</td><td style="width: 665px;">This power input will be directly added to the engine power in addition to possible other auxiliaries. Also used in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>.</td></tr><tr><td><span style="font-weight: bold;"><vair_res></span></td><td style="width: 112px;">Air speed relative to vehicle</td><td style="width: 58px;">[km/h]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td style="font-weight: bold;"><vair_beta></td><td style="width: 112px;">Wind Yaw Angle</td><td style="width: 58px;">[�]</td><td style="width: 665px;">Only required if <span style="font-weight: bold;">Cross Wind Correction</span> is set to<span style="font-family: 'Times New Roman';"> </span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none; font-weight: bold;">Vair & Beta Input</span><span style="color: rgb(0, 0, 0); font-family: 'Times New Roman'; font-size: medium; font-style: normal; font-variant: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; display: inline ! important; float: none;">. See <a href="../GUI/VEH-Editor.html#wind">here</a> for details.</span></td></tr><tr><td><span style="font-weight: bold;"><Pe></span></td><td>Engine power</td><td>[kW]</td><td>Effective engine power at clutch. Only required in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>. Alternatively torque <Me> can be defined.</td></tr><tr><td><span style="font-weight: bold;"><Me></span></td><td>Engine torque</td><td>[Nm]</td><td>Effective engine torque at clutch. Only required in <a href="../GUI/VECTO-Editor.html#engonly">Engine Only Mode</a>. Alternatively power <Pe> can be defined.</td></tr></tbody></table><span style="color: red;">Note: The Identifiers line is no comment line and therefore does not start with "c"</span><br><span style="font-family: Verdana;"><br></span><big><big><small><small><span style="font-weight: bold;">Example 1: </span></small></small></big></big>Distance-based cycle with<span style="font-weight: bold;"> Road Gradient</span> and two <span style="font-weight: bold;">Auxiliaries</span> (as provided in the demo data)<span style="font-family: Verdana;"></span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 590px; height: 219px;" alt="" src="pics/VDRI01.png"></span><br><big><big><small><small><span style="font-weight: bold;">Example 2:</span> Time</small></small></big></big>-based cycle with Engine Speed, <span style="font-weight: bold;">Vair & Beta Input</span>, one <span style="font-weight: bold;">Auxiliary</span> and <span style="font-weight: bold;">Additional Aux Demand</span><br><span style="font-family: Verdana;"></span><span style="font-family: Verdana;"><img style="width: 632px; height: 189px;" alt="" src="pics/VDRI02.png"></span><br><br>The demo data provided with VECTO contains several .vdri files that may be used as template.<br><span style="font-family: Verdana;"></span></div><span style="font-family: Verdana;"></span><br>
<div style="text-align: left;">
<div style="text-align: left;">
<div style="text-align: left;">
diff --git a/User Manual/fileformat/VMOD.html b/User Manual/fileformat/VMOD.html
index ea2e04e4ca8717ecc23435385a8895b70c2dff28..21f903112db411943205f6baa5365f421af9a803 100644
--- a/User Manual/fileformat/VMOD.html
+++ b/User Manual/fileformat/VMOD.html
@@ -98,7 +98,7 @@ Eng</span>).</td>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt; width: 95px;" height="20">Gear</td>
<td style="width: 66px;">[-]</td>
-<td style="width: 757px;">Gear. Zero = clutch opened / neutral.</td>
+<td style="width: 757px;">Gear. "0" = clutch opened / neutral. "0.5" = lock-up clutch is open (AT with torque converter only, see <a href="../GUI/GBX-Editor.html">Gearbox</a>)</td>
</tr>
<tr style="height: 15pt;" height="20">
<td style="height: 15pt; width: 95px;" height="20">Ploss
@@ -176,10 +176,10 @@ Veh</td>
<td style="height: 15pt; width: 95px;" height="20">FC</td>
<td style="width: 66px;">[g/h]</td>
<td style="width: 757px;">Fuel consumption.</td>
-</tr>
+</tr><tr><td>TCν</td><td>[-]</td><td>Torque converter speed ratio*</td></tr><tr><td>TCμ</td><td>[-]</td><td>Torque converter torque ratio*</td></tr><tr><td>TC_M_Out</td><td>[Nm]</td><td>Torque converter output torque*</td></tr><tr><td>TC_n_Out</td><td>[1/min]</td><td>Torque converter output speed*</td></tr>
</tbody>
</table>
-<br>
+<span style="font-style: italic;">*only if the Torque Converter is defined in the <a href="../GUI/GBX-Editor.html">Gearbox</a> settings.</span><br>
<span style="font-family: Verdana;"></span><br>
<span style="font-family: Verdana;"></span></div>
<span style="font-family: Verdana;"></span><br>
diff --git a/User Manual/fileformat/index.html b/User Manual/fileformat/index.html
index ee10fd349c39a63f364212aeff4e1dba8bb39603..96d6b9be62037b51a98e19d940020a8544dcf0a6 100644
--- a/User Manual/fileformat/index.html
+++ b/User Manual/fileformat/index.html
@@ -47,7 +47,7 @@ the comment line. Number and position of comment lines is not limited.</td>
<hr style="width: 100%; height: 2px;">
<div style="text-align: left;"><big><big style="font-weight: bold;">Input Files:<br></big></big><span style="font-style: italic;">Note: Editor-supported Input Files are described in the "User Interface" section of the
User Manual.</span></div><div style="text-align: left;"><ul style="line-height: 1.7em;"><li><a href="VDRI.html">Driving Cycle (.vdri)</a></li>
-<li><a href="../GUI/VEH-Editor.html#cdv">Speed dependent Cross Wind Correction Input File (.vcdv)</a></li><li><a href="../GUI/VEH-Editor.html#cdb">Cross Wind Correction via Vair & Beta Input File (.vcdb)</a></li><li><a href="../GUI/VEH-Editor.html#retard">Retarder Torque Loss Map</a></li><li><a href="../GUI/ENG-Editor.html#fld">Full Load and Drag Torque (.vfld)</a></li><li><a href="../GUI/ENG-Editor.html#map">Fuel Consumption Map (.vmap)</a></li><li><a href="../GUI/GBX-Editor.html#gears">Transmission Loss Map</a></li><li><a href="../GUI/VECTO-Editor_Aux.html#file">Auxiliary (.vaux)</a></li>
+<li><a href="../GUI/VEH-Editor.html#cdv">Speed dependent Cross Wind Correction Input File (.vcdv)</a></li><li><a href="../GUI/VEH-Editor.html#cdb">Cross Wind Correction via Vair & Beta Input File (.vcdb)</a></li><li><a href="../GUI/VEH-Editor.html#retard">Retarder Torque Loss Map</a></li><li><a href="../GUI/ENG-Editor.html#fld">Full Load and Drag Torque (.vfld)</a></li><li><a href="../GUI/ENG-Editor.html#map">Fuel Consumption Map (.vmap)</a></li><li><a href="../GUI/GBX-Editor.html#gears">Transmission Loss Map</a></li><li><a href="../GUI/VECTO-Editor_Aux.html#file">Auxiliary (.vaux)</a></li><li><a href="../GUI/VECTO-Editor_Driver.html#vacc">Max. acceleration and brake curves (.vacc)</a></li><li><a href="../GUI/GBX-Editor.html#polyfile">Shift polygons (.vgbs)</a></li><li><a href="../GUI/GBX-Editor.html#tcfile">Torque Converter Characteristics (.vtcc)</a></li>
</ul>
<br>
<div style="text-align: left;"><big><big style="font-weight: bold;">Output Files:</big></big></div>
diff --git a/User Manual/pics/misc/OpenFile.PNG b/User Manual/pics/misc/OpenFile.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..4bf8f15b3e8731dfdb67d3f67befdeb6ba3f01c3
Binary files /dev/null and b/User Manual/pics/misc/OpenFile.PNG differ
diff --git a/User Manual/usermanual.html b/User Manual/usermanual.html
index bc210ca14981931c15eab7b3cd03609f38c4dcb9..28c3a86b639089b033762fa726d1e85398f95106 100644
--- a/User Manual/usermanual.html
+++ b/User Manual/usermanual.html
@@ -22,8 +22,8 @@ VECTO 1.1<br><br style="font-family: Verdana;"></span>
<li style="font-family: Calibri;"><big><a href="quickstart.html">Quick Start Guide</a></big></li><li style="font-family: Calibri;"><big>User
Interface</big></li>
<ul>
-<li style="font-family: Calibri;"><big><a href="GUI/mainform.html">Main Form</a></big></li>
-<li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor.html">VECTO Editor</a></big></li>
+<li style="font-family: Calibri;"><big><a href="GUI/mainform.html">Main Form</a></big></li><ul><li style="font-family: Calibri;"><big><a href="GUI/settings.html">Settings</a><br></big></li></ul>
+<li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor.html">VECTO Editor</a></big></li><ul><li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor_Aux.html">Aux Dialog</a><br></big></li></ul>
<li style="font-family: Calibri;"><big><a href="GUI/VEH-Editor.html">Vehicle Editor</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/ENG-Editor.html">Engine Editor</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/GBX-Editor.html">Gearbox Editor</a></big></li>
diff --git a/VECTO Changelog.txt b/VECTO Changelog.txt
index 4d08a136ae8b47bc3eac63da7a5e6ef250705cef..d5ee1b49f3e3a0ded2832d4927c4edcb619e83a9 100644
--- a/VECTO Changelog.txt
+++ b/VECTO Changelog.txt
@@ -3,13 +3,17 @@ VECTO ?.? (future release)
VECTO 1.1 x (current source - next release)
+
+
+VECTO 1.1 beta 3
- FC Extrapolation will abort the calculation
- Transmission Type selection in Gearbox (.vgbx) file.
- Enables/Disables transmission type-specific options
- In Proof-Of-Concept mode "Custom" type is available with all options enabled.
-- Automatic Transmission mode with Torque converter !!in development!!
+- Automatic Transmission mode with Torque converter: Input parameters in Gearbox file !!still being tested!!
- Option to open files with GRAPHi or user-defined tool
-
+- User Manual updated
+- Bugfix: Files with relative paths were not located correctly
VECTO 1.1 beta 2 - 01.03.2013
- Corrected comment line for wheels inertia and axle config in .vveh file
diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index 6f0f99ff0e8afac1d7bceb2a595bb01ba44b67bc..2c6145be92caaeb86160e269c81b5c8180b644f1 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -387,6 +387,7 @@ Partial Class F_ENG
'
'TbWHTC
'
+ Me.TbWHTC.Enabled = False
Me.TbWHTC.Location = New System.Drawing.Point(12, 321)
Me.TbWHTC.Name = "TbWHTC"
Me.TbWHTC.Size = New System.Drawing.Size(447, 20)
@@ -395,6 +396,7 @@ Partial Class F_ENG
'Label7
'
Me.Label7.AutoSize = True
+ Me.Label7.Enabled = False
Me.Label7.Location = New System.Drawing.Point(12, 305)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(109, 13)
@@ -403,6 +405,7 @@ Partial Class F_ENG
'
'BtWHTC
'
+ Me.BtWHTC.Enabled = False
Me.BtWHTC.Location = New System.Drawing.Point(465, 319)
Me.BtWHTC.Name = "BtWHTC"
Me.BtWHTC.Size = New System.Drawing.Size(28, 23)
diff --git a/VECTO/GUI/F_ENG.resx b/VECTO/GUI/F_ENG.resx
index 7c2697aedb40fddb222fd2c8db453878d793ef4e..0c5aaf6911f591c954e277eab0d0a3eaa6e90651 100644
--- a/VECTO/GUI/F_ENG.resx
+++ b/VECTO/GUI/F_ENG.resx
@@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>259, 21</value>
+ <value>114, 20</value>
</metadata>
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1101, 12</value>
diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb
index f6d40c48678bcbb8af3030928544b0d62de87d9d..0ee1df5ba172eedeff65691a8ec74376d4ba7390 100644
--- a/VECTO/GUI/F_ENG.vb
+++ b/VECTO/GUI/F_ENG.vb
@@ -316,11 +316,15 @@
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
- Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
- Catch ex As Exception
- MsgBox("Failed to open link!", MsgBoxStyle.Critical)
- End Try
+ If IO.File.Exists(CmFiles(0)) Then
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
End Sub
#End Region
diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 65f58fd539ace606fc83b0e601dedfcb718e8014..7ac6f9ecd11e6751d9f745a985e3fad566ef455b 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -52,6 +52,10 @@ Partial Class F_GBX
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.BtClearGear = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.PnTorqRes = New System.Windows.Forms.Panel()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.TbTqResv = New System.Windows.Forms.TextBox()
Me.BtShiftPolyOpen = New System.Windows.Forms.Button()
Me.ChShiftInside = New System.Windows.Forms.CheckBox()
Me.TbShiftTime = New System.Windows.Forms.TextBox()
@@ -68,11 +72,8 @@ Partial Class F_GBX
Me.Label8 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
Me.Label7 = New System.Windows.Forms.Label()
- Me.TbTqResv = New System.Windows.Forms.TextBox()
Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.Label2 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -90,16 +91,15 @@ Partial Class F_GBX
Me.ChTCon = New System.Windows.Forms.CheckBox()
Me.Label16 = New System.Windows.Forms.Label()
Me.CbGStype = New System.Windows.Forms.ComboBox()
- Me.PnTorqRes = New System.Windows.Forms.Panel()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox1.SuspendLayout()
+ Me.PnTorqRes.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.CmOpenFile.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.PnTC.SuspendLayout()
- Me.PnTorqRes.SuspendLayout()
Me.SuspendLayout()
'
'ToolStrip1
@@ -204,7 +204,7 @@ Partial Class F_GBX
Me.ButCancel.Location = New System.Drawing.Point(378, 687)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 7
+ Me.ButCancel.TabIndex = 9
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = True
'
@@ -214,7 +214,7 @@ Partial Class F_GBX
Me.ButOK.Location = New System.Drawing.Point(297, 687)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 6
+ Me.ButOK.TabIndex = 8
Me.ButOK.Text = "OK"
Me.ButOK.UseVisualStyleBackColor = True
'
@@ -223,7 +223,7 @@ Partial Class F_GBX
Me.TbTracInt.Location = New System.Drawing.Point(389, 299)
Me.TbTracInt.Name = "TbTracInt"
Me.TbTracInt.Size = New System.Drawing.Size(40, 20)
- Me.TbTracInt.TabIndex = 2
+ Me.TbTracInt.TabIndex = 5
'
'LvGears
'
@@ -235,7 +235,7 @@ Partial Class F_GBX
Me.LvGears.MultiSelect = False
Me.LvGears.Name = "LvGears"
Me.LvGears.Size = New System.Drawing.Size(441, 150)
- Me.LvGears.TabIndex = 3
+ Me.LvGears.TabIndex = 2
Me.LvGears.TabStop = False
Me.LvGears.UseCompatibleStateImageBehavior = False
Me.LvGears.View = System.Windows.Forms.View.Details
@@ -260,7 +260,7 @@ Partial Class F_GBX
Me.TBI_getr.Location = New System.Drawing.Point(139, 299)
Me.TBI_getr.Name = "TBI_getr"
Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
- Me.TBI_getr.TabIndex = 1
+ Me.TBI_getr.TabIndex = 4
'
'Label49
'
@@ -330,7 +330,7 @@ Partial Class F_GBX
Me.BtClearGear.Location = New System.Drawing.Point(12, 297)
Me.BtClearGear.Name = "BtClearGear"
Me.BtClearGear.Size = New System.Drawing.Size(29, 23)
- Me.BtClearGear.TabIndex = 4
+ Me.BtClearGear.TabIndex = 3
Me.BtClearGear.UseVisualStyleBackColor = True
'
'GroupBox1
@@ -349,17 +349,52 @@ Partial Class F_GBX
Me.GroupBox1.Location = New System.Drawing.Point(12, 326)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(441, 230)
- Me.GroupBox1.TabIndex = 5
+ Me.GroupBox1.TabIndex = 6
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Gear shift parameters"
'
+ 'PnTorqRes
+ '
+ Me.PnTorqRes.Controls.Add(Me.Label2)
+ Me.PnTorqRes.Controls.Add(Me.Label4)
+ Me.PnTorqRes.Controls.Add(Me.TbTqResv)
+ Me.PnTorqRes.Location = New System.Drawing.Point(235, 66)
+ Me.PnTorqRes.Name = "PnTorqRes"
+ Me.PnTorqRes.Size = New System.Drawing.Size(200, 32)
+ Me.PnTorqRes.TabIndex = 5
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(20, 9)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(79, 13)
+ Me.Label2.TabIndex = 0
+ Me.Label2.Text = "Torque reserve"
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(168, 9)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(21, 13)
+ Me.Label4.TabIndex = 0
+ Me.Label4.Text = "[%]"
+ '
+ 'TbTqResv
+ '
+ Me.TbTqResv.Location = New System.Drawing.Point(105, 6)
+ Me.TbTqResv.Name = "TbTqResv"
+ Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
+ Me.TbTqResv.TabIndex = 3
+ '
'BtShiftPolyOpen
'
Me.BtShiftPolyOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtShiftPolyOpen.Location = New System.Drawing.Point(412, 39)
+ Me.BtShiftPolyOpen.Location = New System.Drawing.Point(412, 40)
Me.BtShiftPolyOpen.Name = "BtShiftPolyOpen"
Me.BtShiftPolyOpen.Size = New System.Drawing.Size(23, 23)
- Me.BtShiftPolyOpen.TabIndex = 34
+ Me.BtShiftPolyOpen.TabIndex = 2
Me.BtShiftPolyOpen.TabStop = False
Me.BtShiftPolyOpen.UseVisualStyleBackColor = True
'
@@ -371,7 +406,7 @@ Partial Class F_GBX
Me.ChShiftInside.Location = New System.Drawing.Point(9, 74)
Me.ChShiftInside.Name = "ChShiftInside"
Me.ChShiftInside.Size = New System.Drawing.Size(195, 17)
- Me.ChShiftInside.TabIndex = 10
+ Me.ChShiftInside.TabIndex = 3
Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT)"
Me.ChShiftInside.UseVisualStyleBackColor = True
'
@@ -380,7 +415,7 @@ Partial Class F_GBX
Me.TbShiftTime.Location = New System.Drawing.Point(340, 98)
Me.TbShiftTime.Name = "TbShiftTime"
Me.TbShiftTime.Size = New System.Drawing.Size(57, 20)
- Me.TbShiftTime.TabIndex = 4
+ Me.TbShiftTime.TabIndex = 6
'
'Label12
'
@@ -406,7 +441,7 @@ Partial Class F_GBX
Me.ChSkipGears.Location = New System.Drawing.Point(9, 100)
Me.ChSkipGears.Name = "ChSkipGears"
Me.ChSkipGears.Size = New System.Drawing.Size(132, 17)
- Me.ChSkipGears.TabIndex = 2
+ Me.ChSkipGears.TabIndex = 4
Me.ChSkipGears.Text = "Skip Gears (MT, AMT)"
Me.ChSkipGears.UseVisualStyleBackColor = True
'
@@ -424,7 +459,7 @@ Partial Class F_GBX
Me.GroupBox2.Location = New System.Drawing.Point(6, 124)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
- Me.GroupBox2.TabIndex = 5
+ Me.GroupBox2.TabIndex = 7
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Start Gear"
'
@@ -503,13 +538,6 @@ Partial Class F_GBX
Me.Label7.TabIndex = 0
Me.Label7.Text = "[%]"
'
- 'TbTqResv
- '
- Me.TbTqResv.Location = New System.Drawing.Point(105, 6)
- Me.TbTqResv.Name = "TbTqResv"
- Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
- Me.TbTqResv.TabIndex = 3
- '
'TbShiftPolyFile
'
Me.TbShiftPolyFile.Location = New System.Drawing.Point(6, 42)
@@ -519,7 +547,7 @@ Partial Class F_GBX
'
'BtShiftPolyBrowse
'
- Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(374, 39)
+ Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(374, 40)
Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
Me.BtShiftPolyBrowse.TabIndex = 1
@@ -527,24 +555,6 @@ Partial Class F_GBX
Me.BtShiftPolyBrowse.Text = "..."
Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
'
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(168, 9)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(21, 13)
- Me.Label4.TabIndex = 0
- Me.Label4.Text = "[%]"
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(20, 9)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(79, 13)
- Me.Label2.TabIndex = 0
- Me.Label2.Text = "Torque reserve"
- '
'Label1
'
Me.Label1.AutoSize = True
@@ -585,7 +595,7 @@ Partial Class F_GBX
Me.GroupBox3.Location = New System.Drawing.Point(12, 562)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(441, 119)
- Me.GroupBox3.TabIndex = 44
+ Me.GroupBox3.TabIndex = 7
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Torque Converter"
'
@@ -645,7 +655,7 @@ Partial Class F_GBX
Me.TbTCfile.Location = New System.Drawing.Point(0, 21)
Me.TbTCfile.Name = "TbTCfile"
Me.TbTCfile.Size = New System.Drawing.Size(362, 20)
- Me.TbTCfile.TabIndex = 1
+ Me.TbTCfile.TabIndex = 0
'
'BtTCfileOpen
'
@@ -653,7 +663,7 @@ Partial Class F_GBX
Me.BtTCfileOpen.Location = New System.Drawing.Point(406, 19)
Me.BtTCfileOpen.Name = "BtTCfileOpen"
Me.BtTCfileOpen.Size = New System.Drawing.Size(23, 23)
- Me.BtTCfileOpen.TabIndex = 34
+ Me.BtTCfileOpen.TabIndex = 2
Me.BtTCfileOpen.TabStop = False
Me.BtTCfileOpen.UseVisualStyleBackColor = True
'
@@ -662,7 +672,7 @@ Partial Class F_GBX
Me.TbTCrefrpm.Location = New System.Drawing.Point(295, 47)
Me.TbTCrefrpm.Name = "TbTCrefrpm"
Me.TbTCrefrpm.Size = New System.Drawing.Size(67, 20)
- Me.TbTCrefrpm.TabIndex = 35
+ Me.TbTCrefrpm.TabIndex = 3
'
'ChTCon
'
@@ -693,17 +703,7 @@ Partial Class F_GBX
Me.CbGStype.Location = New System.Drawing.Point(119, 108)
Me.CbGStype.Name = "CbGStype"
Me.CbGStype.Size = New System.Drawing.Size(227, 21)
- Me.CbGStype.TabIndex = 46
- '
- 'PnTorqRes
- '
- Me.PnTorqRes.Controls.Add(Me.Label2)
- Me.PnTorqRes.Controls.Add(Me.Label4)
- Me.PnTorqRes.Controls.Add(Me.TbTqResv)
- Me.PnTorqRes.Location = New System.Drawing.Point(235, 66)
- Me.PnTorqRes.Name = "PnTorqRes"
- Me.PnTorqRes.Size = New System.Drawing.Size(200, 32)
- Me.PnTorqRes.TabIndex = 35
+ Me.CbGStype.TabIndex = 1
'
'F_GBX
'
@@ -744,6 +744,8 @@ Partial Class F_GBX
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
+ Me.PnTorqRes.ResumeLayout(False)
+ Me.PnTorqRes.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
@@ -751,8 +753,6 @@ Partial Class F_GBX
Me.GroupBox3.PerformLayout()
Me.PnTC.ResumeLayout(False)
Me.PnTC.PerformLayout()
- Me.PnTorqRes.ResumeLayout(False)
- Me.PnTorqRes.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index b759884397ce64867549125bdad7d0189c0a5123..6c320c01ee361f95be439b3090ab860760a2b7d4 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -374,13 +374,16 @@
Case tGearbox.Manual
Me.ChShiftInside.Enabled = False
Me.ChShiftInside.Checked = False
- Me.ChSkipGears.Enabled = True
+ Me.ChSkipGears.Enabled = False
+ Me.ChSkipGears.Checked = True
Me.ChTCon.Enabled = False
Me.ChTCon.Checked = False
Case tGearbox.SemiAutomatic
- Me.ChShiftInside.Enabled = True
- Me.ChSkipGears.Enabled = True
+ Me.ChShiftInside.Enabled = False
+ Me.ChShiftInside.Checked = True
+ Me.ChSkipGears.Enabled = False
+ Me.ChSkipGears.Checked = True
Me.ChTCon.Enabled = False
Me.ChTCon.Checked = False
@@ -522,11 +525,15 @@
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
- Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
- Catch ex As Exception
- MsgBox("Failed to open link!", MsgBoxStyle.Critical)
- End Try
+ If IO.File.Exists(CmFiles(0)) Then
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
End Sub
#End Region
diff --git a/VECTO/GUI/F_GEN.vb b/VECTO/GUI/F_GEN.vb
index 23b8712e0741184b1ea2a1e4050e27310481db86..580eaefb4260a96f5c3a34499366ee58e7a1a2d7 100644
--- a/VECTO/GUI/F_GEN.vb
+++ b/VECTO/GUI/F_GEN.vb
@@ -1370,11 +1370,15 @@ lbDlog:
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
- Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
- Catch ex As Exception
- MsgBox("Failed to open link!", MsgBoxStyle.Critical)
- End Try
+ If IO.File.Exists(CmFiles(0)) Then
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
End Sub
#End Region
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index b50a23c4350a583f2adfcd7439c08c6c7f8295ca..275c7e68d86865bbeeec4f5d966a2063320aeeb0 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -2190,11 +2190,15 @@ lbFound:
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
- Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
- Catch ex As Exception
- MsgBox("Failed to open link!", MsgBoxStyle.Critical)
- End Try
+ If IO.File.Exists(CmFiles(0)) Then
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
End Sub
#End Region
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index 30da82296570bb0f0fbba13ef8557e3a337ad93f..532cd855b925ef1dc92841517283596ab31c6f72 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -251,9 +251,9 @@ Partial Class F_VEH
Me.Label32.AutoSize = True
Me.Label32.Location = New System.Drawing.Point(206, 184)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(43, 13)
+ Me.Label32.Size = New System.Drawing.Size(36, 13)
Me.Label32.TabIndex = 24
- Me.Label32.Text = "[kgm²]"
+ Me.Label32.Text = "[kgm²]"
'
'Label35
'
@@ -278,9 +278,9 @@ Partial Class F_VEH
Me.Label38.AutoSize = True
Me.Label38.Location = New System.Drawing.Point(235, 48)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(31, 13)
+ Me.Label38.Size = New System.Drawing.Size(24, 13)
Me.Label38.TabIndex = 24
- Me.Label38.Text = "[m²]"
+ Me.Label38.Text = "[m²]"
'
'CbCdMode
'
diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb
index 82c5fd247b212bfc6f8a4e92a03cf01d77de6cd0..641fa8672cb64349f30fd80aeb8a5c1c634c57f6 100644
--- a/VECTO/GUI/F_VEH.vb
+++ b/VECTO/GUI/F_VEH.vb
@@ -700,11 +700,15 @@ Public Class F_VEH
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
- Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
- Catch ex As Exception
- MsgBox("Failed to open link!", MsgBoxStyle.Critical)
- End Try
+ If IO.File.Exists(CmFiles(0)) Then
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
End Sub
#End Region
diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb
index 6cf5a41e88ba739d89c195439f58f50a857b40f1..9ea8a310af77ee3458e0d3f98a53970b23ae84ff 100644
--- a/VECTO/GUI/GUI_Subs.vb
+++ b/VECTO/GUI/GUI_Subs.vb
@@ -202,6 +202,9 @@
'Open File
Public Function FileOpenAlt(ByVal file As String) As Boolean
Dim PSI As New ProcessStartInfo
+
+ If Not IO.File.Exists(file) Then Return False
+
PSI.FileName = Cfg.OpenCmd
PSI.Arguments = ChrW(34) & file & ChrW(34)
Try
diff --git a/VECTO/Input Files/cDRI.vb b/VECTO/Input Files/cDRI.vb
index 521a893acda413fcf1a9b69ca17967a0c531b101..0b9a489d9a588c72212406c918c712e21ca24348 100644
--- a/VECTO/Input Files/cDRI.vb
+++ b/VECTO/Input Files/cDRI.vb
@@ -112,12 +112,13 @@ Public Class cDRI
Dim ExsKV As KeyValuePair(Of Integer, List(Of Single))
Dim AuxSpalten As Dictionary(Of String, Integer) = Nothing
+ Dim Mvorg As Boolean = False
- Dim Tvorg As Boolean = False
-
Dim MsgSrc As String
+
+
MsgSrc = "Main/ReadInp/DRI"
bCreateMapParDef = False
@@ -331,11 +332,11 @@ Public Class cDRI
PaddVorg = DRIcheck(tDriComp.Padd)
GradVorg = DRIcheck(tDriComp.Grad)
VairVorg = DRIcheck(tDriComp.VairVres) And DRIcheck(tDriComp.VairBeta)
- Tvorg = DRIcheck(tDriComp.Torque)
+ Mvorg = DRIcheck(tDriComp.Torque)
- If Tvorg And Pvorg Then
+ If Mvorg And Pvorg Then
WorkerMsg(tMsgID.Warn, "Engine torque and power defined in cycle! Torque will be ignored!", MsgSrc)
- Tvorg = False
+ Mvorg = False
End If
'***
@@ -479,7 +480,7 @@ Public Class cDRI
Next
End If
- If Tvorg And Nvorg Then
+ If Mvorg And Nvorg Then
Values.Add(tDriComp.Pe, New List(Of Double))
Pvorg = True
For s = 0 To tDim
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index a7f9473e6c4349273ecdb19c7577a3d82fd42e23..29b53751bcdf30b03da0bf5f7413ef4c670db4b3 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -45,7 +45,9 @@ Public Class cGBX
'Torque Converter Iteration Results
Public TCMin As Single
Public TCnUin As Single
- Public TC_Tbrake As Single
+ Public TC_PeBrake As Single
+ Public TCMout As Single
+ Public TCnout As Single
@@ -285,7 +287,11 @@ Public Class cGBX
Dim MoutCalc As Single
- TC_Tbrake = 0
+ Dim MsgSrc As String
+
+ MsgSrc = "GBX/TCiteration"
+
+ TC_PeBrake = 0
'Dim nUmin As Single
'Dim nUmax As Single
@@ -333,18 +339,21 @@ Public Class cGBX
mu = fTCmu(nu)
MoutCalc = fTCtorque(nu, nUin) * mu
- If MoutCalc < Mout Then Stop
+ If MoutCalc < Mout Then
+ WorkerMsg(tMsgID.Err, "MoutCalc < Mout while nUin = nIdle!", MsgSrc)
+ Return False
+ End If
- TC_Tbrake = Mout - MoutCalc
+ TC_PeBrake = nMtoPe(nUout, Mout - MoutCalc)
End If
-
-
-
TCMin = MoutCalc / mu
TCnUin = nUin
+ TCMout = MoutCalc
+ TCnout = nUout
+
Return True
End Function
@@ -404,7 +413,21 @@ lbInt:
End Function
+ Public Function fGearStr(ByVal Gear As Int16) As String
+
+ If Gear = 0 Then Return "0"
+ If TCon Then
+ If Gear = 1 Then
+ Return "0.5"
+ Else
+ Return CStr(Gear - 1)
+ End If
+ Else
+ Return CStr(Gear)
+ End If
+
+ End Function
Public Function GSinit() As Boolean
Dim file As cFile_V3
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
index 49d47b5db73b18485737bbf6a1f35446bff185d2..386cacc167a5462d37f92aa5f6d55903524fe996 100644
--- a/VECTO/Input Files/cVEH.vb
+++ b/VECTO/Input Files/cVEH.vb
@@ -38,7 +38,7 @@ Public Class cVEH
Private CdDim As Integer
Private siGetrI(16) As Single
- Private sGetrMaps(16) As cSubPath
+ Public GetrMap(16) As cSubPath
Private MyGBmaps As List(Of cDelaunayMap)
Public GetrEffDef(16) As Boolean
Public GetrEff(16) As Single
@@ -77,7 +77,7 @@ Public Class cVEH
MyPath = ""
sFilePath = ""
For i = 0 To 16
- sGetrMaps(i) = New cSubPath
+ GetrMap(i) = New cSubPath
Next
CdFile = New cSubPath
CdX = New List(Of Single)
@@ -123,7 +123,7 @@ Public Class cVEH
sipmodell = 0
For i = 0 To 16
siGetrI(i) = 0
- sGetrMaps(i).Clear()
+ GetrMap(i).Clear()
GetrEffDef(i) = False
GetrEff(i) = 0
Next
@@ -521,7 +521,7 @@ lbError:
Else
- path = sGetrMaps(i).FullPath
+ path = GetrMap(i).FullPath
If Not file.OpenRead(path) Then
WorkerMsg(tMsgID.Err, "Cannot read file '" & path & "'!", MsgSrc)
@@ -1138,19 +1138,6 @@ lbInt:
End Set
End Property
- Public Property AchsMap(Optional ByVal Original As Boolean = False) As String
- Get
- If Original Then
- Return sGetrMaps(0).OriginalPath
- Else
- Return sGetrMaps(0).FullPath
- End If
- End Get
- Set(ByVal value As String)
- sGetrMaps(0).Init(MyPath, value)
- End Set
- End Property
-
Public Property ganganz As Short
Get
Return iganganz
@@ -1169,19 +1156,6 @@ lbInt:
End Set
End Property
- Public Property GetrMap(ByVal x As Short, Optional ByVal Original As Boolean = False) As String
- Get
- If Original Then
- Return sGetrMaps(x).OriginalPath
- Else
- Return sGetrMaps(x).FullPath
- End If
- End Get
- Set(ByVal value As String)
- sGetrMaps(x).Init(MyPath, value)
- End Set
- End Property
-
Public Property Mass As Single
Get
Return siMass
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 1b11222b56addd18d8361f48d8da06b1a8f50f65..bef66ad4b755eef34decd32a4b3e0e59cac4f64e 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -37,6 +37,10 @@ Public Class cMOD
Public Gear As List(Of Single)
Public VehState As List(Of tVehState)
+ Public TCnu As List(Of Single)
+ Public TCmu As List(Of Single)
+ Public TCMout As List(Of Single)
+ Public TCnOut As List(Of Single)
Private bInit As Boolean
@@ -74,6 +78,11 @@ Public Class cMOD
Gear = New List(Of Single)
VehState = New List(Of tVehState)
+ TCnu = New List(Of Single)
+ TCmu = New List(Of Single)
+ TCMout = New List(Of Single)
+ TCnOut = New List(Of Single)
+
Em.Init()
TC.Init()
Vh.Init()
@@ -115,6 +124,11 @@ Public Class cMOD
Gear = Nothing
VehState = Nothing
+ TCnu = Nothing
+ TCmu = Nothing
+ TCMout = Nothing
+ TCnOut = Nothing
+
CylceKin = Nothing
ModErrors = Nothing
bInit = False
@@ -418,6 +432,11 @@ Public Class cMOD
s.Append(",Gear,Ploss GB,Ploss Diff,Ploss Retarder,Pa GB,Pa Veh,Proll,Pair,Pgrad,Pwheel,Pbrake")
sU.Append(",[-],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW]")
+ If GBX.TCon Then
+ s.Append(",TCν,TCμ,TC_M_Out,TC_n_Out")
+ sU.Append(",[-],[-],[Nm],[1/min]")
+ End If
+
'Auxiliaries
For Each StrKey In AuxList
@@ -606,7 +625,7 @@ Public Class cMOD
If Not GEN.VehMode = tVehMode.EngineOnly Then
'Gear
- s.Append(Sepp & .Gear(t))
+ s.Append(Sepp & GBX.fGearStr(.Gear(t)))
'Transmission-losses
s.Append(Sepp & .PlossGB(t))
@@ -638,6 +657,9 @@ Public Class cMOD
'Brake
s.Append(Sepp & .Pbrake(t))
+ 'Torque Converter output
+ If GBX.TCon Then s.Append(Sepp & .TCnu(t) & Sepp & .TCmu(t) & Sepp & .TCMout(t) & Sepp & .TCnOut(t))
+
'Auxiliaries
For Each StrKey In AuxList
s.Append(Sepp & .Paux(StrKey)(t))
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index 8882832fec06f95b99a9f7db896fec715d59d3d9..2424b94dc76cc85d81edc7e31a585ffbcb234b52 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -1060,6 +1060,7 @@ lb_nOK:
Else
If EngState0 = tEngState.Load Then
Pbrake = 0
+ If GBX.TCon And Gear = 1 Then Pbrake = GBX.TC_PeBrake
If Math.Abs(P / Pmax - 1) < 0.02 Then EngState0 = tEngState.FullLoad
Else ' tEngState.Drag (tEngState.Idle, tEngState.Stopped kann's hier nicht geben weil Clutch <> Closed)
If P < Pmin Then
@@ -1195,6 +1196,29 @@ lb_nOK:
MODdata.VehState.Add(VehState0)
MODdata.Gear.Add(Gear)
+ 'Torque Converter output
+ If GBX.TCon Then
+ If Gear = 1 Then
+ If nU = 0 Then
+ MODdata.TCnu.Add(0)
+ Else
+ MODdata.TCnu.Add(GBX.TCnout / nU)
+ End If
+ If GBX.TCMin = 0 Then
+ MODdata.TCmu.Add(0)
+ Else
+ MODdata.TCmu.Add(GBX.TCMout / GBX.TCMin)
+ End If
+ MODdata.TCMout.Add(GBX.TCMout)
+ MODdata.TCnOut.Add(GBX.TCnout)
+ Else
+ MODdata.TCnu.Add(1)
+ MODdata.TCmu.Add(1)
+ MODdata.TCMout.Add(nPeToM(nU, P - Paux - PaMot))
+ MODdata.TCnOut.Add(nU)
+ End If
+ End If
+
If Cfg.WegKorJa Then Vh.DistCorrection(jz, VehState0)
'Interruption of traction(Zugkraftunterbrechung)
diff --git a/VECTO/M_Lese.vb b/VECTO/M_Lese.vb
index f3aad5e7846b658474943b75be441d4d7ce0f438..9a1f892dce3aa3bfbfa5345089dcdea6d931457f 100644
--- a/VECTO/M_Lese.vb
+++ b/VECTO/M_Lese.vb
@@ -97,7 +97,7 @@ Module M_Lese
For Each AuxKV In GEN.AuxPaths
AuxEntry = New cVEH.cAuxEntry
AuxEntry.Type = AuxKV.Value.Type
- AuxEntry.Path.Init(fPATH(GEN.PathVEH), AuxKV.Value.Path.OriginalPath)
+ AuxEntry.Path.Init(fPATH(GEN.FilePath), AuxKV.Value.Path.OriginalPath)
VEH.AuxPaths.Add(UCase(Trim(AuxKV.Key)), AuxEntry)
Next
End If
@@ -122,7 +122,7 @@ Module M_Lese
VEH.GetrEffDef(i) = True
VEH.GetrEff(i) = CSng(GBX.GetrMap(i, True))
Else
- VEH.GetrMap(i) = GBX.GetrMap(i, True)
+ VEH.GetrMap(i).Init(fPATH(GEN.PathGBX), GBX.GetrMap(i, True))
End If
If VEH.Igetr(i) > 0.0001 Then VEH.ganganz = i
Next
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 4442d20e77e940f52b2cea8d0830f1bc25704c07..976a53a48967a3dcfca9d3c0c621cb772c59b18e 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -17,6 +17,8 @@
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation />
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -29,10 +31,8 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -379,24 +379,6 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
- <ItemGroup>
- <None Include="Resources\GRAPHi small.ico" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\GRAPHi small.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\GRAPHi small.gif" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\GRAPHi small1.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\GRAPHi_small.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Open-icon-small.png" />
- </ItemGroup>
<ItemGroup>
<None Include="Resources\application-export-icon-small.png" />
</ItemGroup>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 7bb63d6bf631799269a35fe399ee592c54afa5e4..39712d7eddabec29167359f27e564a8ab6048e45 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -424,7 +424,7 @@ Public Class csKey
Public VairBeta As String = "<VAIR_BETA>"
Public s As String = "<S>"
Public StopTime As String = "<STOP>"
- Public Torque As String = "<M>"
+ Public Torque As String = "<ME>"
End Class
Public Class csKeyEXS