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

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

Merge branch 'hm/feature/VECTO-1572-mockup-vecto-in-vecto-core' into... 

Merge branch 'hm/feature/VECTO-1572-mockup-vecto-in-vecto-core' into hm/feature/VECTO-1638_merge-mockup-in-vecto-core

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	VECTO.sln
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
#	VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoMockup/VectoMockup/VectoMockup.csproj
parents 43dbad12 19bd579d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 39 deletions
VECTO.sln
+ 0
− 16
View file @ 5ea1531a
...@@ -101,12 +101,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VECTOMultistage", "Tools\VE ...@@ -101,12 +101,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VECTOMultistage", "Tools\VE
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VectoMockup", "VectoMockup", "{927F1B17-8075-4185-A324-92971D2FB020}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VectoMockup", "VectoMockup", "{927F1B17-8075-4185-A324-92971D2FB020}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockup", "VectoMockup\VectoMockup\VectoMockup.csproj", "{8E8F5C65-501E-4AAC-97DE-10DD283883D2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockupTest", "VectoMockup\VectoMockupTest\VectoMockupTest.csproj", "{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoMockupTest", "VectoMockup\VectoMockupTest\VectoMockupTest.csproj", "{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}"
ProjectSection(ProjectDependencies) = postProject
{8E8F5C65-501E-4AAC-97DE-10DD283883D2} = {8E8F5C65-501E-4AAC-97DE-10DD283883D2}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
...@@ -390,16 +385,6 @@ Global ...@@ -390,16 +385,6 @@ Global
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.Build.0 = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.Build.0 = Release|Any CPU {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.Build.0 = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDeploy|Any CPU.ActiveCfg = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDeploy|Any CPU.Build.0 = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.Build.0 = Release|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
...@@ -430,7 +415,6 @@ Global ...@@ -430,7 +415,6 @@ Global
{083F6B3C-9529-448F-AF1D-D0889852B918} = {351FF7E8-B56B-445E-8E98-A61E07C990DA} {083F6B3C-9529-448F-AF1D-D0889852B918} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA} {4977BE2A-CB80-4FC0-8D1A-30EC094011B4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E} = {351FF7E8-B56B-445E-8E98-A61E07C990DA} {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
{8E8F5C65-501E-4AAC-97DE-10DD283883D2} = {927F1B17-8075-4185-A324-92971D2FB020}
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88} = {927F1B17-8075-4185-A324-92971D2FB020} {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88} = {927F1B17-8075-4185-A324-92971D2FB020}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
......
VECTO/VECTO.vbproj
+ 4
− 4
View file @ 5ea1531a
...@@ -70,17 +70,17 @@ ...@@ -70,17 +70,17 @@
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Choose> <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))"> <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup> </ItemGroup>
<!--<PropertyGroup> --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants> <DefineConstants>MOCKUP</DefineConstants>
</PropertyGroup>--> </PropertyGroup>--><!--
</When> </When>
</Choose> </Choose>-->
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HashingTool\HashingTool.csproj" /> <ProjectReference Include="..\HashingTool\HashingTool.csproj" />
......
VECTO3GUI2020/VECTO3GUI2020.csproj
+ 2
− 2
View file @ 5ea1531a
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup> </ItemGroup>
<Choose> <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))"> <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup> </ItemGroup>
</When> </When>
</Choose> </Choose>-->
......
VectoConsole/VectoConsole.csproj
+ 4
− 4
View file @ 5ea1531a
...@@ -42,15 +42,15 @@ ...@@ -42,15 +42,15 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup> </ItemGroup>
<Choose> <!--<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))"> <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" /> <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup> </ItemGroup>
<!--<PropertyGroup> --><!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants> <DefineConstants>MOCKUP</DefineConstants>
</PropertyGroup>--> </PropertyGroup>--><!--
</When> </When>
</Choose> </Choose>-->
</Project> </Project>
\ No newline at end of file
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+ 6
− 6
View file @ 5ea1531a
...@@ -658,8 +658,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -658,8 +658,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
//public override IRetarderInputData RetarderInputData => //public override IRetarderInputData RetarderInputData =>
// ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null; // ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
#endregion #endregion
} }
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
...@@ -801,11 +801,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -801,11 +801,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliariesDeclarationInputData ?? public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliariesDeclarationInputData ??
(_busAuxiliariesDeclarationInputData = ComponentReader.BusAuxiliariesInputData); (_busAuxiliariesDeclarationInputData = ComponentReader.BusAuxiliariesInputData);
//public override IAngledriveInputData AngledriveInputData => //public override IAngledriveInputData AngledriveInputData =>
// ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null; // ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
//public override IRetarderInputData RetarderInputData => //public override IRetarderInputData RetarderInputData =>
// ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null; // ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
#endregion #endregion
} }
......
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
+ 5
− 6
View file @ 5ea1531a
...@@ -350,20 +350,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -350,20 +350,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
} }
} }
if (AnyMissingGear(currentGears)) { if (DragCurves.Count > 1 && AnyMissingGear(currentGears))
throw new ArgumentException("The DragCurve contains a gear which was not specified under gears"); throw new ArgumentException("The DragCurve contains a gear which was not specified under gears");
} }
} }
private bool AnyMissingGear(Dictionary<int, bool> foundedGears) private bool AnyMissingGear(Dictionary<int, bool> foundGears)
{ {
var keys = foundedGears.Keys.ToList(); var keys = foundGears.Keys.ToList();
foreach (var key in keys) { foreach (var key in keys) {
if (!foundedGears[key]) { if(!foundGears[key])
return true; return true;
} foundGears[key] = false;
foundedGears[key] = false;
} }
return false; return false;
......
VectoMockup/VectoMockup/MockupResultReader.cs → VectoCore/VectoCore/Mockup/MockupResultReader.cs
+ 1
− 1
View file @ 5ea1531a
...@@ -32,7 +32,7 @@ namespace TUGraz.VectoMockup ...@@ -32,7 +32,7 @@ namespace TUGraz.VectoMockup
private static class MockupResultHelper private static class MockupResultHelper
{ {
private static string _convArch = "Conv"; private static string _convArch = "Conv";
private const string mockupResourcePrefix = "TUGraz.VectoMockup.MockupResults"; private const string mockupResourcePrefix = "TUGraz.VectoCore.Mockup.MockupResults";
private static HashSet<string> conventional = new HashSet<string>() { private static HashSet<string> conventional = new HashSet<string>() {
......
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