diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index ed41cb78d986a6c158530598aa78e044100ecd52..084944fddc92935d6d4c85dcae8c5b38d1d4b434 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -59,6 +59,8 @@ Partial Class MainForm
Me.ButtonGENadd = New System.Windows.Forms.Button()
Me.TabPgOptions = New System.Windows.Forms.TabPage()
Me.PanelOptAllg = New System.Windows.Forms.Panel()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.cbValidateRunData = New System.Windows.Forms.CheckBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.ChBoxModOut = New System.Windows.Forms.CheckBox()
Me.ChBoxMod1Hz = New System.Windows.Forms.CheckBox()
@@ -115,14 +117,13 @@ Partial Class MainForm
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- Me.cbValidateRunData = New System.Windows.Forms.CheckBox()
- Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.StatusBAR.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPageGEN.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPgOptions.SuspendLayout()
Me.PanelOptAllg.SuspendLayout()
+ Me.GroupBox3.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.GroupBox1.SuspendLayout()
Me.TabPageDEV.SuspendLayout()
@@ -133,7 +134,6 @@ Partial Class MainForm
Me.SplitContainer1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.CmOpenFile.SuspendLayout()
- Me.GroupBox3.SuspendLayout()
Me.SuspendLayout()
'
'StatusBAR
@@ -384,6 +384,28 @@ Partial Class MainForm
Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
Me.PanelOptAllg.TabIndex = 0
'
+ 'GroupBox3
+ '
+ Me.GroupBox3.Controls.Add(Me.cbValidateRunData)
+ Me.GroupBox3.Location = New System.Drawing.Point(3, 177)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Size = New System.Drawing.Size(173, 64)
+ Me.GroupBox3.TabIndex = 18
+ Me.GroupBox3.TabStop = False
+ Me.GroupBox3.Text = "Misc"
+ '
+ 'cbValidateRunData
+ '
+ Me.cbValidateRunData.AutoSize = True
+ Me.cbValidateRunData.Checked = True
+ Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19)
+ Me.cbValidateRunData.Name = "cbValidateRunData"
+ Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17)
+ Me.cbValidateRunData.TabIndex = 17
+ Me.cbValidateRunData.Text = "Validate Data"
+ Me.cbValidateRunData.UseVisualStyleBackColor = True
+ '
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.ChBoxModOut)
@@ -801,28 +823,6 @@ Partial Class MainForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
- 'cbValidateRunData
- '
- Me.cbValidateRunData.AutoSize = True
- Me.cbValidateRunData.Checked = True
- Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked
- Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19)
- Me.cbValidateRunData.Name = "cbValidateRunData"
- Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17)
- Me.cbValidateRunData.TabIndex = 17
- Me.cbValidateRunData.Text = "Validate Data"
- Me.cbValidateRunData.UseVisualStyleBackColor = True
- '
- 'GroupBox3
- '
- Me.GroupBox3.Controls.Add(Me.cbValidateRunData)
- Me.GroupBox3.Location = New System.Drawing.Point(3, 177)
- Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(173, 64)
- Me.GroupBox3.TabIndex = 18
- Me.GroupBox3.TabStop = False
- Me.GroupBox3.Text = "Misc"
- '
'MainForm
'
Me.AcceptButton = Me.btStartV3
@@ -845,6 +845,8 @@ Partial Class MainForm
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPgOptions.ResumeLayout(False)
Me.PanelOptAllg.ResumeLayout(False)
+ Me.GroupBox3.ResumeLayout(False)
+ Me.GroupBox3.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
Me.GroupBox1.ResumeLayout(False)
@@ -859,8 +861,6 @@ Partial Class MainForm
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
- Me.GroupBox3.ResumeLayout(False)
- Me.GroupBox3.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 56dcb1f006b4d1ee27e05df38cf9aff1205725b0..6ea4e1b2ee87e50d96e3c5368124383e164bf2da 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -1105,8 +1105,14 @@ lbFound:
Dim report As String = New FileOutputWriter(job).XMLFullReportName
If File.Exists(report) Then
sender.ReportProgress(100, New VectoProgress With {.Target = "ListBox",
- .Message = String.Format("XML-Report for '{0}' written to {1}", Path.GetFileName(job), report),
- .Link = "<RUN>" + report})
+ .Message = String.Format("XML Manufacturer Report for '{0}' written to {1}", Path.GetFileName(job), report),
+ .Link = "<XML>" + report})
+ End If
+ report = New FileOutputWriter(job).XMLCustomerReportName
+ If File.Exists(report) Then
+ sender.ReportProgress(100, New VectoProgress With {.Target = "ListBox",
+ .Message = String.Format("XML Customer Report for '{0}' written to {1}", Path.GetFileName(job), report),
+ .Link = "<XML>" + report})
End If
Next
@@ -1499,6 +1505,11 @@ lbFound:
Catch ex As Exception
GUIMsg(MessageType.Err, "Could not run '" & txt & "'!")
End Try
+ ElseIf _
+ Len(CStr(LvMsg.SelectedItems(0).Tag)) > 5 AndAlso
+ Microsoft.VisualBasic.Left(CStr(LvMsg.SelectedItems(0).Tag), 5) = "<XML>" Then
+ txt = CStr(LvMsg.SelectedItems(0).Tag).Replace("<XML>", "")
+ OpenFiles(txt)
Else
OpenFiles(CStr(LvMsg.SelectedItems(0).Tag))
End If
@@ -1536,7 +1547,6 @@ lbFound:
OpenInGraphWindowToolStripMenuItem.Enabled = (UCase(GetExtension(_contextMenuFiles(0))) = ".VMOD")
-
OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
CmOpenFile.Show(Cursor.Position)
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index ce19738794f5939cf81aee31ba40af84595004c7..5fcef3c24d598be75c945d8af4d6e98f680fb77e 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -168,11 +168,11 @@ Partial Class VehicleForm
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(62, 22)
+ Me.Label1.Location = New System.Drawing.Point(27, 22)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(95, 13)
+ Me.Label1.Size = New System.Drawing.Size(139, 13)
Me.Label1.TabIndex = 0
- Me.Label1.Text = "Curb Mass Vehicle"
+ Me.Label1.Text = "Corrected Actual Curb Mass"
'
'TbMass
'
@@ -202,9 +202,9 @@ Partial Class VehicleForm
Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(3, 6)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(37, 13)
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 8
- Me.Label3.Text = "cd x A"
+ Me.Label3.Text = "Cd x A"
'
'TBcdA
'
diff --git a/VectoCore/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
index b81e6b9cf896b4e24ea40935558ef2d6d37febb2..ccb7e0918dfb9686244358b6ca531afe0d3afc8f 100644
--- a/VectoCore/VectoCore/OutputData/DeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
@@ -111,6 +111,7 @@ namespace TUGraz.VectoCore.OutputData
};
}
Missions[mission.MissionType].ModData[loading] = new T();
+ _resultCount++;
}
@@ -158,7 +159,6 @@ namespace TUGraz.VectoCore.OutputData
public void InitializeReport(VectoRunData modelData, Segment segment)
{
Segment = segment;
- _resultCount = segment.Missions.Sum(m => m.Loadings.Count);
DoInitializeReport(modelData, segment);
}
diff --git a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
index f5604b2f7e09c4b64f74a1471a87777a0bf8b6dc..19e3a3385e4cc77aff28c6077b9e9a7b31a19d29 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
@@ -54,12 +54,12 @@ namespace TUGraz.VectoCore.OutputData.FileIO
public string XMLFullReportName
{
- get { return Path.ChangeExtension(_jobFile, "RESULT.xml"); }
+ get { return Path.ChangeExtension(_jobFile, "RSLT_MANUFACTURER.xml"); }
}
- public string XMLCoCReportName
+ public string XMLCustomerReportName
{
- get { return Path.ChangeExtension(_jobFile, "COC.xml"); }
+ get { return Path.ChangeExtension(_jobFile, "RSLT_CUSTOMER.xml"); }
}
@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.OutputData.FileIO
case ReportType.DeclarationReportXMLFulll:
return new FileStream(XMLFullReportName, FileMode.Create);
case ReportType.DeclarationReportXMLCOC:
- return new FileStream(XMLCoCReportName, FileMode.Create);
+ return new FileStream(XMLCustomerReportName, FileMode.Create);
default:
throw new ArgumentOutOfRangeException("type");