Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Merge branch 'develop' of...

parents d85b6add f7be3db6
No related branches found
No related tags found
No related merge requests found
Showing
with 201 additions and 152 deletions
...@@ -99,8 +99,6 @@ Partial Class MainForm ...@@ -99,8 +99,6 @@ Partial Class MainForm
Me.GearboxEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GearboxEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GraphToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GraphToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
Me.SignOrVerifyFilesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
Me.OpenLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OpenLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.SettingsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SettingsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripDrDnBtInfo = New System.Windows.Forms.ToolStripDropDownButton() Me.ToolStripDrDnBtInfo = New System.Windows.Forms.ToolStripDropDownButton()
...@@ -108,7 +106,6 @@ Partial Class MainForm ...@@ -108,7 +106,6 @@ Partial Class MainForm
Me.UpdateNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UpdateNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ReportBugViaCITnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ReportBugViaCITnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.CreateActivationFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AboutVECTOToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.AboutVECTOToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.CmDEV = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CmDEV = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.TmProgSec = New System.Windows.Forms.Timer(Me.components) Me.TmProgSec = New System.Windows.Forms.Timer(Me.components)
...@@ -672,7 +669,7 @@ Partial Class MainForm ...@@ -672,7 +669,7 @@ Partial Class MainForm
' '
'ToolStripDrDnBtTools 'ToolStripDrDnBtTools
' '
Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.SignOrVerifyFilesToolStripMenuItem, Me.ToolStripSeparator4, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem}) 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.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools" Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
...@@ -719,19 +716,6 @@ Partial Class MainForm ...@@ -719,19 +716,6 @@ Partial Class MainForm
Me.ToolStripSeparator6.Name = "ToolStripSeparator6" Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
Me.ToolStripSeparator6.Size = New System.Drawing.Size(167, 6) Me.ToolStripSeparator6.Size = New System.Drawing.Size(167, 6)
' '
'SignOrVerifyFilesToolStripMenuItem
'
Me.SignOrVerifyFilesToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.Status_dialog_password_icon
Me.SignOrVerifyFilesToolStripMenuItem.Name = "SignOrVerifyFilesToolStripMenuItem"
Me.SignOrVerifyFilesToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.SignOrVerifyFilesToolStripMenuItem.Text = "Sign or Verify Files"
'
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
Me.ToolStripSeparator4.Size = New System.Drawing.Size(167, 6)
Me.ToolStripSeparator4.Visible = False
'
'OpenLogToolStripMenuItem 'OpenLogToolStripMenuItem
' '
Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem" Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
...@@ -746,7 +730,7 @@ Partial Class MainForm ...@@ -746,7 +730,7 @@ Partial Class MainForm
' '
'ToolStripDrDnBtInfo 'ToolStripDrDnBtInfo
' '
Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateActivationFileToolStripMenuItem, Me.AboutVECTOToolStripMenuItem1}) Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.AboutVECTOToolStripMenuItem1})
Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo" Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo"
...@@ -776,12 +760,6 @@ Partial Class MainForm ...@@ -776,12 +760,6 @@ Partial Class MainForm
Me.ToolStripSeparator3.Name = "ToolStripSeparator3" Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
Me.ToolStripSeparator3.Size = New System.Drawing.Size(219, 6) Me.ToolStripSeparator3.Size = New System.Drawing.Size(219, 6)
' '
'CreateActivationFileToolStripMenuItem
'
Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem"
Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File"
'
'AboutVECTOToolStripMenuItem1 'AboutVECTOToolStripMenuItem1
' '
Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1" Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1"
...@@ -905,11 +883,9 @@ Partial Class MainForm ...@@ -905,11 +883,9 @@ Partial Class MainForm
Friend WithEvents ToolStripDrDnBtTools As ToolStripDropDownButton Friend WithEvents ToolStripDrDnBtTools As ToolStripDropDownButton
Friend WithEvents GENEditorToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents GENEditorToolStripMenuItem1 As ToolStripMenuItem
Friend WithEvents VEHEditorToolStripMenuItem As ToolStripMenuItem Friend WithEvents VEHEditorToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
Friend WithEvents OpenLogToolStripMenuItem As ToolStripMenuItem Friend WithEvents OpenLogToolStripMenuItem As ToolStripMenuItem
Friend WithEvents SettingsToolStripMenuItem As ToolStripMenuItem Friend WithEvents SettingsToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolStripDrDnBtInfo As ToolStripDropDownButton Friend WithEvents ToolStripDrDnBtInfo As ToolStripDropDownButton
Friend WithEvents CreateActivationFileToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AboutVECTOToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents AboutVECTOToolStripMenuItem1 As ToolStripMenuItem
Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
Friend WithEvents ToolStripProgBarJob As ToolStripProgressBar Friend WithEvents ToolStripProgBarJob As ToolStripProgressBar
...@@ -925,7 +901,6 @@ Partial Class MainForm ...@@ -925,7 +901,6 @@ Partial Class MainForm
Friend WithEvents ColumnHeader8 As ColumnHeader Friend WithEvents ColumnHeader8 As ColumnHeader
Friend WithEvents ColumnHeader9 As ColumnHeader Friend WithEvents ColumnHeader9 As ColumnHeader
Friend WithEvents UpdateNotesToolStripMenuItem As ToolStripMenuItem Friend WithEvents UpdateNotesToolStripMenuItem As ToolStripMenuItem
Friend WithEvents SignOrVerifyFilesToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolStripSeparator6 As ToolStripSeparator Friend WithEvents ToolStripSeparator6 As ToolStripSeparator
Friend WithEvents LbDecl As Label Friend WithEvents LbDecl As Label
Friend WithEvents GraphToolStripMenuItem As ToolStripMenuItem Friend WithEvents GraphToolStripMenuItem As ToolStripMenuItem
......
...@@ -223,6 +223,9 @@ ...@@ -223,6 +223,9 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value> <value>732, 12</value>
</metadata> </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"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value> <value>49</value>
</metadata> </metadata>
......
...@@ -253,31 +253,9 @@ Public Class MainForm ...@@ -253,31 +253,9 @@ Public Class MainForm
VectoWorkerV3.WorkerReportsProgress = True VectoWorkerV3.WorkerReportsProgress = True
VectoWorkerV3.WorkerSupportsCancellation = True VectoWorkerV3.WorkerSupportsCancellation = True
'Set mode (Batch/Standard) 'Set mode (Batch/Standard)
ModeUpdate() ModeUpdate()
#If DEBUG Then
Const LicCheck As Boolean = False
#Else
Const LicCheck As Boolean = True
#End If
'License check
If LicCheck And Not Lic.LICcheck() Then
MsgBox("License File invalid!" & vbCrLf & vbCrLf & Lic.FailMsg)
If Lic.CreateActFile(MyAppPath & "ActivationCode.dat") Then
MsgBox("Activation File created.")
Else
MsgBox("Failed to create Activation File! Is Directory Read-Only?")
End If
Close()
Else
GUIMsg(MessageType.Normal, "License File validated.")
If Lic.TimeWarn Then GUIMsg(MessageType.Warn, "License expiring date (y/m/d): " & Lic.ExpTime)
End If
DeclOnOff() DeclOnOff()
End Sub End Sub
...@@ -399,8 +377,6 @@ Public Class MainForm ...@@ -399,8 +377,6 @@ Public Class MainForm
End Try End Try
Case ".VECTO" Case ".VECTO"
OpenVECTOeditor(file) OpenVECTOeditor(file)
Case ".VSIG"
OpenSigFile(file)
Case Else Case Else
MsgBox("Type '" & GetExtension(file) & "' unknown!", MsgBoxStyle.Critical) MsgBox("Type '" & GetExtension(file) & "' unknown!", MsgBoxStyle.Critical)
End Select End Select
...@@ -694,7 +670,7 @@ lbFound: ...@@ -694,7 +670,7 @@ lbFound:
'Open input file 'Open input file
Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
If JobfileFileBrowser.OpenDialog("", False, "vecto,vveh,vgbx,veng,vsig") Then If JobfileFileBrowser.OpenDialog("", False, "vecto,vveh,vgbx,veng") Then
OpenVectoFile(JobfileFileBrowser.Files(0)) OpenVectoFile(JobfileFileBrowser.Files(0))
End If End If
End Sub End Sub
...@@ -740,16 +716,6 @@ lbFound: ...@@ -740,16 +716,6 @@ lbFound:
graphForm.Show() graphForm.Show()
End Sub End Sub
Private Sub SignOrVerifyFilesToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles SignOrVerifyFilesToolStripMenuItem.Click
If Not FileSignDialog.Visible Then
FileSignDialog.Show()
Else
If FileSignDialog.WindowState = FormWindowState.Minimized Then FileSignDialog.WindowState = FormWindowState.Normal
FileSignDialog.BringToFront()
End If
End Sub
Private Sub OpenLogToolStripMenuItem_Click(sender As Object, e As EventArgs) _ Private Sub OpenLogToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles OpenLogToolStripMenuItem.Click Handles OpenLogToolStripMenuItem.Click
Process.Start(MyAppPath & "log.txt") Process.Start(MyAppPath & "log.txt")
...@@ -787,18 +753,6 @@ lbFound: ...@@ -787,18 +753,6 @@ lbFound:
JiraDialog.ShowDialog() JiraDialog.ShowDialog()
End Sub End Sub
Private Sub CreateActivationFileToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles CreateActivationFileToolStripMenuItem.Click
If MsgBox("Create Activation File ?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
If Lic.CreateActFile(MyAppPath & "ActivationCode.dat") Then
GUIMsg(MessageType.Normal, "Activation File created.")
Else
GUIMsg(MessageType.Err, "Failed to create Activation File!")
MsgBox("ERROR! Failed to create Activation File!", MsgBoxStyle.Critical)
End If
End If
End Sub
Private Sub AboutVECTOToolStripMenuItem1_Click(sender As Object, e As EventArgs) _ Private Sub AboutVECTOToolStripMenuItem1_Click(sender As Object, e As EventArgs) _
Handles AboutVECTOToolStripMenuItem1.Click Handles AboutVECTOToolStripMenuItem1.Click
AboutBox.ShowDialog() AboutBox.ShowDialog()
...@@ -1335,18 +1289,6 @@ lbFound: ...@@ -1335,18 +1289,6 @@ lbFound:
VectoJobForm.Activate() VectoJobForm.Activate()
End Sub End Sub
'Open signature file (.vsig)
Friend Sub OpenSigFile(file As String)
If Not FileSignDialog.Visible Then
FileSignDialog.Show()
End If
FileSignDialog.WindowState = FormWindowState.Normal
FileSignDialog.TbSigFile.Text = file
FileSignDialog.VerifySigFile()
FileSignDialog.Activate()
End Sub
'Save job and cycle file lists 'Save job and cycle file lists
Private Sub SaveFileLists() Private Sub SaveFileLists()
_jobListView.SaveList() _jobListView.SaveList()
......
...@@ -1238,7 +1238,7 @@ lbDlog: ...@@ -1238,7 +1238,7 @@ lbDlog:
engine.IdleSpeed.Value() engine.IdleSpeed.Value()
Dim fullLoadCurve As FullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve) Dim fullLoadCurve As EngineFullLoadCurve = FullLoadCurveReader.Create(engine.FullLoadCurve)
s = New Series s = New Series
s.Points.DataBindXY(fullLoadCurve.FullLoadEntries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(), s.Points.DataBindXY(fullLoadCurve.FullLoadEntries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(),
......
...@@ -148,7 +148,6 @@ Public Class Engine ...@@ -148,7 +148,6 @@ Public Class Engine
End Sub End Sub
''' <summary> ''' <summary>
''' Save file. <see cref="P:VECTO.cENG.FilePath" /> must be set before calling.
''' </summary> ''' </summary>
''' <returns>True if successful.</returns> ''' <returns>True if successful.</returns>
''' <remarks></remarks> ''' <remarks></remarks>
...@@ -178,7 +177,6 @@ Public Class Engine ...@@ -178,7 +177,6 @@ Public Class Engine
''' <summary> ''' <summary>
''' Get or set Filepath before calling <see cref="M:VECTO.cENG.ReadFile" /> or <see cref="M:VECTO.cENG.SaveFile" />
''' </summary> ''' </summary>
''' <value></value> ''' <value></value>
''' <returns>Full filepath</returns> ''' <returns>Full filepath</returns>
......
...@@ -20,6 +20,7 @@ Imports TUGraz.VectoCommon.Models ...@@ -20,6 +20,7 @@ Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Impl Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.InputData.Reader
Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
Imports TUGraz.VectoCore.Models.SimulationComponent.Data Imports TUGraz.VectoCore.Models.SimulationComponent.Data
Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
...@@ -263,10 +264,10 @@ Public Class Gearbox ...@@ -263,10 +264,10 @@ Public Class Gearbox
.IdleSpeed = 600.RPMtoRad() .IdleSpeed = 600.RPMtoRad()
} }
Dim fldCurve As EngineFullLoadCurve = EngineFullLoadCurve.Create(VectoCSVFile.ReadStream(fldData)) Dim fldCurve As EngineFullLoadCurve = FullLoadCurveReader.Create(VectoCSVFile.ReadStream(fldData))
Dim fullLoadCurves As Dictionary(Of UInteger, EngineFullLoadCurve) = Dim fullLoadCurves As Dictionary(Of UInteger, EngineFullLoadCurve) =
New Dictionary(Of UInteger, EngineFullLoadCurve)() New Dictionary(Of UInteger, EngineFullLoadCurve)()
fullLoadCurves(0) = EngineFullLoadCurve.Create(VectoCSVFile.ReadStream(fldData)) fullLoadCurves(0) = FullLoadCurveReader.Create(VectoCSVFile.ReadStream(fldData))
fullLoadCurves(0).EngineData = retVal fullLoadCurves(0).EngineData = retVal
For i As Integer = 0 To gears.Count - 1 For i As Integer = 0 To gears.Count - 1
fullLoadCurves(CType(i + 1, UInteger)) = AbstractSimulationDataAdapter.IntersectFullLoadCurves(fullLoadCurves(0), fullLoadCurves(CType(i + 1, UInteger)) = AbstractSimulationDataAdapter.IntersectFullLoadCurves(fullLoadCurves(0),
......
File deleted
...@@ -67,7 +67,7 @@ Public Class JSONFileWriter ...@@ -67,7 +67,7 @@ Public Class JSONFileWriter
Protected Function GetHeader(fileVersion As Integer) As Dictionary(Of String, Object) Protected Function GetHeader(fileVersion As Integer) As Dictionary(Of String, Object)
Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object) Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
header.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") header.Add("CreatedBy", "")
header.Add("Date", Now.ToUniversalTime().ToString("o")) header.Add("Date", Now.ToUniversalTime().ToString("o"))
header.Add("AppVersion", VECTOvers) header.Add("AppVersion", VECTOvers)
header.Add("FileVersion", fileVersion) header.Add("FileVersion", fileVersion)
......
...@@ -161,9 +161,6 @@ ...@@ -161,9 +161,6 @@
<Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="vectolic">
<HintPath>.\vectolic.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Import Include="Microsoft.VisualBasic" /> <Import Include="Microsoft.VisualBasic" />
...@@ -195,12 +192,6 @@ ...@@ -195,12 +192,6 @@
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Input Files\AdvancedAuxiliary.vb" /> <Compile Include="Input Files\AdvancedAuxiliary.vb" />
<Compile Include="GUI\FileSignDialog.Designer.vb">
<DependentUpon>FileSignDialog.vb</DependentUpon>
</Compile>
<Compile Include="GUI\FileSignDialog.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="GUI\GraphForm.Designer.vb"> <Compile Include="GUI\GraphForm.Designer.vb">
<DependentUpon>GraphForm.vb</DependentUpon> <DependentUpon>GraphForm.vb</DependentUpon>
</Compile> </Compile>
...@@ -336,9 +327,6 @@ ...@@ -336,9 +327,6 @@
<EmbeddedResource Include="File Browser\FileBrowserFavoritesDialog.resx"> <EmbeddedResource Include="File Browser\FileBrowserFavoritesDialog.resx">
<DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon> <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="GUI\FileSignDialog.resx">
<DependentUpon>FileSignDialog.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\GraphForm.resx"> <EmbeddedResource Include="GUI\GraphForm.resx">
<DependentUpon>GraphForm.vb</DependentUpon> <DependentUpon>GraphForm.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
Imports System.ComponentModel Imports System.ComponentModel
Imports System.IO Imports System.IO
Imports System.Text Imports System.Text
Imports vectolic
Public Module VECTO_Global Public Module VECTO_Global
Public Const VECTOvers As String = "3" Public Const VECTOvers As String = "3"
...@@ -25,19 +24,12 @@ Public Module VECTO_Global ...@@ -25,19 +24,12 @@ Public Module VECTO_Global
Public LogFile As FileLogger Public LogFile As FileLogger
'to ensure correct format for backgroundworker thread 'to ensure correct format for backgroundworker thread
Public VectoWorkerV3 As BackgroundWorker Public VectoWorkerV3 As BackgroundWorker
Public Cfg As Configuration Public Cfg As Configuration
'Public sKey As csKey
Public ReadOnly FileFormat As Encoding = Encoding.UTF8 Public ReadOnly FileFormat As Encoding = Encoding.UTF8
Public Lic As cLicense
'Public VSUM As cVSUM
'Public DEV As cDEV
Public ProgBarCtrl As ProgressbarControl Public ProgBarCtrl As ProgressbarControl
...@@ -256,28 +248,6 @@ Module Constants ...@@ -256,28 +248,6 @@ Module Constants
' ReSharper disable once ClassNeverInstantiated.Global ' ReSharper disable once ClassNeverInstantiated.Global
End Module End Module
...@@ -169,7 +169,7 @@ namespace TUGraz.VectoCommon.InputData ...@@ -169,7 +169,7 @@ namespace TUGraz.VectoCommon.InputData
double Efficiency { get; } double Efficiency { get; }
} }
public interface IAxleDeclarationInputData : IComponentInputData public interface IAxleDeclarationInputData
{ {
/// <summary> /// <summary>
/// P108 /// P108
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/ */
using System;
namespace TUGraz.VectoCommon.Models namespace TUGraz.VectoCommon.Models
{ {
public enum AuxiliaryModel public enum AuxiliaryModel
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
*/ */
using System; using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using TUGraz.VectoCommon.Utils; using TUGraz.VectoCommon.Utils;
......
using System; /*
* This file is part of VECTO.
*
* Copyright © 2012-2016 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
* Institute of Technical Informatics
*
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System;
namespace TUGraz.VectoCommon.Models namespace TUGraz.VectoCommon.Models
{ {
......
using System; /*
* This file is part of VECTO.
*
* Copyright © 2012-2016 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
* Institute of Technical Informatics
*
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System;
namespace TUGraz.VectoCommon.Models namespace TUGraz.VectoCommon.Models
{ {
......
using System; /*
* This file is part of VECTO.
*
* Copyright © 2012-2016 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
* Institute of Technical Informatics
*
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System;
namespace TUGraz.VectoCommon.Models namespace TUGraz.VectoCommon.Models
{ {
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/ */
using System;
using TUGraz.VectoCommon.InputData; using TUGraz.VectoCommon.InputData;
namespace TUGraz.VectoCommon.OutputData namespace TUGraz.VectoCommon.OutputData
......
//------------------------------------------------------------------------------ /*
// <auto-generated> * This file is part of VECTO.
// This code was generated by a tool. *
// Runtime Version:4.0.30319.42000 * Copyright © 2012-2016 European Union
// *
// Changes to this file may cause incorrect behavior and will be lost if * Developed by Graz University of Technology,
// the code is regenerated. * Institute of Internal Combustion Engines and Thermodynamics,
// </auto-generated> * Institute of Technical Informatics
//------------------------------------------------------------------------------ *
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
namespace TUGraz.VectoCommon.Resources { namespace TUGraz.VectoCommon.Resources {
using System; using System;
......
using System.Collections.Generic; /*
* This file is part of VECTO.
*
* Copyright © 2012-2016 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
* Institute of Technical Informatics
*
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Collections.Generic;
using System.Xml.Linq; using System.Xml.Linq;
namespace TUGraz.VectoHashing namespace TUGraz.VectoHashing
......
/*
* This file is part of VECTO.
*
* Copyright © 2012-2016 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
* Institute of Technical Informatics
*
* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
* by the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use VECTO except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
*
* Unless required by applicable law or agreed to in writing, VECTO
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*
* Authors:
* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment