From 5cb84827319a5678e2a0b13242512f1dd25df6b2 Mon Sep 17 00:00:00 2001
From: Martin Dippold <Dippold@ivt.tugraz.at>
Date: Thu, 3 Jan 2019 13:42:05 +0100
Subject: [PATCH] * Release candidate output
---
CSE/App.config | 4 ++--
CSE/GUI/F_Main.vb | 5 ++++-
CSE/GUI/F_VECTOInput.vb | 9 ++++++++-
CSE/My Project/AssemblyInfo.vb | 6 +++---
CSE/declaration_public.vb | 3 ++-
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/CSE/App.config b/CSE/App.config
index d9178eb..c0e145a 100644
--- a/CSE/App.config
+++ b/CSE/App.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
- <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="AirDrag.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+ <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+ <section name="AirDrag.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<runtime>
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 94e5505..d6ae543 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -223,9 +223,12 @@ Public Class F_Main
logme(7, False, "Background operation ended with ERROR.")
Else
logme(7, False, "Background operation ended OK.")
+ If RELEASE_CANDIDATE Then
+ logme(7, False, "ATTENTION: RELEASE CANDIDATE, Not FOR CERTIFICATION!")
+ End If
End If
- Dim asyncJob As cAsyncJob = e.Result
+ Dim asyncJob As cAsyncJob = e.Result
If asyncJob.IsCalibration Then Me.ButtonEval.Enabled = True
If asyncJob.IsEvaluation And SelMode = 1 Then Me.ButtonGenVECTO.Enabled = True
doSaveJob(False)
diff --git a/CSE/GUI/F_VECTOInput.vb b/CSE/GUI/F_VECTOInput.vb
index b54349f..0e40b4a 100644
--- a/CSE/GUI/F_VECTOInput.vb
+++ b/CSE/GUI/F_VECTOInput.vb
@@ -172,13 +172,20 @@ Public Class F_VECTOInput
End Function
Protected Function CreateAirdrag(ns As XNamespace)
+ Dim AppVersx As String
+ If RELEASE_CANDIDATE Then
+ AppVersx = AppVers + " - RELEASE CANDIDATE, NOT FOR CERTIFICATION!"
+ Else
+ AppVersx = AppVers
+ End If
+
Return New XElement(ns + "AirDrag",
New XElement(tns + "Data",
New XElement(tns + "Manufacturer", VECTOconf.Manufacturer),
New XElement(tns + "Model", VECTOconf.Model),
New XElement(tns + "CertificationNumber", VECTOconf.CertNum),
New XElement(tns + "Date", XmlConvert.ToString(DateTime.Now, XmlDateTimeSerializationMode.Utc)),
- New XElement(tns + "AppVersion", "VECTOAirDrag_" + AppVers),
+ New XElement(tns + "AppVersion", "VECTOAirDrag_" + AppVersx),
New XElement(tns + "CdxA_0", Math.Round(VECTOconf.CdxA, 2, MidpointRounding.AwayFromZero).ToString("0.00")),
New XElement(tns + "TransferredCdxA", Math.Round(VECTOconf.CdxA + VECTOconf.TransfR, 2, MidpointRounding.AwayFromZero).ToString("0.00")),
New XElement(tns + "DeclaredCdxA", Math.Round((VECTOconf.CdxA + VECTOconf.TransfR + VECTOconf.WorstCase), 2, MidpointRounding.AwayFromZero).ToString("0.00"))))
diff --git a/CSE/My Project/AssemblyInfo.vb b/CSE/My Project/AssemblyInfo.vb
index c5f9580..d1459a6 100644
--- a/CSE/My Project/AssemblyInfo.vb
+++ b/CSE/My Project/AssemblyInfo.vb
@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
' Die Werte der Assemblyattribute überprüfen
-<Assembly: AssemblyTitle("Air Drag")>
+<Assembly: AssemblyTitle("Air Drag")>
<Assembly: AssemblyDescription("Air Drag Tool for VECTO")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("Air Drag")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("Air Drag")>
<Assembly: AssemblyCopyright("Copyright © 2014 European Commission")>
<Assembly: AssemblyTrademark("")>
diff --git a/CSE/declaration_public.vb b/CSE/declaration_public.vb
index 630167e..b7e9816 100644
--- a/CSE/declaration_public.vb
+++ b/CSE/declaration_public.vb
@@ -12,9 +12,10 @@
Module declaration_public
' Description of the form
- Public Const AppName As String = "Air Drag" ' Name of the programm
+ Public Const AppName As String = "Air Drag - RC" ' Name of the programm
Public AppVers As String = Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() '"3.1.0" ' Version of the Programm
Public AppDate As String ' Date of the compilation of the programm
+ Public RELEASE_CANDIDATE As Boolean = True
' Control variables
Public Const komment = "#" ' Symbol for a comment in the input files
--
GitLab