From 0e2ecfd473ae2d7881275cf0c8e148b965090afa Mon Sep 17 00:00:00 2001 From: "Burns, Terry" <Terry.Burns@ricardo.com> Date: Wed, 11 Mar 2015 17:52:28 +0000 Subject: [PATCH] WIP - SSM SavePoint git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1822 --- VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb | 8 ++++---- VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb | 2 +- VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb index 99cf37898d..0dffc91526 100644 --- a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb +++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb @@ -457,16 +457,16 @@ Public Class SSMCalculate With line - Dim nameLength As integer =15 - Dim catLength As Integer = 18 + Dim nameLength As integer =13 + Dim catLength As Integer = 15 Dim extraNameSpaces, extraCatSpaces As Integer extraNameSpaces = nameLength -.BenefitName.Length extraCatSpaces = catLength - .Category.Length - Dim catDesc As String = line.Category.Substring(0,Math.Min(line.Category.Length-1,catLength)) + Space( If(extraCatSpaces<0,0,extraCatSpaces)) + vbTab + line.BenefitName.Substring(0,Math.Min(line.BenefitName.Length-1,nameLength)) + Space(If(extraNameSpaces<0,0,extraCatSpaces)) + Dim catDesc As String = line.Category.Substring(0,Math.Min(line.Category.Length,catLength)) + Space( If(extraCatSpaces<0,0,extraCatSpaces)).Replace(" ",".") + vbTab + line.BenefitName.Substring(0,Math.Min(line.BenefitName.Length,nameLength)) + Space(If(extraNameSpaces<0,0,extraNameSpaces)).Replace(" ",".") - sb.AppendLine(String.Format( catDesc + " {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab + vbtab, .H.ToString("0.000") , .VH.ToString("0.000"), .VV.ToString("0.000"), .VC.ToString("0.000"), .C.ToString("0.000"))) + sb.AppendLine(String.Format( line.Units + vbTab + catDesc + " {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab , .H.ToString("0.000") , .VH.ToString("0.000"), .VV.ToString("0.000"), .VC.ToString("0.000"), .C.ToString("0.000"))) End With diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb index 0231393312..0c2dd73e7e 100644 --- a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb +++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb @@ -104,7 +104,7 @@ Namespace Hvac Public Readonly Property BC_Low As Double Implements ISSMGenInputs.BC_Low Get '=C27*D10 - Return BC_lowVentilation*BP_BusVolume + Return BP_BusVolume * BC_lowVentilation End Get End Property 'C30 - Watts diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb index 625cca940c..09aabd9beb 100644 --- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb +++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb @@ -2156,12 +2156,14 @@ Partial Class frmHVACTool ' 'txtDiagnostics ' - Me.txtDiagnostics.Location = New System.Drawing.Point(77, 17) + Me.txtDiagnostics.Font = New System.Drawing.Font("Courier New", 8!) + Me.txtDiagnostics.Location = New System.Drawing.Point(22, 17) Me.txtDiagnostics.Multiline = true Me.txtDiagnostics.Name = "txtDiagnostics" - Me.txtDiagnostics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtDiagnostics.Size = New System.Drawing.Size(744, 584) + Me.txtDiagnostics.ScrollBars = System.Windows.Forms.ScrollBars.Both + Me.txtDiagnostics.Size = New System.Drawing.Size(877, 584) Me.txtDiagnostics.TabIndex = 0 + Me.txtDiagnostics.WordWrap = false ' 'ErrorProvider1 ' -- GitLab