From bd2889ed8be85266be1df3f06ad3222b48dff1aa Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Tue, 17 Mar 2015 17:08:55 +0000
Subject: [PATCH] WIP - SSM - Changed OnVehicle to checkbox column
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1830
---
VECTOAux/VectoAuxiliaries/Hvac/DeleteCell.vb | 29 +++
.../VectoAuxiliaries/Hvac/DeleteColumn.vb | 16 ++
VECTOAux/VectoAuxiliaries/Images/Delete.png | Bin 0 -> 1430 bytes
.../My Project/Resources.Designer.vb | 10 +
.../My Project/Resources.resx | 17 +-
.../VectoAuxiliaries/Resources/Image1.png | Bin 0 -> 233 bytes
.../UI/frmHVACTool.Designer.vb | 78 +++----
VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb | 190 +++++++++++-------
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 7 +-
9 files changed, 230 insertions(+), 117 deletions(-)
create mode 100644 VECTOAux/VectoAuxiliaries/Hvac/DeleteCell.vb
create mode 100644 VECTOAux/VectoAuxiliaries/Hvac/DeleteColumn.vb
create mode 100644 VECTOAux/VectoAuxiliaries/Images/Delete.png
create mode 100644 VECTOAux/VectoAuxiliaries/Resources/Image1.png
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/DeleteCell.vb b/VECTOAux/VectoAuxiliaries/Hvac/DeleteCell.vb
new file mode 100644
index 0000000000..011a7d3da1
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/Hvac/DeleteCell.vb
@@ -0,0 +1,29 @@
+Imports System.Windows.Forms
+Imports System.Drawing
+
+
+
+
+Public Class DeleteCell
+ Inherits DataGridViewButtonCell
+
+
+ Dim del As Image = My.Resources.ResourceManager.GetObject("Delete")
+ 'Image.("..\\..\\images\\delete.png")
+
+
+ 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="Delete this Tech benefit line."
+
+ 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
+
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/DeleteColumn.vb b/VECTOAux/VectoAuxiliaries/Hvac/DeleteColumn.vb
new file mode 100644
index 0000000000..617aa5f6cf
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/Hvac/DeleteColumn.vb
@@ -0,0 +1,16 @@
+Imports System.Windows.Forms
+
+
+Public Class DeleteColumn
+ Inherits DataGridViewButtonColumn
+
+
+ Sub new()
+
+ Me.CellTemplate = New DeleteCell()
+
+ End Sub
+
+
+End Class
+
diff --git a/VECTOAux/VectoAuxiliaries/Images/Delete.png b/VECTOAux/VectoAuxiliaries/Images/Delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..31eab12612c7a2895ef3e9fad8110f6dcb6b3448
GIT binary patch
literal 1430
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O
z`AMk?p1FzXsX?iUDV2pMQ*9U+nAc{8M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD5R{poQBn*yJg*oUSjqXh`W1-<`i6Q2`bA(hApb!;o?GDS
zi(f}>E?jkSNl+@n@mS3-4yi0i)elN7&Mz%WP7O*;Q$}(iev3c~p?<LPO)SbzO|eyS
zOUx-w1xxt)TKN}crf23Q=D6f1m*%GCm3X??DwURIrdT<;8oQa88CY1jSy;Nb8X7uU
zm>F1Fx)~Z7IvN?67+Jy$K-O51TcDScnPO#WXlZ8bYHHzR>gr}_=xX5P=xFTZ<Z9w#
z?qq0eYUl#f>zP+vl9-pA3bGWWHxr@P9Isw0=c3falKi5O{QMkPY6{56FUc>?$S+WE
z4mMQ?&&*57FE0i~bOk6rtXxuyGRsm^+=}vZ6~JL`m5If6V<T55OA`|pS2rh9R|7*s
zOGhUYM>iKs17k}!V^dcrC8*vMl7ma%PQgYWl*W+K984(4#SO#+XAe+Tu~R_g!PLAI
zTcsi;d%N|~Sw|Td7^^*9978H@y$N^BI&2{DMXfPTDntGPTUF*f0k8N;*^0JP_bq*r
z;<)~=hr$=mvr8v@VLYoiU0_kKP>%9W?QGT4AD1?<T5fZHeD`7obH|J=mR6pp7nd^G
zK7LiYB7UisnpR8KbB7wK$8T59Xj;cuvr~T=i$sN<UGPVb!~-Rc=??EMZmalbJ>5ms
z?Rpr~&gq)W5=`Ryr!HMRl{h8gcggX)lLdDC$c))j&pfwLw#&!F(?M;=lh%)_RcvOD
z8~G>9<6K{^XFpAh_e~04m+8@Cda;o$znVANO3iU=5jw4(Fu8j-#}OsQ9PM*G8fu)&
z3wIg?w6mNx-N|yUSZYzvw!1gd+dUiJ^}Slcy4S^Hih`T3L5cJ+5td(4fx=lX%SF?L
zGCmpnaz2#frMm2-A@?4J(|1Hyezo{lxx>!exyblGs}XZokA+YX3(LLJhwn{T;}*Vd
z{fgUD<{9MKU!Usc^7EgY>;2$4Yp(4JW>nZBw@!Y;+fx!L-yZxwpLv^wkBNsN{26c4
Xnyx>fvX;Tq)z4*}Q$mxWiIEuqrKa%@
literal 0
HcmV?d00001
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
index 88b7755261..604c7ca8b3 100644
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
@@ -59,5 +59,15 @@ Namespace My.Resources
resourceCulture = value
End Set
End Property
+
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend ReadOnly Property Delete() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("Delete", 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 af7dbebbac..87ce101327 100644
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
+++ b/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
@@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
@@ -109,9 +112,13 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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="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>
</root>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Image1.png b/VECTOAux/VectoAuxiliaries/Resources/Image1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9d6ed41b4901ee2e3811ef6e85df0978acf1d2
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4kiW$h8qca7Z?~A7>k44ofy`glX=O&z`&C3
z=<CS9u(6-}Pa-P=1A{`cN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-
z*%fHRz`&61>Eaj?;r{m0MnMKe9u~tF`!oIrA6&-gQq}4HX70?*ul};HtxCUY`hK^J
z2vduepi_(2f-+t~t;SoXE-P5Ft_v&_S`q7vU+}u=7sdydqeMk6s-9<HU|{fc^>bP0
Hl+XkKC?rZ8
literal 0
HcmV?d00001
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
index 8b706088b9..f7e3e2a67e 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
@@ -202,6 +202,9 @@ Partial Class frmHVACTool
Me.tabDiagnostics = New System.Windows.Forms.TabPage()
Me.txtDiagnostics = New System.Windows.Forms.TextBox()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
Me.ErrorProvider1 = New System.Windows.Forms.ErrorProvider(Me.components)
Me.btnSave = New System.Windows.Forms.Button()
Me.btnCancel = New System.Windows.Forms.Button()
@@ -213,11 +216,8 @@ Partial Class frmHVACTool
Me.txtAdjElectrical = New System.Windows.Forms.TextBox()
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
Me.lblElectricalBaseW = New System.Windows.Forms.Label()
- Me.Label1 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label()
- Me.Label4 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
- Me.Label6 = New System.Windows.Forms.Label()
Me.tabMain.SuspendLayout
Me.tabGeneralInputsBP.SuspendLayout
Me.GroupBox1.SuspendLayout
@@ -1397,7 +1397,7 @@ Partial Class frmHVACTool
Me.tabGeneralInputsOther.Controls.Add(Me.grpEnvironmentConditions)
Me.tabGeneralInputsOther.Location = New System.Drawing.Point(4, 22)
Me.tabGeneralInputsOther.Name = "tabGeneralInputsOther"
- Me.tabGeneralInputsOther.Size = New System.Drawing.Size(937, 618)
+ Me.tabGeneralInputsOther.Size = New System.Drawing.Size(937, 611)
Me.tabGeneralInputsOther.TabIndex = 3
Me.tabGeneralInputsOther.Text = " INP - Other "
Me.tabGeneralInputsOther.UseVisualStyleBackColor = true
@@ -2171,6 +2171,39 @@ Partial Class frmHVACTool
Me.txtDiagnostics.TabIndex = 0
Me.txtDiagnostics.WordWrap = false
'
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.ForeColor = System.Drawing.SystemColors.MenuHighlight
+ Me.Label1.Location = New System.Drawing.Point(748, 11)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(82, 13)
+ Me.Label1.TabIndex = 10
+ Me.Label1.Text = "Electrical Adj W"
+ Me.ToolTip1.SetToolTip(Me.Label1, "Electrical W - Tech List Adjusted")
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = true
+ Me.Label4.ForeColor = System.Drawing.SystemColors.MenuHighlight
+ Me.Label4.Location = New System.Drawing.Point(748, 38)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(94, 13)
+ Me.Label4.TabIndex = 12
+ Me.Label4.Text = "Mechanical Adj W"
+ Me.ToolTip1.SetToolTip(Me.Label4, "Mechanical W - Tech List Adjusted")
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.ForeColor = System.Drawing.SystemColors.MenuHighlight
+ Me.Label6.Location = New System.Drawing.Point(748, 62)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(61, 13)
+ Me.Label6.TabIndex = 14
+ Me.Label6.Text = "Fuel l/h Adj"
+ Me.ToolTip1.SetToolTip(Me.Label6, "Fuel l/h Tech List Adjusted")
+ '
'ErrorProvider1
'
Me.ErrorProvider1.ContainerControl = Me
@@ -2249,17 +2282,6 @@ Partial Class frmHVACTool
Me.lblElectricalBaseW.TabIndex = 9
Me.lblElectricalBaseW.Text = "Electrical Base W"
'
- 'Label1
- '
- Me.Label1.AutoSize = true
- Me.Label1.ForeColor = System.Drawing.SystemColors.MenuHighlight
- Me.Label1.Location = New System.Drawing.Point(748, 11)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(82, 13)
- Me.Label1.TabIndex = 10
- Me.Label1.Text = "Electrical Adj W"
- Me.ToolTip1.SetToolTip(Me.Label1, "Electrical W - Tech List Adjusted")
- '
'Label3
'
Me.Label3.AutoSize = true
@@ -2270,17 +2292,6 @@ Partial Class frmHVACTool
Me.Label3.TabIndex = 11
Me.Label3.Text = "Mechanical Base W"
'
- 'Label4
- '
- Me.Label4.AutoSize = true
- Me.Label4.ForeColor = System.Drawing.SystemColors.MenuHighlight
- Me.Label4.Location = New System.Drawing.Point(748, 38)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(94, 13)
- Me.Label4.TabIndex = 12
- Me.Label4.Text = "Mechanical Adj W"
- Me.ToolTip1.SetToolTip(Me.Label4, "Mechanical W - Tech List Adjusted")
- '
'Label5
'
Me.Label5.AutoSize = true
@@ -2291,22 +2302,12 @@ Partial Class frmHVACTool
Me.Label5.TabIndex = 13
Me.Label5.Text = "Fuel l/h Base"
'
- 'Label6
- '
- Me.Label6.AutoSize = true
- Me.Label6.ForeColor = System.Drawing.SystemColors.MenuHighlight
- Me.Label6.Location = New System.Drawing.Point(748, 62)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(61, 13)
- Me.Label6.TabIndex = 14
- Me.Label6.Text = "Fuel l/h Adj"
- Me.ToolTip1.SetToolTip(Me.Label6, "Fuel l/h Tech List Adjusted")
- '
'frmHVACTool
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoValidate = System.Windows.Forms.AutoValidate.EnableAllowFocusChange
+ Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.ClientSize = New System.Drawing.Size(965, 766)
Me.Controls.Add(Me.Label6)
Me.Controls.Add(Me.Label5)
@@ -2323,7 +2324,10 @@ Partial Class frmHVACTool
Me.Controls.Add(Me.btnCancel)
Me.Controls.Add(Me.btnSave)
Me.Controls.Add(Me.tabMain)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.MaximizeBox = false
Me.Name = "frmHVACTool"
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "SSM HVAC Model V01 ( Excel Model V04 )"
Me.tabMain.ResumeLayout(false)
Me.tabGeneralInputsBP.ResumeLayout(false)
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
index 8c419c6bed..f26e16eaf2 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
@@ -178,7 +178,11 @@ End Sub
gvTechBenefitLines.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
'Column - OnVehicle
- cIndex = gvTechBenefitLines.Columns.Add("OnVehicle", "OnVehicle")
+
+ Dim onV As New DataGridViewCheckBoxColumn()
+
+ cIndex = gvTechBenefitLines.Columns.Add(onV)
+ gvTechBenefitLines.Columns(cIndex).Name ="OnVehicle"
gvTechBenefitLines.Columns(cIndex).DataPropertyName = "OnVehicle"
gvTechBenefitLines.Columns(cIndex).Width = 60
gvTechBenefitLines.Columns(cIndex).ReadOnly = True
@@ -186,25 +190,13 @@ End Sub
gvTechBenefitLines.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
- Dim deleteColumn As New DataGridViewButtonColumn()
-
+ Dim deleteColumn As New DeleteColumn
With deleteColumn
-
.HeaderText=""
.ToolTipText="Delete this row"
.Name="Delete"
- .Text="Del"
- .UseColumnTextForButtonValue=true
- .Width=55
- .DefaultCellStyle.Padding= New Padding(5,1,5,1)
+ .Width=20
.DefaultCellStyle.Alignment= DataGridViewContentAlignment.MiddleCenter
- .DefaultCellStyle.ForeColor= Color.Red
- .AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells
- .FlatStyle = FlatStyle.Standard
- .CellTemplate.Style.BackColor = Color.Honeydew
-
-
-
end with
gvTechBenefitLines.Columns.Add(deleteColumn)
@@ -223,65 +215,65 @@ End Sub
BindGrid()
'Bus Parameterisation
- txtBusModel.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusModel", False, DataSourceUpdateMode.OnPropertyChanged)
- txtRegisteredPassengers.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_NumberOfPassengers", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusFloorType.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusFloorType", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusFloorSurfaceArea.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusFloorSurfaceArea", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusSurfaceArea.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusSurfaceAreaM2", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusWindowSurfaceArea.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusWindowSurface", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusVolume.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusVolume", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusLength.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusLength", False, DataSourceUpdateMode.OnPropertyChanged)
- txtBusWidth.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusWidth", False, DataSourceUpdateMode.OnPropertyChanged)
+ txtBusModel.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusModel")
+ txtRegisteredPassengers.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_NumberOfPassengers")
+ txtBusFloorType.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusFloorType")
+ txtBusFloorSurfaceArea.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusFloorSurfaceArea")
+ txtBusSurfaceArea.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusSurfaceAreaM2")
+ txtBusWindowSurfaceArea.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusWindowSurface")
+ txtBusVolume.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusVolume")
+ txtBusLength.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusLength")
+ txtBusWidth.DataBindings.Add("Text", ssmTOOL.genInputs, "BP_BusWidth")
'Boundary Conditions
- txtBC_GFactor .DataBindings.Add("Text",ssmTool.genInputs,"BC_GFactor" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_SolarClouding .DataBindings.Add("Text",ssmTool.genInputs,"BC_SolarClouding" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_HeatPerPassengerIntoCabinW .DataBindings.Add("Text",ssmTool.genInputs,"BC_HeatPerPassengerIntoCabinW" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_PassengerBoundaryTemperature .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerBoundaryTemperature" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_PassengerDensityLowFloor .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerDensityLowFloor" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_PassengerDensitySemiLowFloor .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerDensitySemiLowFloor" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_PassengerDensityRaisedFloor .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerDensityRaisedFloor" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_CalculatedPassengerNumber .DataBindings.Add("Text",ssmTool.genInputs,"BC_CalculatedPassengerNumber" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_UValues .DataBindings.Add("Text",ssmTool.genInputs,"BC_UValues" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_HeatingBoundaryTemperature .DataBindings.Add("Text",ssmTool.genInputs,"BC_HeatingBoundaryTemperature" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_CoolingBoundaryTemperature .DataBindings.Add("Text",ssmTool.genInputs,"BC_CoolingBoundaryTemperature" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_HighVentilation .DataBindings.Add("Text",ssmTool.genInputs,"BC_HighVentilation" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_lowVentilation .DataBindings.Add("Text",ssmTool.genInputs,"BC_lowVentilation" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_High .DataBindings.Add("Text",ssmTool.genInputs,"BC_High" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_Low .DataBindings.Add("Text",ssmTool.genInputs,"BC_Low" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_HighVentPowerW .DataBindings.Add("Text",ssmTool.genInputs,"BC_HighVentPowerW" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_LowVentPowerW .DataBindings.Add("Text",ssmTool.genInputs,"BC_LowVentPowerW" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_SpecificVentilationPower .DataBindings.Add("Text",ssmTool.genInputs,"BC_SpecificVentilationPower" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_COP .DataBindings.Add("Text",ssmTool.genInputs,"BC_COP" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_AuxHeaterEfficiency .DataBindings.Add("Text",ssmTool.genInputs,"BC_AuxHeaterEfficiency" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_GCVDieselOrHeatingOil .DataBindings.Add("Text",ssmTool.genInputs,"BC_GCVDieselOrHeatingOil" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_VolumicMassDieselOrHeatingOil .DataBindings.Add("Text",ssmTool.genInputs,"BC_VolumicMassDieselOrHeatingOil" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_WindowAreaPerUnitBusLength .DataBindings.Add("Text",ssmTool.genInputs,"BC_WindowAreaPerUnitBusLength" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_FrontRearWindowArea .DataBindings.Add("Text",ssmTool.genInputs,"BC_FrontRearWindowArea" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_MaxTemperatureDeltaForLowFloorBusses.DataBindings.Add("Text",ssmTool.genInputs,"BC_MaxTemperatureDeltaForLowFloorBusses" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtBC_MaxPossibleBenefitFromTechnologyList.DataBindings.Add("Text",ssmTool.genInputs,"BC_MaxPossibleBenefitFromTechnologyList" ,False,DataSourceUpdateMode.OnPropertyChanged)
+ txtBC_GFactor .DataBindings.Add("Text",ssmTool.genInputs,"BC_GFactor" )
+ txtBC_SolarClouding .DataBindings.Add("Text",ssmTool.genInputs,"BC_SolarClouding" )
+ txtBC_HeatPerPassengerIntoCabinW .DataBindings.Add("Text",ssmTool.genInputs,"BC_HeatPerPassengerIntoCabinW" )
+ txtBC_PassengerBoundaryTemperature .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerBoundaryTemperature" )
+ txtBC_PassengerDensityLowFloor .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerDensityLowFloor" )
+ txtBC_PassengerDensitySemiLowFloor .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerDensitySemiLowFloor" )
+ txtBC_PassengerDensityRaisedFloor .DataBindings.Add("Text",ssmTool.genInputs,"BC_PassengerDensityRaisedFloor" )
+ txtBC_CalculatedPassengerNumber .DataBindings.Add("Text",ssmTool.genInputs,"BC_CalculatedPassengerNumber" )
+ txtBC_UValues .DataBindings.Add("Text",ssmTool.genInputs,"BC_UValues" )
+ txtBC_HeatingBoundaryTemperature .DataBindings.Add("Text",ssmTool.genInputs,"BC_HeatingBoundaryTemperature" )
+ txtBC_CoolingBoundaryTemperature .DataBindings.Add("Text",ssmTool.genInputs,"BC_CoolingBoundaryTemperature" )
+ txtBC_HighVentilation .DataBindings.Add("Text",ssmTool.genInputs,"BC_HighVentilation" )
+ txtBC_lowVentilation .DataBindings.Add("Text",ssmTool.genInputs,"BC_lowVentilation" )
+ txtBC_High .DataBindings.Add("Text",ssmTool.genInputs,"BC_High" )
+ txtBC_Low .DataBindings.Add("Text",ssmTool.genInputs,"BC_Low" )
+ txtBC_HighVentPowerW .DataBindings.Add("Text",ssmTool.genInputs,"BC_HighVentPowerW" )
+ txtBC_LowVentPowerW .DataBindings.Add("Text",ssmTool.genInputs,"BC_LowVentPowerW" )
+ txtBC_SpecificVentilationPower .DataBindings.Add("Text",ssmTool.genInputs,"BC_SpecificVentilationPower" )
+ txtBC_COP .DataBindings.Add("Text",ssmTool.genInputs,"BC_COP" )
+ txtBC_AuxHeaterEfficiency .DataBindings.Add("Text",ssmTool.genInputs,"BC_AuxHeaterEfficiency" )
+ txtBC_GCVDieselOrHeatingOil .DataBindings.Add("Text",ssmTool.genInputs,"BC_GCVDieselOrHeatingOil" )
+ txtBC_VolumicMassDieselOrHeatingOil .DataBindings.Add("Text",ssmTool.genInputs,"BC_VolumicMassDieselOrHeatingOil" )
+ txtBC_WindowAreaPerUnitBusLength .DataBindings.Add("Text",ssmTool.genInputs,"BC_WindowAreaPerUnitBusLength" )
+ txtBC_FrontRearWindowArea .DataBindings.Add("Text",ssmTool.genInputs,"BC_FrontRearWindowArea" )
+ txtBC_MaxTemperatureDeltaForLowFloorBusses.DataBindings.Add("Text",ssmTool.genInputs,"BC_MaxTemperatureDeltaForLowFloorBusses" )
+ txtBC_MaxPossibleBenefitFromTechnologyList.DataBindings.Add("Text",ssmTool.genInputs,"BC_MaxPossibleBenefitFromTechnologyList" )
'General Inputs Other
'EnviromentalConditions
- txtEC_EnviromentalTemperature .DataBindings.Add("Text",ssmTool.genInputs,"EC_EnviromentalTemperature" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtEC_Solar .DataBindings.Add("Text",ssmTool.genInputs,"EC_Solar" ,False,DataSourceUpdateMode.OnPropertyChanged)
+ txtEC_EnviromentalTemperature .DataBindings.Add("Text",ssmTool.genInputs,"EC_EnviromentalTemperature" )
+ txtEC_Solar .DataBindings.Add("Text",ssmTool.genInputs,"EC_Solar" )
'AC-system
chkAC_InCabinRoomAC_System .DataBindings.Add("Checked",ssmTool.genInputs,"AC_InCabinRoomAC_System" ,False,DataSourceUpdateMode.OnPropertyChanged)
cboAC_CompressorType .DataBindings.Add("Text",ssmTool.genInputs,"AC_CompressorType" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtAC_CompressorCapacitykW .DataBindings.Add("Text",ssmTool.genInputs,"AC_CompressorCapacitykW" ,False,DataSourceUpdateMode.OnPropertyChanged)
+ txtAC_CompressorCapacitykW .DataBindings.Add("Text",ssmTool.genInputs,"AC_CompressorCapacitykW" )
'Ventilation
chkVEN_VentilationOnDuringHeating .DataBindings.Add("Checked",ssmTool.genInputs,"VEN_VentilationOnDuringHeating" ,False,DataSourceUpdateMode.OnPropertyChanged)
chkVEN_VentilationWhenBothHeatingAndACInactive .DataBindings.Add("Checked",ssmTool.genInputs,"VEN_VentilationWhenBothHeatingAndACInactive" ,False,DataSourceUpdateMode.OnPropertyChanged)
chkVEN_VentilationDuringAC .DataBindings.Add("Checked",ssmTool.genInputs,"VEN_VentilationDuringAC" ,False,DataSourceUpdateMode.OnPropertyChanged)
- cboVEN_VentilationFlowSettingWhenHeatingAndACInactive .DataBindings.Add("Text",ssmTool.genInputs,"VEN_VentilationFlowSettingWhenHeatingAndACInactive" ,False,DataSourceUpdateMode.OnPropertyChanged)
- cboVEN_VentilationDuringHeating .DataBindings.Add("Text",ssmTool.genInputs,"VEN_VentilationDuringHeating" ,False,DataSourceUpdateMode.OnPropertyChanged)
- cboVEN_VentilationDuringCooling .DataBindings.Add("Text",ssmTool.genInputs,"VEN_VentilationDuringCooling" ,False,DataSourceUpdateMode.OnPropertyChanged)
+ cboVEN_VentilationFlowSettingWhenHeatingAndACInactive .DataBindings.Add("Text",ssmTool.genInputs,"VEN_VentilationFlowSettingWhenHeatingAndACInactive" )
+ cboVEN_VentilationDuringHeating .DataBindings.Add("Text",ssmTool.genInputs,"VEN_VentilationDuringHeating" )
+ cboVEN_VentilationDuringCooling .DataBindings.Add("Text",ssmTool.genInputs,"VEN_VentilationDuringCooling" )
'Aux. Heater
- txtAH_EngineWasteHeatkW .DataBindings.Add("Text",ssmTool.genInputs,"AH_EngineWasteHeatkW" ,False,DataSourceUpdateMode.OnPropertyChanged)
- txtAH_FuelFiredHeaterkW .DataBindings.Add("Text",ssmTool.genInputs,"AH_FuelFiredHeaterkW" ,False,DataSourceUpdateMode.OnPropertyChanged)
+ txtAH_EngineWasteHeatkW .DataBindings.Add("Text",ssmTool.genInputs,"AH_EngineWasteHeatkW" )
+ txtAH_FuelFiredHeaterkW .DataBindings.Add("Text",ssmTool.genInputs,"AH_FuelFiredHeaterkW" )
End Sub
@@ -762,27 +754,36 @@ End Function
If e.ColumnIndex<0 OrElse e.RowIndex<0 then Return
- If gvTechBenefitLines.Columns( e.ColumnIndex).Name="Delete" then
+ If gvTechBenefitLines.Columns( e.ColumnIndex).Name="Delete" OrElse gvTechBenefitLines.Columns( e.ColumnIndex).Name="OnVehicle" then
Dim benefit As String = gvTechBenefitLines.Rows( e.RowIndex).Cells(1).Value
Dim category As String = gvTechBenefitLines.Rows( e.RowIndex).Cells(0).Value
Dim feedback As String = String.Empty
- Dim dr As DialogResult = MessageBox.Show(String.Format("Do you want to delete benefit '{0}' ?", benefit),"", MessageBoxButtons.YesNo)
-
- If dr= Windows.Forms.DialogResult.Yes then
-
- If ssmTOOL.TechList.Delete( New TechListBenefitLine With {.BenefitName= benefit, .Category=category}, feedback) then
-
- BindGrid
-
- End If
-
-
-
- End If
-
-
+
+ Select gvTechBenefitLines.Columns( e.ColumnIndex).Name
+
+
+ Case "Delete"
+ Dim dr As DialogResult = MessageBox.Show(String.Format("Do you want to delete benefit '{0}' ?", benefit),"", MessageBoxButtons.YesNo)
+ If dr= Windows.Forms.DialogResult.Yes then
+ If ssmTOOL.TechList.Delete( New TechListBenefitLine With {.BenefitName= benefit, .Category=category}, feedback) then
+ BindGrid
+ End If
+ End If
+
+ Case "OnVehicle"
+ Dim onVehicle as Boolean = NOT gvTechBenefitLines.Rows( e.RowIndex).Cells( e.ColumnIndex).Value
+ ssmTOOL.TechList.TechLines.First( Function(x) x.BenefitName= benefit AndAlso x.Category=category).OnVehicle=onVehicle
+ BindGrid
+ gvTechBenefitLines.Refresh
+
+
+
+ End Select
+
+
+
End If
End Sub
@@ -971,4 +972,45 @@ End Sub
End Sub
+Private Sub gvTechBenefitLines_CurrentCellDirtyStateChanged( sender As Object, e As EventArgs) Handles gvTechBenefitLines.CurrentCellDirtyStateChanged
+
+
+ 'If gvTechBenefitLines.SelectedRows.Count<>1 then Return
+
+
+ If gvTechBenefitLines.IsCurrentCellDirty Then
+ gvTechBenefitLines.CommitEdit(DataGridViewDataErrorContexts.Commit)
+ End If
+
+End Sub
+
+
+
+Private Sub gvTechBenefitLines_CellValueChanged( sender As Object, e As DataGridViewCellEventArgs) Handles gvTechBenefitLines.CellValueChanged
+
+
+ If gvTechBenefitLines.SelectedRows.Count<>1 then Return
+
+
+ Dim benefit As String = gvTechBenefitLines.SelectedRows(0).Cells(1).Value
+ Dim category As String = gvTechBenefitLines.SelectedRows(0).Cells(0).Value
+ Dim feedback As String = String.Empty
+
+
+ Select "kkk"
+
+ Case "OnVehicle"
+ 'Dim onVehicle as Boolean = DirectCast(gvTechBenefitLines.Rows( e.RowIndex).Cells( e.ColumnIndex).Value, DataGridViewCheckBoxCell).Value
+ 'If ssmTOOL.TechList.TechLines.First( Function(x) x.BenefitName= benefit AndAlso x.Category=category).OnVehicle=onVehicle then
+ ' BindGrid
+ 'End If
+
+
+ end Select
+
+
+End Sub
+
+
+
End Class
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index f0a05a3e5d..0230674e97 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -131,6 +131,8 @@
<Compile Include="Hvac\Bus.vb" />
<Compile Include="Hvac\BusDatabase.vb" />
<Compile Include="Hvac\BusEngineType.vb" />
+ <Compile Include="Hvac\DeleteCell.vb" />
+ <Compile Include="Hvac\DeleteColumn.vb" />
<Compile Include="Hvac\HVACConstants.vb" />
<Compile Include="Electrics\IElectricalConsumerList.vb" />
<Compile Include="Hvac\HVACSteadyStateModel.vb" />
@@ -274,7 +276,10 @@
<Content Include="3rdPartyLibraries\DocumentFormat.OpenXml.xml" />
<Content Include="3rdPartyLibraries\SpreadsheetLight.dll" />
<Content Include="3rdPartyLibraries\SpreadsheetLight.xml" />
- <EmbeddedResource Include="Images\Delete-32.png" />
+ <None Include="Resources\Image1.png" />
+ <Resource Include="Images\Delete.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
GitLab