diff --git a/VECTO/File Browser/FileBrowserDialog.designer.vb b/VECTO/File Browser/FileBrowserDialog.designer.vb
index f5ef752b2d0029875b88045f174284adfb7fdf4a..405aa143311a9a301188b75c23b0962a3a098a71 100644
--- a/VECTO/File Browser/FileBrowserDialog.designer.vb
+++ b/VECTO/File Browser/FileBrowserDialog.designer.vb
@@ -35,441 +35,418 @@ Partial Class FileBrowserDialog
'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(FileBrowserDialog))
- Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.ButtonNewDir = New System.Windows.Forms.Button()
- Me.ButtonDesktop = New System.Windows.Forms.Button()
- Me.ButtonHisFolder = New System.Windows.Forms.Button()
- Me.ButtonFolderBack = New System.Windows.Forms.Button()
- Me.TextBoxSearchFolder = New System.Windows.Forms.TextBox()
- Me.ComboBoxDrive = New System.Windows.Forms.ComboBox()
- Me.ListViewFolder = New System.Windows.Forms.ListView()
- Me.ColumnHeader3 = New System.Windows.Forms.ColumnHeader()
- Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
- Me.ButtonAll = New System.Windows.Forms.Button()
- Me.ComboBoxExt = New System.Windows.Forms.ComboBox()
- Me.ButtonHisFile = New System.Windows.Forms.Button()
- Me.TextBoxSearchFile = New System.Windows.Forms.TextBox()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.ListViewFiles = New System.Windows.Forms.ListView()
- Me.ColumnFileName = New System.Windows.Forms.ColumnHeader()
- Me.ColumnType = New System.Windows.Forms.ColumnHeader()
- Me.ColumnSize = New System.Windows.Forms.ColumnHeader()
- Me.ColumnChangedOn = New System.Windows.Forms.ColumnHeader()
- Me.ContextMenuFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.RenameFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.DeleteFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.TextBoxPath = New System.Windows.Forms.TextBox()
- Me.ContextMenuHisFolder = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.ContextMenuHisFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.ButtonOK = New System.Windows.Forms.Button()
- Me.ButtonCancel = New System.Windows.Forms.Button()
- Me.TextBoxCurrent = New System.Windows.Forms.TextBox()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).BeginInit
- Me.SplitContainer1.Panel1.SuspendLayout
- Me.SplitContainer1.Panel2.SuspendLayout
- Me.SplitContainer1.SuspendLayout
- Me.ContextMenuFile.SuspendLayout
- Me.SuspendLayout
- '
- 'SplitContainer1
- '
- Me.SplitContainer1.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.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.SplitContainer1.Cursor = System.Windows.Forms.Cursors.VSplit
- Me.SplitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1
- Me.SplitContainer1.Location = New System.Drawing.Point(6, 51)
- Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
- Me.SplitContainer1.Name = "SplitContainer1"
- '
- 'SplitContainer1.Panel1
- '
- Me.SplitContainer1.Panel1.Controls.Add(Me.Label1)
- Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonNewDir)
- Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonDesktop)
- Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonHisFolder)
- Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonFolderBack)
- Me.SplitContainer1.Panel1.Controls.Add(Me.TextBoxSearchFolder)
- Me.SplitContainer1.Panel1.Controls.Add(Me.ComboBoxDrive)
- Me.SplitContainer1.Panel1.Controls.Add(Me.ListViewFolder)
- Me.SplitContainer1.Panel1.Cursor = System.Windows.Forms.Cursors.Default
- Me.SplitContainer1.Panel1MinSize = 195
- '
- 'SplitContainer1.Panel2
- '
- Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonAll)
- Me.SplitContainer1.Panel2.Controls.Add(Me.ComboBoxExt)
- Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonHisFile)
- Me.SplitContainer1.Panel2.Controls.Add(Me.TextBoxSearchFile)
- Me.SplitContainer1.Panel2.Controls.Add(Me.Label5)
- Me.SplitContainer1.Panel2.Controls.Add(Me.Label2)
- Me.SplitContainer1.Panel2.Controls.Add(Me.ListViewFiles)
- Me.SplitContainer1.Panel2.Cursor = System.Windows.Forms.Cursors.Default
- Me.SplitContainer1.Size = New System.Drawing.Size(737, 333)
- Me.SplitContainer1.SplitterDistance = 195
- Me.SplitContainer1.SplitterWidth = 5
- Me.SplitContainer1.TabIndex = 5
- Me.SplitContainer1.TabStop = false
- '
- 'Label1
- '
- Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(2, 314)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(36, 15)
- Me.Label1.TabIndex = 28
- Me.Label1.Text = "Filter:"
- '
- 'ButtonNewDir
- '
- Me.ButtonNewDir.Image = Global.TUGraz.VECTO.My.Resources.Resources.new_dir
- Me.ButtonNewDir.Location = New System.Drawing.Point(129, 4)
- Me.ButtonNewDir.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonNewDir.Name = "ButtonNewDir"
- Me.ButtonNewDir.Size = New System.Drawing.Size(30, 29)
- Me.ButtonNewDir.TabIndex = 21
- Me.ButtonNewDir.TabStop = false
- Me.ToolTip1.SetToolTip(Me.ButtonNewDir, "Create new Directory")
- Me.ButtonNewDir.UseVisualStyleBackColor = true
- '
- 'ButtonDesktop
- '
- Me.ButtonDesktop.Image = Global.TUGraz.VECTO.My.Resources.Resources.desktop
- Me.ButtonDesktop.Location = New System.Drawing.Point(99, 4)
- Me.ButtonDesktop.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonDesktop.Name = "ButtonDesktop"
- Me.ButtonDesktop.Size = New System.Drawing.Size(30, 29)
- Me.ButtonDesktop.TabIndex = 22
- Me.ButtonDesktop.TabStop = false
- Me.ToolTip1.SetToolTip(Me.ButtonDesktop, "Go to Desktop")
- Me.ButtonDesktop.UseVisualStyleBackColor = true
- '
- 'ButtonHisFolder
- '
- Me.ButtonHisFolder.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButtonHisFolder.Image = Global.TUGraz.VECTO.My.Resources.Resources.file_history
- Me.ButtonHisFolder.Location = New System.Drawing.Point(159, 4)
- Me.ButtonHisFolder.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonHisFolder.Name = "ButtonHisFolder"
- Me.ButtonHisFolder.Size = New System.Drawing.Size(30, 29)
- Me.ButtonHisFolder.TabIndex = 24
- Me.ButtonHisFolder.TabStop = false
- Me.ToolTip1.SetToolTip(Me.ButtonHisFolder, "History / Favorites")
- Me.ButtonHisFolder.UseVisualStyleBackColor = true
- '
- 'ButtonFolderBack
- '
- Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"),System.Drawing.Image)
- Me.ButtonFolderBack.Location = New System.Drawing.Point(69, 4)
- Me.ButtonFolderBack.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonFolderBack.Name = "ButtonFolderBack"
- Me.ButtonFolderBack.Size = New System.Drawing.Size(30, 29)
- Me.ButtonFolderBack.TabIndex = 20
- Me.ButtonFolderBack.TabStop = false
- Me.ToolTip1.SetToolTip(Me.ButtonFolderBack, "Move up one directory")
- Me.ButtonFolderBack.UseVisualStyleBackColor = true
- '
- 'TextBoxSearchFolder
- '
- Me.TextBoxSearchFolder.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TextBoxSearchFolder.Location = New System.Drawing.Point(41, 309)
- Me.TextBoxSearchFolder.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.TextBoxSearchFolder.Name = "TextBoxSearchFolder"
- Me.TextBoxSearchFolder.Size = New System.Drawing.Size(153, 23)
- Me.TextBoxSearchFolder.TabIndex = 15
- Me.ToolTip1.SetToolTip(Me.TextBoxSearchFolder, "Filter the directories")
- '
- 'ComboBoxDrive
- '
- Me.ComboBoxDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.ComboBoxDrive.Font = New System.Drawing.Font("Segoe UI", 11!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
- Me.ComboBoxDrive.FormattingEnabled = true
- Me.ComboBoxDrive.Location = New System.Drawing.Point(6, 4)
- Me.ComboBoxDrive.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ComboBoxDrive.Name = "ComboBoxDrive"
- Me.ComboBoxDrive.Size = New System.Drawing.Size(62, 28)
- Me.ComboBoxDrive.TabIndex = 5
- '
- 'ListViewFolder
- '
- Me.ListViewFolder.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.ListViewFolder.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader3})
- Me.ListViewFolder.FullRowSelect = true
- Me.ListViewFolder.GridLines = true
- Me.ListViewFolder.HideSelection = false
- Me.ListViewFolder.Location = New System.Drawing.Point(-2, 37)
- Me.ListViewFolder.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ListViewFolder.MultiSelect = false
- Me.ListViewFolder.Name = "ListViewFolder"
- Me.ListViewFolder.Size = New System.Drawing.Size(198, 273)
- Me.ListViewFolder.SmallImageList = Me.ImageList1
- Me.ListViewFolder.TabIndex = 10
- Me.ListViewFolder.UseCompatibleStateImageBehavior = false
- Me.ListViewFolder.View = System.Windows.Forms.View.Details
- '
- 'ColumnHeader3
- '
- Me.ColumnHeader3.Text = "Sub-Directories:"
- Me.ColumnHeader3.Width = 368
- '
- 'ImageList1
- '
- Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit
- Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16)
- Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent
- '
- 'ButtonAll
- '
- Me.ButtonAll.Location = New System.Drawing.Point(4, 4)
- Me.ButtonAll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonAll.Name = "ButtonAll"
- Me.ButtonAll.Size = New System.Drawing.Size(83, 29)
- Me.ButtonAll.TabIndex = 19
- Me.ButtonAll.Text = "Select All"
- Me.ToolTip1.SetToolTip(Me.ButtonAll, "Select all shown files")
- Me.ButtonAll.UseVisualStyleBackColor = true
- '
- 'ComboBoxExt
- '
- Me.ComboBoxExt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ComboBoxExt.FormattingEnabled = true
- Me.ComboBoxExt.Location = New System.Drawing.Point(393, 309)
- Me.ComboBoxExt.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ComboBoxExt.Name = "ComboBoxExt"
- Me.ComboBoxExt.Size = New System.Drawing.Size(144, 23)
- Me.ComboBoxExt.TabIndex = 20
- Me.ToolTip1.SetToolTip(Me.ComboBoxExt, "Filter the file type")
- '
- 'ButtonHisFile
- '
- Me.ButtonHisFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButtonHisFile.Image = Global.TUGraz.VECTO.My.Resources.Resources.file_history
- Me.ButtonHisFile.Location = New System.Drawing.Point(493, 4)
- Me.ButtonHisFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonHisFile.Name = "ButtonHisFile"
- Me.ButtonHisFile.Size = New System.Drawing.Size(30, 29)
- Me.ButtonHisFile.TabIndex = 24
- Me.ButtonHisFile.TabStop = false
- Me.ToolTip1.SetToolTip(Me.ButtonHisFile, "History")
- Me.ButtonHisFile.UseVisualStyleBackColor = true
- '
- 'TextBoxSearchFile
- '
- Me.TextBoxSearchFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TextBoxSearchFile.Location = New System.Drawing.Point(44, 309)
- Me.TextBoxSearchFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.TextBoxSearchFile.Name = "TextBoxSearchFile"
- Me.TextBoxSearchFile.Size = New System.Drawing.Size(337, 23)
- Me.TextBoxSearchFile.TabIndex = 15
- Me.ToolTip1.SetToolTip(Me.TextBoxSearchFile, "Filter the files")
- '
- 'Label5
- '
- Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(381, 313)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(10, 15)
- Me.Label5.TabIndex = 30
- Me.Label5.Text = "."
- '
- 'Label2
- '
- Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(2, 314)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(36, 15)
- Me.Label2.TabIndex = 29
- Me.Label2.Text = "Filter:"
- '
- 'ListViewFiles
- '
- Me.ListViewFiles.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.ListViewFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnFileName, Me.ColumnType, Me.ColumnSize, Me.ColumnChangedOn})
- Me.ListViewFiles.ContextMenuStrip = Me.ContextMenuFile
- Me.ListViewFiles.FullRowSelect = true
- Me.ListViewFiles.GridLines = true
- Me.ListViewFiles.HideSelection = false
- Me.ListViewFiles.Location = New System.Drawing.Point(-1, 37)
- Me.ListViewFiles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ListViewFiles.Name = "ListViewFiles"
- Me.ListViewFiles.Size = New System.Drawing.Size(538, 273)
- Me.ListViewFiles.SmallImageList = Me.ImageList1
- Me.ListViewFiles.TabIndex = 10
- Me.ListViewFiles.UseCompatibleStateImageBehavior = false
- Me.ListViewFiles.View = System.Windows.Forms.View.Details
- '
- 'ColumnFileName
- '
- Me.ColumnFileName.Text = "Files:"
- Me.ColumnFileName.Width = 191
- '
- 'ColumnType
- '
- Me.ColumnType.Text = "Type"
- '
- 'ColumnSize
- '
- Me.ColumnSize.Text = "Size"
- Me.ColumnSize.Width = 48
- '
- 'ColumnChangedOn
- '
- Me.ColumnChangedOn.Text = "Changed on"
- Me.ColumnChangedOn.Width = 42
- '
- 'ContextMenuFile
- '
- Me.ContextMenuFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RenameFileToolStripMenuItem, Me.DeleteFileToolStripMenuItem})
- Me.ContextMenuFile.Name = "ContextMenuFile"
- Me.ContextMenuFile.Size = New System.Drawing.Size(148, 48)
- '
- 'RenameFileToolStripMenuItem
- '
- Me.RenameFileToolStripMenuItem.Name = "RenameFileToolStripMenuItem"
- Me.RenameFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22)
- Me.RenameFileToolStripMenuItem.Text = "Rename File..."
- '
- 'DeleteFileToolStripMenuItem
- '
- Me.DeleteFileToolStripMenuItem.Name = "DeleteFileToolStripMenuItem"
- Me.DeleteFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22)
- Me.DeleteFileToolStripMenuItem.Text = "Delete File..."
- '
- 'TextBoxPath
- '
- Me.TextBoxPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TextBoxPath.Font = New System.Drawing.Font("Segoe UI", 11!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
- Me.TextBoxPath.Location = New System.Drawing.Point(48, 389)
- Me.TextBoxPath.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.TextBoxPath.Name = "TextBoxPath"
- Me.TextBoxPath.Size = New System.Drawing.Size(695, 27)
- Me.TextBoxPath.TabIndex = 15
- '
- 'ContextMenuHisFolder
- '
- Me.ContextMenuHisFolder.Name = "ContextMenuFolderHis"
- Me.ContextMenuHisFolder.Size = New System.Drawing.Size(61, 4)
- '
- 'ContextMenuHisFile
- '
- Me.ContextMenuHisFile.Name = "ContextMenuFileHis"
- Me.ContextMenuHisFile.Size = New System.Drawing.Size(61, 4)
- '
- 'ButtonOK
- '
- Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButtonOK.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.ButtonOK.Location = New System.Drawing.Point(564, 420)
- Me.ButtonOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonOK.Name = "ButtonOK"
- Me.ButtonOK.Size = New System.Drawing.Size(88, 27)
- Me.ButtonOK.TabIndex = 20
- Me.ButtonOK.TabStop = false
- Me.ButtonOK.Text = "OK"
- Me.ButtonOK.UseVisualStyleBackColor = true
- '
- 'ButtonCancel
- '
- Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButtonCancel.Location = New System.Drawing.Point(655, 420)
- Me.ButtonCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.ButtonCancel.Name = "ButtonCancel"
- Me.ButtonCancel.Size = New System.Drawing.Size(88, 27)
- Me.ButtonCancel.TabIndex = 25
- Me.ButtonCancel.TabStop = false
- Me.ButtonCancel.Text = "Cancel"
- Me.ButtonCancel.UseVisualStyleBackColor = true
- '
- 'TextBoxCurrent
- '
- Me.TextBoxCurrent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TextBoxCurrent.Cursor = System.Windows.Forms.Cursors.Hand
- Me.TextBoxCurrent.Font = New System.Drawing.Font("Segoe UI", 11!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
- Me.TextBoxCurrent.Location = New System.Drawing.Point(6, 20)
- Me.TextBoxCurrent.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.TextBoxCurrent.Name = "TextBoxCurrent"
- Me.TextBoxCurrent.ReadOnly = true
- Me.TextBoxCurrent.Size = New System.Drawing.Size(737, 27)
- Me.TextBoxCurrent.TabIndex = 0
- Me.TextBoxCurrent.TabStop = false
- Me.ToolTip1.SetToolTip(Me.TextBoxCurrent, "Click for changing the directory")
- '
- 'Label3
- '
- Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(6, 395)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(42, 15)
- Me.Label3.TabIndex = 29
- Me.Label3.Text = "Name:"
- '
- 'Label4
- '
- Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(5, 3)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(101, 15)
- Me.Label4.TabIndex = 30
- Me.Label4.Text = "Current Directory:"
- '
- 'FileBrowserDialog
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.ButtonCancel
- Me.ClientSize = New System.Drawing.Size(752, 453)
- Me.Controls.Add(Me.Label4)
- Me.Controls.Add(Me.TextBoxCurrent)
- Me.Controls.Add(Me.ButtonCancel)
- Me.Controls.Add(Me.ButtonOK)
- Me.Controls.Add(Me.TextBoxPath)
- Me.Controls.Add(Me.SplitContainer1)
- Me.Controls.Add(Me.Label3)
- Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.MinimizeBox = false
- Me.MinimumSize = New System.Drawing.Size(395, 308)
- Me.Name = "FileBrowserDialog"
- Me.ShowIcon = false
- Me.ShowInTaskbar = false
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
- Me.Text = "File Browser"
- Me.SplitContainer1.Panel1.ResumeLayout(false)
- Me.SplitContainer1.Panel1.PerformLayout
- Me.SplitContainer1.Panel2.ResumeLayout(false)
- Me.SplitContainer1.Panel2.PerformLayout
- CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit
- Me.SplitContainer1.ResumeLayout(false)
- Me.ContextMenuFile.ResumeLayout(false)
- Me.ResumeLayout(false)
- Me.PerformLayout
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FileBrowserDialog))
+ Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.ButtonNewDir = New System.Windows.Forms.Button()
+ Me.ButtonDesktop = New System.Windows.Forms.Button()
+ Me.ButtonHisFolder = New System.Windows.Forms.Button()
+ Me.ButtonFolderBack = New System.Windows.Forms.Button()
+ Me.TextBoxSearchFolder = New System.Windows.Forms.TextBox()
+ Me.ComboBoxDrive = New System.Windows.Forms.ComboBox()
+ Me.ListViewFolder = New System.Windows.Forms.ListView()
+ Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
+ Me.ButtonAll = New System.Windows.Forms.Button()
+ Me.ComboBoxExt = New System.Windows.Forms.ComboBox()
+ Me.ButtonHisFile = New System.Windows.Forms.Button()
+ Me.TextBoxSearchFile = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.ListViewFiles = New System.Windows.Forms.ListView()
+ Me.ColumnFileName = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnType = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnSize = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnChangedOn = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ContextMenuFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.RenameFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.DeleteFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.TextBoxPath = New System.Windows.Forms.TextBox()
+ Me.ContextMenuHisFolder = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.ContextMenuHisFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.ButtonOK = New System.Windows.Forms.Button()
+ Me.ButtonCancel = New System.Windows.Forms.Button()
+ Me.TextBoxCurrent = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.SplitContainer1.Panel1.SuspendLayout()
+ Me.SplitContainer1.Panel2.SuspendLayout()
+ Me.SplitContainer1.SuspendLayout()
+ Me.ContextMenuFile.SuspendLayout()
+ Me.SuspendLayout()
+ '
+ 'SplitContainer1
+ '
+ Me.SplitContainer1.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.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.SplitContainer1.Cursor = System.Windows.Forms.Cursors.VSplit
+ Me.SplitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1
+ Me.SplitContainer1.Location = New System.Drawing.Point(5, 44)
+ Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
+ Me.SplitContainer1.Name = "SplitContainer1"
+ '
+ 'SplitContainer1.Panel1
+ '
+ Me.SplitContainer1.Panel1.Controls.Add(Me.Label1)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonNewDir)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonDesktop)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonHisFolder)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonFolderBack)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.TextBoxSearchFolder)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.ComboBoxDrive)
+ Me.SplitContainer1.Panel1.Controls.Add(Me.ListViewFolder)
+ Me.SplitContainer1.Panel1.Cursor = System.Windows.Forms.Cursors.Default
+ Me.SplitContainer1.Panel1MinSize = 195
+ '
+ 'SplitContainer1.Panel2
+ '
+ Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonAll)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.ComboBoxExt)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonHisFile)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.TextBoxSearchFile)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.Label5)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.Label2)
+ Me.SplitContainer1.Panel2.Controls.Add(Me.ListViewFiles)
+ Me.SplitContainer1.Panel2.Cursor = System.Windows.Forms.Cursors.Default
+ Me.SplitContainer1.Size = New System.Drawing.Size(632, 289)
+ Me.SplitContainer1.SplitterDistance = 195
+ Me.SplitContainer1.TabIndex = 5
+ Me.SplitContainer1.TabStop = False
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(2, 272)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(32, 13)
+ Me.Label1.TabIndex = 28
+ Me.Label1.Text = "Filter:"
+ '
+ 'ButtonNewDir
+ '
+ Me.ButtonNewDir.Image = Global.TUGraz.VECTO.My.Resources.Resources.new_dir
+ Me.ButtonNewDir.Location = New System.Drawing.Point(111, 3)
+ Me.ButtonNewDir.Name = "ButtonNewDir"
+ Me.ButtonNewDir.Size = New System.Drawing.Size(26, 25)
+ Me.ButtonNewDir.TabIndex = 21
+ Me.ButtonNewDir.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.ButtonNewDir, "Create new Directory")
+ Me.ButtonNewDir.UseVisualStyleBackColor = True
+ '
+ 'ButtonDesktop
+ '
+ Me.ButtonDesktop.Image = Global.TUGraz.VECTO.My.Resources.Resources.desktop
+ Me.ButtonDesktop.Location = New System.Drawing.Point(85, 3)
+ Me.ButtonDesktop.Name = "ButtonDesktop"
+ Me.ButtonDesktop.Size = New System.Drawing.Size(26, 25)
+ Me.ButtonDesktop.TabIndex = 22
+ Me.ButtonDesktop.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.ButtonDesktop, "Go to Desktop")
+ Me.ButtonDesktop.UseVisualStyleBackColor = True
+ '
+ 'ButtonHisFolder
+ '
+ Me.ButtonHisFolder.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonHisFolder.Image = Global.TUGraz.VECTO.My.Resources.Resources.file_history
+ Me.ButtonHisFolder.Location = New System.Drawing.Point(164, 3)
+ Me.ButtonHisFolder.Name = "ButtonHisFolder"
+ Me.ButtonHisFolder.Size = New System.Drawing.Size(26, 25)
+ Me.ButtonHisFolder.TabIndex = 24
+ Me.ButtonHisFolder.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.ButtonHisFolder, "History / Favorites")
+ Me.ButtonHisFolder.UseVisualStyleBackColor = True
+ '
+ 'ButtonFolderBack
+ '
+ Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"), System.Drawing.Image)
+ Me.ButtonFolderBack.Location = New System.Drawing.Point(59, 3)
+ Me.ButtonFolderBack.Name = "ButtonFolderBack"
+ Me.ButtonFolderBack.Size = New System.Drawing.Size(26, 25)
+ Me.ButtonFolderBack.TabIndex = 20
+ Me.ButtonFolderBack.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.ButtonFolderBack, "Move up one directory")
+ Me.ButtonFolderBack.UseVisualStyleBackColor = True
+ '
+ 'TextBoxSearchFolder
+ '
+ Me.TextBoxSearchFolder.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TextBoxSearchFolder.Location = New System.Drawing.Point(35, 268)
+ Me.TextBoxSearchFolder.Name = "TextBoxSearchFolder"
+ Me.TextBoxSearchFolder.Size = New System.Drawing.Size(160, 20)
+ Me.TextBoxSearchFolder.TabIndex = 15
+ Me.ToolTip1.SetToolTip(Me.TextBoxSearchFolder, "Filter the directories")
+ '
+ 'ComboBoxDrive
+ '
+ Me.ComboBoxDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.ComboBoxDrive.Font = New System.Drawing.Font("Segoe UI", 11.0!)
+ Me.ComboBoxDrive.FormattingEnabled = True
+ Me.ComboBoxDrive.Location = New System.Drawing.Point(5, 3)
+ Me.ComboBoxDrive.Name = "ComboBoxDrive"
+ Me.ComboBoxDrive.Size = New System.Drawing.Size(54, 28)
+ Me.ComboBoxDrive.TabIndex = 5
+ '
+ 'ListViewFolder
+ '
+ Me.ListViewFolder.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.ListViewFolder.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader3})
+ Me.ListViewFolder.FullRowSelect = True
+ Me.ListViewFolder.GridLines = True
+ Me.ListViewFolder.HideSelection = False
+ Me.ListViewFolder.Location = New System.Drawing.Point(-2, 32)
+ Me.ListViewFolder.MultiSelect = False
+ Me.ListViewFolder.Name = "ListViewFolder"
+ Me.ListViewFolder.Size = New System.Drawing.Size(198, 237)
+ Me.ListViewFolder.SmallImageList = Me.ImageList1
+ Me.ListViewFolder.TabIndex = 10
+ Me.ListViewFolder.UseCompatibleStateImageBehavior = False
+ Me.ListViewFolder.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader3
+ '
+ Me.ColumnHeader3.Text = "Sub-Directories:"
+ Me.ColumnHeader3.Width = 368
+ '
+ 'ImageList1
+ '
+ Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit
+ Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16)
+ Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent
+ '
+ 'ButtonAll
+ '
+ Me.ButtonAll.Location = New System.Drawing.Point(3, 3)
+ Me.ButtonAll.Name = "ButtonAll"
+ Me.ButtonAll.Size = New System.Drawing.Size(71, 25)
+ Me.ButtonAll.TabIndex = 19
+ Me.ButtonAll.Text = "Select All"
+ Me.ToolTip1.SetToolTip(Me.ButtonAll, "Select all shown files")
+ Me.ButtonAll.UseVisualStyleBackColor = True
+ '
+ 'ComboBoxExt
+ '
+ Me.ComboBoxExt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ComboBoxExt.FormattingEnabled = True
+ Me.ComboBoxExt.Location = New System.Drawing.Point(308, 268)
+ Me.ComboBoxExt.Name = "ComboBoxExt"
+ Me.ComboBoxExt.Size = New System.Drawing.Size(124, 21)
+ Me.ComboBoxExt.TabIndex = 20
+ Me.ToolTip1.SetToolTip(Me.ComboBoxExt, "Filter the file type")
+ '
+ 'ButtonHisFile
+ '
+ Me.ButtonHisFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonHisFile.Image = Global.TUGraz.VECTO.My.Resources.Resources.file_history
+ Me.ButtonHisFile.Location = New System.Drawing.Point(394, 3)
+ Me.ButtonHisFile.Name = "ButtonHisFile"
+ Me.ButtonHisFile.Size = New System.Drawing.Size(26, 25)
+ Me.ButtonHisFile.TabIndex = 24
+ Me.ButtonHisFile.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.ButtonHisFile, "History")
+ Me.ButtonHisFile.UseVisualStyleBackColor = True
+ '
+ 'TextBoxSearchFile
+ '
+ Me.TextBoxSearchFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TextBoxSearchFile.Location = New System.Drawing.Point(38, 268)
+ Me.TextBoxSearchFile.Name = "TextBoxSearchFile"
+ Me.TextBoxSearchFile.Size = New System.Drawing.Size(261, 20)
+ Me.TextBoxSearchFile.TabIndex = 15
+ Me.ToolTip1.SetToolTip(Me.TextBoxSearchFile, "Filter the files")
+ '
+ 'Label5
+ '
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(298, 271)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(10, 13)
+ Me.Label5.TabIndex = 30
+ Me.Label5.Text = "."
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(2, 272)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(32, 13)
+ Me.Label2.TabIndex = 29
+ Me.Label2.Text = "Filter:"
+ '
+ 'ListViewFiles
+ '
+ Me.ListViewFiles.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.ListViewFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnFileName, Me.ColumnType, Me.ColumnSize, Me.ColumnChangedOn})
+ Me.ListViewFiles.ContextMenuStrip = Me.ContextMenuFile
+ Me.ListViewFiles.FullRowSelect = True
+ Me.ListViewFiles.GridLines = True
+ Me.ListViewFiles.HideSelection = False
+ Me.ListViewFiles.Location = New System.Drawing.Point(-1, 32)
+ Me.ListViewFiles.Name = "ListViewFiles"
+ Me.ListViewFiles.Size = New System.Drawing.Size(433, 237)
+ Me.ListViewFiles.SmallImageList = Me.ImageList1
+ Me.ListViewFiles.TabIndex = 10
+ Me.ListViewFiles.UseCompatibleStateImageBehavior = False
+ Me.ListViewFiles.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnFileName
+ '
+ Me.ColumnFileName.Text = "Files:"
+ Me.ColumnFileName.Width = 191
+ '
+ 'ColumnType
+ '
+ Me.ColumnType.Text = "Type"
+ '
+ 'ColumnSize
+ '
+ Me.ColumnSize.Text = "Size"
+ Me.ColumnSize.Width = 48
+ '
+ 'ColumnChangedOn
+ '
+ Me.ColumnChangedOn.Text = "Changed on"
+ Me.ColumnChangedOn.Width = 42
+ '
+ 'ContextMenuFile
+ '
+ Me.ContextMenuFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RenameFileToolStripMenuItem, Me.DeleteFileToolStripMenuItem})
+ Me.ContextMenuFile.Name = "ContextMenuFile"
+ Me.ContextMenuFile.Size = New System.Drawing.Size(148, 48)
+ '
+ 'RenameFileToolStripMenuItem
+ '
+ Me.RenameFileToolStripMenuItem.Name = "RenameFileToolStripMenuItem"
+ Me.RenameFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22)
+ Me.RenameFileToolStripMenuItem.Text = "Rename File..."
+ '
+ 'DeleteFileToolStripMenuItem
+ '
+ Me.DeleteFileToolStripMenuItem.Name = "DeleteFileToolStripMenuItem"
+ Me.DeleteFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22)
+ Me.DeleteFileToolStripMenuItem.Text = "Delete File..."
+ '
+ 'TextBoxPath
+ '
+ Me.TextBoxPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TextBoxPath.Font = New System.Drawing.Font("Segoe UI", 11.0!)
+ Me.TextBoxPath.Location = New System.Drawing.Point(41, 335)
+ Me.TextBoxPath.Name = "TextBoxPath"
+ Me.TextBoxPath.Size = New System.Drawing.Size(596, 27)
+ Me.TextBoxPath.TabIndex = 15
+ '
+ 'ContextMenuHisFolder
+ '
+ Me.ContextMenuHisFolder.Name = "ContextMenuFolderHis"
+ Me.ContextMenuHisFolder.Size = New System.Drawing.Size(61, 4)
+ '
+ 'ContextMenuHisFile
+ '
+ Me.ContextMenuHisFile.Name = "ContextMenuFileHis"
+ Me.ContextMenuHisFile.Size = New System.Drawing.Size(61, 4)
+ '
+ 'ButtonOK
+ '
+ Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonOK.DialogResult = System.Windows.Forms.DialogResult.OK
+ Me.ButtonOK.Location = New System.Drawing.Point(483, 364)
+ Me.ButtonOK.Name = "ButtonOK"
+ Me.ButtonOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButtonOK.TabIndex = 20
+ Me.ButtonOK.TabStop = False
+ Me.ButtonOK.Text = "OK"
+ Me.ButtonOK.UseVisualStyleBackColor = True
+ '
+ 'ButtonCancel
+ '
+ Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.ButtonCancel.Location = New System.Drawing.Point(561, 364)
+ Me.ButtonCancel.Name = "ButtonCancel"
+ Me.ButtonCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButtonCancel.TabIndex = 25
+ Me.ButtonCancel.TabStop = False
+ Me.ButtonCancel.Text = "Cancel"
+ Me.ButtonCancel.UseVisualStyleBackColor = True
+ '
+ 'TextBoxCurrent
+ '
+ Me.TextBoxCurrent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TextBoxCurrent.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.TextBoxCurrent.Font = New System.Drawing.Font("Segoe UI", 11.0!)
+ Me.TextBoxCurrent.Location = New System.Drawing.Point(5, 18)
+ Me.TextBoxCurrent.Name = "TextBoxCurrent"
+ Me.TextBoxCurrent.ReadOnly = True
+ Me.TextBoxCurrent.Size = New System.Drawing.Size(632, 27)
+ Me.TextBoxCurrent.TabIndex = 0
+ Me.TextBoxCurrent.TabStop = False
+ Me.ToolTip1.SetToolTip(Me.TextBoxCurrent, "Click for changing the directory")
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(5, 342)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
+ Me.Label3.TabIndex = 29
+ Me.Label3.Text = "Name:"
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(4, 3)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(89, 13)
+ Me.Label4.TabIndex = 30
+ Me.Label4.Text = "Current Directory:"
+ '
+ 'FileBrowserDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.ButtonCancel
+ Me.ClientSize = New System.Drawing.Size(645, 393)
+ Me.Controls.Add(Me.Label4)
+ Me.Controls.Add(Me.TextBoxCurrent)
+ Me.Controls.Add(Me.ButtonCancel)
+ Me.Controls.Add(Me.ButtonOK)
+ Me.Controls.Add(Me.TextBoxPath)
+ Me.Controls.Add(Me.SplitContainer1)
+ Me.Controls.Add(Me.Label3)
+ Me.MinimizeBox = False
+ Me.MinimumSize = New System.Drawing.Size(341, 272)
+ Me.Name = "FileBrowserDialog"
+ Me.ShowIcon = False
+ Me.ShowInTaskbar = False
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+ Me.Text = "File Browser"
+ Me.SplitContainer1.Panel1.ResumeLayout(False)
+ Me.SplitContainer1.Panel1.PerformLayout()
+ Me.SplitContainer1.Panel2.ResumeLayout(False)
+ Me.SplitContainer1.Panel2.PerformLayout()
+ CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.SplitContainer1.ResumeLayout(False)
+ Me.ContextMenuFile.ResumeLayout(False)
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
-End Sub
+ End Sub
Friend WithEvents SplitContainer1 As SplitContainer
Friend WithEvents ComboBoxDrive As ComboBox
Friend WithEvents ListViewFolder As ListView
diff --git a/VECTO/File Browser/FileBrowserDialog.resx b/VECTO/File Browser/FileBrowserDialog.resx
index 5f85c5eac100fbacead7d84c653bd70ed068d933..b894af7783a82da509871845d81a9a8ce324d5aa 100644
--- a/VECTO/File Browser/FileBrowserDialog.resx
+++ b/VECTO/File Browser/FileBrowserDialog.resx
@@ -1,4 +1,64 @@
+<?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">
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index de16c7ced350084401c41cd30ad8a984714036f8..164e7ff11544f541dbb71cfb7d462c42f357a1e2 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -182,7 +182,7 @@ Public Class MainForm
TorqueConverterShiftPolygonFileBrowser.Extensions = New String() {"vgbs"}
CrossWindCorrectionFileBrowser.Extensions = New String() {"vcdv", "vcdb"}
ElectricMotorFileBrowser.Extensions = New String() {"vem"}
- REESSFileBrowser.Extensions = New String() {"vreess"}
+ REESSFileBrowser.Extensions = New String() {"vreess", "vbat"}
EmADCLossMapFileBrowser.Extensions = New String() {"vtlm"}
ElectricMachineDragTorqueFileBrowser.Extensions = New String() {"vemd"}
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 6fc6e3a0b3200d11e8810f642c0a25b47f006945..671152777634fd165c8c73f2dae879ae910cb0a6 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -121,7 +121,9 @@ Public Class VehicleForm
_changed = False
- cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetLabel())
+ cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetLabel(),
+ Function(x) x <> PowertrainPosition.GEN _
+ AndAlso x <> PowertrainPosition.HybridP0)
NewVehicle()
End Sub
@@ -460,6 +462,7 @@ Public Class VehicleForm
tbEmADCLossMap.Text = If(em.MechanicalTransmissionLossMap Is Nothing, em.MechanicalTransmissionEfficiency.ToGUIFormat(),
GetRelativePath(em.MechanicalTransmissionLossMap.Source, basePath))
tbRatioEm.Text = em.RatioADC.ToGUIFormat()
+
cbEmPos.SelectedValue = em.Position
If (em.Position = PowertrainPosition.HybridP2_5) AndAlso Not em.RatioPerGear Is Nothing Then
@@ -521,19 +524,19 @@ Public Class VehicleForm
gbVehicleIdlingSpeed.Enabled = True
gbTankSystem.Enabled = True
gbAngledrive.Enabled = True
+ tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+ tcVehicleComponents.TabPages.Remove(tpElectricComponents)
Select Case vehType
Case VectoSimulationJobType.ConventionalVehicle
lblTitle.Text = "Conventional Vehicle"
gbRetarderLosses.Enabled = True
- tpElectricComponents.Enabled = False
cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
(Function(t) t.GetLabel(), Function(t) t = PowertrainPosition.HybridPositionNotSet)
cbEngineStopStart.Enabled = True
cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
cbEcoRoll.Enabled = True
gbEMTorqueLimits.Enabled = False
- tpGensetComponents.Visible = False
Case VectoSimulationJobType.ParallelHybridVehicle
gbRetarderLosses.Enabled = True
lblTitle.Text = "Parallel Hybrid Vehicle"
@@ -541,7 +544,10 @@ Public Class VehicleForm
(Function(t) t.GetLabel(), Function(x) x.IsParallelHybrid())
gbEMTorqueLimits.Enabled = True
cbEcoRoll.Enabled = True
- tpGensetComponents.Visible = False
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
+ tpElectricComponents.BindingContext = BindingContext
+ End If
Case VectoSimulationJobType.SerialHybridVehicle
gbRetarderLosses.Enabled = False
lblTitle.Text = "Serial Hybrid Vehicle"
@@ -553,7 +559,13 @@ Public Class VehicleForm
cbEcoRoll.DataSource = {New With {.Key = EcoRollType.None, .Value = EcoRollType.None.GetName()}}
cbEcoRoll.Enabled = False
gbEMTorqueLimits.Enabled = False
- tpGensetComponents.Visible = True
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
+ tpElectricComponents.BindingContext = BindingContext
+ End If
+ If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
+ tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+ End If
Case VectoSimulationJobType.BatteryElectricVehicle
gbRetarderLosses.Enabled = False
lblTitle.Text = "Battery Electric Vehicle"
@@ -568,7 +580,20 @@ Public Class VehicleForm
cbEcoRoll.DataSource = {New With {.Key = EcoRollType.None, .Value = EcoRollType.None.GetName()}}
cbEcoRoll.Enabled = False
gbEMTorqueLimits.Enabled = False
- tpGensetComponents.Visible = False
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
+ tpElectricComponents.BindingContext = BindingContext
+ End If
+ Case Else
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
+ tpElectricComponents.BindingContext = BindingContext
+ End If
+ If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
+ tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+ tpGensetComponents.BindingContext = BindingContext
+ End If
+
End Select
End Sub
@@ -1216,21 +1241,18 @@ Public Class VehicleForm
Private Sub cbEmPos_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbEmPos.SelectedIndexChanged
gbRatiosPerGear.Enabled = PowertrainPosition.HybridP2_5.Equals(cbEmPos.SelectedValue)
-
Dim selectedValue = CbRtType.SelectedValue
- CType(CbRtType.DataSource, DataView).RowFilter = $"Key <> {CInt(RetarderType.AxlegearInputRetarder)}"
If PowertrainPosition.BatteryElectricE4.Equals(cbEmPos.SelectedValue) Then
gbRetarderLosses.Enabled = False
TbRtRatio.Text = ""
TbRtPath.Text = ""
- CType(CbRtType.DataSource, DataView).RowFilter = $"Key in ({CInt(RetarderType.None)})"
-
+ CbRtType.SelectedIndex = 0
+ CType(CbRtType.DataSource, DataView).RowFilter = $"Key <> {CInt(RetarderType.AxlegearInputRetarder)}"
ElseIf PowertrainPosition.BatteryElectricE3.Equals(cbEmPos.SelectedValue) Then
gbRetarderLosses.Enabled = True
CType(CbRtType.DataSource, DataView).RowFilter = $"Key in ({CInt(RetarderType.None)}, {CInt(RetarderType.AxlegearInputRetarder)})"
-
- ElseIf PowertrainPosition.BatteryElectricE2.Equals(cbEmPos.SelectedValue) Then
+ Else
gbRetarderLosses.Enabled = True
CType(CbRtType.DataSource, DataView).RowFilter = $"Key <> {CInt(RetarderType.AxlegearInputRetarder)}"
End If
@@ -1238,7 +1260,7 @@ Public Class VehicleForm
If (selectedValue IsNot Nothing) Then
If Not selectedValue.Equals(CbRtType.SelectedValue) Then
MsgBox("Retarder has changed due to change of electric motor position. Please check.", MsgBoxStyle.Information)
- CbRtType.SelectedValue = selectedValue
+ CbRtType.SelectedIndex = 0
End If
End If
End Sub
diff --git a/VectoCommon/VectoCommon/Models/PowertrainPosition.cs b/VectoCommon/VectoCommon/Models/PowertrainPosition.cs
index ae6edc8132e74b590969357b163d036327ac9377..c06a09c8f13aa94427594b19ce25387d96993e8e 100644
--- a/VectoCommon/VectoCommon/Models/PowertrainPosition.cs
+++ b/VectoCommon/VectoCommon/Models/PowertrainPosition.cs
@@ -72,14 +72,20 @@ namespace TUGraz.VectoCommon.InputData
public static bool IsBatteryElectric(this PowertrainPosition pos)
{
- return pos == PowertrainPosition.BatteryElectricE2 || pos == PowertrainPosition.BatteryElectricE3 ||
- pos == PowertrainPosition.BatteryElectricE4;
+ switch (pos) {
+ case PowertrainPosition.BatteryElectricE2:
+ case PowertrainPosition.BatteryElectricE3:
+ case PowertrainPosition.BatteryElectricE4:
+ return true;
+ default:
+ return false;
+ }
}
public static bool IsParallelHybrid(this PowertrainPosition pos)
{
switch (pos) {
- case PowertrainPosition.HybridP0:
+ //case PowertrainPosition.HybridP0: // special case, currently not considered in VECTO
case PowertrainPosition.HybridP1:
case PowertrainPosition.HybridP2:
case PowertrainPosition.HybridP2_5:
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index bb57cfc4460acb55eeca049457e81f636147ab82..74e2855d1c22982a44de0d8137891eab54e970dd 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -235,6 +235,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
}
}
+ if (runData.ElectricMachinesData?.Any(e => e.Item1 == PowertrainPosition.HybridP0) ?? false){
+ return new ValidationResult("PowertrainPosition P0 is currently not supported.");
+ }
+
return ValidationResult.Success;
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 96e80a328e1c6fc34a35d7c6e0fc92751502517c..11de9cf78fc917565ebabbac44ef5a36b00ba430 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -412,6 +412,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
if (data.ElectricMachinesData.Count != 1) {
throw new VectoException("ParallelHybrid needs exactly one electric motor.");
}
+ if (data.ElectricMachinesData.Any(e => e.Item1 == PowertrainPosition.HybridP0)) {
+ throw new VectoException("PowertrainPosition P0 is currently not supported.");
+ }
var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
@@ -665,7 +668,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
if (data.ElectricMachinesData.Count != 1) {
throw new VectoException("Battery electric vehicle needs exactly one electric motor.");
}
-
+
var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
index 2061f830f3b2c6349fb65b6c9bcc10eafe7e11d9..641291ebdc124d5466451eda4f32b3586f70cc4a 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
@@ -173,10 +173,16 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
Container.RunStatus = Status.Success;
Container.FinishSimulationRun();
WritingResultsDone = true;
- if (Progress.IsSmaller(1, 1e-9) && !(response is ResponseBatteryEmpty)) {
- throw new VectoSimulationException("{5} ({6} {7}) Progress: {8} - absTime: {0}, distance: {1}, dt: {2}, v: {3}, Gear: {4}",
- AbsTime, Container.MileageCounter.Distance, dt, Container.VehicleInfo.VehicleSpeed,
- TryCatch(() => Container.GearboxInfo.Gear), RunIdentifier, CycleName, RunSuffix, Progress);
+ if (Progress.IsSmaller(1, 1e-9)) {
+ if (response is ResponseBatteryEmpty) {
+ throw new VectoSimulationException("{3} ({4} {5}) REESS was empty before cycle could be finished. Progress: {6:P1} - absTime: {0:F1}, distance: {1:F1}, dt: {2:F1}",
+ AbsTime, Container.MileageCounter.Distance, dt, RunIdentifier, CycleName, RunSuffix, Progress);
+
+ } else {
+ throw new VectoSimulationException("{5} ({6} {7}) Driving Cycle could not be finished. Progress: {8:P1} - absTime: {0:F1}, distance: {1:F1}, dt: {2:F1}, v: {3:F1}, Gear: {4}",
+ AbsTime, Container.MileageCounter.Distance, dt, Container.VehicleInfo.VehicleSpeed,
+ TryCatch(() => Container.GearboxInfo.Gear), RunIdentifier, CycleName, RunSuffix, Progress);
+ }
}
IterationStatistics.FinishSimulation(RunName + CycleName + RunSuffix + RunIdentifier);
Log.Info("VectoJob finished.");
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index 9d0ac85e97ba8a28fabff445fb9020cc068404ae..74824470c2c751032d7fea79137ff1dfaba54de4 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public NewtonMeter EfficiencyMapLookupTorque(Volt voltage, Watt electricPower, PerSecond avgSpeed, NewtonMeter maxEmTorque)
{
- if (avgSpeed.IsEqual(0.RPMtoRad()) || avgSpeed.IsGreaterOrEqual(MaxSpeed)) {
+ if (avgSpeed.IsEqual(0.RPMtoRad()) || avgSpeed.IsGreater(MaxSpeed)) {
return 0.SI<NewtonMeter>();
}
var (a, b) = GetSection(voltage);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
index 515d8a6fc79650cf025b276f293695e4bc0c594f..16d3959e7d58d6d9b85dfdcb2561ea3aa2c751ed 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs
@@ -72,7 +72,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public IResponse Request(Second absTime, Second dt, NewtonMeter torque, PerSecond angularVelocity, bool dryRun)
{
- if (angularVelocity == null || (_primaryRetarder && !DataBus.ClutchInfo.ClutchClosed(absTime))) {
+ if (angularVelocity == null || (_primaryRetarder && (!DataBus.ClutchInfo.ClutchClosed(absTime) || !DataBus.GearboxInfo.GearEngaged(absTime)))) {
return NextComponent.Request(absTime, dt, torque, angularVelocity, dryRun);
}
var avgAngularSpeed = (PreviousState.InAngularVelocity + angularVelocity) / 2.0;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
index 1008e5710834063b6f7a61b844bca297a81a22a2..54955db39f6ae5d4f853fbce13c490398f3040a3 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
@@ -82,8 +82,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (operatingPointList.Count > 0) {
operatingPoint = SelectOperatingPoint(operatingPointList);
} else {
- Log.Warn(
- "TorqueConverter Initialize: No operating point found. Using output as input values as fallback for initialize.");
+ if (outTorque.IsEqual(0) && outAngularVelocity.IsEqual(0)) {
+ Log.Info("TorqueConverter Initialize: No operating point found. Using output as input values as fallback for initialize.");
+ }
+ else {
+ Log.Warn("TorqueConverter Initialize: No operating point found. Using output as input values as fallback for initialize.");
+ }
var inAngularVelocity = outAngularVelocity.LimitTo(DataBus.EngineInfo.EngineIdleSpeed, DataBus.EngineInfo.EngineN95hSpeed);
operatingPoint = new TorqueConverterOperatingPoint {
OutAngularVelocity = outAngularVelocity,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
index f4262e239e04a49afc0021c172ca5f764a2e4559..03fb6648e233379500a2e8a419192c62b33d9d2b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
@@ -105,9 +105,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
gearbox.Disengaged = true;
gearbox.EngageTime = 100.SI<Second>();
gearbox._nextGear = gearForSpeed;
+
var vehicleSpeed = SimulateRollingVehicle(vehicle, gradient, container);
modData?.Reset();
- tmp.Add(new Entry() { StartVelocity = speed, Gradient = gradient, EndVelocity = vehicleSpeed });
+ tmp.Add(new Entry { StartVelocity = speed, Gradient = gradient, EndVelocity = vehicleSpeed });
}
}