Changes for Denier to match Temperature app

src/About.frm

@@ -246,12 +246,12 @@ Private Sub Form_Load()
     lblAddress.Caption = address(0) & address(1) & address(2) & address(3)
 
     lblTelephone.Caption = "Telephone: 781-555-0000"
-    lblTelephone.Caption = "E-mail: jpiso@aol.com"
+    lblTelephone.Caption = "E-mail: john.piso@sensatus.us"
     lblWarning.Caption = warning(0) & warning(1) & warning(2) & warning(3)
     '"Warning!  This computer program is protected by copyright law and international treaties.  Unauthorized reproduction or distribution of this program is illegal and may result in criminal and civil penalties."
 
 End Sub
 
 Private Sub lblEmail_Click()
-    OpenEmail "jpiso@aol.com"
+    OpenEmail "john.piso@sensatus.us"
 End Sub

src/BarChart.frm

@@ -117,14 +117,14 @@ Private Sub Form_Load()
 
     PlotData.Hide
 
-    SensorColors(1) = vbBlue
-    SensorColors(2) = vbRed
-    SensorColors(3) = vbYellow
-    SensorColors(4) = vbGreen
-    SensorColors(5) = vbCyan
-    SensorColors(6) = vbMagenta
-    SensorColors(7) = 33023         ' 33023 = orange
-    SensorColors(8) = 8421440       ' 8421440 = darker green
+    SensorColors(1) = RGB(0, 0, 255)    ' Blue
+    SensorColors(2) = RGB(204, 0, 0)    ' Red
+    SensorColors(3) = RGB(204, 255, 0)  ' Yellow
+    SensorColors(4) = RGB(0, 102, 0)    ' Green
+    SensorColors(5) = RGB(0, 255, 204)  ' Cyan
+    SensorColors(6) = RGB(204, 0, 153)  ' Magenta
+    SensorColors(7) = RGB(204, 102, 0)  ' Orange
+    SensorColors(8) = RGB(0, 51, 0)     ' Darker Green
 
     lColorMatrix(0) = SensorColors(1) 'vbBlue
     lColorMatrix(1) = SensorColors(2) 'vbGreen

src/FTComm.cls

@@ -91,10 +91,7 @@ ErrHan:
         log "Error " & Err.Number & ": " & Err.Description
         MsgBox "Error opening communications channel.  Please try another COM Port or check your device configuration.", vbCritical Or vbOKOnly, "FiberTrack FTComm"
     Else
-        MsgBox "Unexpected error occurred while opening communications channel." & vbCrLf & _
-               "Please try another COM Port or check your device configuration." & vbCrLf & _
-               "Error " & Err.Number & ": " & Err.Description, _
-               vbCritical Or vbOKOnly, "FiberTrack FTComm"
+        MsgBox "Unexpected error occurred while opening communications channel." & vbCrLf & "Please try another COM Port or check your device configuration." & vbCrLf & "Error " & Err.Number & ": " & Err.Description, vbCritical Or vbOKOnly, "FiberTrack FTComm"
     End If
 
 End Function

src/FTDataFile.cls

@@ -321,15 +321,22 @@ Private Sub WriteHeaderText()
     Debug.Assert mDataFileFormatEnum = Text
     Dim index As Integer
     WriteLine ms_Title
-    WriteLine "       --------------------------------------------------------------"
+    WriteLine "            ----------------------------------------------------"
     WriteLine ""
     WriteLine ms_Info
     WriteLine ""
-    WriteLine ""
+    ' WriteLine ""
     WriteComma ""
+    Dim line As String
+    Dim blank As String
+    blank = "             "
     For index = LBound(mb_SensorOnline) To UBound(mb_SensorOnline)
         If mb_SensorOnline(index) Then
-            WriteComma GetIniSetting("Application", "NameOfThreadLine") & " " & SensorInfos(index).Package  ' CHANGED
+            line = CStr(GetIniSetting("Application", "NameOfThreadLine") & " " & RTrim(SensorInfos(index).Package))  ' CHANGED
+	    If CBool(GetIniSetting("Application", "IncludeCvColumn")) Then
+                line = line & blank
+            End If
+            WriteComma Replace(line, vbNewLine, "")
         End If
     Next index
     WriteLine ""
@@ -343,7 +350,7 @@ Private Sub WriteHeaderText()
         End If
     Next index
     WriteLine ""
-    WriteLine "--------------------------------------------------------------------------------------------------------------------------------------------------------------"
+    WriteLine "-------------------------------------------------------------------------------"
 End Sub
 
 Private Sub WriteHeaderCSV()
@@ -352,7 +359,7 @@ Private Sub WriteHeaderCSV()
     line = HEADER_TIME
     For index = LBound(mb_SensorOnline) To UBound(mb_SensorOnline)
         If mb_SensorOnline(index) Then
-            line = line & ", " & HEADER_SENSOR & CStr(index) & " " & GetIniSetting("Application", "NameOfThreadLine") & " " & SensorInfos(index).Package ' CHANGED
+            line = line & ", " & HEADER_SENSOR & CStr(index) & " " & GetIniSetting("Application", "NameOfThreadLine") & " " & Replace(SensorInfos(index).Package, vbNewLine, "") ' CHANGED
             If CBool(GetIniSetting("Application", "IncludeCvColumn")) Then
                 line = line & ", " & HEADER_CV & CStr(index)
             End If
@@ -371,7 +378,7 @@ Public Sub WriteFooter()
     WriteComma HEADER_TIME
     For index = LBound(mb_SensorOnline) To UBound(mb_SensorOnline)
         If mb_SensorOnline(index) Then
-            WriteComma HEADER_SENSOR & index & " " & GetIniSetting("Application", "NameOfThreadLine") & " " & SensorInfos(index).Package  ' CHANGED
+            WriteComma HEADER_SENSOR & index & " " & GetIniSetting("Application", "NameOfThreadLine") & " " & Replace(SensorInfos(index).Package, vbNewLine, "")  ' CHANGED
             If CBool(GetIniSetting("Application", "IncludeCvColumn")) Then
                 WriteComma HEADER_CV & index
             End If

src/FTExcelController.cls

@@ -178,7 +178,7 @@ Private Function ConvertCSVToExcel(cvsFileName As String, excelFileName As Strin
     End If
     Set workBook = mo_ExcelObject.Workbooks.Open(cvsFileName, Editable:=True, AddToMRU:=False)
 #If USE_GENERIC_OBJECTS Then
-    workBook.SaveAs excelFileName, FileFormat:=43, CreateBackup:=True, AddToMRU:=True
+    workBook.SaveAs excelFileName, FileFormat:=56, CreateBackup:=True, AddToMRU:=True
 #Else
     workBook.SaveAs excelFileName, FileFormat:=xlExcel9795, CreateBackup:=True, AddToMRU:=True
 #End If

src/FiberTrack.PDM

@@ -412,7 +412,7 @@ C:\WINDOWS\system32\comdlg32.ocx=
 C:\WINDOWS\system32\scrrun.dll=
 
 [Package|FiberTrack Denier 2.5.0|Files Added]
-C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode\settings.ini=
+c:\documents and settings\compaq_owner\desktop\works\denier2.5.0\sourcecode\settings.ini=
 
 [Package|FiberTrack Denier 2.5.0|Files Removed]
 
@@ -421,7 +421,6 @@ C:\Program Files\Microsoft Visual Studio\VB98\Wizards\PDWizard\Redist\COMCAT.DLL
 C:\Program Files\Microsoft Visual Studio\VB98\Wizards\PDWizard\SETUP.EXE=Yes
 C:\Program Files\Microsoft Visual Studio\VB98\Wizards\PDWizard\SETUP1.EXE=Yes
 C:\Program Files\Microsoft Visual Studio\VB98\Wizards\PDWizard\ST6UNST.EXE=Yes
-C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode\FiberTrack.exe=Yes
 C:\WINDOWS\system32\msvbvm60.dll=Yes
 C:\WINDOWS\system32\oleaut32.dll=Yes
 C:\WINDOWS\system32\olepro32.dll=Yes
@@ -439,6 +438,7 @@ C:\WINDOWS\system32\COMCT232.OCX=Yes
 C:\WINDOWS\system32\VB6STKIT.DLL=Yes
 C:\WINDOWS\system32\SQLPARSE.DLL=Yes
 C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode\settings.ini=Yes
+C:\Github2\FiberTracker\src\FiberTrack.exe=Yes
 
 [Package|FiberTrack Denier 2.5.0|Configure Registry Files]
 Applicable=No
@@ -490,6 +490,7 @@ C:\WINDOWS\system32\COMCT232.OCX=$(WinSysPath)
 C:\WINDOWS\system32\VB6STKIT.DLL=$(WinSysPathSysFile)
 C:\WINDOWS\system32\SQLPARSE.DLL=$(WinSysPath)
 C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode\settings.ini=$(AppPath)
+C:\Github2\FiberTracker\src\FiberTrack.exe=$(AppPath)
 
 [Package|FiberTrack Denier 2.5.0|Configure Shared Files]
 Applicable=Yes
@@ -498,22 +499,13 @@ C:\sti\bin\FiberTrack231\Denier\setup.svd=No
 F:\Denier2.5.0\SourceCode\FiberTrack.exe=No
 C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode\FiberTrack.exe=Yes
 C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode\settings.ini=No
+C:\Github2\FiberTracker\src\FiberTrack.exe=No
 
 [Package|FiberTrack Denier 2.5.0|Distribution]
 Type=single
 Size=1.44 MB
 Title=FiberTrack - Denier 2.5.0
 
-[Package|FiberTrack Denier 2.5.0|Package]
-PackageFolder=C:\FiberTrackerDenier250
-ProjectFolder=C:\Documents and Settings\Compaq_Owner\Desktop\WORKS\Denier2.5.0\SourceCode
-ServerSideCab=
-File1=C:\FiberTrackerDenier250\setup.exe
-File2=C:\FiberTrackerDenier250\Setup.Lst
-File3=C:\FiberTrackerDenier250\FiberTrack.CAB
-Handler1=PDWizard.FolderDplySubWiz
-Handler2=PDWizard.WebPostDplySubWiz
-
 [Package|FiberTrack Denier 2.5.0|IconGroups]
 Group0=FiberTrack 2.5.0 Denier
 PrivateGroup0=False
@@ -524,3 +516,13 @@ Icon1=FiberTrack.exe
 Title1=FiberTrack 2.5.0 Denier
 StartIn1=$(AppPath)
 Key1=Icon1
+
+[Package|FiberTrack Denier 2.5.0|Package]
+PackageFolder=C:\FiberTrackerDenier250
+ProjectFolder=C:\Github2\FiberTracker\src
+ServerSideCab=
+File1=C:\FiberTrackerDenier250\setup.exe
+File2=C:\FiberTrackerDenier250\Setup.Lst
+File3=C:\FiberTrackerDenier250\FiberTrack.CAB
+Handler1=PDWizard.FolderDplySubWiz
+Handler2=PDWizard.WebPostDplySubWiz