Code development platform for open source projects from the European Union institutions

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

Merge branch 'feature/VECTO-1590-implement-ihpc-powertrain-architecture' of... 

Merge branch 'feature/VECTO-1590-implement-ihpc-powertrain-architecture' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1590-implement-ihpc-powertrain-architecture
parents 69afc154 5a984111
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4768 additions and 2282 deletions
VECTO/File Browser/FileBrowserModule.vb
+ 5
− 0
View file @ 0cdc4228
......@@ -69,4 +69,9 @@ Public Module FileBrowserModule
Public REESSFileBrowser As FileBrowser
public EmADCLossMapFileBrowser As FileBrowser
Public IHPCPowerMapFileBrowser As FileBrowser
Public IHPCFullLoadCurveFileBrowser As FileBrowser
public IHPCDragCurveFileBrowser As FileBrowser
End Module
VECTO/GUI/IHPCForm.Designer.vb 0 → 100644
+ 1322
− 0
View file @ 0cdc4228
This diff is collapsed.
VECTO/GUI/IHPCForm.resx 0 → 100644
+ 260
− 0
View file @ 0cdc4228
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btDragCurve.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<data name="btFLCurveFile1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<data name="btFLCurveFile2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<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>348, 20</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>52</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/QLg6NsG/v7+AgAA
AAAAAAAAAAAAAAAAAAAAAAAA////////////////////////////////////////////////////////
/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4B1uDQEIil
di319/MQ////AQAAAAAAAAAAAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+
/gudtI5FRHEmhMbUvS7+/v4CAAAAAAAAAAAAAAAAAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA//////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAD///8B7PDpJmOJS5s4aBnEjal8Wf39/A8AAAAAAAAAAAAAAAAAAAAA/////wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAP7+/ga3ya0+PGsexzdnGO9Vfjut4OfcLP///wIAAAAAAAAAAAAAAAD/////AAAA/wAA
AP8AAAD/AAAA////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAD///8B+vv6Fn+ea3E2ZhfeN2cY/DhnGc+nvJpJ/v7+CQAAAAAAAAAAAAAAAP//
//8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/+/gLU3s0vSHQstTZmF/Y2Zhf+NmYX6G2QV4zy9fAg////AQAA
AAAAAAAA/////wAAAP8AAAD/AAAA/wAAAP//////////////////////////////////////AAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+DJqyilI1ZhbTNmYW/TZmF/82Zhf5P20hwMDP
tzj+/v4EAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wLr7+cpX4ZFpTVmFfA2ZhX/NmYW/zZm
Fv42ZhfZh6N0ZPz9/BL+/v4BAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+B7TGqEI6ahnMNmcV/DZn
Ff82ZhX/NmYV/zVlF/RPeTOw2+TWLf7+/gIAAAAA/////wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wH4+vgZeppleTVm
FOE2ZxX+NmcV/zZnFf82ZhX/NmYV/TZmFtGhuJNO/v7+CgAAAAD/////AAAA/wAAAP8AAAD/AAAA////
//////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+As/b
yDBGcyi3NWYU9zVmFP82ZxX/NmcV/zZnFf82ZxX+NWYV7GeMT5fv8+0k////Af////8AAAD/AAAA/wAA
AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAD+/v4Mlq+FVDRlE9Q1ZhT9NWYU/zVmFP82ZxX/NmcV/zZnFf82ZxX7PWwdxbzMsTz+/v4F/////wAA
AP8AAAD/AAAA/wAAAP///////////////////////////////////////////wAAAAAAAAAAAAAAAAAA
AAAAAAAA////Auju5Stbg0GqNWUU8jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZnFf41ZhTdgqBubfv8
+hX/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP//////AAAAAAAA
AAAAAAAAAAAAAAAAAAD+/v4HscOlRThoGM41ZhT9NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zVm
FPVLdy6z1+DQL/7+/v8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
//8AAAAAAAAAAAAAAAAAAAAA////Afj59xt2l2F+NGUT4zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zVm
FP82ZxX/NmcV/TVmFdOctI1R/v7+/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAD+/v4CzdnFMURxJbo1ZhT4NWYU/zVmFP81ZhT/NWYU/zVm
FP81ZhT/NWYU/zVmFP82ZxX/NWYU7mKISZ/8/Pv/////////////////////////////////////////
////////////////////////AAAAAAAAAAAAAAAAAAAAAP7+/gyUroNUNGUT1DVmFP01ZhT/NWYU/zVm
FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX8O2obybfIq0L+/v4I/v7+Av39/QL9/v0C/f79Av3+
/QL9/v0C/f79Av3+/QL9/v0C/f79Av3+/QL9/v0C/f79AgAAAAD///8C5uziK1mBPqs0ZRPzNWYU/zVm
FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFf41ZhThepplhNTezUPZ4tM12eLTNdni
0zXZ4tM12eLTNdni1DXZ4tQ12eLUNdrj1DXa49U12eLUNdrj1DXa49U1AAAAAP7+/givwqJGN2cWzjVm
FP01ZhT/NWYU/zVmFP81ZhT/NGYT/zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFfg1ZhThRHImz0Rx
JspEcSfKRXEoykVyKMpFcinKRnMqykd0K8pIdCvKSXUsykt3LspIdCvKSXUsykt3Lsr//v8B9vj1HXSW
XoM0ZRPlNWYU/jVmFP81ZhT/NWYU/zVmFP82ZhX0U3w34DRlE/Q1ZhT/NWYU/zVmFP81ZhT/NWYU/zZn
Ff42ZxX9NmYV/TZmFv02Zhf9NmYX/TdnGP03Zxj9OWgZ/TppGv06ahv9PGwd/TppGv06ahv9PGwd/f7/
/gLK1sIyQnAkuzRlE/g1ZhT/NWYU/zVmFP81ZhT/NWYU+0dzKc2gt5GGP24g0zVmFP01ZhT/NWYU/zVm
FP81ZhT/NmcV/zZnFf82ZxX/NmYW/zZmF/82Zhf/N2cY/zdnGP84aBn/Omka/zpqG/87axz/Omka/zpq
G/87axz//f79DY+qflc0ZRPVNWYU/TVmFP81ZhT/NWYU/zVmFP41ZRTraY1RluLp3k1fhkWnNGUT8TVm
FP81ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhX/NmYW/zZmF/83Zxf/N2cY/zhoGf85aRr/Omob/ztr
HP85aRr/Omob/ztrHP/j6t8rVn88rDRlFPM1ZhT/NWYU/zVmFP81ZhT/NWYU/jRlE9KWr4VN/f39F5Cq
flU0ZRPVNWYU/jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZmFf82Zhb/NmYX/zZmF/83Zxj/N2cY/zlp
Gv86ahv/O2sc/zlpGv86ahv/O2sc/6zAn0c3ZxbPNWYU/TVmFP81ZhT/NWYU/zVmFP81ZhT9PWwdycPS
ujb+/v4EwtC4Nz1sHco1ZhT9NWYU/zVmFP81ZhT/NWYU/zZnFf82ZxX/NmYV/zZmFv82Zhf/NmYX/zdn
GP83Zxj/OWka/zpqG/86ahv/OWka/zpqG/86ahv/cpRchjRlE+Y1ZhT+NWYU/zVmFP81ZhT/NWYU/zVm
FPZXgDyz6e7mLv///wPp7uYsWYE+rzVmFPQ1ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhT/NmYV/zZm
F/82Zhf/N2cX/zdnGP85aRr/Omob/zpqG/85aRr/Omob/zpqG/9BbyK6NGUU9jVmFP01ZhT9NWYU/TVm
FP01ZhT8NGUT3IGgbW78/PwW////Af39/RGJpXZiNGUT2DVmFPw1ZhT9NGUT/TVmFP02ZxX9NmcV/TZm
Ff02ZhX9NmYX/TZmF/03Zxf9N2cY/ThoGf06aRr9Omob/ThoGf06aRr9Omob/TZnFaE2ZxXINmcVyjZn
Fco2ZxXKNmcVyjZnFck4aBijr8KiNP7+/gUAAAAA/v7+A7rKrzA7ahuiNmcVyTZnFco2ZxXKN2cWyjdo
Fso3aBbKN2gWyjdnF8o3ZxjKOGcZyjhoGco5aBrKOmobyjtrHMo8ax3KOmobyjtrHMo8ax3KscSkKrHE
pDWxxKQ1scSkNbHEpDWxxKQ1scSkNbTGqCru8uwM///+AQAAAAAAAAAA8/bxC7bHqiqxxKQ1scSkNbHE
pDWxxKQ1scSlNbHEpTWxxKU1scSlNbHEpTWxxKU1scSmNbLEpjWyxaY1s8WnNbPFpzWyxaY1s8WnNbPF
pzX///8C////Av///wL///8C////Av///wL///8C////AgAAAAAAAAAAAAAAAAAAAAAAAAAA////Av//
/wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////AgAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA////////gAP//4AD/9+AA/+fgAP/j4AD/4+B//8HgAf/B4AH/geAB/4D
gAf+A4AH/AGB//wBgAP4AYAD+ACAA/gAgAPwAAAD8AB//+AAP//gAAAAwAAAAMAAAADAIAAAgHAAAIBw
AAAAcAAAAPgAAAD4AAD///////////////8=
</value>
</data>
</root>
\ No newline at end of file
VECTO/GUI/IHPCForm.vb 0 → 100644
+ 198
− 0
View file @ 0cdc4228
Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Public Class IHPCForm
Private _changed as Boolean
Private _dragCurveFilePath as String
Private _flCurveFilePath1 as String
Private _flCurveFilePath2 as String
#Region "Set JSON Data"
Public Sub ReadIHPCFile(file As String)
Dim inputProvider = New JSONComponentInputData(file, Nothing)
Dim ihpcData = inputProvider.ElectricMachines.Entries.First().ElectricMachine
tbModel.Text = ihpcData.Model
tbInertia.Text = ihpcData.Inertia.ToGUIFormat()
tbThermalOverload.Text = ihpcData.OverloadRecoveryFactor.ToGUIFormat()
tbDragCurve.Text = ihpcData.DragCurve.Source
SetVoltageLevelLow(ihpcData.VoltageLevels.First())
SetVoltageLevelHigh(ihpcData.VoltageLevels.Last())
End Sub
Private Sub SetVoltageLevelLow(voltageLevel as IElectricMotorVoltageLevel)
tbVoltage1.Text = voltageLevel.VoltageLevel.ToGUIFormat()
tbContinousTorque1.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
tbContinousTorqueSpeed1.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadTime1.Text = voltageLevel.OverloadTime.ToGUIFormat()
tbOverloadTorque1.Text = voltageLevel.OverloadTorque.ToGUIFormat()
tboverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
tbFLCurve1.Text = voltageLevel.FullLoadCurve.Source
SetPowerMapEntries(_lvPowerMap1, voltageLevel.PowerMap)
End Sub
Private Sub SetVoltageLevelHigh(voltageLevel as IElectricMotorVoltageLevel)
tbVoltage2.Text = voltageLevel.VoltageLevel.ToGUIFormat()
tbContinousTorque2.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
tbContinousTorqueSpeed2.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadTime2.Text = voltageLevel.OverloadTime.ToGUIFormat()
tbOverloadTorque2.Text = voltageLevel.OverloadTorque.ToGUIFormat()
tboverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
tbFLCurve2.Text = voltageLevel.FullLoadCurve.Source
SetPowerMapEntries(_lvPowerMap2, voltageLevel.PowerMap)
End Sub
Private Sub SetPowerMapEntries(powerMapListView As ListView, entries As IList(Of IElectricMotorPowerMap))
For Each entry As IElectricMotorPowerMap In entries
Dim listEntry = CreateListViewItem(entry.Gear, entry.PowerMap.Source)
powerMapListView.Items.Add(listEntry)
Next
End Sub
Private Function CreateListViewItem(axleNumber As Integer, filepath As String) As ListViewItem
Dim retVal As New ListViewItem
retVal.SubItems(0).Text = axleNumber.ToGUIFormat()
retVal.SubItems.Add(filepath)
Return retVal
End Function
#End Region
Public Sub ClearIHPC()
tbModel.Text = ""
tbInertia.Text = ""
tbThermalOverload.Text = ""
tbDragCurve.Text = ""
tbVoltage1.Text = ""
tbContinousTorque1.Text = ""
tbContinousTorqueSpeed1.Text = ""
tbOverloadTime1.Text = ""
tbOverloadTorque1.Text = ""
tboverloadTorqueSpeed1.Text = ""
tbFLCurve1.Text = ""
RemoveAllListViewItems(_lvPowerMap1)
tbVoltage2.Text = ""
tbContinousTorque2.Text = ""
tbContinousTorqueSpeed2.Text = ""
tbOverloadTime2.Text = ""
tbOverloadTorque2.Text = ""
tboverloadTorqueSpeed1.Text = ""
tbFLCurve2.Text = ""
RemoveAllListViewItems(_lvPowerMap2)
LbStatus.Text = ""
_changed = False
End Sub
Private Sub RemoveAllListViewItems(listView As ListView)
If listView.Items.Count = 0 Then
Exit Sub
Else
For Each listItem As ListViewItem In listView.Items
listItem.Remove()
Next
End If
End Sub
#Region "Events"
Private Sub btDragCurve_Click(sender As Object, e As EventArgs) Handles btDragCurve.Click
If IHPCDragCurveFileBrowser.OpenDialog(FileRepl(tbDragCurve.Text, GetPath(_dragCurveFilePath)))
_tbDragCurve.Text = GetFilenameWithoutDirectory(IHPCDragCurveFileBrowser.Files(0), GetPath(_dragCurveFilePath))
End If
End Sub
Private Sub btFLCurveFile1_Click(sender As Object, e As EventArgs) Handles btFLCurveFile1.Click
If IHPCFullLoadCurveFileBrowser.OpenDialog(FileRepl(tbFLCurve1.Text, GetPath(_flCurveFilePath1)))
_tbFLCurve1.Text = GetFilenameWithoutDirectory(IHPCFullLoadCurveFileBrowser.Files(0), GetPath(_flCurveFilePath1))
End If
End Sub
Private Sub btFLCurveFile2_Click(sender As Object, e As EventArgs) Handles btFLCurveFile2.Click
If IHPCFullLoadCurveFileBrowser.OpenDialog(FileRepl(tbFLCurve2.Text, GetPath(_flCurveFilePath2)))
_tbFLCurve2.Text = GetFilenameWithoutDirectory(IHPCFullLoadCurveFileBrowser.Files(0), GetPath(_flCurveFilePath2))
End If
End Sub
Private Sub btAddPowerMap1_Click(sender As Object, e As EventArgs) Handles btAddPowerMap1.Click
AddListViewItem(lvPowerMap1)
End Sub
Private Sub btAddPowerMap2_Click(sender As Object, e As EventArgs) Handles btAddPowerMap2.Click
AddListViewItem(lvPowerMap2)
End Sub
Private Sub AddListViewItem(listView As ListView)
If IHPCPowerMapInputDialog.ShowDialog() = DialogResult.OK Then
Dim gear = Convert.ToInt32(IHPCPowerMapInputDialog.tbGear.Text)
Dim filePath = IHPCPowerMapInputDialog.tbInputFile.Text
listView.Items.Add(CreateListViewItem(gear, filePath))
End If
End Sub
Private Sub btRemovePowerMap1_Click(sender As Object, e As EventArgs) Handles btRemovePowerMap1.Click
RemoveListEntry(lvPowerMap1)
End Sub
Private Sub btRemovePowerMap2_Click(sender As Object, e As EventArgs) Handles btRemovePowerMap2.Click
RemoveListEntry(lvPowerMap2)
End Sub
Private Sub RemoveListEntry(listView As ListView)
If listView.Items.Count = 0 Then
Exit Sub
Else
listView.Items(listView.Items.Count - 1).Remove()
End If
End Sub
Private Sub lvPowerMap1_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap1.DoubleClick
EditEntry(lvPowerMap1)
End Sub
Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
EditEntry(lvPowerMap2)
End Sub
Private Sub EditEntry( listView As ListView)
If listView.SelectedItems.Count = 0 Then Exit Sub
Dim entry As ListViewItem = listView.SelectedItems(0)
IHPCPowerMapInputDialog.tbGear.Text = entry.SubItems(0).Text
If entry.SubItems.Count = 2 Then
IHPCPowerMapInputDialog.tbInputFile.Text = entry.SubItems(1).Text
End If
IHPCPowerMapInputDialog.tbGear.Focus()
If IHPCPowerMapInputDialog.ShowDialog() = DialogResult.OK Then
entry.SubItems(0).Text = IHPCPowerMapInputDialog.tbGear.Text
entry.SubItems(1).Text = IHPCPowerMapInputDialog.tbInputFile.Text
End If
End Sub
Private Sub btSave_Click(sender As Object, e As EventArgs) Handles btSave.Click
End Sub
Private Sub btCancel_Click(sender As Object, e As EventArgs) Handles btCancel.Click
End Sub
#End Region
End Class
\ No newline at end of file
VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb 0 → 100644
+ 186
− 0
View file @ 0cdc4228
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class IHPCPowerMapInputDialog
Inherits System.Windows.Forms.Form
'Form overrides dispose to clean up the component list.
<System.Diagnostics.DebuggerNonUserCode()> _
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
components.Dispose()
End If
Finally
MyBase.Dispose(disposing)
End Try
End Sub
'Required by the Windows Form Designer
Private components As System.ComponentModel.IContainer
'NOTE: The following procedure is required by the Windows Form Designer
'It can be modified using the Windows Form Designer.
'Do not modify it using the code editor.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IHPCPowerMapInputDialog))
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
Me.tbGear = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
Me.btAddFilePath = New System.Windows.Forms.Button()
Me.tbInputFile = New System.Windows.Forms.TextBox()
Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
Me.btAddInput = New System.Windows.Forms.Button()
Me.btCancel = New System.Windows.Forms.Button()
Me.FlowLayoutPanel1.SuspendLayout
Me.TableLayoutPanel4.SuspendLayout
Me.TableLayoutPanel5.SuspendLayout
Me.TableLayoutPanel1.SuspendLayout
Me.SuspendLayout
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel4)
Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel5)
Me.FlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
Me.FlowLayoutPanel1.Size = New System.Drawing.Size(508, 45)
Me.FlowLayoutPanel1.TabIndex = 11
'
'TableLayoutPanel4
'
Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel4.ColumnCount = 2
Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.8!))
Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.2!))
Me.TableLayoutPanel4.Controls.Add(Me.tbGear, 1, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label3, 0, 0)
Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 8)
Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(6, 3, 3, 3)
Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
Me.TableLayoutPanel4.RowCount = 1
Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
Me.TableLayoutPanel4.Size = New System.Drawing.Size(128, 28)
Me.TableLayoutPanel4.TabIndex = 10
'
'tbGear
'
Me.tbGear.Anchor = System.Windows.Forms.AnchorStyles.None
Me.tbGear.Location = New System.Drawing.Point(46, 4)
Me.tbGear.Name = "tbGear"
Me.tbGear.Size = New System.Drawing.Size(77, 20)
Me.tbGear.TabIndex = 9
'
'Label3
'
Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label3.AutoSize = true
Me.Label3.Location = New System.Drawing.Point(5, 7)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(30, 13)
Me.Label3.TabIndex = 9
Me.Label3.Text = "Gear"
'
'TableLayoutPanel5
'
Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel5.ColumnCount = 2
Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 316!))
Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40!))
Me.TableLayoutPanel5.Controls.Add(Me.btAddFilePath, 1, 0)
Me.TableLayoutPanel5.Controls.Add(Me.tbInputFile, 0, 0)
Me.TableLayoutPanel5.Location = New System.Drawing.Point(140, 3)
Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
Me.TableLayoutPanel5.RowCount = 1
Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100!))
Me.TableLayoutPanel5.Size = New System.Drawing.Size(356, 39)
Me.TableLayoutPanel5.TabIndex = 8
'
'btAddFilePath
'
Me.btAddFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btAddFilePath.Image = CType(resources.GetObject("btAddFilePath.Image"),System.Drawing.Image)
Me.btAddFilePath.Location = New System.Drawing.Point(324, 6)
Me.btAddFilePath.Name = "btAddFilePath"
Me.btAddFilePath.Size = New System.Drawing.Size(24, 26)
Me.btAddFilePath.TabIndex = 30
Me.btAddFilePath.UseVisualStyleBackColor = true
'
'tbInputFile
'
Me.tbInputFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.tbInputFile.Location = New System.Drawing.Point(3, 9)
Me.tbInputFile.Name = "tbInputFile"
Me.tbInputFile.Size = New System.Drawing.Size(310, 20)
Me.tbInputFile.TabIndex = 0
'
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 2
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
Me.TableLayoutPanel1.Controls.Add(Me.btAddInput, 0, 0)
Me.TableLayoutPanel1.Controls.Add(Me.btCancel, 1, 0)
Me.TableLayoutPanel1.Location = New System.Drawing.Point(348, 51)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 1
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
Me.TableLayoutPanel1.Size = New System.Drawing.Size(148, 29)
Me.TableLayoutPanel1.TabIndex = 12
'
'btAddInput
'
Me.btAddInput.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btAddInput.Location = New System.Drawing.Point(3, 3)
Me.btAddInput.Name = "btAddInput"
Me.btAddInput.Size = New System.Drawing.Size(67, 23)
Me.btAddInput.TabIndex = 0
Me.btAddInput.Text = "OK"
'
'btCancel
'
Me.btCancel.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.btCancel.Location = New System.Drawing.Point(77, 3)
Me.btCancel.Name = "btCancel"
Me.btCancel.Size = New System.Drawing.Size(67, 23)
Me.btCancel.TabIndex = 1
Me.btCancel.Text = "Cancel"
'
'IHPCPowerMapInputDialog
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(508, 85)
Me.Controls.Add(Me.TableLayoutPanel1)
Me.Controls.Add(Me.FlowLayoutPanel1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
Me.MaximizeBox = false
Me.MinimizeBox = false
Me.Name = "IHPCPowerMapInputDialog"
Me.ShowInTaskbar = false
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "IHPCPowerMapInputDialog"
Me.FlowLayoutPanel1.ResumeLayout(false)
Me.TableLayoutPanel4.ResumeLayout(false)
Me.TableLayoutPanel4.PerformLayout
Me.TableLayoutPanel5.ResumeLayout(false)
Me.TableLayoutPanel5.PerformLayout
Me.TableLayoutPanel1.ResumeLayout(false)
Me.ResumeLayout(false)
End Sub
Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
Friend WithEvents tbGear As TextBox
Friend WithEvents Label3 As Label
Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
Friend WithEvents btAddFilePath As Button
Friend WithEvents tbInputFile As TextBox
Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
Friend WithEvents btAddInput As Button
Friend WithEvents btCancel As Button
End Class
VECTO/GUI/IHPCPowerMapInputDialog.resx 0 → 100644
+ 139
− 0
View file @ 0cdc4228
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btAddFilePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
</root>
\ No newline at end of file
VECTO/GUI/IHPCPowerMapInputDialog.vb 0 → 100644
+ 72
− 0
View file @ 0cdc4228
Imports System.IO
Public Class IHPCPowerMapInputDialog
Private _inputFilePath As String
public Sub Clear()
_tbGear.Text = ""
_tbInputFile.Text = ""
_tbGear.Focus()
End Sub
#Region "Events"
Private Sub btAddInput_Click(sender As Object, e As EventArgs) Handles btAddInput.Click
Dim gear As Integer
If Not Integer.TryParse(tbGear.Text, gear) Then
MsgBox("Invalid input for Gear")
_tbGear.Focus()
Return
End If
If gear < 0 Then
MsgBox("Invalid input for Gear")
_tbGear.Focus()
Return
End If
If tbInputFile.Text.Length = 0 Then
MsgBox("Invalid input no file path given")
_tbGear.Focus()
Return
End If
If Not File.Exists(tbInputFile.Text) Then
MsgBox("Invalid input no valid file path given")
_tbInputFile.Focus()
Return
End If
Dim fileExtension = new FileInfo(tbInputFile.Text).Extension
If Not $".{IHPCPowerMapFileBrowser.Extensions.First()}" = fileExtension Then
MsgBox($"The selected Power Map file(.{IHPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
Return
End If
DialogResult = DialogResult.OK
Close()
End Sub
Private Sub btCancel_Click(sender As Object, e As EventArgs) Handles btCancel.Click
DialogResult = DialogResult.Cancel
Close()
Clear()
End Sub
Private Sub btAddFilePath_Click(sender As Object, e As EventArgs) Handles btAddFilePath.Click
If IHPCPowerMapFileBrowser.OpenDialog(FileRepl(tbInputFile.Text, GetPath(_inputFilePath)))
tbInputFile.Text = GetFilenameWithoutDirectory(IHPCPowerMapFileBrowser.Files(0), GetPath(_inputFilePath))
End If
End Sub
Private Sub IHPCPowerMapInputDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Show()
_tbGear.Focus()
End Sub
#End Region
End Class
\ No newline at end of file
VECTO/GUI/MainForm.Designer.vb
+ 20
− 11
View file @ 0cdc4228
......@@ -96,8 +96,10 @@ Partial Class MainForm
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripDrDnBtTools = New System.Windows.Forms.ToolStripDropDownButton()
Me.GENEditorToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorSerialHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorParallelHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorBatteryElectricVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorIHPCVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorEngineOnlyModeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.EPTPJobEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VEHEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
......@@ -120,7 +122,6 @@ Partial Class MainForm
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.JobEditorSerialHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.StatusBAR.SuspendLayout
Me.TabControl1.SuspendLayout
Me.TabPageGEN.SuspendLayout
......@@ -373,8 +374,8 @@ Partial Class MainForm
Me.TabPgOptions.Controls.Add(Me.PanelOptAllg)
Me.TabPgOptions.Location = New System.Drawing.Point(4, 22)
Me.TabPgOptions.Name = "TabPgOptions"
Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
Me.TabPgOptions.Size = New System.Drawing.Size(1035, 302)
Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3)
Me.TabPgOptions.Size = New System.Drawing.Size(1034, 301)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
Me.TabPgOptions.UseVisualStyleBackColor = true
......@@ -720,7 +721,7 @@ Partial Class MainForm
'
'ToolStripDrDnBtTools
'
Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorIHPCVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
......@@ -734,6 +735,13 @@ Partial Class MainForm
Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(262, 30)
Me.GENEditorToolStripMenuItem1.Text = "Job Editor - Conventional Vehicle"
'
'JobEditorSerialHybridVehicleToolStripMenuItem
'
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
'
'JobEditorParallelHybridVehicleToolStripMenuItem
'
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
......@@ -748,6 +756,13 @@ Partial Class MainForm
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "JobEditor - Battery Electric Vehicle"
'
'JobEditorIHPCVehicleToolStripMenuItem
'
Me.JobEditorIHPCVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorIHPCVehicleToolStripMenuItem.Name = "JobEditorIHPCVehicleToolStripMenuItem"
Me.JobEditorIHPCVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorIHPCVehicleToolStripMenuItem.Text = "JobEditor - IHPC Vehicle"
'
'JobEditorEngineOnlyModeToolStripMenuItem
'
Me.JobEditorEngineOnlyModeToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
......@@ -882,13 +897,6 @@ Partial Class MainForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'JobEditorSerialHybridVehicleToolStripMenuItem
'
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
'
'MainForm
'
Me.AcceptButton = Me.btStartV3
......@@ -1027,4 +1035,5 @@ End Sub
Friend WithEvents JobEditorBatteryElectricVehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorEngineOnlyModeToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorSerialHybridVehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorIHPCVehicleToolStripMenuItem As ToolStripMenuItem
End Class
VECTO/GUI/MainForm.resx
+ 0
− 3
View file @ 0cdc4228
......@@ -223,9 +223,6 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value>
</metadata>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>850, 12</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
......
VECTO/GUI/MainForm.vb
+ 11
− 0
View file @ 0cdc4228
......@@ -157,6 +157,9 @@ Public Class MainForm
PropulsionTorqueLimitFileBrowser = New FileBrowser("vtqp")
ModalResultsFileBrowser = New FileBrowser("vmod")
IHPCPowerMapFileBrowser = new FileBrowser("vemo")
IHPCFullLoadCurveFileBrowser = new FileBrowser("vemp")
IHPCDragCurveFileBrowser = new FileBrowser("vemd")
'-------------------------------------------------------
TextFileBrowser.Extensions = New String() {"txt"}
......@@ -198,6 +201,10 @@ Public Class MainForm
PropulsionTorqueLimitFileBrowser.Extensions = New String() {"vtqp"}
ModalResultsFileBrowser.Extensions = New String() {"vmod"}
IHPCPowerMapFileBrowser.Extensions = New String(){"vemo"}
IHPCFullLoadCurveFileBrowser.Extensions = New String(){"vemp"}
IHPCDragCurveFileBrowser.Extensions = New String(){"vemd"}
End Sub
Private Sub FB_Close()
......@@ -2180,4 +2187,8 @@ lbFound:
Private Sub JobEditorSerialHybridVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorSerialHybridVehicleToolStripMenuItem.Click
OpenVECTOeditor("<New>", VectoSimulationJobType.SerialHybridVehicle)
End Sub
Private Sub JobEditorIHPCVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorIHPCVehicleToolStripMenuItem.Click
OpenVECTOeditor("<New>", VectoSimulationJobType.IHPC)
End Sub
End Class
VECTO/GUI/VehicleForm.Designer.vb
+ 2309
− 2244
View file @ 0cdc4228
This diff is collapsed.
VECTO/GUI/VehicleForm.resx
+ 18
− 0
View file @ 0cdc4228
......@@ -164,6 +164,24 @@
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<data name="btIHPCFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
......
VECTO/GUI/VehicleForm.vb
+ 22
− 0
View file @ 0cdc4228
......@@ -1466,5 +1466,27 @@ Public Class VehicleForm
Private Sub cbEngineStopStart_CheckedChanged(sender As Object, e As EventArgs) Handles cbEngineStopStart.CheckedChanged
Change()
End Sub
Private Sub btIHPC_Click(sender As Object, e As EventArgs) Handles btIHPC.Click
Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
If Not IHPCForm.Visible Then
IHPCForm.ClearIHPC()
IHPCForm.Show()
Else
If IHPCForm.WindowState = FormWindowState.Minimized Then IHPCForm.WindowState = FormWindowState.Normal
IHPCForm.BringToFront()
End If
If Not Trim(f) = "" Then
Try
IHPCForm.ReadIHPCFile(f)
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IEPC File")
End Try
End If
End Sub
End Class
VectoCore/VectoCore/JsonKeys.Designer.cs
+ 118
− 1
View file @ 0cdc4228
......@@ -19,7 +19,7 @@ namespace TUGraz.VectoCore {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class JsonKeys {
......@@ -222,6 +222,105 @@ namespace TUGraz.VectoCore {
}
}
/// <summary>
/// Looks up a localized string similar to ContinuousTorque.
/// </summary>
internal static string EM_ContinuousTorque {
get {
return ResourceManager.GetString("EM_ContinuousTorque", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to ContinuousTorqueSpeed.
/// </summary>
internal static string EM_ContinuousTorqueSpeed {
get {
return ResourceManager.GetString("EM_ContinuousTorqueSpeed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to DragCurve.
/// </summary>
internal static string EM_DragCurve {
get {
return ResourceManager.GetString("EM_DragCurve", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to EfficiencyMap.
/// </summary>
internal static string EM_EfficiencyMap {
get {
return ResourceManager.GetString("EM_EfficiencyMap", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to FullLoadCurve.
/// </summary>
internal static string EM_FullLoadCurve {
get {
return ResourceManager.GetString("EM_FullLoadCurve", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to OverloadTime.
/// </summary>
internal static string EM_OverloadTime {
get {
return ResourceManager.GetString("EM_OverloadTime", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to OverloadTorque.
/// </summary>
internal static string EM_OverloadTorque {
get {
return ResourceManager.GetString("EM_OverloadTorque", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to OverloadTorqueSpeed.
/// </summary>
internal static string EM_OverloadTorqueSpeed {
get {
return ResourceManager.GetString("EM_OverloadTorqueSpeed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to ThermalOverloadRecoveryFactor.
/// </summary>
internal static string EM_ThermalOverloadRecoveryFactor {
get {
return ResourceManager.GetString("EM_ThermalOverloadRecoveryFactor", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Voltage.
/// </summary>
internal static string EM_Voltage {
get {
return ResourceManager.GetString("EM_Voltage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to VoltageLevels.
/// </summary>
internal static string EM_VoltageLevels {
get {
return ResourceManager.GetString("EM_VoltageLevels", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Displacement.
/// </summary>
......@@ -708,6 +807,24 @@ namespace TUGraz.VectoCore {
}
}
/// <summary>
/// Looks up a localized string similar to CreatedBy.
/// </summary>
internal static string JsonHeader_CreatedBy {
get {
return ResourceManager.GetString("JsonHeader_CreatedBy", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Date.
/// </summary>
internal static string JsonHeader_Date {
get {
return ResourceManager.GetString("JsonHeader_Date", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to FileVersion.
/// </summary>
......
VectoCore/VectoCore/JsonKeys.resx
+ 39
− 0
View file @ 0cdc4228
......@@ -444,4 +444,43 @@
<data name="IEPC_VoltageLevels" xml:space="preserve">
<value>VoltageLevels</value>
</data>
<data name="EM_ContinuousTorque" xml:space="preserve">
<value>ContinuousTorque</value>
</data>
<data name="EM_ContinuousTorqueSpeed" xml:space="preserve">
<value>ContinuousTorqueSpeed</value>
</data>
<data name="EM_DragCurve" xml:space="preserve">
<value>DragCurve</value>
</data>
<data name="EM_EfficiencyMap" xml:space="preserve">
<value>EfficiencyMap</value>
</data>
<data name="EM_FullLoadCurve" xml:space="preserve">
<value>FullLoadCurve</value>
</data>
<data name="EM_OverloadTime" xml:space="preserve">
<value>OverloadTime</value>
</data>
<data name="EM_OverloadTorque" xml:space="preserve">
<value>OverloadTorque</value>
</data>
<data name="EM_OverloadTorqueSpeed" xml:space="preserve">
<value>OverloadTorqueSpeed</value>
</data>
<data name="EM_ThermalOverloadRecoveryFactor" xml:space="preserve">
<value>ThermalOverloadRecoveryFactor</value>
</data>
<data name="EM_Voltage" xml:space="preserve">
<value>Voltage</value>
</data>
<data name="EM_VoltageLevels" xml:space="preserve">
<value>VoltageLevels</value>
</data>
<data name="JsonHeader_CreatedBy" xml:space="preserve">
<value>CreatedBy</value>
</data>
<data name="JsonHeader_Date" xml:space="preserve">
<value>Date</value>
</data>
</root>
\ No newline at end of file
VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+ 49
− 22
View file @ 0cdc4228
......@@ -71,36 +71,63 @@ public class JSONFileWriter : IOutputFileWriter
var header = GetHeader(ElectricMotorFormatVersion);
var body = new Dictionary<string, object> {
{ "SavedInDeclMode", declMode },
{ "Model", electricMachine.Model },
{ "Inertia", electricMachine.Inertia.Value() },
{ "ThermalOverloadRecoveryFactor", electricMachine.OverloadRecoveryFactor }
{ JsonKeys.SavedInDeclMode, declMode },
{ JsonKeys.Component_Model, electricMachine.Model },
{ JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() },
{ JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }
};
var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename);
body.Add(JsonKeys.EM_DragCurve, GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
body.Add(JsonKeys.EM_VoltageLevels, vlevels);
WriteFile(header, body, filename);
}
public void SaveIHPC(IElectricMotorEngineeringInputData electricMachine, string filename, bool declMode)
{
var header = GetHeader(ElectricMotorFormatVersion);
var body = new Dictionary<string, object> {
{ JsonKeys.SavedInDeclMode, declMode },
{ JsonKeys.Component_Model, electricMachine.Model },
{ JsonKeys.EM_DragCurve, GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename))},
{ JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() },
{ JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }
};
var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename);
body.Add(JsonKeys.EM_VoltageLevels, vlevels);
WriteFile(header, body, filename);
}
private List<Dictionary<string, object>> GetVoltageLevelEntries(IList<IElectricMotorVoltageLevel> voltageLevels, string filename)
{
var vlevels = new List<Dictionary<string, object>>();
foreach (var entry in electricMachine.VoltageLevels) {
foreach (var entry in voltageLevels)
{
var vlevel = new Dictionary<string, object> {
{ "Voltage", entry.VoltageLevel.Value() },
{ "ContinuousTorque", entry.ContinuousTorque.Value() },
{ "ContinuousTorqueSpeed", entry.ContinuousTorqueSpeed.AsRPM },
{ "OverloadTorque", entry.OverloadTorque.Value() },
{ "OverloadTorqueSpeed", entry.OverloadTestSpeed.AsRPM },
{ "OverloadTime", entry.OverloadTime.Value() },
{ "FullLoadCurve", GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)) }
{ JsonKeys.EM_Voltage, entry.VoltageLevel.Value() },
{ JsonKeys.EM_ContinuousTorque, entry.ContinuousTorque.Value() },
{ JsonKeys.EM_ContinuousTorqueSpeed, entry.ContinuousTorqueSpeed.AsRPM },
{ JsonKeys.EM_OverloadTorque, entry.OverloadTorque.Value() },
{ JsonKeys.EM_OverloadTorqueSpeed, entry.OverloadTestSpeed.AsRPM },
{ JsonKeys.EM_OverloadTime, entry.OverloadTime.Value() },
{ JsonKeys.EM_FullLoadCurve, GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)) }
};
var powerMaps = new Dictionary<int, object>();
foreach (var pMap in entry.PowerMap) {
foreach (var pMap in entry.PowerMap)
{
powerMaps.Add(pMap.Gear, GetRelativePath(pMap.PowerMap.Source, Path.GetDirectoryName(filename)));
}
vlevel.Add("EfficiencyMap", powerMaps); //PowerMap
vlevel.Add(JsonKeys.EM_EfficiencyMap, powerMaps); //PowerMap
vlevels.Add(vlevel);
}
body.Add("DragCurve", GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
body.Add("VoltageLevels", vlevels);
WriteFile(header, body, filename);
return vlevels;
}
public void SaveBattery(IBatteryPackEngineeringInputData battery, string filename, bool declMode)
{
var header = GetHeader(REESSFormatVersion);
......@@ -211,10 +238,10 @@ public class JSONFileWriter : IOutputFileWriter
protected Dictionary<string, object> GetHeader(int fileVersion) =>
new Dictionary<string, object> {
{ "CreatedBy", "" },
{ "Date", DateTime.Now.ToUniversalTime().ToString("o") },
{ "AppVersion", VECTOvers },
{ "FileVersion", fileVersion }
{ JsonKeys.JsonHeader_CreatedBy, "" },
{ JsonKeys.JsonHeader_Date , DateTime.Now.ToUniversalTime().ToString("o") },
{ JsonKeys.AppVersion, VECTOvers },
{ JsonKeys.JsonHeader_FileVersion, fileVersion }
};
public void SaveGearbox(IGearboxEngineeringInputData gbx, IAxleGearInputData axl,
......
VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem
+ 0
− 1
View file @ 0cdc4228
......@@ -8,7 +8,6 @@
"Body": {
"SavedInDeclMode": false,
"Model": "Generic IHPC",
"FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
"DragCurve": "GenericIHPCDrag.vemd",
"Inertia": 0.5,
"ThermalOverloadRecoveryFactor": 0.9,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about