From 562f1406c2d1cda3333b74b1359d4123835d48ee Mon Sep 17 00:00:00 2001 From: Martin Dippold <Dippold@ivt.tugraz.at> Date: Fri, 3 Nov 2017 09:55:22 +0100 Subject: [PATCH] * New Version number * License module deleted --- CHANGES.md | 6 ++++++ CSE/AirDrag.vbproj | 4 ---- CSE/ApplicationEvents.vb | 4 ---- CSE/Calculation/Signal_identification.vb | 2 -- CSE/GUI/F_Main.Designer.vb | 25 +++++------------------- CSE/GUI/F_Main.vb | 14 ------------- CSE/IO/cJsonFile.vb | 2 +- CSE/My Project/AssemblyInfo.vb | 4 ++-- CSE/declaration_public.vb | 4 ---- 9 files changed, 14 insertions(+), 51 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 25c124f..e7b41ce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ VECTO-AirDrag: Changes =================== +#### 2017-11-03: v3.1.2 #### +TUG improvements: + + * New version number + * License module deleted + #### 2017-10-04: v3.1.1 #### TUG improvements: diff --git a/CSE/AirDrag.vbproj b/CSE/AirDrag.vbproj index 22e9519..bf5680f 100644 --- a/CSE/AirDrag.vbproj +++ b/CSE/AirDrag.vbproj @@ -99,10 +99,6 @@ <SpecificVersion>False</SpecificVersion> <HintPath>bin\Release\VectoHashing.dll</HintPath> </Reference> - <Reference Include="vectolic, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>bin\Release\vectolic.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Import Include="Microsoft.VisualBasic" /> diff --git a/CSE/ApplicationEvents.vb b/CSE/ApplicationEvents.vb index 3877320..85ef1dc 100644 --- a/CSE/ApplicationEvents.vb +++ b/CSE/ApplicationEvents.vb @@ -69,10 +69,6 @@ Namespace My ' compile date AppDate = fiAss.LastWriteTime.Date - ' Licencemodul - Lic.FilePath = joinPaths(MyPath, "License.dat") - Lic.AppVersion = AppVers - ' Declaration from the filebrowser optionen fbVECTO = New cFileBrowser("AirDrag") fbVECTO.Extensions = New String() {"csjob.json", "csjob"} diff --git a/CSE/Calculation/Signal_identification.vb b/CSE/Calculation/Signal_identification.vb index 601c4bc..8a153a1 100644 --- a/CSE/Calculation/Signal_identification.vb +++ b/CSE/Calculation/Signal_identification.vb @@ -937,7 +937,6 @@ Module Signal_identification Else CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i + 1) - CalcData(tCompCali.alt)(i)) / (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i)))) * 180 / Math.PI End If - 'CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i + 1) - CalcData(tCompCali.alt)(i)) / (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i)))) * 180 / Math.PI ElseIf CalcData(tCompCali.SecID)(i + 1) <> CalcData(tCompCali.SecID)(i) Then ' Last value If (CalcData(tCompCali.dist_root)(i) - CalcData(tCompCali.dist_root)(i - 1)) = 0 Then @@ -946,7 +945,6 @@ Module Signal_identification Else CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i) - CalcData(tCompCali.alt)(i - 1)) / (CalcData(tCompCali.dist_root)(i) - CalcData(tCompCali.dist_root)(i - 1)))) * 180 / Math.PI End If - 'CalcData(tCompCali.slope_deg)(i) = (Math.Atan((CalcData(tCompCali.alt)(i) - CalcData(tCompCali.alt)(i - 1)) / (CalcData(tCompCali.dist_root)(i) - CalcData(tCompCali.dist_root)(i - 1)))) * 180 / Math.PI ElseIf CalcData(tCompCali.SecID)(i - 1) = CalcData(tCompCali.SecID)(i) And CalcData(tCompCali.SecID)(i + 1) = CalcData(tCompCali.SecID)(i) Then ' All other values inside MS If (CalcData(tCompCali.dist_root)(i + 1) - CalcData(tCompCali.dist_root)(i - 1)) = 0 Then diff --git a/CSE/GUI/F_Main.Designer.vb b/CSE/GUI/F_Main.Designer.vb index e8a6489..71344a5 100644 --- a/CSE/GUI/F_Main.Designer.vb +++ b/CSE/GUI/F_Main.Designer.vb @@ -34,8 +34,6 @@ Partial Class F_Main Me.MenuItemClearLog = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItemLog = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator() - Me.CreateActivationFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripMenuItemOption = New System.Windows.Forms.ToolStripMenuItem() Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItemManu = New System.Windows.Forms.ToolStripMenuItem() @@ -336,7 +334,7 @@ Partial Class F_Main ' 'ToolsToolStripMenuItem ' - Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemClearLog, Me.ToolStripMenuItemLog, Me.ToolStripMenuItem2, Me.CreateActivationFileToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItemOption}) + Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemClearLog, Me.ToolStripMenuItemLog, Me.ToolStripMenuItem2, Me.ToolStripMenuItemOption}) Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(47, 20) Me.ToolsToolStripMenuItem.Text = "Tools" @@ -344,37 +342,26 @@ Partial Class F_Main 'MenuItemClearLog ' Me.MenuItemClearLog.Name = "MenuItemClearLog" - Me.MenuItemClearLog.Size = New System.Drawing.Size(186, 22) + Me.MenuItemClearLog.Size = New System.Drawing.Size(152, 22) Me.MenuItemClearLog.Text = "Clear Log" ' 'ToolStripMenuItemLog ' Me.ToolStripMenuItemLog.Image = Global.AirDrag.My.Resources.Resources.Log_File Me.ToolStripMenuItemLog.Name = "ToolStripMenuItemLog" - Me.ToolStripMenuItemLog.Size = New System.Drawing.Size(186, 22) + Me.ToolStripMenuItemLog.Size = New System.Drawing.Size(152, 22) Me.ToolStripMenuItemLog.Text = "Open LogFile" ' 'ToolStripMenuItem2 ' Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(183, 6) - ' - 'CreateActivationFileToolStripMenuItem - ' - Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem" - Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(186, 22) - Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File" - ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(183, 6) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(149, 6) ' 'ToolStripMenuItemOption ' Me.ToolStripMenuItemOption.Image = Global.AirDrag.My.Resources.Resources.Optionen Me.ToolStripMenuItemOption.Name = "ToolStripMenuItemOption" - Me.ToolStripMenuItemOption.Size = New System.Drawing.Size(186, 22) + Me.ToolStripMenuItemOption.Size = New System.Drawing.Size(152, 22) Me.ToolStripMenuItemOption.Text = "Preferences" ' 'InfoToolStripMenuItem @@ -2642,7 +2629,6 @@ Partial Class F_Main Friend WithEvents MenuStrip1 As System.Windows.Forms.MenuStrip Friend WithEvents ToolsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripMenuItemLog As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ToolStripMenuItemOption As System.Windows.Forms.ToolStripMenuItem Friend WithEvents InfoToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripMenuItemAbout As System.Windows.Forms.ToolStripMenuItem @@ -2822,7 +2808,6 @@ Partial Class F_Main Friend WithEvents MenuItemExit As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ToolStripMenuItem2 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents CreateActivationFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox Friend WithEvents Label5 As System.Windows.Forms.Label diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb index 2435f63..6684440 100644 --- a/CSE/GUI/F_Main.vb +++ b/CSE/GUI/F_Main.vb @@ -59,13 +59,6 @@ Public Class F_Main IO.Directory.CreateDirectory(Prefs.workingDir) End If - 'Lizenz checken - If Not Lic.LICcheck() Then - logme(9, True, Lic.FailMsg) - CreatActivationFileToolStripMenuItem_Click(sender, e) - Me.Close() - End If - ' Write a defult config file if failed to read one. If Not configL Then Try @@ -1041,13 +1034,6 @@ Public Class F_Main #Region "Infos menu" - ' Create activation file - - Private Sub CreatActivationFileToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CreateActivationFileToolStripMenuItem.Click - Lic.CreateActFile(MyPath & "ActivationCode.dat") - logme(7, True, "Activation code created under: " & MyPath & "ActivationCode.dat") - End Sub - ' Menu open the Infobox Private Sub ToolStripMenuItemAbout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItemAbout.Click ' Show the info GUI diff --git a/CSE/IO/cJsonFile.vb b/CSE/IO/cJsonFile.vb index e218ade..37ea0b5 100644 --- a/CSE/IO/cJsonFile.vb +++ b/CSE/IO/cJsonFile.vb @@ -218,7 +218,7 @@ When False, it overrides Application's choice and is not replaced ever.", If prefs Is Nothing OrElse Not prefs.hideUsername Then username = System.Security.Principal.WindowsIdentity.GetCurrent().Name & "@" End If - h("CreatedBy") = format("{0}{1}(lic: {2})", username, Lic.LicString, Lic.GUID) + h("CreatedBy") = format("{0})", username) h("AppVersion") = AppVers diff --git a/CSE/My Project/AssemblyInfo.vb b/CSE/My Project/AssemblyInfo.vb index 7f33a15..3297d70 100644 --- a/CSE/My Project/AssemblyInfo.vb +++ b/CSE/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' <Assembly: AssemblyVersion("1.0.*")> -<Assembly: AssemblyVersion("3.1.1.0")> -<Assembly: AssemblyFileVersion("3.1.1.0")> +<Assembly: AssemblyVersion("3.1.2.0")> +<Assembly: AssemblyFileVersion("3.1.2.0")> diff --git a/CSE/declaration_public.vb b/CSE/declaration_public.vb index a5a2e67..6a69551 100644 --- a/CSE/declaration_public.vb +++ b/CSE/declaration_public.vb @@ -114,10 +114,6 @@ Module declaration_public ' Result values Public GenShape As New cGenShp - ' ***************************************************************** - ' Licencemodul - Public Lic As New vectolic.cLicense - ' ***************************************************************** ' Backgroundworker Public BWorker As System.ComponentModel.BackgroundWorker -- GitLab