From 03b41b41ccbd65f91d50c4983747594547f2c6dd Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Thu, 23 Apr 2015 07:28:12 +0000
Subject: [PATCH] AAUX Johannes UI Changes ( Not Including Info Column ) as per
Niks UI_TODO.DOC change list
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1901
---
VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb | 3 +-
.../Electrics/ElectricalConsumer.vb | 7 +-
.../Electrics/ElectricalConsumerList.vb | 40 ++--
.../Electrics/IElectricalConsumer.vb | 1 +
.../VectoAuxiliaries/Electrics/ImageCell.vb | 33 +++
.../VectoAuxiliaries/Electrics/ImageColumn.vb | 28 +++
VECTOAux/VectoAuxiliaries/Images/Delete1.png | Bin 0 -> 1430 bytes
.../My Project/Resources.Designer.vb | 20 ++
.../My Project/Resources.resx | 6 +
VECTOAux/VectoAuxiliaries/Resources/Blank.bmp | Bin 0 -> 4150 bytes
VECTOAux/VectoAuxiliaries/Resources/Info.bmp | Bin 0 -> 4150 bytes
.../UI/frmAuxiliaryConfig.Designer.vb | 216 +++++++++---------
.../VectoAuxiliaries/UI/frmAuxiliaryConfig.vb | 142 +++++++++---
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 5 +
.../Mocks/ElectricalConsumerMock.vb | 2 +
.../UnitTests/ElectricalConsumerListTests.vb | 4 +-
.../UnitTests/ElectricalConsumerTests.vb | 16 +-
..._NonSmart_AlternatorsSetEfficiencyTests.vb | 2 +-
18 files changed, 345 insertions(+), 180 deletions(-)
create mode 100644 VECTOAux/VectoAuxiliaries/Electrics/ImageCell.vb
create mode 100644 VECTOAux/VectoAuxiliaries/Electrics/ImageColumn.vb
create mode 100644 VECTOAux/VectoAuxiliaries/Images/Delete1.png
create mode 100644 VECTOAux/VectoAuxiliaries/Resources/Blank.bmp
create mode 100644 VECTOAux/VectoAuxiliaries/Resources/Info.bmp
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index 5b90e71596..fe8a0bd85e 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -343,7 +343,8 @@ For Each otherConsumer As IElectricalConsumer In other.ElectricalUserInputsConf
otherConsumer.NominalConsumptionAmps, _
otherConsumer.PhaseIdle_TractionOn, _
otherConsumer.PowerNetVoltage, _
- otherConsumer.NumberInActualVehicle )
+ otherConsumer.NumberInActualVehicle ,
+ otherConsumer.info )
Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Add( newConsumer )
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
index 3e30967c28..ccb1f8ba75 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
@@ -18,6 +18,7 @@ Namespace Electrics
Public Class ElectricalConsumer
Implements IElectricalConsumer
+
'Calculated
Private Property AvgConsumptionAmps As Single Implements IElectricalConsumer.AvgConsumptionAmps
@@ -29,7 +30,7 @@ Namespace Electrics
Public Property NumberInActualVehicle As Integer Implements IElectricalConsumer.NumberInActualVehicle
Public Property PhaseIdle_TractionOn As Single Implements IElectricalConsumer.PhaseIdle_TractionOn
Public Property PowerNetVoltage As Single Implements IElectricalConsumer.PowerNetVoltage
-
+ Public Property Info As String Implements IElectricalConsumer.Info
'Public class outputs
Public Function TotalAvgConumptionAmps(Optional PhaseIdle_TractionOnBasedOnCycle As Single = 0.0) As Single Implements IElectricalConsumer.TotalAvgConumptionAmps
@@ -47,7 +48,7 @@ Namespace Electrics
End Function
'Constructor
- Public Sub New(BaseVehicle As Boolean, Category As String, ConsumerName As String, NominalConsumptionAmps As Single, PhaseIdle_TractionOn As Single, PowerNetVoltage As Single, numberInVehicle As Integer)
+ Public Sub New(BaseVehicle As Boolean, Category As String, ConsumerName As String, NominalConsumptionAmps As Single, PhaseIdle_TractionOn As Single, PowerNetVoltage As Single, numberInVehicle As Integer,info As string)
'Illegal Value Check.
If Category.Trim.Length = 0 Then Throw New ArgumentException("Category Name cannot be empty")
@@ -65,6 +66,7 @@ Namespace Electrics
Me.PhaseIdle_TractionOn = PhaseIdle_TractionOn
Me.PowerNetVoltage = PowerNetVoltage
Me.NumberInActualVehicle = numberInVehicle
+ Me.Info = info
End Sub
@@ -85,6 +87,7 @@ Namespace Electrics
+
End Class
End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
index ae6c8de9e6..9784a23460 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
@@ -43,26 +43,26 @@ End Sub
Dim c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16, c17, c18, c19, c20 As IElectricalConsumer
- c1 = CType(New ElectricalConsumer(False, "Doors", "Doors per Door", 3.00, 0.096339, _powernetVoltage, 3), IElectricalConsumer)
- c2 = CType(New ElectricalConsumer(True, "Veh Electronics &Engine", "Controllers,Valves etc", 25.00, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c3 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio City", 2.00, 0.80, _powernetVoltage, 1), IElectricalConsumer)
- c4 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio Intercity", 5.00, 0.80, _powernetVoltage, 0), IElectricalConsumer)
- c5 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio/Audio Tourism", 9.00, 0.80, _powernetVoltage, 0), IElectricalConsumer)
- c6 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Fridge", 4.00, 0.50, _powernetVoltage, 0), IElectricalConsumer)
- c7 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Kitchen Standard", 67.00, 0.05, _powernetVoltage, 0), IElectricalConsumer)
- c8 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Interior lights City/ Intercity + Doorlights [1/m]", 1.00, 0.70, _powernetVoltage, 12), IElectricalConsumer)
- c9 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "LED Interior lights ceiling city/ontercity + door [1/m]", 0.60, 0.70, _powernetVoltage, 0), IElectricalConsumer)
- c10 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Interior lights Tourism + reading [1/m]", 1.10, 0.70, _powernetVoltage, 0), IElectricalConsumer)
- c11 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "LED Interior lights ceiling Tourism + LED reading [1/m]", 0.66, 0.70, _powernetVoltage, 0), IElectricalConsumer)
- c12 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "External Displays Font/Side/Rear", 2.65017667844523, 1.00, _powernetVoltage, 4), IElectricalConsumer)
- c13 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "Internal display per unit ( front side rear)", 1.06007067137809, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c14 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "CityBus Ref EBSF Table4 Devices ITS No Displays", 9.30, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c15 = CType(New ElectricalConsumer(False, "Lights", "Exterior Lights BULB", 7.40, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c16 = CType(New ElectricalConsumer(False, "Lights", "Day running lights LED bonus", -0.723, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c17 = CType(New ElectricalConsumer(False, "Lights", "Antifog rear lights LED bonus", -0.17, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c18 = CType(New ElectricalConsumer(False, "Lights", "Position lights LED bonus", -1.20, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c19 = CType(New ElectricalConsumer(False, "Lights", "Direction lights LED bonus", -0.30, 1.00, _powernetVoltage, 1), IElectricalConsumer)
- c20 = CType(New ElectricalConsumer(False, "Lights", "Brake Lights", -1.20, 1.00, _powernetVoltage, 1), IElectricalConsumer)
+ c1 = CType(New ElectricalConsumer(False, "Doors", "Doors per Door", 3.00, 0.096339, _powernetVoltage, 3,""), IElectricalConsumer)
+ c2 = CType(New ElectricalConsumer(True, "Veh Electronics &Engine", "Controllers,Valves etc", 25.00, 1.00, _powernetVoltage, 1,""), IElectricalConsumer )
+ c3 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio City", 2.00, 0.80, _powernetVoltage, 1,""), IElectricalConsumer )
+ c4 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio Intercity", 5.00, 0.80, _powernetVoltage, 0,""), IElectricalConsumer )
+ c5 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio/Audio Tourism", 9.00, 0.80, _powernetVoltage, 0,""), IElectricalConsumer )
+ c6 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Fridge", 4.00, 0.50, _powernetVoltage, 0,""), IElectricalConsumer )
+ c7 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Kitchen Standard", 67.00, 0.05, _powernetVoltage, 0,""), IElectricalConsumer )
+ c8 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Interior lights City/ Intercity + Doorlights [Should be 1/m]", 1.00, 0.70, _powernetVoltage, 12,"1 Per metre length of bus"), IElectricalConsumer)
+ c9 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "LED Interior lights ceiling city/Intercity + door [Should be 1/m]", 0.60, 0.70, _powernetVoltage, 0,"1 Per metre length of bus"), IElectricalConsumer)
+ c10 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Interior lights Tourism + reading [1/m]", 1.10, 0.70, _powernetVoltage, 0,"1 Per metre length of bus"), IElectricalConsumer)
+ c11 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "LED Interior lights ceiling Tourism + LED reading [Should be 1/m]", 0.66, 0.70, _powernetVoltage, 0,"1 Per metre length of bus"), IElectricalConsumer)
+ c12 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "External Displays Font/Side/Rear", 2.65017667844523, 1.00, _powernetVoltage, 4,""), IElectricalConsumer)
+ c13 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "Internal display per unit ( front side rear)", 1.06007067137809, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c14 = CType(New ElectricalConsumer(False, "Customer Specific Equipment", "CityBus Ref EBSF Table4 Devices ITS No Displays", 9.30, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c15 = CType(New ElectricalConsumer(False, "Lights", "Exterior Lights BULB", 7.40, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c16 = CType(New ElectricalConsumer(False, "Lights", "Day running lights LED bonus", -0.723, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c17 = CType(New ElectricalConsumer(False, "Lights", "Antifog rear lights LED bonus", -0.17, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c18 = CType(New ElectricalConsumer(False, "Lights", "Position lights LED bonus", -1.20, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c19 = CType(New ElectricalConsumer(False, "Lights", "Direction lights LED bonus", -0.30, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
+ c20 = CType(New ElectricalConsumer(False, "Lights", "Brake Lights", -1.20, 1.00, _powernetVoltage, 1,""), IElectricalConsumer)
_items.Add(c1)
_items.Add(c2)
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumer.vb b/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumer.vb
index 1e5c8a2eb1..d57348e49a 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumer.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/IElectricalConsumer.vb
@@ -21,6 +21,7 @@ Namespace Electrics
Property NumberInActualVehicle As Integer
Property PowerNetVoltage As Single
Property AvgConsumptionAmps As Single
+ Property Info As string
Function TotalAvgConumptionAmps(Optional PhaseIdle_TractionOnBasedOnCycle As Single = Nothing) As Single
Function TotalAvgConsumptionInWatts(Optional PhaseIdle_TractionOnBasedOnCycle As Single = 0.0) As Single
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ImageCell.vb b/VECTOAux/VectoAuxiliaries/Electrics/ImageCell.vb
new file mode 100644
index 0000000000..9715b08195
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ImageCell.vb
@@ -0,0 +1,33 @@
+Imports System.Windows.Forms
+Imports System.Drawing
+
+
+Namespace Electrics
+
+Public Class ImageCell
+ Inherits DataGridViewImageCell
+
+ Public property tt As String = "ABC"
+ Private del As Image = My.Resources.ResourceManager.GetObject("Info")
+
+
+ Protected Overrides Sub Paint(graphics As Graphics, clipBounds As Rectangle, cellBounds As Rectangle, rowIndex As Integer, elementState As DataGridViewElementStates, value As Object, formattedValue As Object, errorText As String, cellStyle As DataGridViewCellStyle, advancedBorderStyle As DataGridViewAdvancedBorderStyle, paintParts As DataGridViewPaintParts)
+
+ advancedBorderStyle.All = DataGridViewAdvancedCellBorderStyle.Single
+
+ Me.ToolTipText=tt
+
+ cellStyle.BackColor= Color.White
+ MyBase.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, value, formattedValue, errorText, cellStyle, advancedBorderStyle, paintParts)
+ graphics.DrawImage(del, cellBounds)
+
+ End Sub
+
+
+End Class
+
+
+End Namespace
+
+
+
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ImageColumn.vb b/VECTOAux/VectoAuxiliaries/Electrics/ImageColumn.vb
new file mode 100644
index 0000000000..e76e28fa3b
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ImageColumn.vb
@@ -0,0 +1,28 @@
+Imports System.Windows.Forms
+
+
+Namespace Electrics
+
+
+Public Class ImageColumn
+ Inherits DataGridViewImageColumn
+
+
+
+ Public Sub new()
+
+ MyBase.New()
+ Me.CellTemplate = New ImageCell()
+
+ End Sub
+
+
+
+
+End Class
+
+
+End Namespace
+
+
+
diff --git a/VECTOAux/VectoAuxiliaries/Images/Delete1.png b/VECTOAux/VectoAuxiliaries/Images/Delete1.png
new file mode 100644
index 0000000000000000000000000000000000000000..31eab12612c7a2895ef3e9fad8110f6dcb6b3448
GIT binary patch
literal 1430
zcmb7EZA{!`94~MzW6C7x6wm0o5{PbceYw|G4(MImadU@wM+D=`DA#gV?ykMHJ?}V|
zD2SON8seDj!{o!1ZAJu576RFv#<`hs*>om4<7Aq!XtHcG7&MB?e9Ab+hlRu@?eq5k
z{eJ(qr>{0PY%N}AUI#%?v9F#9fDty{wQImv%Vg%jaIem`=s~4jPw}b<(Sp(@!oD~k
z76T$LbnZMYRzpz12U1gu-s0a*g_O93H*75FcmkjysJb?t;6qVShug%kB)gGckA8x{
zlHf*~?S9Ok@QM+sKBJ1kOhZ#B6Ah69Qd<L8rzt=X7j+&^$78ZarQOIPF9qhtHj2QD
zCVJG3+;FPJ-w1mZRfO#ptSW>#FxY`xaI4MfbUq9d7>=PBf#O6J?xd^)g<<g0g8(&E
zXr}@Ux1<GDZX}}X2?|A1sgxyUwJ2&B#YvJhI0&K&SX619vd*WgWUV~Mz=&E%l@hw7
z$gsi4w<$^8jQ~$?gb+^zq;N#nmdRypDOn(GXqr!;xCKMiMH?f&9Ln!s9TAT&TWfki
zyy^Tc`L(9bgop-2O-ZUDP{sE06;i7U8HP(SP<~#GilB-dAJfFe1HYeo3^*^ze2h^-
z$+#%%KE{nClafHutd+AlFqeySkqnFDw9A2!B!?3?O<*>H%n_^v0xgRGup~}8tgPMT
zv9lbGvzUjbtsW0+W1Jq`YR8!z)+cK^FNZ`!)WAwNvCdVolvfpbT~V79C6?=^#)zUT
zT0}{}-k=?BmSjOmX-1&|GYFIsRp~iV;8Z0JFXo(*ZlP`^SPyBlF)Ro4F&rmpkB#OS
z60?$=)y{g5C9Lqj(}e<0P@~6I^jvNWG_o;WzCmEId<R7tluQLTZ0xCylMs~mypN%q
z(%)ZcraMkxC3BTs&zd6}zgm-#hDx^Wcr&`mz4!R=C4nCMw;rA=Iy2lqmv?5<V99~k
zOJn7eTcQ=&+2QU&a(wH|^tnjEEBlU+lrQ^EGT%LOIeB=;@aD?RJ-xrw?K00?eScr~
zXx^?#^q{FMZK(;)*7Kk0bhz%?x$*SEBZEu@cm9d|$-##T%JT0)r@sDXiXUkGTmNEu
zPszle($mLYD0sW;{@(32UtQ(IrI%+bGHV<&U3c^k6^*4VwQt>Bd_`E_Yd?9)^30Px
z^DlkmHt*+pO0#I|p4X19{T#`QZ8_WbU}e#vos&f4Zd2AiX*#Q!5A=;se;3~Ed-2*E
zm)|Y?n5iFtIX|Y~cj_+Fy!r7vJD5Wo!ljYluzBxiv27IxPvf^8gR(ztc<*=DLgz%y
zqh8f|y^tvA?Q@l?Cey|2iHrRsT=VGI;R^#pm|S~)FUS0~z_C9D_m6ygJeUU`d0=$o
rhgYY{gg<_|{-t!mv_AiKsQKsO?vdVqjDIcUV;h)JPir@BBOLz$rKa%@
literal 0
HcmV?d00001
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
index 604c7ca8b3..4653ffe175 100644
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
@@ -60,6 +60,16 @@ Namespace My.Resources
End Set
End Property
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property Blank() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("Blank", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
@@ -69,5 +79,15 @@ Namespace My.Resources
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
+
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property Info() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("Info", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
End Module
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Resources.resx b/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
index 87ce101327..4c9d6e0a86 100644
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
+++ b/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
@@ -118,7 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="Blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Blank.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Info.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Blank.bmp b/VECTOAux/VectoAuxiliaries/Resources/Blank.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..3356cb1a16ef78415ac26ff4ddfe2ec06e7f5e1a
GIT binary patch
literal 4150
zcmeIuK@9*P3`5ajfFOY*3MPO%uJHxUh6?hVbXl)&E^iib-J$l^5}$^$Yc`kJAqXIV
V00IagfB*srAb<b@2q5sizy)IH^cnyF
literal 0
HcmV?d00001
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Info.bmp b/VECTOAux/VectoAuxiliaries/Resources/Info.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..c87470c216723cf67cf853cec686934aee6c9c66
GIT binary patch
literal 4150
zcmZ?rH4|U}12Z700mKSW%m`)yIY4lP4}u{)28REmU^E0qLtw~+!0T^3|8Ze@cmkK*
zAaQztQTs>ZA6FU}O@Fix0bF4}n*T@3Kia3h|2XTuk&^!C5yperj=@m=U<)65roVx<
PA6Fb;bJwWY;0^%*r<-Z|
literal 0
HcmV?d00001
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index ed5c49f95b..700b2c5cd7 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -24,18 +24,18 @@ Partial Class frmAuxiliaryConfig
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuxiliaryConfig))
- Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.btnCancel = New System.Windows.Forms.Button()
Me.btnSave = New System.Windows.Forms.Button()
@@ -320,97 +320,97 @@ Partial Class frmAuxiliaryConfig
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
+ DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle14
+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle2
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
+ DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle17
+ DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle5
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
+ DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
+ DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle20
+ DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle8
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle21
+ DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -462,33 +462,33 @@ Partial Class frmAuxiliaryConfig
'
'gvElectricalConsumables
'
- DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
+ DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle23
+ DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
+ DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index c1f5ec4ac9..b842e69d7b 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -34,6 +34,9 @@ Private auxFile As string
Private cmFilesList As String()
Private SaveClicked As Boolean
+
+
+
#End Region
Private Function ValidateAuxFileName( filename As String ) As Boolean
@@ -87,6 +90,13 @@ End Sub
'Validation
#Region "Validation Helpers"
+Private Function ValidateSSMFile( filepath As String ) As Boolean
+
+ Dim ssmTool As ISSMTOOL = New SSMTOOL(filepath,False)
+
+ Return ssmTool.Load( filepath)
+
+End Function
Public Function IsPostiveNumber(ByVal test As String) As Boolean
@@ -576,6 +586,9 @@ Private Sub Dashboard_Load(sender As Object, e As EventArgs) Handles MyBase.Load
tabMain.SelectTab(tabMain.TabPages("tabElectricalConfig"))
+
+ SetSmartCardEmabledStatus()
+
End Sub
Private Sub frmAuxiliaryConfig_FormClosing( sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
@@ -657,6 +670,32 @@ Private Sub gvElectricalConsumables_CellValidating(sender As Object, e As DataGr
e.Cancel = True
End If
+ 'SBrake Lights and Exterior Bulb
+ if e.RowIndex =14 OrElse e.RowIndex=19 then
+ If Not IsNumeric(e.FormattedValue) Then
+ MessageBox.Show("This value must be numeric")
+ e.Cancel = True
+ End If
+ If s <> 1 Then
+ MessageBox.Show("This must be set 1")
+ e.Cancel = True
+ End If
+ End If
+
+ 'Bonus Bulbs
+ if e.RowIndex >=15 AndAlso e.RowIndex<=18 then
+
+ If Not IsNumeric(e.FormattedValue) Then
+ MessageBox.Show("This value must be numeric")
+ e.Cancel = True
+ End If
+ If s <> 0 AndAlso s <> 1 Then
+ MessageBox.Show("This must be set to 0 or 1")
+ e.Cancel = True
+ End If
+
+ End If
+
Case "PhaseIdle_TractionOn"
If Not IsNumeric(e.FormattedValue) Then
@@ -670,6 +709,8 @@ Private Sub gvElectricalConsumables_CellValidating(sender As Object, e As DataGr
e.Cancel = True
End If
+
+
End Select
@@ -735,17 +776,6 @@ Private Sub resultCardContextMenu_ItemClicked(sender As Object, e As ToolStripIt
End Sub
Private Sub gvElectricalConsumables_CellFormatting(sender As Object, e As DataGridViewCellFormattingEventArgs) Handles gvElectricalConsumables.CellFormatting
-
- If e.ColumnIndex = 4 AndAlso e.RowIndex = 0 Then
-
- e.CellStyle.BackColor = Color.LightGray
- e.CellStyle.ForeColor = Color.LightGray
-
-
- End If
-
-
-
End Sub
Private Sub gvElectricalConsumables_CellBeginEdit(sender As Object, e As DataGridViewCellCancelEventArgs) Handles gvElectricalConsumables.CellBeginEdit
@@ -757,8 +787,6 @@ Private Sub gvElectricalConsumables_CellBeginEdit(sender As Object, e As DataGri
End If
-
-
End Sub
#End Region
@@ -1134,15 +1162,11 @@ End Sub
#End Region
+Private Sub chkSmartElectricals_CheckedChanged( sender As Object, e As EventArgs) Handles chkSmartElectricals.CheckedChanged
-Private Function ValidateSSMFile( filepath As String ) As Boolean
-
- Dim ssmTool As ISSMTOOL = New SSMTOOL(filepath,False)
-
- Return ssmTool.Load( filepath)
-
-End Function
+ SetSmartCardEmabledStatus()
+End Sub
#Region "File Viewer Button Events"
Private Sub btnAALTOpen_Click( sender As Object, e As EventArgs) Handles btnAALTOpen.Click
@@ -1351,31 +1375,41 @@ Private Sub SetupControls()
cIndex = gvElectricalConsumables.Columns.Add("NominalConsumptionAmps", "Nominal Amps")
gvElectricalConsumables.Columns(cIndex).DataPropertyName = "NominalConsumptionAmps"
- gvElectricalConsumables.Columns(cIndex).Width = 70
+ gvElectricalConsumables.Columns(cIndex).Width = 60
gvElectricalConsumables.Columns(cIndex).ReadOnly=true
+ gvElectricalConsumables.Columns(cIndex).DefaultCellStyle= New DataGridViewCellStyle() with {.BackColor= Color.LightGray}
gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Nominal consumption in AMPS"
cIndex = gvElectricalConsumables.Columns.Add("PhaseIdle_TractionOn", "PhaseIdle/ TractionOn")
gvElectricalConsumables.Columns(cIndex).DataPropertyName = "PhaseIdle_TractionOn"
- gvElectricalConsumables.Columns(cIndex).Width = 70
+ gvElectricalConsumables.Columns(cIndex).Width = 60
gvElectricalConsumables.Columns(cIndex).ReadOnly=true
+ gvElectricalConsumables.Columns(cIndex).DefaultCellStyle= New DataGridViewCellStyle() with {.BackColor= Color.LightGray}
gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Represents the amount of time (during engine fueling) as " & vbCrLf & "percentage that the consumer is active during the cycle."
cIndex = gvElectricalConsumables.Columns.Add("NumberInActualVehicle", "Num in Vehicle")
gvElectricalConsumables.Columns(cIndex).DataPropertyName = "NumberInActualVehicle"
- gvElectricalConsumables.Columns(cIndex).Width = 70
+ gvElectricalConsumables.Columns(cIndex).Width = 55
gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Number of consumables of this" & vbCrLf & "type installed on the vehicle."
- 'ResultCard Grids
- 'Handler for deleting rows.
+ ' 'INFO COLUMN
+ '' cIndex = gvElectricalConsumables.Columns.Add("info","Info")
+ ' cIndex = gvElectricalConsumables.Columns.Add( New ImageColumn())
+ ' gvElectricalConsumables.Columns(cIndex).DataPropertyName = "Info"
+ ' gvElectricalConsumables.Columns(cIndex).Width = 120
+ ' gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
+ ' gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
+ ' gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Further Information"
+
+ 'ResultCard Grids
'IDLE
@@ -1479,9 +1513,6 @@ Private Sub CreateBindings()
txtActuationsMap.DataBindings.Add("Text", auxConfig.PneumaticUserInputsConfig, "ActuationsMap")
chkSmartAirCompression.DataBindings.Add("Checked", auxConfig.PneumaticUserInputsConfig, "SmartAirCompression", False, DataSourceUpdateMode.OnPropertyChanged)
-
-
-
chkSmartRegeneration.DataBindings.Add("Checked", auxConfig.PneumaticUserInputsConfig, "SmartRegeneration", False, DataSourceUpdateMode.OnPropertyChanged)
chkRetarderBrake.DataBindings.Add("Checked", auxConfig.PneumaticUserInputsConfig, "RetarderBrake")
txtKneelingHeightMillimeters.DataBindings.Add("Text", auxConfig.PneumaticUserInputsConfig, "KneelingHeightMillimeters")
@@ -1489,17 +1520,11 @@ Private Sub CreateBindings()
cboAdBlueDosing.DataBindings.Add("Text", auxConfig.PneumaticUserInputsConfig, "AdBlueDosing")
cboDoors.DataBindings.Add("Text", auxConfig.PneumaticUserInputsConfig, "Doors")
- 'HVAC Bindings
- 'txtHVACElectricalLoadPowerWatts.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACElectricalLoadPowerWatts",False,DataSourceUpdateMode.OnPropertyChanged)
- 'txtHVACFuellingLitresPerHour.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACFuellingLitresPerHour",False,DataSourceUpdateMode.OnPropertyChanged)
- 'txtHVACMechanicalLoadPowerWatts.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACMechanicalLoadPowerWatts",False,DataSourceUpdateMode.OnPropertyChanged)
-
txtSSMFilePath.DataBindings.Add( "Text", auxConfig.HvacUserInputsConfig,"SSMFilePath")
txtBusDatabaseFilePath.DataBindings.Add("Text",auxConfig.HvacUserInputsConfig,"BusDatabasePath")
- 'Signals
-
+ SetSmartCardEmabledStatus()
End Sub
@@ -1510,15 +1535,50 @@ Private Sub EnsureBinding()
For currentTab As Integer = 0 To .TabCount - 1
.SelectedIndex = currentTab
Next
- .SelectedIndex = 0
+ .SelectedIndex = 0
End With
- End Sub
+ SetSmartCardEmabledStatus()
+
+ End Sub
+
+
#End Region
+Protected sub SetSmartCardEmabledStatus( )
+
+ If chkSmartElectricals.Checked then
+ gvResultsCardIdle.Enabled=True
+ gvResultsCardTraction.Enabled=True
+ gvResultsCardOverrun.Enabled=true
-'Open File with software defined in Config
+
+
+
+ gvResultsCardIdle.BackgroundColor=Color.Gray
+ gvResultsCardTraction.BackgroundColor=Color.Gray
+ gvResultsCardOverrun.BackgroundColor=Color.Gray
+
+
+ else
+
+ gvResultsCardIdle.Enabled=false
+ gvResultsCardTraction.Enabled=false
+ gvResultsCardOverrun.Enabled=false
+
+
+ gvResultsCardIdle.BackgroundColor= Color.White
+ gvResultsCardTraction.BackgroundColor=Color.White
+ gvResultsCardOverrun.BackgroundColor= Color.White
+
+
+
+ End If
+
+
+
+ End Sub
Public Function FileOpenAlt(ByVal file As String) As Boolean
Dim PSI As New ProcessStartInfo
@@ -1537,5 +1597,11 @@ Public Function FileOpenAlt(ByVal file As String) As Boolean
+'Private Sub gvElectricalConsumables_RowsAdded( sender As Object, e As DataGridViewRowsAddedEventArgs) Handles gvElectricalConsumables.RowsAdded
+
+
+
+'End Sub
+
End Class
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index c2e461d598..d47b31bdda 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -118,6 +118,8 @@
<Compile Include="Electrics\CombinedAlternator.vb" />
<Compile Include="Electrics\CombinedAlternatorMapRow.vb" />
<Compile Include="Electrics\CombinedAlternatorSignals.vb" />
+ <Compile Include="Electrics\ImageCell.vb" />
+ <Compile Include="Electrics\ImageColumn.vb" />
<Compile Include="Electrics\ElectricsUserInputsConfig.vb" />
<Compile Include="Electrics\IAlternator.vb" />
<Compile Include="Electrics\ICombinedAlternator.vb" />
@@ -287,6 +289,9 @@
<Content Include="3rdPartyLibraries\DocumentFormat.OpenXml.xml" />
<Content Include="3rdPartyLibraries\SpreadsheetLight.dll" />
<Content Include="3rdPartyLibraries\SpreadsheetLight.xml" />
+ <None Include="Resources\Blank.bmp" />
+ <None Include="Images\Delete1.png" />
+ <None Include="Resources\Info.bmp" />
<None Include="Resources\Image1.png" />
<Resource Include="Images\Delete.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
index 7ef0c1043a..b096d7531d 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
@@ -6,6 +6,7 @@ Namespace Mocks
Implements IElectricalConsumer
+
Public Property AvgConsumptionAmps As Single Implements IElectricalConsumer.AvgConsumptionAmps
Public Property BaseVehicle As Boolean Implements IElectricalConsumer.BaseVehicle
@@ -35,6 +36,7 @@ Namespace Mocks
End Function
+ Public Property Info As String Implements IElectricalConsumer.Info
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
index 78997edb20..c72c90a42a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
@@ -55,8 +55,8 @@ Public Sub DuplicateConsumersTest_ThrowsArgumentException()
Dim target As New ElectricalConsumerList(0.096,26.3)
'Add two OnBaseVehicle consumers
- target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1))
- target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1))
+ target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1,""))
+ target.AddConsumer(New ElectricalConsumer(True, "TEST", "Exclude1", 10, 1, 26.3, 1,""))
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
index e02d532f39..e227cfb538 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
@@ -11,7 +11,7 @@ Namespace UnitTests
Public Function GetGoodConsumer() As ElectricalConsumer
- Return New ElectricalConsumer(False, "Doors", "Doors per Door", 20, 0.5, 26.3, 1)
+ Return New ElectricalConsumer(False, "Doors", "Doors per Door", 20, 0.5, 26.3, 1,"")
End Function
#End Region
@@ -28,14 +28,14 @@ Namespace UnitTests
<Test(), ExpectedException("System.ArgumentException")>
Public Sub ZeroLengthConsumerNameTest()
- Dim target As New ElectricalConsumer(False, "Doors", "", 20, 0.5, 26.3, 1)
+ Dim target As New ElectricalConsumer(False, "Doors", "", 20, 0.5, 26.3, 1,"")
End Sub
<Test(), ExpectedException("System.ArgumentException")>
Public Sub ZeroLengthCategoryNameTest_ThrowsArgumentException()
- Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, 1)
+ Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, 1,"")
End Sub
@@ -46,29 +46,29 @@ Namespace UnitTests
<Test(), ExpectedException("System.ArgumentException")>
Public Sub ToLow_PhaseIdleTractionOn_ThrowsArgumentException()
- Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionOnMin - 1, 26.3, 1)
+ Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionOnMin - 1, 26.3, 1,"")
End Sub
<Test(), ExpectedException("System.ArgumentException")>
Public Sub ToHigh_PhaseIdleTractionOn_ThrowsArgumentException()
- Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionMax + 1, 26.3, 1)
+ Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, ElectricConstants.PhaseIdleTractionMax + 1, 26.3, 1,"")
End Sub
<Test(), ExpectedException("System.ArgumentException")>
Public Sub ToLowNumberInVehicle_ThrowsArgumentException()
- Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, -1)
+ Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, 26.3, -1,"")
End Sub
'TooLow PowerNetVoltage
<Test(), ExpectedException("System.ArgumentException")>
Public Sub ToLowPowerNetVoltageTest_ThrowsArgumentException()
- Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, ElectricConstants.PowenetVoltageMin - 1, 1)
+ Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, ElectricConstants.PowenetVoltageMin - 1, 1,"")
End Sub
'TooHigh PowerNetVoltage
Public Sub ToHighPowerNetVoltageTest_ThrowsArgumentException()
- Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, ElectricConstants.PowenetVoltageMax + 1, 1)
+ Dim target As New ElectricalConsumer(False, "", "Doors per Door", 20, 0.5, ElectricConstants.PowenetVoltageMax + 1, 1,"")
End Sub
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 523b0e8ba8..c6464d481e 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -48,7 +48,7 @@ Public Sub New()
'Setup consumers and HVAC ( 1 Consumer in Test Category )
elecConsumers = CType(New ElectricalConsumerList(0.096,26.3), IElectricalConsumerList)
- elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5, 26.3, 1))
+ elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5, 26.3, 1,""))
'Alternator Map
--
GitLab