diff --git a/VECTO.sln b/VECTO.sln index aff9d4f9bbbff58d334a8abe4415cf6d6639f3c4..d3fe7288cf10583ec65bea9d47a9263601d0c840 100644 --- a/VECTO.sln +++ b/VECTO.sln @@ -66,6 +66,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HashingCmd", "HashingCmd\HashingCmd.csproj", "{33F9848E-9257-4BE2-915F-68E748AEB204}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B5A298FD-8117-4443-9419-66BADA094716}" + ProjectSection(SolutionItems) = preProject + .nuget\packages.config = .nuget\packages.config + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -141,8 +144,8 @@ Global {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.Build.0 = Release|Any CPU + {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|Any CPU.Build.0 = Debug|Any CPU {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|x64.ActiveCfg = Debug|Any CPU {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Deploy|x86.ActiveCfg = Debug|Any CPU {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,8 +172,8 @@ Global {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.Build.0 = Release|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.Build.0 = Debug|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|x64.ActiveCfg = Debug|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|x86.ActiveCfg = Debug|Any CPU {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -195,7 +198,8 @@ Global {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.Build.0 = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|x64.ActiveCfg = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|x86.ActiveCfg = Debug|Any CPU {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -222,7 +226,8 @@ Global {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.Build.0 = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|x64.ActiveCfg = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|x86.ActiveCfg = Debug|Any CPU {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -268,8 +273,8 @@ Global {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.Build.0 = Release|Any CPU + {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.Build.0 = Debug|Any CPU {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x64.ActiveCfg = Debug|Any CPU {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x86.ActiveCfg = Debug|Any CPU {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -296,8 +301,8 @@ Global {60AD4DF0-6648-4374-83CB-C7A162EFB391}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.Build.0 = Release|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.Build.0 = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|x64.ActiveCfg = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|x86.ActiveCfg = Debug|Any CPU {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -324,7 +329,8 @@ Global {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.Build.0 = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|x64.ActiveCfg = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|x86.ActiveCfg = Debug|Any CPU {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -351,7 +357,8 @@ Global {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.Build.0 = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|x64.ActiveCfg = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|x86.ActiveCfg = Debug|Any CPU {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -378,7 +385,8 @@ Global {E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.Build.0 = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|x64.ActiveCfg = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|x86.ActiveCfg = Debug|Any CPU {E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -403,8 +411,8 @@ Global {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.Build.0 = Release|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.Build.0 = Debug|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|x64.ActiveCfg = Debug|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|x86.ActiveCfg = Debug|Any CPU {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -428,7 +436,8 @@ Global {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.Build.0 = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|x64.ActiveCfg = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|x86.ActiveCfg = Debug|Any CPU {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -451,8 +460,8 @@ Global {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU - {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|Any CPU.Build.0 = Deploy|Any CPU + {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|Any CPU.Build.0 = Release|Any CPU {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|x64.ActiveCfg = Debug|Any CPU {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Deploy|x86.ActiveCfg = Debug|Any CPU {512C2CD1-E5BE-4F6B-943B-2BFA7E0CBD64}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -475,8 +484,8 @@ Global {D959CB7C-F514-4F5E-9C33-684D0012474B}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {D959CB7C-F514-4F5E-9C33-684D0012474B}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {D959CB7C-F514-4F5E-9C33-684D0012474B}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.Build.0 = Release|Any CPU + {D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|Any CPU.Build.0 = Debug|Any CPU {D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|x64.ActiveCfg = Debug|Any CPU {D959CB7C-F514-4F5E-9C33-684D0012474B}.Deploy|x86.ActiveCfg = Debug|Any CPU {D959CB7C-F514-4F5E-9C33-684D0012474B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -499,8 +508,8 @@ Global {41314A40-AB3E-4F43-B1A4-58443F4014F2}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {41314A40-AB3E-4F43-B1A4-58443F4014F2}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {41314A40-AB3E-4F43-B1A4-58443F4014F2}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.Build.0 = Release|Any CPU + {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|Any CPU.Build.0 = Debug|Any CPU {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|x64.ActiveCfg = Debug|Any CPU {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Deploy|x86.ActiveCfg = Debug|Any CPU {41314A40-AB3E-4F43-B1A4-58443F4014F2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -546,8 +555,8 @@ Global {2C58BA97-2954-4D19-920F-A24B78FC80A4}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {2C58BA97-2954-4D19-920F-A24B78FC80A4}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {2C58BA97-2954-4D19-920F-A24B78FC80A4}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.Build.0 = Release|Any CPU + {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|Any CPU.Build.0 = Debug|Any CPU {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|x64.ActiveCfg = Debug|Any CPU {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Deploy|x86.ActiveCfg = Debug|Any CPU {2C58BA97-2954-4D19-920F-A24B78FC80A4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -570,7 +579,8 @@ Global {7C364099-9B85-473A-8A42-BBEBE4798FF5}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.Build.0 = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|x64.ActiveCfg = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|x86.ActiveCfg = Debug|Any CPU {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -594,8 +604,8 @@ Global {B673E12F-D323-4C4C-8805-9915B2C72D3D}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.Build.0 = Release|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.Build.0 = Debug|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|x64.ActiveCfg = Debug|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|x86.ActiveCfg = Debug|Any CPU {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -620,7 +630,8 @@ Global {760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Release|Any CPU + {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.Build.0 = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|x64.ActiveCfg = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|x86.ActiveCfg = Debug|Any CPU {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -645,8 +656,8 @@ Global {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.Build.0 = Release|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.Build.0 = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|x64.ActiveCfg = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|x86.ActiveCfg = Debug|Any CPU {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -671,8 +682,8 @@ Global {33F9848E-9257-4BE2-915F-68E748AEB204}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.DebugTUG|x64.ActiveCfg = Debug|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.DebugTUG|x86.ActiveCfg = Debug|Any CPU - {33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.ActiveCfg = Release|Any CPU - {33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.Build.0 = Release|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU + {33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.Build.0 = Debug|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|x64.ActiveCfg = Debug|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|x86.ActiveCfg = Debug|Any CPU {33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/VECTO/File Browser/FileBrowserModule.vb b/VECTO/File Browser/FileBrowserModule.vb index c035d47776058e87ba801ff6a1928063005d4005..253a85419cde24483dcf4fe6d4a3473a298f33d6 100644 --- a/VECTO/File Browser/FileBrowserModule.vb +++ b/VECTO/File Browser/FileBrowserModule.vb @@ -23,6 +23,7 @@ Public Module FileBrowserModule Public JobfileFileBrowser As FileBrowser Public TextFileBrowser As FileBrowser Public VehicleFileBrowser As FileBrowser + Public VehicleXMLFileBrowser As FileBrowser Public DrivingCycleFileBrowser As FileBrowser Public PTODrivingCycleFileBrowser As FileBrowser Public FuelConsumptionMapFileBrowser As FileBrowser diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb index bf88bcc11cf8cfdc9c6a59b4c170df5d5717da6a..90fcaa0b417dc4a18bd3aa11eef5da2ed696d05c 100644 --- a/VECTO/GUI/MainForm.Designer.vb +++ b/VECTO/GUI/MainForm.Designer.vb @@ -115,6 +115,7 @@ 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.EPTPJobEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusBAR.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPageGEN.SuspendLayout() @@ -680,7 +681,7 @@ Partial Class MainForm ' 'ToolStripDrDnBtTools ' - Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, 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.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" @@ -812,6 +813,13 @@ Partial Class MainForm Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" ' + 'EPTPJobEditorToolStripMenuItem + ' + Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO + Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem" + Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.EPTPJobEditorToolStripMenuItem.Text = "EPTP Job Editor" + ' 'MainForm ' Me.AcceptButton = Me.btStartV3 @@ -942,5 +950,6 @@ Partial Class MainForm Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox Friend WithEvents cbValidateRunData As System.Windows.Forms.CheckBox Friend WithEvents cbActVmod As System.Windows.Forms.CheckBox + Friend WithEvents EPTPJobEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx index 1ab95c20be0eb1a9777f7aae6720fb67961848f1..7a10cc6bc771ee05159f0a0d4132dbe37d358569 100644 --- a/VECTO/GUI/MainForm.resx +++ b/VECTO/GUI/MainForm.resx @@ -223,6 +223,9 @@ <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> diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb index 0eaeddb9708b2c82f703bf9a057a4d38628eb8d3..d8802473ae3f90f06219f82e343fdd44ee1af8b5 100644 --- a/VECTO/GUI/MainForm.vb +++ b/VECTO/GUI/MainForm.vb @@ -115,6 +115,7 @@ Public Class MainForm TextFileBrowser = New FileBrowser("FileLists") JobfileFileBrowser = New FileBrowser("vecto") VehicleFileBrowser = New FileBrowser("vveh") + VehicleXMLFileBrowser = New FileBrowser("vveh_xml") FuelConsumptionMapFileBrowser = New FileBrowser("vmap") DrivingCycleFileBrowser = New FileBrowser("vdri") FullLoadCurveFileBrowser = New FileBrowser("vfld") @@ -142,6 +143,7 @@ Public Class MainForm TextFileBrowser.Extensions = New String() {"txt"} JobfileFileBrowser.Extensions = New String() {"vecto"} VehicleFileBrowser.Extensions = New String() {"vveh"} + VehicleXMLFileBrowser.Extensions = New String() {"xml"} FuelConsumptionMapFileBrowser.Extensions = New String() {"vmap"} DrivingCycleFileBrowser.Extensions = New String() {"vdri"} FullLoadCurveFileBrowser.Extensions = New String() {"vfld"} @@ -166,6 +168,7 @@ Public Class MainForm TextFileBrowser.Close() JobfileFileBrowser.Close() VehicleFileBrowser.Close() + VehicleXMLFileBrowser.Close() FuelConsumptionMapFileBrowser.Close() DrivingCycleFileBrowser.Close() FullLoadCurveFileBrowser.Close() @@ -1265,18 +1268,22 @@ lbFound: 'Open Job Editor and open file (or new file) Friend Sub OpenVECTOeditor(x As String) - If Not VectoJobForm.Visible Then - VectoJobForm.Show() - Else - If VectoJobForm.WindowState = FormWindowState.Minimized Then VectoJobForm.WindowState = FormWindowState.Normal - VectoJobForm.BringToFront() - End If - If x = "<New>" Then + ShowVectoJobForm() VectoJobForm.VectoNew() + ElseIf x = "<EPTP>" Then + ShowVectoEPTPJobForm() + VectoEPTPJobForm.VectoNew() Else Try - VectoJobForm.VECTOload2Form(x) + Dim job As IEPTPInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(x), IEPTPInputDataProvider) + If job Is Nothing Then + ShowVectoJobForm() + VectoJobForm.VECTOload2Form(x) + Else + ShowVectoEPTPJobForm() + VectoEPTPJobForm.VECTOload2Form(x) + End If Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading Vecto Job File") End Try @@ -1285,6 +1292,25 @@ lbFound: VectoJobForm.Activate() End Sub + Private Sub ShowVectoJobForm() + If Not VectoJobForm.Visible Then + VectoJobForm.Show() + Else + If VectoJobForm.WindowState = FormWindowState.Minimized Then VectoJobForm.WindowState = FormWindowState.Normal + VectoJobForm.BringToFront() + End If + End Sub + + Private Sub ShowVectoEPTPJobForm() + If Not VectoEPTPJobForm.Visible Then + VectoEPTPJobForm.Show() + Else + If VectoEPTPJobForm.WindowState = FormWindowState.Minimized Then _ + VectoEPTPJobForm.WindowState = FormWindowState.Normal + VectoEPTPJobForm.BringToFront() + End If + End Sub + 'Save job and cycle file lists Private Sub SaveFileLists() _jobListView.SaveList() @@ -2001,6 +2027,11 @@ Lb1: End If Next End Sub + + Private Sub EPTPJobEditorToolStripMenuItem_Click(sender As Object, e As EventArgs) _ + Handles EPTPJobEditorToolStripMenuItem.Click + OpenVECTOeditor("<EPTP>") + End Sub End Class diff --git a/VECTO/GUI/VectoEPTPJobForm.Designer.vb b/VECTO/GUI/VectoEPTPJobForm.Designer.vb new file mode 100644 index 0000000000000000000000000000000000000000..67673c6f89d86f1e56b573dbb020f9afa20967a7 --- /dev/null +++ b/VECTO/GUI/VectoEPTPJobForm.Designer.vb @@ -0,0 +1,637 @@ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ +Partial Class VectoEPTPJobForm + Inherits Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + <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 + + 'Wird vom Windows Form-Designer benötigt. + Private components As IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + <DebuggerStepThrough()> _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VectoEPTPJobForm)) + Me.GrCycles = New System.Windows.Forms.GroupBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.LvCycles = New System.Windows.Forms.ListView() + Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.BtDRIrem = New System.Windows.Forms.Button() + Me.BtDRIadd = New System.Windows.Forms.Button() + Me.GrAux = New System.Windows.Forms.GroupBox() + Me.LvAux = New System.Windows.Forms.ListView() + Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.TbVEH = New System.Windows.Forms.TextBox() + Me.ButtonVEH = New System.Windows.Forms.Button() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel() + Me.ButOK = New System.Windows.Forms.Button() + Me.ButCancel = New System.Windows.Forms.Button() + Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton() + Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton() + Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton() + Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() + Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PicVehicle = New System.Windows.Forms.PictureBox() + Me.PicBox = New System.Windows.Forms.PictureBox() + Me.TbEngTxt = New System.Windows.Forms.TextBox() + Me.TbVehCat = New System.Windows.Forms.TextBox() + Me.TbAxleConf = New System.Windows.Forms.TextBox() + Me.TbHVCclass = New System.Windows.Forms.TextBox() + Me.TbGbxTxt = New System.Windows.Forms.TextBox() + Me.TbMass = New System.Windows.Forms.TextBox() + Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) + Me.lblEngineCharacteristics = New System.Windows.Forms.Label() + Me.PictureBox2 = New System.Windows.Forms.PictureBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.tbC1 = New System.Windows.Forms.TextBox() + Me.tbC2 = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.tbC3 = New System.Windows.Forms.TextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.GrCycles.SuspendLayout() + Me.GrAux.SuspendLayout() + Me.StatusStrip1.SuspendLayout() + Me.ToolStrip1.SuspendLayout() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.CmOpenFile.SuspendLayout() + CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox1.SuspendLayout() + Me.SuspendLayout() + ' + 'GrCycles + ' + Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GrCycles.Controls.Add(Me.Label2) + Me.GrCycles.Controls.Add(Me.LvCycles) + Me.GrCycles.Controls.Add(Me.BtDRIrem) + Me.GrCycles.Controls.Add(Me.BtDRIadd) + Me.GrCycles.Location = New System.Drawing.Point(12, 260) + Me.GrCycles.Name = "GrCycles" + Me.GrCycles.Size = New System.Drawing.Size(515, 138) + Me.GrCycles.TabIndex = 10 + Me.GrCycles.TabStop = False + Me.GrCycles.Text = "Cycles" + ' + 'Label2 + ' + Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(391, 109) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(118, 13) + Me.Label2.TabIndex = 3 + Me.Label2.Text = "(Right-Click for Options)" + ' + 'LvCycles + ' + Me.LvCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1}) + Me.LvCycles.FullRowSelect = True + Me.LvCycles.GridLines = True + Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None + Me.LvCycles.HideSelection = False + Me.LvCycles.LabelEdit = True + Me.LvCycles.Location = New System.Drawing.Point(6, 19) + Me.LvCycles.MultiSelect = False + Me.LvCycles.Name = "LvCycles" + Me.LvCycles.Size = New System.Drawing.Size(503, 89) + Me.LvCycles.TabIndex = 0 + Me.LvCycles.TabStop = False + Me.LvCycles.UseCompatibleStateImageBehavior = False + Me.LvCycles.View = System.Windows.Forms.View.Details + ' + 'ColumnHeader1 + ' + Me.ColumnHeader1.Text = "Cycle path" + Me.ColumnHeader1.Width = 470 + ' + 'BtDRIrem + ' + Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon + Me.BtDRIrem.Location = New System.Drawing.Point(29, 109) + Me.BtDRIrem.Name = "BtDRIrem" + Me.BtDRIrem.Size = New System.Drawing.Size(24, 24) + Me.BtDRIrem.TabIndex = 2 + Me.BtDRIrem.UseVisualStyleBackColor = True + ' + 'BtDRIadd + ' + Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon + Me.BtDRIadd.Location = New System.Drawing.Point(5, 109) + Me.BtDRIadd.Name = "BtDRIadd" + Me.BtDRIadd.Size = New System.Drawing.Size(24, 24) + Me.BtDRIadd.TabIndex = 1 + Me.BtDRIadd.UseVisualStyleBackColor = True + ' + 'GrAux + ' + Me.GrAux.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GrAux.Controls.Add(Me.LvAux) + Me.GrAux.Location = New System.Drawing.Point(12, 114) + Me.GrAux.Name = "GrAux" + Me.GrAux.Size = New System.Drawing.Size(515, 140) + Me.GrAux.TabIndex = 9 + Me.GrAux.TabStop = False + Me.GrAux.Text = "Auxiliaries" + ' + 'LvAux + ' + Me.LvAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6}) + Me.LvAux.FullRowSelect = True + Me.LvAux.GridLines = True + Me.LvAux.HideSelection = False + Me.LvAux.Location = New System.Drawing.Point(4, 19) + Me.LvAux.MultiSelect = False + Me.LvAux.Name = "LvAux" + Me.LvAux.Size = New System.Drawing.Size(503, 115) + Me.LvAux.TabIndex = 0 + Me.LvAux.TabStop = False + Me.LvAux.UseCompatibleStateImageBehavior = False + Me.LvAux.View = System.Windows.Forms.View.Details + ' + 'ColumnHeader4 + ' + Me.ColumnHeader4.Text = "ID" + Me.ColumnHeader4.Width = 45 + ' + 'ColumnHeader5 + ' + Me.ColumnHeader5.Text = "Type" + Me.ColumnHeader5.Width = 108 + ' + 'ColumnHeader6 + ' + Me.ColumnHeader6.Text = "Input File" + Me.ColumnHeader6.Width = 331 + ' + 'TbVEH + ' + Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TbVEH.Location = New System.Drawing.Point(90, 86) + Me.TbVEH.Name = "TbVEH" + Me.TbVEH.Size = New System.Drawing.Size(411, 20) + Me.TbVEH.TabIndex = 1 + ' + 'ButtonVEH + ' + Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image) + Me.ButtonVEH.Location = New System.Drawing.Point(502, 84) + Me.ButtonVEH.Name = "ButtonVEH" + Me.ButtonVEH.Size = New System.Drawing.Size(24, 24) + Me.ButtonVEH.TabIndex = 2 + Me.ButtonVEH.TabStop = False + Me.ButtonVEH.UseVisualStyleBackColor = True + ' + 'StatusStrip1 + ' + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN}) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 554) + Me.StatusStrip1.Name = "StatusStrip1" + Me.StatusStrip1.Size = New System.Drawing.Size(944, 22) + Me.StatusStrip1.SizingGrip = False + Me.StatusStrip1.TabIndex = 6 + Me.StatusStrip1.Text = "StatusStrip1" + ' + 'ToolStripStatusLabelGEN + ' + Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN" + Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(121, 17) + Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1" + ' + 'ButOK + ' + Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ButOK.Location = New System.Drawing.Point(778, 527) + Me.ButOK.Name = "ButOK" + Me.ButOK.Size = New System.Drawing.Size(75, 23) + Me.ButOK.TabIndex = 0 + Me.ButOK.Text = "Save" + Me.ButOK.UseVisualStyleBackColor = True + ' + 'ButCancel + ' + Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.ButCancel.Location = New System.Drawing.Point(859, 527) + Me.ButCancel.Name = "ButCancel" + Me.ButCancel.Size = New System.Drawing.Size(75, 23) + Me.ButCancel.TabIndex = 1 + Me.ButCancel.Text = "Cancel" + Me.ButCancel.UseVisualStyleBackColor = True + ' + 'ToolStrip1 + ' + Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1}) + Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.Name = "ToolStrip1" + Me.ToolStrip1.Size = New System.Drawing.Size(944, 25) + Me.ToolStrip1.TabIndex = 20 + Me.ToolStrip1.Text = "ToolStrip1" + ' + 'ToolStripBtNew + ' + Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon + Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtNew.Name = "ToolStripBtNew" + Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtNew.Text = "New" + Me.ToolStripBtNew.ToolTipText = "New" + ' + 'ToolStripBtOpen + ' + Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.Name = "ToolStripBtOpen" + Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Text = "Open" + Me.ToolStripBtOpen.ToolTipText = "Open..." + ' + 'ToolStripBtSave + ' + Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon + Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSave.Name = "ToolStripBtSave" + Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSave.Text = "Save" + Me.ToolStripBtSave.ToolTipText = "Save" + ' + 'ToolStripBtSaveAs + ' + Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon + Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs" + Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSaveAs.Text = "Save As" + Me.ToolStripBtSaveAs.ToolTipText = "Save As..." + ' + 'ToolStripSeparator1 + ' + Me.ToolStripSeparator1.Name = "ToolStripSeparator1" + Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) + ' + 'ToolStripBtSendTo + ' + Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon + Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo" + Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSendTo.Text = "Send to Job List" + Me.ToolStripBtSendTo.ToolTipText = "Send to Job List" + ' + 'ToolStripSeparator2 + ' + Me.ToolStripSeparator2.Name = "ToolStripSeparator2" + Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25) + ' + 'ToolStripButton1 + ' + Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon + Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.Name = "ToolStripButton1" + Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Text = "Help" + ' + 'PictureBox1 + ' + Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.PictureBox1.BackColor = System.Drawing.Color.White + Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VECTO + Me.PictureBox1.Location = New System.Drawing.Point(0, 28) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(944, 40) + Me.PictureBox1.TabIndex = 21 + Me.PictureBox1.TabStop = False + ' + 'CmOpenFile + ' + Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) + Me.CmOpenFile.Name = "CmOpenFile" + Me.CmOpenFile.ShowImageMargin = False + Me.CmOpenFile.Size = New System.Drawing.Size(128, 48) + ' + 'OpenWithToolStripMenuItem + ' + Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem" + Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22) + Me.OpenWithToolStripMenuItem.Text = "Open with ..." + ' + 'ShowInFolderToolStripMenuItem + ' + Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem" + Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22) + Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" + ' + 'PicVehicle + ' + Me.PicVehicle.BackColor = System.Drawing.Color.LightGray + Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.PicVehicle.Location = New System.Drawing.Point(542, 80) + Me.PicVehicle.Name = "PicVehicle" + Me.PicVehicle.Size = New System.Drawing.Size(300, 88) + Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage + Me.PicVehicle.TabIndex = 36 + Me.PicVehicle.TabStop = False + ' + 'PicBox + ' + Me.PicBox.BackColor = System.Drawing.Color.LightGray + Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.PicBox.Location = New System.Drawing.Point(542, 219) + Me.PicBox.Name = "PicBox" + Me.PicBox.Size = New System.Drawing.Size(390, 296) + Me.PicBox.TabIndex = 36 + Me.PicBox.TabStop = False + ' + 'TbEngTxt + ' + Me.TbEngTxt.Location = New System.Drawing.Point(542, 171) + Me.TbEngTxt.Name = "TbEngTxt" + Me.TbEngTxt.ReadOnly = True + Me.TbEngTxt.Size = New System.Drawing.Size(390, 20) + Me.TbEngTxt.TabIndex = 6 + ' + 'TbVehCat + ' + Me.TbVehCat.Location = New System.Drawing.Point(848, 84) + Me.TbVehCat.Name = "TbVehCat" + Me.TbVehCat.ReadOnly = True + Me.TbVehCat.Size = New System.Drawing.Size(87, 20) + Me.TbVehCat.TabIndex = 2 + ' + 'TbAxleConf + ' + Me.TbAxleConf.Location = New System.Drawing.Point(904, 113) + Me.TbAxleConf.Name = "TbAxleConf" + Me.TbAxleConf.ReadOnly = True + Me.TbAxleConf.Size = New System.Drawing.Size(31, 20) + Me.TbAxleConf.TabIndex = 4 + ' + 'TbHVCclass + ' + Me.TbHVCclass.Location = New System.Drawing.Point(848, 142) + Me.TbHVCclass.Name = "TbHVCclass" + Me.TbHVCclass.ReadOnly = True + Me.TbHVCclass.Size = New System.Drawing.Size(87, 20) + Me.TbHVCclass.TabIndex = 5 + ' + 'TbGbxTxt + ' + Me.TbGbxTxt.Location = New System.Drawing.Point(542, 194) + Me.TbGbxTxt.Name = "TbGbxTxt" + Me.TbGbxTxt.ReadOnly = True + Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20) + Me.TbGbxTxt.TabIndex = 7 + ' + 'TbMass + ' + Me.TbMass.Location = New System.Drawing.Point(848, 113) + Me.TbMass.Name = "TbMass" + Me.TbMass.ReadOnly = True + Me.TbMass.Size = New System.Drawing.Size(50, 20) + Me.TbMass.TabIndex = 3 + ' + 'lblEngineCharacteristics + ' + Me.lblEngineCharacteristics.AutoSize = True + Me.lblEngineCharacteristics.Location = New System.Drawing.Point(542, 518) + Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics" + Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13) + Me.lblEngineCharacteristics.TabIndex = 37 + ' + 'PictureBox2 + ' + Me.PictureBox2.Image = CType(resources.GetObject("PictureBox2.Image"), System.Drawing.Image) + Me.PictureBox2.InitialImage = CType(resources.GetObject("PictureBox2.InitialImage"), System.Drawing.Image) + Me.PictureBox2.Location = New System.Drawing.Point(7, 19) + Me.PictureBox2.Name = "PictureBox2" + Me.PictureBox2.Size = New System.Drawing.Size(277, 108) + Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox2.TabIndex = 38 + Me.PictureBox2.TabStop = False + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.tbC3) + Me.GroupBox1.Controls.Add(Me.Label4) + Me.GroupBox1.Controls.Add(Me.tbC2) + Me.GroupBox1.Controls.Add(Me.Label3) + Me.GroupBox1.Controls.Add(Me.tbC1) + Me.GroupBox1.Controls.Add(Me.Label1) + Me.GroupBox1.Controls.Add(Me.PictureBox2) + Me.GroupBox1.Location = New System.Drawing.Point(11, 404) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(515, 135) + Me.GroupBox1.TabIndex = 39 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Fan Power" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(316, 28) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(23, 13) + Me.Label1.TabIndex = 39 + Me.Label1.Text = "C1:" + ' + 'tbC1 + ' + Me.tbC1.Location = New System.Drawing.Point(363, 25) + Me.tbC1.Name = "tbC1" + Me.tbC1.Size = New System.Drawing.Size(100, 20) + Me.tbC1.TabIndex = 40 + ' + 'tbC2 + ' + Me.tbC2.Location = New System.Drawing.Point(363, 51) + Me.tbC2.Name = "tbC2" + Me.tbC2.Size = New System.Drawing.Size(100, 20) + Me.tbC2.TabIndex = 42 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(316, 54) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(23, 13) + Me.Label3.TabIndex = 41 + Me.Label3.Text = "C2:" + ' + 'tbC3 + ' + Me.tbC3.Location = New System.Drawing.Point(363, 77) + Me.tbC3.Name = "tbC3" + Me.tbC3.Size = New System.Drawing.Size(100, 20) + Me.tbC3.TabIndex = 44 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(316, 80) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(23, 13) + Me.Label4.TabIndex = 43 + Me.Label4.Text = "C3:" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(15, 89) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(70, 13) + Me.Label5.TabIndex = 40 + Me.Label5.Text = "Vehicle XML:" + ' + 'VectoEPTPJobForm + ' + Me.AcceptButton = Me.ButOK + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.CancelButton = Me.ButCancel + Me.ClientSize = New System.Drawing.Size(944, 576) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.GroupBox1) + Me.Controls.Add(Me.GrAux) + Me.Controls.Add(Me.GrCycles) + Me.Controls.Add(Me.lblEngineCharacteristics) + Me.Controls.Add(Me.TbHVCclass) + Me.Controls.Add(Me.TbMass) + Me.Controls.Add(Me.TbVEH) + Me.Controls.Add(Me.TbAxleConf) + Me.Controls.Add(Me.TbVehCat) + Me.Controls.Add(Me.TbGbxTxt) + Me.Controls.Add(Me.TbEngTxt) + Me.Controls.Add(Me.ButtonVEH) + Me.Controls.Add(Me.PicBox) + Me.Controls.Add(Me.PicVehicle) + Me.Controls.Add(Me.PictureBox1) + Me.Controls.Add(Me.ToolStrip1) + Me.Controls.Add(Me.ButCancel) + Me.Controls.Add(Me.ButOK) + Me.Controls.Add(Me.StatusStrip1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon) + Me.MaximizeBox = false + Me.Name = "VectoEPTPJobForm" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Job Editor" + Me.GrCycles.ResumeLayout(false) + Me.GrCycles.PerformLayout + Me.GrAux.ResumeLayout(false) + Me.StatusStrip1.ResumeLayout(false) + Me.StatusStrip1.PerformLayout + Me.ToolStrip1.ResumeLayout(false) + Me.ToolStrip1.PerformLayout + CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit + Me.CmOpenFile.ResumeLayout(false) + CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.PictureBox2,System.ComponentModel.ISupportInitialize).EndInit + Me.GroupBox1.ResumeLayout(false) + Me.GroupBox1.PerformLayout + Me.ResumeLayout(false) + Me.PerformLayout + +End Sub + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents ButtonVEH As Button + Friend WithEvents ToolStripStatusLabelGEN As ToolStripStatusLabel + Friend WithEvents ButOK As Button + Friend WithEvents TbVEH As TextBox + Friend WithEvents ButCancel As Button + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents ToolStripBtNew As ToolStripButton + Friend WithEvents ToolStripBtOpen As ToolStripButton + Friend WithEvents ToolStripBtSave As ToolStripButton + Friend WithEvents ToolStripBtSaveAs As ToolStripButton + Friend WithEvents ToolStripBtSendTo As ToolStripButton + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents GrAux As GroupBox + Friend WithEvents LvAux As ListView + Friend WithEvents ColumnHeader4 As ColumnHeader + Friend WithEvents ColumnHeader5 As ColumnHeader + Friend WithEvents ColumnHeader6 As ColumnHeader + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents GrCycles As GroupBox + Friend WithEvents LvCycles As ListView + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents BtDRIrem As Button + Friend WithEvents BtDRIadd As Button + Friend WithEvents ToolStripSeparator2 As ToolStripSeparator + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents Label2 As Label + Friend WithEvents CmOpenFile As ContextMenuStrip + Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PicVehicle As PictureBox + Friend WithEvents PicBox As PictureBox + Friend WithEvents TbEngTxt As TextBox + Friend WithEvents TbVehCat As TextBox + Friend WithEvents TbAxleConf As TextBox + Friend WithEvents TbHVCclass As TextBox + Friend WithEvents TbGbxTxt As TextBox + Friend WithEvents TbMass As TextBox + Friend WithEvents ToolTip1 As ToolTip + Friend WithEvents lblEngineCharacteristics As System.Windows.Forms.Label + Friend WithEvents PictureBox2 As System.Windows.Forms.PictureBox + Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox + Friend WithEvents tbC3 As System.Windows.Forms.TextBox + Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents tbC2 As System.Windows.Forms.TextBox + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents tbC1 As System.Windows.Forms.TextBox + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents Label5 As System.Windows.Forms.Label +End Class diff --git a/VECTO/GUI/VectoEPTPJobForm.resx b/VECTO/GUI/VectoEPTPJobForm.resx new file mode 100644 index 0000000000000000000000000000000000000000..0a0d0dea6bd749f7c29cb28b49365fe5adf215cb --- /dev/null +++ b/VECTO/GUI/VectoEPTPJobForm.resx @@ -0,0 +1,649 @@ +<?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="ButtonVEH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw + 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/ + 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC + AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5 + FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK + TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb + Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI + gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q + kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C + x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj + zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5 + znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax + DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg== +</value> + </data> + <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>125, 17</value> + </metadata> + <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 17</value> + </metadata> + <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>350, 15</value> + </metadata> + <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>468, 15</value> + </metadata> + <data name="PictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 +</value> + </data> + <data name="PictureBox2.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 +</value> + </data> + <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>49</value> + </metadata> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 + FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX8O2obybfIq0L+/v4I/v7+Av39/QL9/v0C/f79Av3+ + /QL9/v0C/f79Av3+/QL9/v0C/f79Av3+/QL9/v0C/f79AgAAAAAAAAAAAAAAAAAAAAAAAAAA////Aubs + 4itZgT6rNGUT8zVmFP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX+NWYU4Xqa + ZYTU3s1D2eLTNdni0zXZ4tM12eLTNdni0zXZ4tQ12eLUNdni1DXa49Q12uPVNdni1DXa49Q12uPVNQAA + AAAAAAAAAAAAAAAAAAAAAAAA/v7+CK/CokY3ZxbONWYU/TVmFP81ZhT/NWYU/zVmFP80ZhP/NWYU/jVm + FP81ZhT/NWYU/zVmFP81ZhT/NmcV+DVmFOFEcibPRHEmykRxJ8pFcSjKRXIoykVyKcpGcyrKR3Qrykh0 + K8pJdSzKS3cuykh0K8pJdSzKS3cuygAAAAAAAAAAAAAAAAAAAAD//v8B9vj1HXSWXoM0ZRPlNWYU/jVm + FP81ZhT/NWYU/zVmFP82ZhX0U3w34DRlE/Q1ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFf42ZxX9NmYV/TZm + Fv02Zhf9NmYX/TdnGP03Zxj9OWgZ/TppGv06ahv9PGwd/TppGv06ahv9PGwd/QAAAAAAAAAAAAAAAAAA + AAD+//4CytbCMkJwJLs0ZRP4NWYU/zVmFP81ZhT/NWYU/zVmFPtHcynNoLeRhj9uINM1ZhT9NWYU/zVm + FP81ZhT/NWYU/zZnFf82ZxX/NmcV/zZmFv82Zhf/NmYX/zdnGP83Zxj/OGgZ/zppGv86ahv/O2sc/zpp + Gv86ahv/O2sc/wAAAAAAAAAAAAAAAAAAAAD9/v0Nj6p+VzRlE9U1ZhT9NWYU/zVmFP81ZhT/NWYU/jVl + FOtpjVGW4uneTV+GRac0ZRPxNWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZmFf82Zhb/NmYX/zdn + F/83Zxj/OGgZ/zlpGv86ahv/O2sc/zlpGv86ahv/O2sc/wAAAAAAAAAAAAAAAP///gLj6t8rVn88rDRl + FPM1ZhT/NWYU/zVmFP81ZhT/NWYU/jRlE9KWr4VN/f39F5CqflU0ZRPVNWYU/jVmFP81ZhT/NWYU/zVm + FP82ZxX/NmcV/zZmFf82Zhb/NmYX/zZmF/83Zxj/N2cY/zlpGv86ahv/O2sc/zlpGv86ahv/O2sc/wAA + AAAAAAAAAAAAAP7+/giswJ9HN2cWzzVmFP01ZhT/NWYU/zVmFP81ZhT/NWYU/T1sHcnD0ro2/v7+BMLQ + uDc9bB3KNWYU/TVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZmFf82Zhb/NmYX/zZmF/83Zxj/N2cY/zlp + Gv86ahv/Omob/zlpGv86ahv/Omob/wAAAAAAAAAA////AfX49B5ylFyGNGUT5jVmFP41ZhT/NWYU/zVm + FP81ZhT/NWYU9leAPLPp7uYu////A+nu5ixZgT6vNWYU9DVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZm + FP82ZhX/NmYX/zZmF/83Zxf/N2cY/zlpGv86ahv/Omob/zlpGv86ahv/Omob/wAAAAAAAAAA/v7+AsjV + vzFBbyK6NGUU9jVmFP01ZhT9NWYU/TVmFP01ZhT8NGUT3IGgbW78/PwW////Af39/RGJpXZiNGUT2DVm + FPw1ZhT9NGUT/TVmFP02ZxX9NmcV/TZmFf02ZhX9NmYX/TZmF/03Zxf9N2cY/ThoGf06aRr9Omob/Tho + Gf06aRr9Omob/QAAAAAAAAAA/f79A4+qfS42ZxWhNmcVyDZnFco2ZxXKNmcVyjZnFco2ZxXJOGgYo6/C + ojT+/v4FAAAAAP7+/gO6yq8wO2obojZnFck2ZxXKNmcVyjdnFso3aBbKN2gWyjdoFso3ZxfKN2cYyjhn + Gco4aBnKOWgayjpqG8o7axzKPGsdyjpqG8o7axzKPGsdygAAAAAAAAAA+vv6AcHQtwyxxKQqscSkNbHE + pDWxxKQ1scSkNbHEpDWxxKQ1tMaoKu7y7Az///4BAAAAAAAAAADz9vELtseqKrHEpDWxxKQ1scSkNbHE + pDWxxKU1scSlNbHEpTWxxKU1scSlNbHEpTWxxKY1ssSmNbLFpjWzxac1s8WnNbLFpjWzxac1s8WnNQAA + AAAAAAAAAAAAAAAAAAD///8C////Av///wL///8C////Av///wL///8C////AgAAAAAAAAAAAAAAAAAA + AAAAAAAA////Av///wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////Av// + /wL///8C////AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////8AAAAP// + 8A/wAAAA///wA/AAAAD/+/AB8AAAAP/z8AHwAAAA//HwAfAAAAD/8f8B8AAAAP/g/4HwAAAA/+D/gfAA + AAD/wP+B8AAAAP/Af4HwAAAA/8B/gfAAAAD/gD+B8AAAAP+APAHwAAAA/wA8AfAAAAD/ABwB8AAAAP8A + HAHwAAAA/gAMAfAAAAD+AA//8AAAAPwAB//wAAAA/AAAABAAAAD4AAAAEAAAAPgAAAAQAAAA+AQAABAA + AADwDgAAEAAAAPAOAAAQAAAA4A4AABAAAADgHwAAEAAAAOAfAAAQAAAA//////AAAAD/////8AAAAP// + ///wAAAA +</value> + </data> +</root> \ No newline at end of file diff --git a/VECTO/GUI/VectoEPTPJobForm.vb b/VECTO/GUI/VectoEPTPJobForm.vb new file mode 100644 index 0000000000000000000000000000000000000000..0eb10face8ff43adf3c70063df086952fbba5553 --- /dev/null +++ b/VECTO/GUI/VectoEPTPJobForm.vb @@ -0,0 +1,700 @@ +' Copyright 2017 European Union. +' Licensed under the EUPL (the 'Licence'); +' +' * You may not use this work except in compliance with the Licence. +' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl +' * Unless required by applicable law or agreed to in writing, +' software distributed under the Licence is distributed on an "AS IS" basis, +' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +' +' See the LICENSE.txt for the specific language governing permissions and limitations. +'Option Infer On + +Imports System.Collections.Generic +Imports System.Drawing.Imaging +Imports System.IO +Imports System.Linq +Imports System.Runtime.CompilerServices +Imports System.Text.RegularExpressions +Imports System.Windows.Forms.DataVisualization.Charting +Imports TUGraz.VECTO.Input_Files +Imports TUGraz.VectoCommon.InputData +Imports TUGraz.VectoCommon.Models +Imports TUGraz.VectoCommon.Utils +Imports TUGraz.VectoCore.InputData.FileIO.JSON +Imports TUGraz.VectoCore.InputData.Reader +Imports TUGraz.VectoCore.Models.Declaration +Imports TUGraz.VectoCore.Models.SimulationComponent.Data +Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine +Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox + +''' <summary> +''' Job Editor. Create/Edit VECTO job files (.vecto) +''' </summary> +''' <remarks></remarks> +Public Class VectoEPTPJobForm + Public VectoFile As String + Private _changed As Boolean = False + + Private _pgDriver As TabPage + + Private _pgDriverOn As Boolean = True + + Private _auxDialog As VehicleAuxiliariesDialog + + Enum AuxViewColumns + AuxID = 0 + AuxType = 1 + AuxInputOrTech = 2 + End Enum + + + + 'Initialise form + Private Sub F02_GEN_Load(sender As Object, e As EventArgs) Handles Me.Load + Dim x As Integer + + _auxDialog = New VehicleAuxiliariesDialog + + + LvAux.Columns(AuxViewColumns.AuxInputOrTech).Width = -2 + + LvAux.Columns(AuxViewColumns.AuxInputOrTech).Text = "Technology" + + GrCycles.Enabled = True + + _changed = False + End Sub + + 'Close - Check for unsaved changes + Private Sub F02_GEN_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then + e.Cancel = ChangeCheckCancel() + End If + End Sub + + + + +#Region "Browse Buttons" + + Private Sub ButtonVEH_Click(sender As Object, e As EventArgs) Handles ButtonVEH.Click + If VehicleXMLFileBrowser.OpenDialog(FileRepl(TbVEH.Text, GetPath(VectoFile))) Then + TbVEH.Text = GetFilenameWithoutDirectory(VehicleXMLFileBrowser.Files(0), GetPath(VectoFile)) + End If + End Sub + + +#End Region + + +#Region "Toolbar" + + 'New + Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click + VectoNew() + End Sub + + 'Open + Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click + If JobfileFileBrowser.OpenDialog(VectoFile, False, "vecto") Then + Try + VECTOload2Form(JobfileFileBrowser.Files(0)) + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading Vecto Job File") + End Try + + End If + End Sub + + 'Save + Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click + Save() + End Sub + + 'Save As + Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click + If JobfileFileBrowser.SaveDialog(VectoFile) Then Call VECTOsave(JobfileFileBrowser.Files(0)) + End Sub + + 'Send to Job file list in main form + Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click + If ChangeCheckCancel() Then Exit Sub + If VectoFile = "" Then + MsgBox("File not found!" & ChrW(10) & ChrW(10) & "Save file and try again.") + Else + MainForm.AddToJobListView(VectoFile) + End If + End Sub + + 'Help + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + If File.Exists(MyAppPath & "User Manual\help.html") Then + Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath() + Process.Start(defaultBrowserPath, + String.Format("""file://{0}{1}""", MyAppPath, "User Manual\help.html#job-editor")) + Else + MsgBox("User Manual not found!", MsgBoxStyle.Critical) + End If + End Sub + + +#End Region + + 'Save ("Save" or "Save As" when new file) + Private Function Save() As Boolean + If VectoFile = "" Then + If JobfileFileBrowser.SaveDialog("") Then + VectoFile = JobfileFileBrowser.Files(0) + Else + Return False + End If + End If + Try + Return VECTOsave(VectoFile) + Catch ex As Exception + MsgBox("Error when saving file" + Environment.NewLine + ex.Message) + Return False + End Try + End Function + + 'Open file + Public Sub VECTOload2Form(file As String) + + If ChangeCheckCancel() Then Exit Sub + + VectoNew() + + 'Read GEN + Dim vectoJob As IEngineeringJobInputData = Nothing + Dim inputData As IEngineeringInputDataProvider = Nothing + Try + inputData = TryCast(JSONInputDataFactory.ReadComponentData(file), + IEngineeringInputDataProvider) + vectoJob = inputData.JobInputData() + Catch ex As Exception + MsgBox("Failed to read Job-File" + Environment.NewLine + ex.Message) + Return + End Try + + + If Cfg.DeclMode <> vectoJob.SavedInDeclarationMode Then + Select Case WrongMode() + Case 1 + Close() + MainForm.RbDecl.Checked = Not MainForm.RbDecl.Checked + MainForm.OpenVectoFile(file) + Case -1 + Exit Sub + End Select + End If + + VectoFile = file + _basePath = Path.GetDirectoryName(file) + 'Update Form + + + 'Files ----------------------------- + TbVEH.Text = GetRelativePath(inputData.VehicleInputData.Source, _basePath) + + 'Start/Stop + Dim driver As IDriverEngineeringInputData = inputData.DriverInputData + + + Dim declarationInput As IDeclarationInputDataProvider = CType(inputData, IDeclarationInputDataProvider) + Dim auxInput As IAuxiliariesDeclarationInputData = declarationInput.AuxiliaryInputData() + + LvAux.Items.Clear() + Dim entry As IAuxiliaryDeclarationInputData + For Each entry In auxInput.Auxiliaries + 'If entry.AuxiliaryType = AuxiliaryDemandType.Constant Then Continue For + Try + LvAux.Items.Add(CreateAuxListEntry(AuxiliaryTypeHelper.GetAuxKey(entry.Type), + AuxiliaryTypeHelper.ToString(entry.Type), String.Join("; ", entry.Technology))) + Catch ex As Exception + End Try + Next + + Try + Dim sb As ICycleData + For Each sb In vectoJob.Cycles + Dim lv0 As ListViewItem = New ListViewItem + lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name + LvCycles.Items.Add(lv0) + Next + Catch ex As Exception + End Try + + VehicleForm.AutoSendTo = False + + + Dim x As Integer = Len(file) + While Mid(file, x, 1) <> "\" And x > 0 + x = x - 1 + End While + Text = Mid(file, x + 1, Len(file) - x) + _changed = False + ToolStripStatusLabelGEN.Text = "" 'file & " opened." + + UpdatePic() + + '------------------------------------------------------------- + End Sub + + Private Function CreateAuxListEntry(auxKey As String, type As String, technology As String) As ListViewItem + Dim lv0 As ListViewItem = New ListViewItem + lv0.SubItems(AuxViewColumns.AuxID).Text = auxKey + lv0.SubItems.Add(type) + lv0.SubItems.Add(technology) + Return lv0 + End Function + + + 'Save file + Private Function VECTOsave(file As String) As Boolean + Dim message As String = String.Empty + + + Dim vectoJob As VectoJob = New VectoJob + vectoJob.FilePath = file + + 'Files ------------------------------------------------- ----------------- + + vectoJob.PathVeh = TbVEH.Text + + For Each lv0 As ListViewItem In LvCycles.Items + Dim sb As SubPath = New SubPath + sb.Init(GetPath(file), lv0.Text) + vectoJob.CycleFiles.Add(sb) + Next + + For Each lv0 As ListViewItem In LvAux.Items + Dim auxEntry As VectoJob.AuxEntry = New VectoJob.AuxEntry + + If Cfg.DeclMode Then + auxEntry.TechnologyList.Clear() + auxEntry.TechnologyList.AddRange( + lv0.SubItems(AuxViewColumns.AuxInputOrTech).Text.Split(";"c).Select( + Function(x) Trim(x))) + Else + auxEntry.Path.Init(GetPath(file), lv0.SubItems(AuxViewColumns.AuxInputOrTech).Text) + End If + + auxEntry.Type = AuxiliaryTypeHelper.ParseKey(lv0.SubItems(AuxViewColumns.AuxID).Text) + vectoJob.AuxPaths.Add(lv0.SubItems(AuxViewColumns.AuxID).Text, auxEntry) + Next + + '------------------------------------------------------------ + + 'SAVE + If Not vectoJob.SaveFile Then + MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical) + Return False + End If + + VectoFile = file + + file = GetFilenameWithoutPath(VectoFile, True) + + Text = file + ToolStripStatusLabelGEN.Text = "" + + MainForm.AddToJobListView(VectoFile) + + _changed = False + + Return True + End Function + + 'New file + Public Sub VectoNew() + + If ChangeCheckCancel() Then Exit Sub + + 'Files + TbVEH.Text = "" + LvCycles.Items.Clear() + + + LvAux.Items.Clear() + + EngineForm.AutoSendTo = False + + VectoFile = "" + Text = "Job Editor" + ToolStripStatusLabelGEN.Text = "" + _changed = False + UpdatePic() + End Sub + + +#Region "Track changes" + +#Region "'Change' Events" + + Private Sub TextBoxVEH_TextChanged(sender As Object, e As EventArgs) _ + Handles TbVEH.TextChanged + UpdatePic() + Change() + End Sub + + + Private Sub LvCycles_AfterLabelEdit(sender As Object, e As LabelEditEventArgs) _ + Handles LvCycles.AfterLabelEdit + Change() + End Sub + + +#End Region + + Private Sub Change() + If Not _changed Then + ToolStripStatusLabelGEN.Text = "Unsaved changes in current file" + _changed = True + End If + End Sub + + ' "Save changes? "... Returns True if User aborts + Private Function ChangeCheckCancel() As Boolean + + If _changed Then + + Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel) + Case MsgBoxResult.Yes + Return Not Save() + Case MsgBoxResult.Cancel + Return True + Case Else 'MsgBoxResult.No + _changed = False + Return False + End Select + + Else + + Return False + + End If + End Function + +#End Region + + + 'OK (Save & Close) + Private Sub ButSave_Click(sender As Object, e As EventArgs) Handles ButOK.Click + If Not Save() Then Exit Sub + Close() + End Sub + + 'Cancel + Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click + Close() + End Sub + +#Region "Cycle list" + + Private Sub LvCycles_KeyDown(sender As Object, e As KeyEventArgs) Handles LvCycles.KeyDown + Select Case e.KeyCode + Case Keys.Delete, Keys.Back + RemoveCycle() + Case Keys.Enter + If LvCycles.SelectedItems.Count > 0 Then LvCycles.SelectedItems(0).BeginEdit() + End Select + End Sub + + Private Sub BtDRIadd_Click(sender As Object, e As EventArgs) Handles BtDRIadd.Click + Dim genDir As String = GetPath(VectoFile) + + If DrivingCycleFileBrowser.OpenDialog("", True) Then + Dim s As String + For Each s In DrivingCycleFileBrowser.Files + LvCycles.Items.Add(GetFilenameWithoutDirectory(s, genDir)) + Next + Change() + End If + End Sub + + Private Sub BtDRIrem_Click(sender As Object, e As EventArgs) Handles BtDRIrem.Click + RemoveCycle() + End Sub + + Private Sub RemoveCycle() + Dim i As Integer + + If LvCycles.SelectedItems.Count = 0 Then + If LvCycles.Items.Count = 0 Then + Exit Sub + Else + LvCycles.Items(LvCycles.Items.Count - 1).Selected = True + End If + End If + + i = LvCycles.SelectedItems(0).Index + + LvCycles.SelectedItems(0).Remove() + + If LvCycles.Items.Count > 0 Then + If i < LvCycles.Items.Count Then + LvCycles.Items(i).Selected = True + Else + LvCycles.Items(LvCycles.Items.Count - 1).Selected = True + End If + + LvCycles.Focus() + End If + + Change() + End Sub + +#End Region + + + Public Sub UpdatePic() + + + TbHVCclass.Text = "" + TbVehCat.Text = "" + TbMass.Text = "" + TbAxleConf.Text = "" + TbEngTxt.Text = "" + TbGbxTxt.Text = "" + PicVehicle.Image = Nothing + PicBox.Image = Nothing + + Try + UpdateVehiclePic() + + Dim chart As Chart = Nothing + UpdateEnginePic(chart) + + + UpdateGearboxPic(chart) + + If chart Is Nothing Then Return + + Dim chartArea As ChartArea = New ChartArea() + chartArea.Name = "main" + + chartArea.AxisX.Title = "engine speed [1/min]" + chartArea.AxisX.TitleFont = New Font("Helvetica", 10) + chartArea.AxisX.LabelStyle.Font = New Font("Helvetica", 8) + chartArea.AxisX.LabelAutoFitStyle = LabelAutoFitStyles.None + chartArea.AxisX.MajorGrid.LineDashStyle = ChartDashStyle.Dot + + chartArea.AxisY.Title = "engine torque [Nm]" + chartArea.AxisY.TitleFont = New Font("Helvetica", 10) + chartArea.AxisY.LabelStyle.Font = New Font("Helvetica", 8) + chartArea.AxisY.LabelAutoFitStyle = LabelAutoFitStyles.None + chartArea.AxisY.MajorGrid.LineDashStyle = ChartDashStyle.Dot + + chartArea.AxisX.Minimum = 300 + chartArea.BorderDashStyle = ChartDashStyle.Solid + chartArea.BorderWidth = 1 + + chartArea.BackColor = Color.GhostWhite + + chart.ChartAreas.Add(chartArea) + chart.Update() + + Dim img As Bitmap = New Bitmap(chart.Width, chart.Height, PixelFormat.Format32bppArgb) + chart.DrawToBitmap(img, New Rectangle(0, 0, PicBox.Width, PicBox.Height)) + + PicBox.Image = img + Catch + End Try + End Sub + + Private Sub UpdateGearboxPic(ByRef chartArea As Chart) + Dim s As Series + Dim i As Integer + + Dim gearbox As IGearboxEngineeringInputData = Nothing + Dim vehicleFile As String = + If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text) + If File.Exists(vehicleFile) Then + Try + Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(vehicleFile), + IEngineeringInputDataProvider) + gearbox = inputData.GearboxInputData + Catch + End Try + End If + + If gearbox Is Nothing Then Return + + TbGbxTxt.Text = String.Format("{0}-Speed {1} {2}", gearbox.Gears.Count, gearbox.Type.ShortName(), gearbox.Model) + + End Sub + + Private Sub UpdateEnginePic(ByRef chart As Chart) + Dim s As Series + Dim pmax As Double + + Dim engine As IEngineEngineeringInputData = Nothing + lblEngineCharacteristics.Text = "" + Dim vehicleFile As String = + If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text) + If File.Exists(vehicleFile) Then + Try + Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(vehicleFile), + IEngineeringInputDataProvider) + engine = inputData.EngineInputData + Catch + Return + End Try + End If + + 'engine.FilePath = fFileRepl(TbENG.Text, GetPath(VECTOfile)) + + 'Create plot + chart = New Chart + chart.Width = PicBox.Width + chart.Height = PicBox.Height + + + 'Dim FLD0 As EngineFullLoadCurve = New EngineFullLoadCurve + + If engine Is Nothing Then Return + + + engine.IdleSpeed.Value() + + Dim fullLoadCurve As EngineFullLoadCurve = FullLoadCurveReader.Create(engine.FullLoadCurve) + + s = New Series + s.Points.DataBindXY(fullLoadCurve.FullLoadEntries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(), + fullLoadCurve.FullLoadEntries.Select(Function(x) x.TorqueFullLoad.Value()).ToArray()) + s.ChartType = SeriesChartType.FastLine + s.BorderWidth = 2 + s.Color = Color.DarkBlue + s.Name = "Full load" + chart.Series.Add(s) + + s = New Series + s.Points.DataBindXY(fullLoadCurve.FullLoadEntries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(), + fullLoadCurve.FullLoadEntries.Select(Function(x) x.TorqueDrag.Value()).ToArray()) + s.ChartType = SeriesChartType.FastLine + s.BorderWidth = 2 + s.Color = Color.Blue + s.Name = "Motoring" + chart.Series.Add(s) + + pmax = fullLoadCurve.MaxPower.Value() / 1000 'FLD0.Pfull(FLD0.EngineRatedSpeed) + + + TbEngTxt.Text = String.Format("{0} l {1} kw {2}", (engine.Displacement.Value() * 1000).ToString("0.0"), + pmax.ToString("#"), engine.Model) + + Dim fuelConsumptionMap As FuelConsumptionMap = FuelConsumptionMapReader.Create(engine.FuelConsumptionMap) + + s = New Series + s.Points.DataBindXY(fuelConsumptionMap.Entries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(), + fuelConsumptionMap.Entries.Select(Function(x) x.Torque.Value()).ToArray()) + s.ChartType = SeriesChartType.Point + s.MarkerSize = 3 + s.Color = Color.Red + s.Name = "Map" + chart.Series.Add(s) + + Dim engineCharacteristics As String = + String.Format("Max. Torque: {0:F0} Nm; Max. Power: {1:F1} kW; n_rated: {2:F0} rpm; n_95h: {3:F0} rpm", + fullLoadCurve.MaxTorque.Value(), fullLoadCurve.MaxPower.Value() / 1000, fullLoadCurve.RatedSpeed.AsRPM, + fullLoadCurve.N95hSpeed.AsRPM) + lblEngineCharacteristics.Text = engineCharacteristics + End Sub + + Private Sub UpdateVehiclePic() + Dim HDVclass As String + + Dim vehicle As IVehicleEngineeringInputData = Nothing + + Dim vehicleFile As String = + If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text) + If File.Exists(vehicleFile) Then + Try + Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(vehicleFile), + IEngineeringInputDataProvider) + vehicle = inputData.VehicleInputData + Catch + End Try + End If + + If vehicle Is Nothing Then Return + + Dim maxMass As Kilogram = vehicle.GrossVehicleMassRating 'CSng(fTextboxToNumString(TbMassMass.Text)) + + Dim s0 As Segment = Nothing + Try + s0 = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration, maxMass, 0.SI(Of Kilogram), + True) + Catch + End Try + If Not s0.Found Then + HDVclass = "-" + Else + HDVclass = s0.VehicleClass.GetClassNumber() + + If Cfg.DeclMode Then + LvCycles.Items.Clear() + Dim m0 As Mission + For Each m0 In s0.Missions + LvCycles.Items.Add(m0.MissionType.ToString()) + Next + End If + + End If + + PicVehicle.Image = ConvPicPath(If(Not s0.Found, -1, HDVclass.ToInt()), False) _ + 'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False)) + + TbHVCclass.Text = String.Format("HDV Class {0}", HDVclass) + TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True) + TbMass.Text = (vehicle.GrossVehicleMassRating.Value() / 1000) & " t" + TbAxleConf.Text = vehicle.AxleConfiguration.GetName() 'ConvAxleConf(VEH0.AxleConf) + End Sub + + +#Region "Open File Context Menu" + + Private _contextMenuFiles As String() + Private _basePath As String = "" + + Private Sub OpenFiles(ParamArray files() As String) + If files.Length = 0 Then Exit Sub + + _contextMenuFiles = files + OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName + CmOpenFile.Show(Windows.Forms.Cursor.Position) + End Sub + + Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _ + Handles OpenWithToolStripMenuItem.Click + If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!") + End Sub + + Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _ + Handles ShowInFolderToolStripMenuItem.Click + If File.Exists(_contextMenuFiles(0)) Then + Try + Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "") + Catch ex As Exception + MsgBox("Failed to open file!") + End Try + Else + MsgBox("File not found!") + End If + End Sub + +#End Region + + + Private Sub LvCycles_MouseClick(sender As Object, e As MouseEventArgs) Handles LvCycles.MouseClick + If e.Button = MouseButtons.Right AndAlso LvCycles.SelectedItems.Count > 0 Then + OpenFiles(FileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VectoFile))) + End If + End Sub + + Private Sub LvAux_SelectedIndexChanged(sender As Object, e As EventArgs) Handles LvAux.SelectedIndexChanged + End Sub +End Class + + diff --git a/VECTO/Input Files/VectoEPTPJob.vb b/VECTO/Input Files/VectoEPTPJob.vb new file mode 100644 index 0000000000000000000000000000000000000000..f1069cbb6f1d5a72c6b77c1f33adb7a3d9f64698 --- /dev/null +++ b/VECTO/Input Files/VectoEPTPJob.vb @@ -0,0 +1,53 @@ + +Imports System.Collections.Generic +Imports System.IO +Imports TUGraz.VECTO.Input_Files +Imports TUGraz.VectoCommon.InputData + +Public Class VectoEPTPJob + Implements IEPTPInputDataProvider + Private _sFilePath As String + Private _myPath As String + + Private ReadOnly _vehicleFile As SubPath + + + Public Property FilePath As String + Get + Return _sFilePath + End Get + Set(value As String) + _sFilePath = value + If _sFilePath = "" Then + _myPath = "" + Else + _myPath = Path.GetDirectoryName(_sFilePath) & "\" + End If + End Set + End Property + + + Public Property PathVeh(Optional ByVal original As Boolean = False) As String + Get + If original Then + Return _vehicleFile.OriginalPath + Else + Return _vehicleFile.FullPath + End If + End Get + Set(value As String) + _vehicleFile.Init(_myPath, value) + End Set + End Property + + + Public ReadOnly Property Vehicle As IDeclarationInputDataProvider Implements IEPTPInputDataProvider.Vehicle + Get + End Get + End Property + + Public ReadOnly Property Cycles As IList(Of ICycleData) Implements IEPTPInputDataProvider.Cycles + Get + End Get + End Property +End Class diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb index ed250025c5c6fc3fdc7d2ba8e8ee72d9d61c044b..b9c25834d4dcd1a61463268983ab34ef475bfc3c 100644 --- a/VECTO/My Project/Resources.Designer.vb +++ b/VECTO/My Project/Resources.Designer.vb @@ -1,547 +1,553 @@ '------------------------------------------------------------------------------ ' <auto-generated> -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 ' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. ' </auto-generated> '------------------------------------------------------------------------------ Option Strict On Option Explicit On -Imports System.CodeDom.Compiler -Imports System.ComponentModel -Imports System.Globalization -Imports System.Resources -Imports System.Runtime.CompilerServices +Imports System Namespace My.Resources - - 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - '''<summary> - ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - '''</summary> - <GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _ - DebuggerNonUserCode(), _ - CompilerGenerated(), _ - HideModuleName()> _ - Friend Module Resources - - Private resourceMan As ResourceManager - - Private resourceCulture As CultureInfo - - '''<summary> - ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - '''</summary> - <EditorBrowsable(EditorBrowsableState.Advanced)> _ - Friend ReadOnly Property ResourceManager() As ResourceManager - Get - If ReferenceEquals(resourceMan, Nothing) Then - Dim temp As ResourceManager = New ResourceManager("TUGraz.VECTO.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - '''<summary> - ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - '''</summary> - <EditorBrowsable(EditorBrowsableState.Advanced)> _ - Friend Property Culture() As CultureInfo - Get - Return resourceCulture - End Get - Set(value As CultureInfo) - resourceCulture = value - End Set - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property _4x2r() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("_4x2r", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property _4x2rt() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("_4x2rt", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property _4x2tt() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("_4x2tt", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property _6x2r() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("_6x2r", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property _6x2rt() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("_6x2rt", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property _6x2tt() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("_6x2tt", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_arrow_down_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_arrow_down_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_arrow_up_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_arrow_up_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_document_save_as_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_document_save_as_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_document_save_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_document_save_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property application_add_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("application_add_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property application_export_icon_small() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("application_export_icon_small", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property blue_document_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("blue_document_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property desktop() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("desktop", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property export_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("export_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_ENG() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_ENG", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_GBX() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_GBX", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_Graph() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_Graph", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_VECTO() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_VECTO", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_VEH() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_VEH", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property favorites() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("favorites", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property file_history() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("file_history", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Help_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Help_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). - '''</summary> - Friend ReadOnly Property Icon2() As Icon - Get - Dim obj As Object = ResourceManager.GetObject("Icon2", resourceCulture) - Return CType(obj, Icon) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Information_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Information_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property IVT_91x44() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("IVT_91x44", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property IVT_About() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("IVT_About", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property JRC_About() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("JRC_About", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property minus_circle_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("minus_circle_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Misc_Tools_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Misc_Tools_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property new_dir() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("new_dir", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Open_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Open_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Play_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Play_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Play_icon_gray() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Play_icon_gray", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property plus_circle_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("plus_circle_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Refresh_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Refresh_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Status_dialog_password_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Status_dialog_password_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Stop_icon() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Stop_icon", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property TUG_91x34() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("TUG_91x34", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property TUG_About() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("TUG_About", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Undef() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Undef", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property up_directory() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("up_directory", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_About() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_About", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_ENG() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_ENG", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_GBX() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_GBX", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_Mainform() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_Mainform", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_VECTO() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_VECTO", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - - '''<summary> - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_VEH() As Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_VEH", resourceCulture) - Return CType(obj, Bitmap) - End Get - End Property - End Module + + 'This class was auto-generated by the StronglyTypedResourceBuilder + '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. + '''<summary> + ''' A strongly-typed resource class, for looking up localized strings, etc. + '''</summary> + <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _ + Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ + Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ + Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + '''<summary> + ''' Returns the cached ResourceManager instance used by this class. + '''</summary> + <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("TUGraz.VECTO.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + '''<summary> + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + '''</summary> + <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _4x2r() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_4x2r", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _4x2rt() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_4x2rt", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _4x2tt() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_4x2tt", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _6x2r() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_6x2r", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _6x2rt() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_6x2rt", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _6x2tt() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_6x2tt", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_arrow_down_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_arrow_down_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_arrow_up_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_arrow_up_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_document_save_as_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_document_save_as_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_document_save_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_document_save_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property application_add_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("application_add_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property application_export_icon_small() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("application_export_icon_small", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property blue_document_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("blue_document_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property desktop() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("desktop", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property export_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("export_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_ENG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_ENG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_GBX() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_GBX", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_Graph() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_Graph", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_VECTO() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_VECTO", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_VEH() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_VEH", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property favorites() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("favorites", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property file_history() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("file_history", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Help_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Help_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + '''</summary> + Friend ReadOnly Property Icon2() As System.Drawing.Icon + Get + Dim obj As Object = ResourceManager.GetObject("Icon2", resourceCulture) + Return CType(obj,System.Drawing.Icon) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Information_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Information_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property IVT_91x44() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("IVT_91x44", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property IVT_About() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("IVT_About", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property JRC_About() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("JRC_About", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property minus_circle_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("minus_circle_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Misc_Tools_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Misc_Tools_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property new_dir() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("new_dir", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Open_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Open_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property P_fan_eqn() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("P_fan_eqn", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Play_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Play_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Play_icon_gray() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Play_icon_gray", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property plus_circle_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("plus_circle_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Refresh_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Refresh_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Status_dialog_password_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Status_dialog_password_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Stop_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Stop_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property TUG_91x34() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("TUG_91x34", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property TUG_About() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("TUG_About", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Undef() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Undef", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property up_directory() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("up_directory", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_About() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_About", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_ENG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_ENG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_GBX() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_GBX", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_Mainform() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_Mainform", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_VECTO() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_VECTO", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + '''<summary> + ''' Looks up a localized resource of type System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_VEH() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_VEH", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + End Module End Namespace diff --git a/VECTO/My Project/Resources.resx b/VECTO/My Project/Resources.resx index 7338ebea8417c443ad6dd80922ce9e3a04cee2fd..08268b9e00b457688c1339d6b2886f62cc755004 100644 --- a/VECTO/My Project/Resources.resx +++ b/VECTO/My Project/Resources.resx @@ -262,4 +262,7 @@ <data name="_6x2tt" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\6x2tt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="P_fan_eqn" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\P_fan_eqn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb index 0bd62c399ba4fa42e3b07332fb2e468812b78a29..f81964733b181d63c76f793bd3287b8d170c5974 100644 --- a/VECTO/OutputData/JSONFileWriter.vb +++ b/VECTO/OutputData/JSONFileWriter.vb @@ -17,7 +17,7 @@ Public Class JSONFileWriter Public Const VehicleFormatVersion As Integer = 7 - Private Const VectoJobFormatVersion As Integer = 3 + Private Const VectoJobFormatVersion As Integer = 4 Private Shared _instance As JSONFileWriter @@ -352,6 +352,21 @@ Public Class JSONFileWriter WriteFile(header, body, filename) End Sub + Public Sub Save(job As IEPTPInputDataProvider, filename As String) Implements IOutputFileWriter.SaveJob + Dim basePath As String = Path.GetDirectoryName(filename) + 'Header + Dim header As Dictionary(Of String, Object) = GetHeader(VectoJobFormatVersion) + + 'Body + Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object) + + body.Add("DeclarationVehicle", job.Vehicle.VehicleInputData.Source) + body.Add("FanPowerCoefficients", job.FanPowerCoefficents) + body.Add("Cycles", job.Cycles) + + WriteFile(header, body, filename) + End Sub + Public Sub ExportJob(input As IEngineeringInputDataProvider, filename As String, separateFiles As Boolean) _ Implements IOutputFileWriter.ExportJob Throw New NotImplementedException @@ -389,4 +404,4 @@ Public Class JSONFileWriter path As String) WriteFile(JToken.FromObject(New Dictionary(Of String, Object) From {{"Header", header}, {"Body", body}}), path) End Sub -End Class \ No newline at end of file +End Class diff --git a/VECTO/Resources/P_fan_eqn.png b/VECTO/Resources/P_fan_eqn.png new file mode 100644 index 0000000000000000000000000000000000000000..25ccb5e969f5254a29338a6ced69429aaf8cfc33 Binary files /dev/null and b/VECTO/Resources/P_fan_eqn.png differ diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index 1eb8d624686c6a045252554217ddb783bbc5528d..cb11c8ed38ff6492f5dd985fb6203e68852fbb70 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -187,6 +187,12 @@ </ItemGroup> <ItemGroup> <Compile Include="ApplicationEvents.vb" /> + <Compile Include="GUI\VectoEPTPJobForm.Designer.vb"> + <DependentUpon>VectoEPTPJobForm.vb</DependentUpon> + </Compile> + <Compile Include="GUI\VectoEPTPJobForm.vb"> + <SubType>Form</SubType> + </Compile> <Compile Include="Input Files\BrowserUtils.vb" /> <Compile Include="GUI\VehicleTorqueLimitsDialog.Designer.vb"> <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon> @@ -351,6 +357,10 @@ <EmbeddedResource Include="GUI\JiraDialog.resx"> <DependentUpon>JiraDialog.vb</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="GUI\VectoEPTPJobForm.resx"> + <DependentUpon>VectoEPTPJobForm.vb</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="GUI\VehicleTorqueLimitsDialog.resx"> <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon> </EmbeddedResource> @@ -529,6 +539,9 @@ <Content Include="Resources\F_VECTO.ico" /> <Content Include="Resources\F_VEH.ico" /> <Content Include="Resources\Graph.ico" /> + <None Include="Resources\P_fan_Equation.bmp" /> + <None Include="Resources\P_fan_units.png" /> + <None Include="Resources\P_fan_eqn.png" /> <Content Include="Resources\Status-dialog-password-icon.ico" /> <EmbeddedResource Include="Resources\Undef.png" /> <Content Include="Resources\up.ico" /> @@ -536,7 +549,6 @@ </ItemGroup> <ItemGroup /> <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" /> - <PropertyGroup> <PostBuildEvent> </PostBuildEvent> diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs index 836135d05d95e69cacff2f26dde7ec2169d3743a..efe192178226b09d3f2322f1905eb04992ac5a19 100644 --- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs +++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs @@ -29,6 +29,7 @@ * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology */ +using System.Collections.Generic; using System.Xml.Linq; namespace TUGraz.VectoCommon.InputData @@ -90,4 +91,13 @@ namespace TUGraz.VectoCommon.InputData IPTOTransmissionInputData PTOTransmissionInputData { get; } } -} \ No newline at end of file + + public interface IEPTPInputDataProvider : IInputDataProvider + { + IDeclarationInputDataProvider Vehicle { get; } + + IList<ICycleData> Cycles { get; } + + IEnumerable<double> FanPowerCoefficents { get; } + } +} diff --git a/VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs b/VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs index 12395cafa9481f5a98aade38416e9605b1a44514..3787810749d4b540b853fb6dbe12858d1b500df4 100644 --- a/VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs +++ b/VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs @@ -29,22 +29,24 @@ * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology */ -using TUGraz.VectoCommon.InputData; - -namespace TUGraz.VectoCommon.OutputData -{ - public interface IOutputFileWriter - { - void SaveEngine(IEngineEngineeringInputData eng, string filename); - - void SaveGearbox(IGearboxEngineeringInputData gbx, IAxleGearInputData axl, string filename); - - void SaveVehicle(IVehicleEngineeringInputData vehicle, IAirdragEngineeringInputData airdrag, - IRetarderInputData retarder, - IPTOTransmissionInputData pto, IAngledriveInputData angledrive, string filename); - - void SaveJob(IEngineeringInputDataProvider input, string filename); - - void ExportJob(IEngineeringInputDataProvider input, string filename, bool separateFiles); - } -} \ No newline at end of file +using TUGraz.VectoCommon.InputData; + +namespace TUGraz.VectoCommon.OutputData +{ + public interface IOutputFileWriter + { + void SaveEngine(IEngineEngineeringInputData eng, string filename); + + void SaveGearbox(IGearboxEngineeringInputData gbx, IAxleGearInputData axl, string filename); + + void SaveVehicle(IVehicleEngineeringInputData vehicle, IAirdragEngineeringInputData airdrag, + IRetarderInputData retarder, + IPTOTransmissionInputData pto, IAngledriveInputData angledrive, string filename); + + void SaveJob(IEngineeringInputDataProvider input, string filename); + + void SaveJob(IEPTPInputDataProvider input, string filename); + + void ExportJob(IEngineeringInputDataProvider input, string filename, bool separateFiles); + } +}