This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

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 a1a73586 authored by Raphael LUZ's avatar Raphael LUZ
Browse files

- Updated DEV options for AT update 

- "DEV" tab is now "Test" tab
parent a0f42651
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
VECTO/GUI/F_MAINForm.Designer.vb
+ 1014
− 1000
View file @ a1a73586
......@@ -82,6 +82,7 @@ Partial Class F_MAINForm
Me.ChBoxCyclDistCor = New System.Windows.Forms.CheckBox()
Me.ChBoxUseGears = New System.Windows.Forms.CheckBox()
Me.TabPageDEV = New System.Windows.Forms.TabPage()
Me.Label1 = New System.Windows.Forms.Label()
Me.LvDEVoptions = New System.Windows.Forms.ListView()
Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
......@@ -667,15 +668,26 @@ Partial Class F_MAINForm
'
'TabPageDEV
'
Me.TabPageDEV.Controls.Add(Me.Label1)
Me.TabPageDEV.Controls.Add(Me.LvDEVoptions)
Me.TabPageDEV.Location = New System.Drawing.Point(4, 22)
Me.TabPageDEV.Name = "TabPageDEV"
Me.TabPageDEV.Padding = New System.Windows.Forms.Padding(3)
Me.TabPageDEV.Size = New System.Drawing.Size(1118, 346)
Me.TabPageDEV.TabIndex = 3
Me.TabPageDEV.Text = "DEV"
Me.TabPageDEV.Text = "Test"
Me.TabPageDEV.UseVisualStyleBackColor = True
'
'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(6, 330)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(125, 13)
Me.Label1.TabIndex = 1
Me.Label1.Text = "Double-Click entry to edit"
'
'LvDEVoptions
'
Me.LvDEVoptions.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
......@@ -687,7 +699,7 @@ Partial Class F_MAINForm
Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
Me.LvDEVoptions.MultiSelect = False
Me.LvDEVoptions.Name = "LvDEVoptions"
Me.LvDEVoptions.Size = New System.Drawing.Size(1106, 334)
Me.LvDEVoptions.Size = New System.Drawing.Size(1106, 321)
Me.LvDEVoptions.TabIndex = 0
Me.LvDEVoptions.UseCompatibleStateImageBehavior = False
Me.LvDEVoptions.View = System.Windows.Forms.View.Details
......@@ -992,7 +1004,7 @@ Partial Class F_MAINForm
'
'F_MAINForm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1136, 638)
Me.Controls.Add(Me.ToolStrip1)
......@@ -1002,35 +1014,36 @@ Partial Class F_MAINForm
Me.MinimumSize = New System.Drawing.Size(785, 485)
Me.Name = "F_MAINForm"
Me.Text = "VECTO"
Me.StatusBAR.ResumeLayout(False)
Me.StatusBAR.PerformLayout()
Me.TabControl1.ResumeLayout(False)
Me.TabPageGEN.ResumeLayout(False)
Me.TabPageGEN.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPageDRI.ResumeLayout(False)
Me.TabPageDRI.PerformLayout()
Me.TabPgOptions.ResumeLayout(False)
Me.TabPgOptions.PerformLayout()
Me.GrBoxBATCH.ResumeLayout(False)
Me.GrBoxBATCH.PerformLayout()
Me.PanelOptAllg.ResumeLayout(False)
Me.PanelOptAllg.PerformLayout()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
Me.PnDeclOpt.ResumeLayout(False)
Me.PnDeclOpt.PerformLayout()
Me.TabPageDEV.ResumeLayout(False)
Me.ConMenFilelist.ResumeLayout(False)
Me.SplitContainer1.Panel1.ResumeLayout(False)
Me.SplitContainer1.Panel2.ResumeLayout(False)
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer1.ResumeLayout(False)
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
Me.StatusBAR.ResumeLayout(false)
Me.StatusBAR.PerformLayout
Me.TabControl1.ResumeLayout(false)
Me.TabPageGEN.ResumeLayout(false)
Me.TabPageGEN.PerformLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
Me.TabPageDRI.ResumeLayout(false)
Me.TabPageDRI.PerformLayout
Me.TabPgOptions.ResumeLayout(false)
Me.TabPgOptions.PerformLayout
Me.GrBoxBATCH.ResumeLayout(false)
Me.GrBoxBATCH.PerformLayout
Me.PanelOptAllg.ResumeLayout(false)
Me.PanelOptAllg.PerformLayout
Me.GroupBox1.ResumeLayout(false)
Me.GroupBox1.PerformLayout
Me.PnDeclOpt.ResumeLayout(false)
Me.PnDeclOpt.PerformLayout
Me.TabPageDEV.ResumeLayout(false)
Me.TabPageDEV.PerformLayout
Me.ConMenFilelist.ResumeLayout(false)
Me.SplitContainer1.Panel1.ResumeLayout(false)
Me.SplitContainer1.Panel2.ResumeLayout(false)
CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit
Me.SplitContainer1.ResumeLayout(false)
Me.ToolStrip1.ResumeLayout(false)
Me.ToolStrip1.PerformLayout
Me.CmOpenFile.ResumeLayout(false)
Me.ResumeLayout(false)
Me.PerformLayout
End Sub
Friend WithEvents Button1 As System.Windows.Forms.Button
......@@ -1126,5 +1139,6 @@ Partial Class F_MAINForm
Friend WithEvents RbDev As System.Windows.Forms.RadioButton
Friend WithEvents RbDecl As System.Windows.Forms.RadioButton
Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
Friend WithEvents Label1 As System.Windows.Forms.Label
End Class
VECTO/GUI/F_MAINForm.vb
+ 2206
− 2214
View file @ a1a73586
......@@ -17,7 +17,6 @@ Imports System.Collections.Generic
''' <remarks></remarks>
Public Class F_MAINForm
Private JobListView As cFileListView
Private CycleListView As cFileListView
......@@ -77,6 +76,7 @@ Public Class F_MAINForm
#End Region
#Region "FileBrowser Init/Close"
Private Sub FB_Initialize()
FB_Init = False
fbFolder = New cFileBrowser("WorkDir", True)
......@@ -117,9 +117,8 @@ Public Class F_MAINForm
fbCDx.Extensions = New String() {"vcdv", "vcdb"}
fbVMOD.Extensions = New String() {"vmod"}
End Sub
Private Sub FB_Close()
fbFolder.Close()
fbFileLists.Close()
......@@ -159,8 +158,12 @@ Public Class F_MAINForm
Me.LvGEN.SelectedItems.Clear()
'If more than 100 calculations, ask whether to write by-second results
If Cfg.BatchMode And ((Me.LvGEN.CheckedItems.Count) * (Me.LvDRI.CheckedItems.Count) > 100) And Me.ChBoxModOut.Checked Then
Select Case MsgBox("You are about to run Batch Mode with " & (Me.LvGEN.CheckedItems.Count) * (Me.LvDRI.CheckedItems.Count) & " calculations!" & ChrW(10) & "Do you still want to write modal results?", MsgBoxStyle.YesNoCancel)
If Cfg.BatchMode And ((Me.LvGEN.CheckedItems.Count) * (Me.LvDRI.CheckedItems.Count) > 100) And Me.ChBoxModOut.Checked _
Then
Select Case _
MsgBox(
"You are about to run Batch Mode with " & (Me.LvGEN.CheckedItems.Count) * (Me.LvDRI.CheckedItems.Count) &
" calculations!" & ChrW(10) & "Do you still want to write modal results?", MsgBoxStyle.YesNoCancel)
Case MsgBoxResult.No
Me.ChBoxModOut.Checked = False
Case MsgBoxResult.Cancel
......@@ -201,7 +204,6 @@ Public Class F_MAINForm
'Launch through Job_Launcher
Job_Launcher(ProgOverall)
End Sub
'Lock certain GUI elements while VECTO is running
......@@ -229,7 +231,6 @@ Public Class F_MAINForm
If DEV.Enabled Then
Me.LvDEVoptions.Enabled = Not Lock
End If
End Sub
'Define job file list
......@@ -248,7 +249,6 @@ Public Class F_MAINForm
SetCheckedItemColor(x, tJobStatus.Queued)
JobFileList.Add(fFileRepl(LV0.SubItems(0).Text))
Next
End Sub
'Define cycle list (BATCH mode only)
......@@ -262,7 +262,6 @@ Public Class F_MAINForm
JobCycleList.Add(fFileRepl(LV0.SubItems(0).Text))
Next
End If
End Sub
'Job Launcher
......@@ -300,7 +299,6 @@ Public Class F_MAINForm
'BG-Worker start
VECTOworker.RunWorkerAsync()
End Sub
'Abort Job
......@@ -315,7 +313,8 @@ Public Class F_MAINForm
#Region "BackgroundWorker Events"
'DoWork - Start Calculations
Private Sub BackgroundWorker1_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
Private Sub BackgroundWorker1_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs) _
Handles BackgroundWorker1.DoWork
'Prevent SLEEP
AllowSleepOFF()
......@@ -329,12 +328,11 @@ Public Class F_MAINForm
End If
e.Result = VECTO()
End Sub
'Progress Report - Progressbar, Messages, etc.
Private Sub BackgroundWorker1_ProgressChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
Private Sub BackgroundWorker1_ProgressChanged(ByVal sender As Object,
ByVal e As System.ComponentModel.ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
Dim x As cWorkProg
x = e.UserState
......@@ -369,7 +367,8 @@ Public Class F_MAINForm
End Sub
'Work completed
Private Sub BackgroundWorker1_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
Private Sub BackgroundWorker1_RunWorkerCompleted(ByVal sender As Object,
ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
Dim Result As tCalcResult
......@@ -386,7 +385,7 @@ Public Class F_MAINForm
'ShutDown when Unexpected Error
If e.Error IsNot Nothing Then
MsgBox("An Unexpected Error occurred!" & ChrW(10) & ChrW(10) & _
MsgBox("An Unexpected Error occurred!" & ChrW(10) & ChrW(10) &
e.Error.Message.ToString, MsgBoxStyle.Critical, "Unexpected Error")
LogFile.WriteToLog(tMsgID.Err, ">>>Unexpected Error:" & e.Error.ToString())
Me.Close()
......@@ -415,7 +414,6 @@ Public Class F_MAINForm
'SLEEP reactivate
AllowSleepON()
End Sub
#End Region
......@@ -503,7 +501,6 @@ Public Class F_MAINForm
End If
DeclOnOff()
End Sub
'Declaration mode GUI settings
......@@ -534,7 +531,6 @@ Public Class F_MAINForm
Me.LbDecl.Visible = Cfg.DeclMode
Me.PnDeclOpt.Enabled = Not Cfg.DeclMode
End Sub
'Shown Event (Form-Load finished) ... here StartUp Forms are loaded (DEV, GEN/ADV- Editor ..)
......@@ -559,7 +555,6 @@ Public Class F_MAINForm
fwelcome.ShowDialog()
End If
End If
End Sub
'Open file
......@@ -627,11 +622,11 @@ Public Class F_MAINForm
Else
If ComFile <> sKey.NoFile Then OpenVectoFile(ComFile)
End If
End Sub
'Close
Private Sub F01_MAINForm_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
Private Sub F01_MAINForm_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) _
Handles Me.FormClosing
'Save File-Lists
SaveFileLists()
......@@ -646,7 +641,6 @@ Public Class F_MAINForm
'File browser instances close
FB_Close()
End Sub
#End Region
......@@ -698,14 +692,14 @@ Public Class F_MAINForm
End Select
End If
End Sub
#Region "Job file list"
#Region "Events"
Private Sub ButtonGENremove_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonGENremove.Click
Private Sub ButtonGENremove_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ButtonGENremove.Click
RemoveJobFile()
End Sub
......@@ -713,7 +707,8 @@ Public Class F_MAINForm
AddJobFile()
End Sub
Private Sub ButtonGENoptions_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonGENopt.Click
Private Sub ButtonGENoptions_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ButtonGENopt.Click
ConMenTarget = Me.LvGEN
ConMenTarJob = True
......@@ -725,7 +720,8 @@ Public Class F_MAINForm
Me.ConMenFilelist.Show(Control.MousePosition)
End Sub
Private Sub ListViewGEN_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles LvGEN.KeyDown
Private Sub ListViewGEN_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) _
Handles LvGEN.KeyDown
Select Case e.KeyCode
Case Keys.Delete, Keys.Back
If Not GUIlocked Then RemoveJobFile()
......@@ -741,7 +737,8 @@ Public Class F_MAINForm
End If
End Sub
Private Sub LvGEN_ItemChecked(sender As Object, e As System.Windows.Forms.ItemCheckedEventArgs) Handles LvGEN.ItemChecked
Private Sub LvGEN_ItemChecked(sender As Object, e As System.Windows.Forms.ItemCheckedEventArgs) _
Handles LvGEN.ItemChecked
If e.Item.Checked Then
GENchecked += 1
......@@ -751,15 +748,16 @@ Public Class F_MAINForm
If CheckLock Then Exit Sub
UpdateJobTabText()
End Sub
Private Sub ChBoxAllGEN_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ChBoxAllGEN.CheckedChanged
Private Sub ChBoxAllGEN_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ChBoxAllGEN.CheckedChanged
If GENcheckAllLock And Me.ChBoxAllGEN.CheckState = CheckState.Indeterminate Then Exit Sub
CheckAllGEN(Me.ChBoxAllGEN.Checked)
End Sub
Private Sub CheckAllGEN(ByVal Check As Boolean)
Dim x As ListViewItem
......@@ -777,12 +775,15 @@ Public Class F_MAINForm
UpdateJobTabText()
End Sub
Private Sub ListGEN_DragEnter(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles LvGEN.DragEnter
Private Sub ListGEN_DragEnter(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) _
Handles LvGEN.DragEnter
If (e.Data.GetDataPresent(DataFormats.FileDrop)) Then
e.Effect = DragDropEffects.Copy
End If
End Sub
Private Sub ListGEN_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles LvGEN.DragDrop
Private Sub ListGEN_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) _
Handles LvGEN.DragDrop
Dim f As String()
f = CType(e.Data.GetData(DataFormats.FileDrop), Array)
AddToJobListView(f)
......@@ -851,7 +852,6 @@ Public Class F_MAINForm
End If
If Chck Then AddToJobListView(x)
End Sub
'Open file in list
......@@ -946,8 +946,6 @@ lbFound:
'Number update
GENchecked = Me.LvGEN.CheckedItems.Count
UpdateJobTabText()
End Sub
'Add File to job listview (single file)
......@@ -976,7 +974,6 @@ lbFound:
End If
GENcheckAllLock = False
End Sub
#End Region
......@@ -990,17 +987,20 @@ lbFound:
AddCycle()
End Sub
Private Sub ButtonDRIremove_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonDRIremove.Click
Private Sub ButtonDRIremove_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ButtonDRIremove.Click
RemoveCycle()
End Sub
Private Sub ButtonDRIoptions_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonDRIedit.Click
Private Sub ButtonDRIoptions_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ButtonDRIedit.Click
ConMenTarget = Me.LvDRI
ConMenTarJob = False
Me.ConMenFilelist.Show(Control.MousePosition)
End Sub
Private Sub LvDRI_ItemChecked(sender As Object, e As System.Windows.Forms.ItemCheckedEventArgs) Handles LvDRI.ItemChecked
Private Sub LvDRI_ItemChecked(sender As Object, e As System.Windows.Forms.ItemCheckedEventArgs) _
Handles LvDRI.ItemChecked
If e.Item.Checked Then
DRIchecked += 1
......@@ -1010,10 +1010,10 @@ lbFound:
If CheckLock Then Exit Sub
UpdateCycleTabText()
End Sub
Private Sub ChBoxAllDRI_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ChBoxAllDRI.CheckedChanged
Private Sub ChBoxAllDRI_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ChBoxAllDRI.CheckedChanged
Dim Check As Boolean
Dim x As ListViewItem
......@@ -1033,7 +1033,6 @@ lbFound:
DRIchecked = Me.LvDRI.CheckedItems.Count
UpdateCycleTabText()
End Sub
Private Sub ListViewDRI_DoubleClick(ByVal sender As Object, ByVal e As System.EventArgs) Handles LvDRI.DoubleClick
......@@ -1045,7 +1044,8 @@ lbFound:
End If
End Sub
Private Sub ListViewDRI_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles LvDRI.KeyDown
Private Sub ListViewDRI_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) _
Handles LvDRI.KeyDown
Select Case e.KeyCode
Case Keys.Delete, Keys.Back
If Not GUIlocked Then RemoveCycle()
......@@ -1055,10 +1055,13 @@ lbFound:
End Sub
'Drag n' Drop
Private Sub ListDRI_DragEnter(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles LvDRI.DragEnter
Private Sub ListDRI_DragEnter(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) _
Handles LvDRI.DragEnter
If (e.Data.GetDataPresent(DataFormats.FileDrop)) Then e.Effect = DragDropEffects.Copy
End Sub
Private Sub ListDRI_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles LvDRI.DragDrop
Private Sub ListDRI_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) _
Handles LvDRI.DragDrop
Dim f As String()
f = CType(e.Data.GetData(DataFormats.FileDrop), Array)
AddToCycleListView(f)
......@@ -1164,7 +1167,6 @@ lbFound:
'Number update
DRIchecked = Me.LvDRI.CheckedItems.Count
UpdateCycleTabText()
End Sub
'Add File to cycle listview (single file)
......@@ -1193,7 +1195,6 @@ lbFound:
End If
DRIcheckAllLock = False
End Sub
#End Region
......@@ -1211,14 +1212,15 @@ lbFound:
If fbVECTO.OpenDialog("", False, "vecto,vveh,vgbx,veng,vsig") Then
OpenVectoFile(fbVECTO.Files(0))
End If
End Sub
Private Sub GENEditorToolStripMenuItem1_Click(sender As System.Object, e As System.EventArgs) Handles GENEditorToolStripMenuItem1.Click
Private Sub GENEditorToolStripMenuItem1_Click(sender As System.Object, e As System.EventArgs) _
Handles GENEditorToolStripMenuItem1.Click
OpenVECTOeditor("<New>")
End Sub
Private Sub VEHEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles VEHEditorToolStripMenuItem.Click
Private Sub VEHEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles VEHEditorToolStripMenuItem.Click
If Not F_VEH.Visible Then
F_VEH.Show()
Else
......@@ -1227,7 +1229,8 @@ lbFound:
End If
End Sub
Private Sub EngineEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles EngineEditorToolStripMenuItem.Click
Private Sub EngineEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles EngineEditorToolStripMenuItem.Click
If Not F_ENG.Visible Then
F_ENG.Show()
Else
......@@ -1236,7 +1239,8 @@ lbFound:
End If
End Sub
Private Sub GearboxEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles GearboxEditorToolStripMenuItem.Click
Private Sub GearboxEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles GearboxEditorToolStripMenuItem.Click
If Not F_GBX.Visible Then
F_GBX.Show()
Else
......@@ -1245,12 +1249,14 @@ lbFound:
End If
End Sub
Private Sub GraphToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles GraphToolStripMenuItem.Click
Private Sub GraphToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles GraphToolStripMenuItem.Click
Dim FGraph As New F_Graph
FGraph.Show()
End Sub
Private Sub SignOrVerifyFilesToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles SignOrVerifyFilesToolStripMenuItem.Click
Private Sub SignOrVerifyFilesToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles SignOrVerifyFilesToolStripMenuItem.Click
If Not F_FileSign.Visible Then
F_FileSign.Show()
Else
......@@ -1259,15 +1265,18 @@ lbFound:
End If
End Sub
Private Sub OpenLogToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenLogToolStripMenuItem.Click
Private Sub OpenLogToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles OpenLogToolStripMenuItem.Click
System.Diagnostics.Process.Start(MyAppPath & "log.txt")
End Sub
Private Sub SettingsToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles SettingsToolStripMenuItem.Click
Private Sub SettingsToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles SettingsToolStripMenuItem.Click
F_Settings.ShowDialog()
End Sub
Private Sub UserManualToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles UserManualToolStripMenuItem.Click
Private Sub UserManualToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles UserManualToolStripMenuItem.Click
If IO.File.Exists(MyAppPath & "User Manual\usermanual.html") Then
System.Diagnostics.Process.Start(MyAppPath & "User Manual\usermanual.html")
Else
......@@ -1275,7 +1284,8 @@ lbFound:
End If
End Sub
Private Sub UpdateNotesToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles UpdateNotesToolStripMenuItem.Click
Private Sub UpdateNotesToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles UpdateNotesToolStripMenuItem.Click
If IO.File.Exists(MyAppPath & "User Manual\Release Notes.pdf") Then
System.Diagnostics.Process.Start(MyAppPath & "User Manual\Release Notes.pdf")
Else
......@@ -1283,7 +1293,8 @@ lbFound:
End If
End Sub
Private Sub CreateActivationFileToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles CreateActivationFileToolStripMenuItem.Click
Private Sub CreateActivationFileToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles CreateActivationFileToolStripMenuItem.Click
If MsgBox("Create Activation File ?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
If Lic.CreateActFile(MyAppPath & "ActivationCode.dat") Then
GUImsg(tMsgID.Normal, "Activation File created.")
......@@ -1294,13 +1305,12 @@ lbFound:
End If
End Sub
Private Sub AboutVECTOToolStripMenuItem1_Click(sender As System.Object, e As System.EventArgs) Handles AboutVECTOToolStripMenuItem1.Click
Private Sub AboutVECTOToolStripMenuItem1_Click(sender As System.Object, e As System.EventArgs) _
Handles AboutVECTOToolStripMenuItem1.Click
F_AboutBox.ShowDialog()
End Sub
#End Region
'Move job/cycle file up or down in list view
......@@ -1352,14 +1362,14 @@ lbFound:
Next
ListV.EndUpdate()
End Sub
#Region "job/cycle file List - Context Menu"
'Save List
Private Sub SaveListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SaveListToolStripMenuItem.Click
Private Sub SaveListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles SaveListToolStripMenuItem.Click
If fbFileLists.SaveDialog("") Then
If ConMenTarJob Then
JobListView.SaveList(fbFileLists.Files(0))
......@@ -1370,7 +1380,8 @@ lbFound:
End Sub
'Load List
Private Sub LoadListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles LoadListToolStripMenuItem.Click
Private Sub LoadListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles LoadListToolStripMenuItem.Click
If GUIlocked Then Exit Sub
......@@ -1389,11 +1400,11 @@ lbFound:
End If
End If
End Sub
'Load Default List
Private Sub LoadDefaultListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles LoadDefaultListToolStripMenuItem.Click
Private Sub LoadDefaultListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles LoadDefaultListToolStripMenuItem.Click
If GUIlocked Then Exit Sub
......@@ -1411,7 +1422,8 @@ lbFound:
End Sub
'Clear List
Private Sub ClearListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ClearListToolStripMenuItem.Click
Private Sub ClearListToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ClearListToolStripMenuItem.Click
'Dim ListViewItem0 As ListViewItem
'For Each ListViewItem0 In ConMenTarget.SelectedItems
' ListViewItem0.Remove()
......@@ -1451,7 +1463,6 @@ lbFound:
VECTO_Launcher()
End If
End Sub
'Mode Change (STANDARD/BATCH)
......@@ -1517,12 +1528,10 @@ lbFound:
'Status label
Status(LastModeName & " Mode")
End Sub
'Class for ListView control - Job and cycle lists
Private Class cFileListView
Private FilePath As String
Private LoadedDefault As Boolean
Public LVbox As ListView
......@@ -1602,9 +1611,7 @@ lbFound:
F_MAINForm.CheckLock = False
If LVbox.Items.Count > 0 Then LVbox.Items(LVbox.Items.Count - 1).EnsureVisible()
End Sub
End Class
'Set color of job files in list (Error, Warnings, Currently running, etc.)
......@@ -1633,7 +1640,6 @@ lbFound:
lv0.BackColor = Color.FromKnownColor(KnownColor.Window)
lv0.ForeColor = Color.FromKnownColor(KnownColor.WindowText)
End Select
End Sub
'Open Job Editor and open file (or new file)
......@@ -1653,7 +1659,6 @@ lbFound:
End If
F_VECTO.Activate()
End Sub
'Open signature file (.vsig)
......@@ -1720,11 +1725,11 @@ lbFound:
Me.ToolStripProgBarJob.Value = .ProgJobInt
If .ProgOverallStartInt > -1 Then
Me.ToolStripProgBarOverall.Value = CInt(.ProgOverallStartInt + (.PgroOverallEndInt - .ProgOverallStartInt) * .ProgJobInt / 100)
Me.ToolStripProgBarOverall.Value =
CInt(.ProgOverallStartInt + (.PgroOverallEndInt - .ProgOverallStartInt) * .ProgJobInt / 100)
End If
End With
End Sub
......@@ -1751,7 +1756,6 @@ lbFound:
If Not Cfg.DeclMode Then Me.CbBatch.Checked = Cfg.BatchMode
Me.RbDecl.Checked = Cfg.DeclMode
End Sub
'Update config class from options in GUI, e.g. before running calculations
......@@ -1773,17 +1777,17 @@ lbFound:
Cfg.BATCHoutSubD = Me.ChBoxBatchSubD.Checked
DEV.SetOptions()
End Sub
#Region "Events"
Private Sub ChBoxAutoSD_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ChBoxAutoSD.CheckedChanged
Private Sub ChBoxAutoSD_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ChBoxAutoSD.CheckedChanged
Me.LbAutoShDown.Visible = Me.ChBoxAutoSD.Checked
End Sub
Private Sub CbBOmode_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CbBOmode.SelectedIndexChanged
Private Sub CbBOmode_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles CbBOmode.SelectedIndexChanged
Me.TbBOpath.Visible = (Me.CbBOmode.SelectedIndex = 2)
Me.ButBObrowse.Visible = (Me.CbBOmode.SelectedIndex = 2)
End Sub
......@@ -1794,7 +1798,8 @@ lbFound:
End If
End Sub
Private Sub ChBoxBatchOut_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ChBoxModOut.CheckedChanged
Private Sub ChBoxBatchOut_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) _
Handles ChBoxModOut.CheckedChanged
Me.ChBoxBatchSubD.Enabled = Me.ChBoxModOut.Checked
End Sub
......@@ -1835,7 +1840,6 @@ lbFound:
End If
LV0.Tag = Config0.Key
If Not Config0.Value.Enabled Then
......@@ -1847,12 +1851,11 @@ lbFound:
UpdateDEVconfigs(LV0)
Next
End Sub
'Update value of specific DEV option
Private Sub UpdateDEVconfigs(ByRef LV0 As ListViewItem)
LV0.SubItems(3).Text = DEV.Options(LV0.Tag).ValText
DEV.UpdateDevConfigs()
End Sub
'Change value of DEV option or execute action-type DEV options
......@@ -1905,11 +1908,11 @@ lbFound:
End Select
UpdateDEVconfigs(Me.LvDEVoptions.SelectedItems(0))
End Sub
'Context menu for selection-type DEV options
Private Sub CmDEV_ItemClicked(sender As Object, e As System.Windows.Forms.ToolStripItemClickedEventArgs) Handles CmDEV.ItemClicked
Private Sub CmDEV_ItemClicked(sender As Object, e As System.Windows.Forms.ToolStripItemClickedEventArgs) _
Handles CmDEV.ItemClicked
Dim i As Integer
i = e.ClickedItem.Tag
......@@ -1917,12 +1920,9 @@ lbFound:
DEV.Options(CmDEVitem.Tag).ModeIndex = i
UpdateDEVconfigs(CmDEVitem)
End Sub
#End Region
'Add message to message list
......@@ -1970,18 +1970,17 @@ lbFound:
LvMsg.Items.Add(lv0)
lv0.EnsureVisible()
End Sub
'Open link in message list
Private Sub LvMsg_MouseClick(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles LvMsg.MouseClick
Dim txt As String
If Me.LvMsg.SelectedIndices.Count > 0 Then
If Not Me.LvMsg.SelectedItems(0).Tag Is Nothing Then
If Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 4 AndAlso Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 4) = "<UM>" Then
If _
Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 4 AndAlso
Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 4) = "<UM>" Then
txt = CStr(Me.LvMsg.SelectedItems(0).Tag).Replace("<UM>", MyAppPath & "User Manual")
txt = txt.Replace(" ", "%20")
txt = txt.Replace("\", "/")
......@@ -1991,10 +1990,14 @@ lbFound:
Catch ex As Exception
MsgBox("Cannot open link! (-_-;)")
End Try
ElseIf Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 5 AndAlso Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 5) = "<GUI>" Then
ElseIf _
Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 5 AndAlso
Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 5) = "<GUI>" Then
txt = CStr(Me.LvMsg.SelectedItems(0).Tag).Replace("<GUI>", "")
OpenVectoFile(txt)
ElseIf Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 5 AndAlso Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 5) = "<RUN>" Then
ElseIf _
Len(CStr(Me.LvMsg.SelectedItems(0).Tag)) > 5 AndAlso
Microsoft.VisualBasic.Left(CStr(Me.LvMsg.SelectedItems(0).Tag), 5) = "<RUN>" Then
txt = CStr(Me.LvMsg.SelectedItems(0).Tag).Replace("<RUN>", "")
Try
Process.Start(txt)
......@@ -2036,22 +2039,24 @@ lbFound:
OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
CmOpenFile.Show(Cursor.Position)
End Sub
'Open with tool defined in Settings
Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles OpenWithToolStripMenuItem.Click
If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
End Sub
Private Sub OpenInGraphWindowToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenInGraphWindowToolStripMenuItem.Click
Private Sub OpenInGraphWindowToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles OpenInGraphWindowToolStripMenuItem.Click
Dim FGraph As New F_Graph
FGraph.Show()
FGraph.LoadNewFile(CmFiles(0))
End Sub
'Show in folder
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
Handles ShowInFolderToolStripMenuItem.Click
If IO.File.Exists(CmFiles(0)) Then
Try
System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
......@@ -2079,13 +2084,9 @@ lbFound:
Me.RbDev.Checked = Not Me.RbDecl.Checked
DeclOnOff()
End If
End Sub
#Region "GUI Tests"
Private GUItest0 As New GUItest(Me)
......@@ -2167,8 +2168,6 @@ lbFound:
MyForm.LvMsg.Focus()
MyForm.TmProgSec.Start()
End Sub
Public Sub TestStop()
......@@ -2259,7 +2258,6 @@ LbRace:
PnDirRnd = 3
End Select
End If
End Sub
Public Sub TestKey(ByVal Key0 As Integer)
......@@ -2319,8 +2317,6 @@ LbRace:
TestActive = False
MyForm.ToolStripLbStatus.Text = MyForm.LastModeName & " Mode"
End Sub
Private Sub sSetCtrl()
......@@ -2429,7 +2425,6 @@ Lb1:
KeyCode.Add(Keys.A)
CtrlC = 0
End Sub
End Class
Private Sub LvMsg_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles LvMsg.KeyDown
......@@ -2442,7 +2437,4 @@ Lb1:
End Sub
#End Region
End Class
VECTO/VECTO_Global.vb
+ 544
− 564
View file @ a1a73586
......@@ -11,8 +11,7 @@
Imports System.Collections.Generic
Module VECTO_Global
Public Const VECTOvers As String = "2.0.4-beta4 Test2"
Public Const VECTOvers As String = "2.0.5"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String
......@@ -145,7 +144,6 @@ Module VECTO_Global
Case Else
Return tAuxComp.Undefined
End Select
End Function
......@@ -167,7 +165,6 @@ Module VECTO_Global
sK = Left(sK, x)
Return sK
End Function
......@@ -193,7 +190,6 @@ Module VECTO_Global
End Function
Public Function ConvVehCat(ByVal VehCat As tVehCat, ByVal NiceName As Boolean) As String
Select Case VehCat
Case tVehCat.Citybus
......@@ -341,7 +337,6 @@ Module VECTO_Global
End Function
Public Function CdModeConv(ByVal CdMode As tCdMode) As String
Select Case CdMode
Case tCdMode.CdOfBeta
......@@ -365,7 +360,6 @@ Module VECTO_Global
End Function
Public Function RtTypeConv(ByVal RtType As tRtType) As String
Select Case RtType
Case tRtType.Primary
......@@ -392,7 +386,6 @@ Module VECTO_Global
Public Class cLogFile
Private LOGstream As System.IO.StreamWriter
Public Function StartLog() As Boolean
......@@ -408,7 +401,6 @@ Module VECTO_Global
End Try
Return True
End Function
Public Function SizeCheck() As Boolean
......@@ -449,7 +441,6 @@ Module VECTO_Global
End If
Return True
End Function
Public Function CloseLog() As Boolean
......@@ -461,7 +452,6 @@ Module VECTO_Global
End Try
Return True
End Function
......@@ -483,10 +473,7 @@ Module VECTO_Global
Catch ex As Exception
Return False
End Try
End Function
End Class
#Region "File path functions"
......@@ -503,7 +490,8 @@ Module VECTO_Global
If file = "" Then Return ""
'Replace sKeys
file = Microsoft.VisualBasic.Strings.Replace(file, sKey.DefVehPath & "\", MyAppPath & "Default Vehicles\", 1, -1, CompareMethod.Text)
file = Microsoft.VisualBasic.Strings.Replace(file, sKey.DefVehPath & "\", MyAppPath & "Default Vehicles\", 1, - 1,
CompareMethod.Text)
file = Microsoft.VisualBasic.Strings.Replace(file, sKey.HomePath & "\", MyAppPath, 1, - 1, CompareMethod.Text)
'Replace - Determine folder
......@@ -528,7 +516,6 @@ Module VECTO_Global
Else
Return file
End If
End Function
'Path one-level-up "C:\temp\ordner1\" >> "C:\temp\"
......@@ -542,7 +529,6 @@ Module VECTO_Global
If x = - 1 Then Return ""
Return Pfad.Substring(0, x + 1)
End Function
'File name without the path "C:\temp\TEST.txt" >> "TEST.txt" oder "TEST"
......@@ -575,7 +561,6 @@ Module VECTO_Global
If UCase(fPATH(file)) = UCase(path) Then file = fFILE(file, True)
Return file
End Function
'Path alone "C:\temp\TEST.txt" >> "C:\temp\"
......@@ -600,8 +585,6 @@ Module VECTO_Global
#End Region
End Module
......@@ -651,9 +634,6 @@ Public Class csKey
Public ElecSys As String = "ES"
Public PneumSys As String = "PS"
End Class
End Class
VECTO/cDEV.vb
+ 505
− 469
View file @ a1a73586
......@@ -11,7 +11,6 @@
Imports System.Collections.Generic
Public Class cDEV
Public Enabled As Boolean
Private MyOptions As Dictionary(Of String, cDEVoption)
......@@ -20,6 +19,7 @@ Public Class cDEV
Public TCiterPrec As Single
Public TClimit As Single
Public AdvFormat As Boolean
......@@ -77,7 +77,6 @@ Public Class cDEV
'**************************************************************************************************************
Public Sub New()
Enabled = False
......@@ -118,26 +117,41 @@ Public Class cDEV
'MyOptions.Add("Menu_Test", Conf0)
Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC iteration: target precision for torque ratio")
Conf0.SingleVal = 0.001
MyOptions.Add("TCiterPrec", Conf0)
Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Detailed output files format")
Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Advanced output files format")
Conf0.BoolVal = False
MyOptions.Add("AdvFormat", Conf0)
Conf0 = New cDEVoption(tDEVconfType.tBoolean,
"Limit engine speed in torque converter operation if Pe(acc_min) < Pe_max")
Conf0.BoolVal = True
MyOptions.Add("TClimitOn", Conf0)
Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Max. engine speed for torque converter operation")
Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Max. engine speed for torque converter operation [1/min]")
Conf0.SingleVal = 1600
MyOptions.Add("TClimit", Conf0)
Conf0 = New cDEVoption(tDEVconfType.tSelection,
"Acceleration for AT Up-Shift power condition")
Conf0.AddMode("acc_target (old)")
Conf0.AddMode("acc_min (new)")
Conf0.ModeIndex = 1
MyOptions.Add("TCshiftMode", Conf0)
Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Minimum acceleration (acc_min) for TC rpm limit and AT-Shift [m/s²]")
Conf0.SingleVal = 0.02
MyOptions.Add("TCaccMin", Conf0)
'**************************** END: Parameters Configuration '*****************************
'*****************************************************************************************
'*****************************************************************************************
iOptionsDim = MyOptions.Count - 1
End Sub
'Initialize the actual Config-Parameters from MyConfigs list
......@@ -152,6 +166,27 @@ Public Class cDEV
Return "OK...?"
End Function
Public sub UpdateDevConfigs
Dim lv0 As ListViewItem
EnabledOptCheck()
for each lv0 In F_MAINForm.LvDEVoptions.Items
lv0.SubItems(3).Text = DEV.Options(lv0.Tag).ValText
If DEV.Options(lv0.Tag).Enabled Then
lv0.ForeColor = Color.Black
Else
lv0.ForeColor = Color.DarkGray
End If
Next
End Sub
Private sub EnabledOptCheck
MyOptions("TClimit").EnabledOpt = MyOptions("TClimitOn").BoolVal
MyOptions("TCaccMin").EnabledOpt = MyOptions("TClimitOn").BoolVal Or MyOptions("TCshiftMode").ModeIndex = 1
End Sub
Public Function DEVinfo() As String
Dim s As New System.Text.StringBuilder
Dim Conf0 As KeyValuePair(Of String, cDEVoption)
......@@ -173,9 +208,9 @@ Public Class cDEV
Next
Return s.ToString
End Function
Public Function LoadFromFile() As Boolean
Dim file As cFile_V3
Dim ConfigFromFile As Dictionary(Of String, String)
......@@ -213,8 +248,9 @@ Public Class cDEV
End If
Next
Return True
UpdateDevConfigs
Return True
End Function
Public Function SaveToFile() As Boolean
......@@ -245,9 +281,9 @@ Public Class cDEV
file.Close()
Return True
End Function
Public ReadOnly Property Options As Dictionary(Of String, cDEVoption)
Get
Return MyOptions
......@@ -285,14 +321,19 @@ Public Class cDEVoption
Private sValTextDef As String
Private sValTextDefdef As Boolean
Public EnabledOpt As Boolean
Public Delegate Function dActionDelegate() As String
Public ActionDelegate As dActionDelegate
Public Sub New(ByVal ConfigType As tDEVconfType, ByVal Description As String, Optional SaveInConfg As Boolean = True, Optional ByVal Enabled As Boolean = True)
Public Sub New(ByVal ConfigType As tDEVconfType, ByVal Description As String, Optional SaveInConfg As Boolean = True,
Optional ByVal Enabled As Boolean = True)
MyConfType = ConfigType
MyDescr = Description
bEnabled = Enabled
bSaveInFile = SaveInConfg
EnabledOpt = True
Select Case MyConfType
Case tDEVconfType.tAction
......@@ -326,7 +367,6 @@ Public Class cDEVoption
sValTextDef = ""
sValTextDefdef = False
End Sub
Private Sub DefValTextDef()
......@@ -378,7 +418,6 @@ Public Class cDEVoption
Return False
End Try
End Function
Public Function ValToString() As String
......@@ -400,7 +439,6 @@ Public Class cDEVoption
Return StringVal
End Select
End Function
Public ReadOnly Property ValText As String
......@@ -516,7 +554,7 @@ Public Class cDEVoption
Public ReadOnly Property Enabled As Boolean
Get
Return bEnabled
Return (bEnabled And EnabledOpt)
End Get
End Property
......@@ -525,7 +563,6 @@ Public Class cDEVoption
Return bSaveInFile
End Get
End Property
End Class
Public Enum tDEVconfType
......@@ -538,4 +575,3 @@ Public Enum tDEVconfType
End Enum
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about