JSONRetarderInputData: Added check to read retarder only when Not Electric or SerialHybrid (except for E3)

Changed Top VECTO logo with graphical text to simple Main Logo with a label (label intersected with underlying graphical text).

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1543-calculation-of-em-overload-buffer-and-continuous-torque to develop

* commit '280cfab8':
  move calculation of overload buffer, continuous torque etc. from EM to data adapter
  use .net framework 4.5 as target for VECTO GUI

Franz KOBER josef authored 3 years ago and Markus Quaritsch committed 3 years ago

Merge in VECTO/vecto-dev from VECTO/fk_vecto-dev:ivt/feature/VECTO-1454-xml-schema-for-new-components to develop

* commit 'd549bf02': (32 commits)
  set correct signature value for completd bus job
  added correct signature for primary bus jobs
  added correct signature for medium lorry jobs
  added correct signature for heavy lorry jobs
  updated component signature
  added additional unit test for sort methods
  added sort methods for AuxConventionalPrimyBus - ElectricSystem elements with unit test
  Job test files adapted to schema changes
  applied namespace_adaptions.diff
  added ElectircMachine and BoostingLimitation
  corrected ElectricMachine declaration
  added sort methods for ElectricEnergyStorage, ElectricMotorTorquelimits and SteeringPump, and added unit test for jobfiles
  refactoring of the PowerMap sort rule and added additional comments
  adjusted signature hash
  revised and added some comments in the xslt file
  updated hash sort test
  added sort test case for TrailerAerodynamicDevice
  added sort method for trailer ApplicableVehicleGroups
  simplified if condition at  voltagelevel, dragcurve and engine mode
  added sort method for input engine modes and fuel types
  ...

# Conflicts:
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S_IEPC_Std.xml

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1460-apt-n-gearbox to develop

* commit 'bc41c98b':
  adding testcases for B2 with APT-N transmission
  renaming test directory

Pull request #161: hybrid strategy: allow disengage if engine speed is below idle and no lower gear is available

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1532-077.2547-p2-crashing-with-600-rpm-idling-speed to develop

* commit '3fe9129c':
  hybrid strategy: allow disengage if engine speed is below idle and no lower gear is available

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '2b1eb31a':
  fix handling of steered axles in json jobs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1455_MergeDevelop to develop

* commit '74f274e2':
  Correction in XML Schema for serial hybrids
  updating GUI to create serial hybrid vehicles
  implementing hybrid strategy for serial hybrids with APT-N transmission, adding testcases extending databus to get information on charging power (necessary to correctly initialize test-powertrain drivetrain serial hybrid)
  adding testcase for S2 APT-N, adding testcase S2 with 3-speed transmission
  fixes APT-N transmission: treat as automatic transmission, do not overwrite model data in component
  testcases for serial hybrids S4, S3, S2-AMT work
  fix reading parameters for serial hybrid strategy powertrain builder serial hybrid: connect genset to charger port of electric system serial hybrid controller: handle responses where state in the powertrain does not match update S2 testcase
  adding missing files
  adding S4 test job, S2 test job
  updating genset preprocessor: initialize batteries at min soc, consider min power for optimal operating point
  adding parameter for serial hybrid strategy, loading serial hybrid jobs works
  removed duplicate entry for powertrain position generator (em)
  extending serial hybrid tests to S4 configuration, adapt model parameters
  taking over implementation of serial hzbrid controller, strategy, tests

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

# Conflicts:
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

# Conflicts:
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

Michael KRISPER authored 3 years ago and Markus Quaritsch committed 3 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:merge/Cleanup-Project-Refs-VectoCoreTest to develop

* commit 'f45594a0':
  Corrected errors in copying MockVehicleInputData to VectoCoreTest-Project
  Removed VectoHashing Reference from VectoCoreTest project
  Removed reference to VECTO project from VectoCoreTest
  MSBuild Project-Files: Updated <DefineConstants> Tag and removed the TRACE constant for all projects.
  Added TargetFrameworks in the project files to be able to individually adjust them.