diff --git a/src/About.frm b/src/About.frm index 24853db..9d2098e 100644 --- a/src/About.frm +++ b/src/About.frm @@ -245,8 +245,8 @@ 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 = StringFormat("Telephone: {0}", GetIniSetting("Application", "Phone")) + lblEmail.Caption = StringFormat("E-mail: {0}", GetIniSetting("Application", "Email")) 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." diff --git a/src/FiberTrack.PDM b/src/FiberTrack.PDM index 970ba0e..e18301b 100644 --- a/src/FiberTrack.PDM +++ b/src/FiberTrack.PDM @@ -387,7 +387,7 @@ Key1=Icon1 [Package|FiberTrack Denier 2.5.0|Root] SubWizProgID=PDWizard.SetupPkgSubWiz -BuildFolder=C:\FiberTrackerDenier250 +BuildFolder=C:\Publish\FiberTrackerDenier250 [Package|FiberTrack Denier 2.5.0|Configure DAO ISAMs] Applicable=No @@ -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:\github3\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:\github3\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:\github3\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:\Publish\FiberTrackerDenier250 +ProjectFolder=C:\github3\FiberTracker\src +ServerSideCab= +File1=C:\Publish\FiberTrackerDenier250\setup.exe +File2=C:\Publish\FiberTrackerDenier250\Setup.Lst +File3=C:\Publish\FiberTrackerDenier250\FiberTrack.CAB +Handler1=PDWizard.FolderDplySubWiz +Handler2=PDWizard.WebPostDplySubWiz diff --git a/src/FiberTrack.exe b/src/FiberTrack.exe new file mode 100644 index 0000000..e490b4f Binary files /dev/null and b/src/FiberTrack.exe differ diff --git a/src/FiberTrack.frm b/src/FiberTrack.frm index c18a45c..5997d98 100644 --- a/src/FiberTrack.frm +++ b/src/FiberTrack.frm @@ -1115,7 +1115,7 @@ Begin VB.Form FiberTrack TabIndex = 0 Top = 3360 Width = 9495 - _Version = 524288 + _Version = 196608 _ExtentX = 16748 _ExtentY = 5106 _StockProps = 71 @@ -1130,56 +1130,64 @@ Begin VB.Form FiberTrack Strikethrough = 0 'False EndProperty Reset_0 = 0 'False - CompatibleVers_0= 524288 + CompatibleVers_0= 196608 Graph_0 = 1 ClassName_1 = "CCWGraphFrame" opts_1 = 30 + Bindings_1 = 2 + ClassName_2 = "CCWBindingHolderArray" + Editor_2 = 3 + ClassName_3 = "CCWBindingHolderArrayEditor" + Owner_3 = 1 C[0]_1 = 12632256 C[1]_1 = 8421504 C[2]_1 = 8421376 - Event_1 = 2 - ClassName_2 = "CCWGFPlotEvent" - Owner_2 = 1 - Plots_1 = 3 - ClassName_3 = "CCWDataPlots" - Array_3 = 1 - Editor_3 = 4 - ClassName_4 = "CCWGFPlotArrayEditor" + Event_1 = 4 + ClassName_4 = "CCWGFPlotEvent" Owner_4 = 1 - Array[0]_3 = 5 - ClassName_5 = "CCWDataPlot" - opts_5 = 4194335 - Name_5 = "Plot-1" - C[0]_5 = 8388608 - C[1]_5 = 255 - C[2]_5 = 16711680 - C[3]_5 = 16776960 - Event_5 = 2 - X_5 = 6 - ClassName_6 = "CCWAxis" - opts_6 = 543 - Name_6 = "Time" - Orientation_6 = 2946 - format_6 = 7 - ClassName_7 = "CCWFormat" - Format_7 = "." - Scale_6 = 8 - ClassName_8 = "CCWScale" - opts_8 = 24576 - rMin_8 = 49 - rMax_8 = 621 - dMax_8 = 20 - discInterval_8 = 0.0017 - Radial_6 = 0 - Enum_6 = 9 - ClassName_9 = "CCWEnum" - Editor_9 = 10 - ClassName_10 = "CCWEnumArrayEditor" - Owner_10 = 6 - Font_6 = 11 - ClassName_11 = "CCWFont" - bFont_11 = -1 'True - BeginProperty Font_11 {0BE35203-8F91-11CE-9DE3-00AA004BB851} + Plots_1 = 5 + ClassName_5 = "CCWDataPlots" + Array_5 = 1 + Editor_5 = 6 + ClassName_6 = "CCWGFPlotArrayEditor" + Owner_6 = 1 + Array[0]_5 = 7 + ClassName_7 = "CCWDataPlot" + opts_7 = 4194335 + Name_7 = "Plot-1" + Bindings_7 = 0 + C[0]_7 = 8388608 + C[1]_7 = 255 + C[2]_7 = 16711680 + C[3]_7 = 16776960 + Event_7 = 4 + X_7 = 8 + ClassName_8 = "CCWAxis" + opts_8 = 543 + Name_8 = "Time" + Bindings_8 = 0 + Orientation_8 = 2946 + format_8 = 9 + ClassName_9 = "CCWFormat" + Format_9 = "." + Scale_8 = 10 + ClassName_10 = "CCWScale" + opts_10 = 24576 + Bindings_10 = 0 + rMin_10 = 49 + rMax_10 = 621 + dMax_10 = 20 + discInterval_10 = 0.0017 + Radial_8 = 0 + Enum_8 = 11 + ClassName_11 = "CCWEnum" + Editor_11 = 12 + ClassName_12 = "CCWEnumArrayEditor" + Owner_12 = 8 + Font_8 = 13 + ClassName_13 = "CCWFont" + bFont_13 = -1 'True + BeginProperty Font_13 {0BE35203-8F91-11CE-9DE3-00AA004BB851} Name = "Arial" Size = 9 Charset = 0 @@ -1188,43 +1196,47 @@ Begin VB.Form FiberTrack Italic = 0 'False Strikethrough = 0 'False EndProperty - tickopts_6 = 1679 - major_6 = 10 - minor_6 = 10 - Caption_6 = 12 - ClassName_12 = "CCWDrawObj" - opts_12 = 30 - C[0]_12 = -2147483640 - Image_12 = 13 - ClassName_13 = "CCWTextImage" - szText_13 = "Elapsed Time Window(Minutes)" - font_13 = 0 - Animator_12 = 0 - Blinker_12 = 0 - Y_5 = 14 - ClassName_14 = "CCWAxis" - opts_14 = 543 - Name_14 = "Denier" - Orientation_14 = 2323 - format_14 = 15 - ClassName_15 = "CCWFormat" - Scale_14 = 16 - ClassName_16 = "CCWScale" - opts_16 = 57344 - rMin_16 = 29 - rMax_16 = 149 - dMax_16 = 200 - discInterval_16 = 1 - Radial_14 = 0 - Enum_14 = 17 - ClassName_17 = "CCWEnum" - Editor_17 = 18 - ClassName_18 = "CCWEnumArrayEditor" - Owner_18 = 14 - Font_14 = 19 - ClassName_19 = "CCWFont" - bFont_19 = -1 'True - BeginProperty Font_19 {0BE35203-8F91-11CE-9DE3-00AA004BB851} + tickopts_8 = 1679 + major_8 = 10 + minor_8 = 10 + Caption_8 = 14 + ClassName_14 = "CCWDrawObj" + opts_14 = 30 + Bindings_14 = 0 + C[0]_14 = -2147483640 + Image_14 = 15 + ClassName_15 = "CCWTextImage" + Bindings_15 = 0 + szText_15 = "Elapsed Time Window(Minutes)" + font_15 = 0 + Animator_14 = 0 + Blinker_14 = 0 + Y_7 = 16 + ClassName_16 = "CCWAxis" + opts_16 = 543 + Name_16 = "Denier" + Bindings_16 = 0 + Orientation_16 = 2323 + format_16 = 17 + ClassName_17 = "CCWFormat" + Scale_16 = 18 + ClassName_18 = "CCWScale" + opts_18 = 57344 + Bindings_18 = 0 + rMin_18 = 29 + rMax_18 = 149 + dMax_18 = 200 + discInterval_18 = 1 + Radial_16 = 0 + Enum_16 = 19 + ClassName_19 = "CCWEnum" + Editor_19 = 20 + ClassName_20 = "CCWEnumArrayEditor" + Owner_20 = 16 + Font_16 = 21 + ClassName_21 = "CCWFont" + bFont_21 = -1 'True + BeginProperty Font_21 {0BE35203-8F91-11CE-9DE3-00AA004BB851} Name = "Arial" Size = 9 Charset = 0 @@ -1233,212 +1245,155 @@ Begin VB.Form FiberTrack Italic = 0 'False Strikethrough = 0 'False EndProperty - tickopts_14 = 1679 - major_14 = 10 - minor_14 = 5 - Caption_14 = 20 - ClassName_20 = "CCWDrawObj" - opts_20 = 30 - C[0]_20 = -2147483640 - Image_20 = 21 - ClassName_21 = "CCWTextImage" - szText_21 = "Denier" - style_21 = 1 - font_21 = 0 - Animator_20 = 0 - Blinker_20 = 0 - LineStyle_5 = 1 - LineWidth_5 = 1 - BasePlot_5 = 0 - DefaultXInc_5 = 1 - DefaultPlotPerRow_5= -1 'True - Axes_1 = 22 - ClassName_22 = "CCWAxes" - Array_22 = 2 - Editor_22 = 23 - ClassName_23 = "CCWGFAxisArrayEditor" - Owner_23 = 1 - Array[0]_22 = 6 - Array[1]_22 = 14 - DefaultPlot_1 = 24 - ClassName_24 = "CCWDataPlot" - opts_24 = 4194335 - Name_24 = "[Template]" - C[0]_24 = 8421376 - C[1]_24 = 255 - C[2]_24 = 16711680 - C[3]_24 = 16776960 - Event_24 = 2 - X_24 = 6 - Y_24 = 14 - LineStyle_24 = 4 - LineWidth_24 = 1 - BasePlot_24 = 0 - DefaultXInc_24 = 1 - DefaultPlotPerRow_24= -1 'True - Cursors_1 = 25 - ClassName_25 = "CCWCursors" - Array_25 = 3 - Editor_25 = 26 - ClassName_26 = "CCWGFCursorArrayEditor" - Owner_26 = 1 - Array[0]_25 = 27 - ClassName_27 = "CCWCursor" - opts_27 = 31 - Name_27 = "Target_Denier" - C[0]_27 = 65280 - Event_27 = 2 - X_27 = 6 - Y_27 = 14 - XPos_27 = 1 - YPos_27 = 100 - PointIndex_27 = -1 - ChrosshairStyle_27= 6 - LockPlot_27 = 0 - Array[1]_25 = 28 - ClassName_28 = "CCWCursor" - opts_28 = 31 - Name_28 = "Plus_Tol" - C[0]_28 = 255 - Event_28 = 2 - X_28 = 6 - Y_28 = 14 - XPos_28 = 24.8 - YPos_28 = 50 - PointIndex_28 = -1 - ChrosshairStyle_28= 6 - LockPlot_28 = 0 - Array[2]_25 = 29 + tickopts_16 = 1679 + major_16 = 10 + minor_16 = 5 + Caption_16 = 22 + ClassName_22 = "CCWDrawObj" + opts_22 = 30 + Bindings_22 = 0 + C[0]_22 = -2147483640 + Image_22 = 23 + ClassName_23 = "CCWTextImage" + Bindings_23 = 0 + szText_23 = "Denier" + style_23 = 1 + font_23 = 0 + Animator_22 = 0 + Blinker_22 = 0 + LineStyle_7 = 1 + LineWidth_7 = 1 + BasePlot_7 = 0 + DefaultXInc_7 = 1 + DefaultPlotPerRow_7= -1 'True + Axes_1 = 24 + ClassName_24 = "CCWAxes" + Array_24 = 2 + Editor_24 = 25 + ClassName_25 = "CCWGFAxisArrayEditor" + Owner_25 = 1 + Array[0]_24 = 8 + Array[1]_24 = 16 + DefaultPlot_1 = 26 + ClassName_26 = "CCWDataPlot" + opts_26 = 4194335 + Name_26 = "[Template]" + Bindings_26 = 0 + C[0]_26 = 8421376 + C[1]_26 = 255 + C[2]_26 = 16711680 + C[3]_26 = 16776960 + Event_26 = 4 + X_26 = 8 + Y_26 = 16 + LineStyle_26 = 4 + LineWidth_26 = 1 + BasePlot_26 = 0 + DefaultXInc_26 = 1 + DefaultPlotPerRow_26= -1 'True + Cursors_1 = 27 + ClassName_27 = "CCWCursors" + Array_27 = 3 + Editor_27 = 28 + ClassName_28 = "CCWGFCursorArrayEditor" + Owner_28 = 1 + Array[0]_27 = 29 ClassName_29 = "CCWCursor" opts_29 = 31 - Name_29 = "Minus_Tol" - C[0]_29 = 255 - Event_29 = 2 - X_29 = 6 - Y_29 = 14 - XPos_29 = 36.7 - YPos_29 = 150 + Name_29 = "Target_Denier" + Bindings_29 = 0 + C[0]_29 = 65280 + Event_29 = 4 + X_29 = 8 + Y_29 = 16 + XPos_29 = 1 + YPos_29 = 100 PointIndex_29 = -1 ChrosshairStyle_29= 6 LockPlot_29 = 0 + Array[1]_27 = 30 + ClassName_30 = "CCWCursor" + opts_30 = 31 + Name_30 = "Plus_Tol" + Bindings_30 = 0 + C[0]_30 = 255 + Event_30 = 4 + X_30 = 8 + Y_30 = 16 + XPos_30 = 24.8 + YPos_30 = 50 + PointIndex_30 = -1 + ChrosshairStyle_30= 6 + LockPlot_30 = 0 + Array[2]_27 = 31 + ClassName_31 = "CCWCursor" + opts_31 = 31 + Name_31 = "Minus_Tol" + Bindings_31 = 0 + C[0]_31 = 255 + Event_31 = 4 + X_31 = 8 + Y_31 = 16 + XPos_31 = 36.7 + YPos_31 = 150 + PointIndex_31 = -1 + ChrosshairStyle_31= 6 + LockPlot_31 = 0 TrackMode_1 = 2 GraphBackground_1= 0 - GraphFrame_1 = 30 - ClassName_30 = "CCWDrawObj" - opts_30 = 30 - C[0]_30 = 8421504 - C[1]_30 = 8421504 - Image_30 = 31 - ClassName_31 = "CCWPictImage" - opts_31 = 1280 - Rows_31 = 1 - Cols_31 = 1 - F_31 = 8421504 - B_31 = 8421504 - ColorReplaceWith_31= 8421504 - ColorReplace_31 = 8421504 - Tolerance_31 = 2 - Animator_30 = 0 - Blinker_30 = 0 - PlotFrame_1 = 32 + GraphFrame_1 = 32 ClassName_32 = "CCWDrawObj" opts_32 = 30 + Bindings_32 = 0 C[0]_32 = 8421504 - C[1]_32 = 12632256 + C[1]_32 = 8421504 Image_32 = 33 ClassName_33 = "CCWPictImage" opts_33 = 1280 + Bindings_33 = 0 Rows_33 = 1 Cols_33 = 1 - Pict_33 = 1 F_33 = 8421504 - B_33 = 12632256 + B_33 = 8421504 ColorReplaceWith_33= 8421504 ColorReplace_33 = 8421504 Tolerance_33 = 2 Animator_32 = 0 Blinker_32 = 0 - Caption_1 = 34 + PlotFrame_1 = 34 ClassName_34 = "CCWDrawObj" opts_34 = 30 - C[0]_34 = -2147483640 + Bindings_34 = 0 + C[0]_34 = 8421504 + C[1]_34 = 12632256 Image_34 = 35 - ClassName_35 = "CCWTextImage" - szText_35 = "Online plot of average Orientation" - font_35 = 0 + ClassName_35 = "CCWPictImage" + opts_35 = 1280 + Bindings_35 = 0 + Rows_35 = 1 + Cols_35 = 1 + Pict_35 = 1 + F_35 = 8421504 + B_35 = 12632256 + ColorReplaceWith_35= 8421504 + ColorReplace_35 = 8421504 + Tolerance_35 = 2 Animator_34 = 0 Blinker_34 = 0 + Caption_1 = 36 + ClassName_36 = "CCWDrawObj" + opts_36 = 30 + Bindings_36 = 0 + C[0]_36 = -2147483640 + Image_36 = 37 + ClassName_37 = "CCWTextImage" + Bindings_37 = 0 + szText_37 = "Online plot of average Orientation" + font_37 = 0 + Animator_36 = 0 + Blinker_36 = 0 DefaultXInc_1 = 1 DefaultPlotPerRow_1= -1 'True - Bindings_1 = 36 - ClassName_36 = "CCWBindingHolderArray" - Editor_36 = 37 - ClassName_37 = "CCWBindingHolderArrayEditor" - Owner_37 = 1 - Annotations_1 = 38 - ClassName_38 = "CCWAnnotations" - Editor_38 = 39 - ClassName_39 = "CCWAnnotationArrayEditor" - Owner_39 = 1 - AnnotationTemplate_1= 40 - ClassName_40 = "CCWAnnotation" - opts_40 = 63 - Name_40 = "[Template]" - Plot_40 = 24 - Text_40 = "[Template]" - TextXPoint_40 = 13.4 - TextYPoint_40 = 13.4 - TextColor_40 = 16777215 - TextFont_40 = 41 - ClassName_41 = "CCWFont" - bFont_41 = -1 'True - BeginProperty Font_41 {0BE35203-8F91-11CE-9DE3-00AA004BB851} - Name = "Courier New" - Size = 9.75 - Charset = 0 - Weight = 400 - Underline = 0 'False - Italic = -1 'True - Strikethrough = 0 'False - EndProperty - ShapeXPoints_40 = 42 - ClassName_42 = "CDataBuffer" - Type_42 = 5 - m_cDims;_42 = 1 - m_cElts_42 = 1 - Element[0]_42 = 6.6 - ShapeYPoints_40 = 43 - ClassName_43 = "CDataBuffer" - Type_43 = 5 - m_cDims;_43 = 1 - m_cElts_43 = 1 - Element[0]_43 = 6.6 - ShapeFillColor_40= 16777215 - ShapeLineColor_40= 16777215 - ShapeLineWidth_40= 1 - ShapeLineStyle_40= 1 - ShapePointStyle_40= 10 - ShapeImage_40 = 44 - ClassName_44 = "CCWDrawObj" - opts_44 = 62 - Image_44 = 45 - ClassName_45 = "CCWPictImage" - opts_45 = 1280 - Rows_45 = 1 - Cols_45 = 1 - Pict_45 = 7 - F_45 = -2147483633 - B_45 = -2147483633 - ColorReplaceWith_45= 8421504 - ColorReplace_45 = 8421504 - Tolerance_45 = 2 - Animator_44 = 0 - Blinker_44 = 0 - ArrowVisible_40 = -1 'True - ArrowColor_40 = 16777215 - ArrowWidth_40 = 1 - ArrowLineStyle_40= 1 - ArrowHeadStyle_40= 1 End Begin VB.PictureBox picSetup BackColor = &H8000000C& @@ -1997,7 +1952,7 @@ On Error GoTo cmdComPort_err_hdr End Select Exit Sub cmdComPort_err_hdr: - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Save Settings File Error, cmdComPort" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Save Settings File Error, cmdComPort" fraSetup.Enabled = True cmdDone.Enabled = True End Sub @@ -2326,7 +2281,7 @@ On Error GoTo cmdOkPC_err_hdr cmdDone.Enabled = True Exit Sub cmdOkPC_err_hdr: - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Error, cmdOkPC FiberTrack" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Error, cmdOkPC FiberTrack" End Sub Private Sub cmdParDD_Click(index As Integer) @@ -2729,7 +2684,7 @@ On Error GoTo fibertrack_err_rtn FormLoadCount = FormLoadCount + 1 - Me.Caption = StringFormat("{0} - {1} - {2} Denier", GetIniSetting("Constants", "Name"), GetIniSetting("Constants", "ProductName"), GetIniSetting("Constants", "Version")) + Me.Caption = StringFormat("{0} - {1} - {2} {3}", GetIniSetting("Constants", "Name"), GetIniSetting("Constants", "ProductName"), GetIniSetting("Constants", "Version"), GetIniSetting("Constants", "ApplicationName")) cmdExit.ToolTipText = "Click here to exit this program." cmdPlotData.ToolTipText = "Click here to plot a line chart of saved data files." cmdBarChart.ToolTipText = "Click here to plot a bar chart of the current data." @@ -2960,7 +2915,7 @@ fibertrack_err_rtn: If Err.Number = 53 Then Exit Sub '53 = file not found End If - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Open File Error, Form_Load" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Open File Error, Form_Load" End Sub Private Sub Form_MouseDown(Button As Integer, Shift As Integer, X As Single, Y As Single) @@ -3069,7 +3024,7 @@ On Error GoTo form_unload_err_hdr Exit Sub form_unload_err_hdr: - MsgBox "Error Number = " & Str(Err.Number) & ", " _ + MsgBox "Error Number = " & str(Err.Number) & ", " _ & Err.Description & ", " & Err.Source, vbExclamation, _ "Form_Unload DataFile Error, FiberTrack" End @@ -3267,7 +3222,7 @@ On Error GoTo init_err_rtn Exit Sub '*******************Sensors initialized******************** init_err_rtn: - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Initialization Error, Initialization FiberTrack" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Initialization Error, Initialization FiberTrack" Exit Sub End Sub @@ -3296,7 +3251,7 @@ lblThreadLine_err_hdr: 'cdlCancel = Cancel button clicked If Err.Number = cdlCancel Then Exit Sub - MsgBox "Error Number = " & Str(Err.Number) & ", " _ + MsgBox "Error Number = " & str(Err.Number) & ", " _ & Err.Description & ", " & Err.Source, vbExclamation, _ "FiberTrack, lblThreadLine_Click" @@ -3512,7 +3467,7 @@ mnuOpen_err_hdr: Exit Sub End If - MsgBox "Error Number = " & Str(Err.Number) & ", " _ + MsgBox "Error Number = " & str(Err.Number) & ", " _ & Err.Description & ", " & Err.Source, vbExclamation, _ "Open Setup File Error, mnuOpen FiberTrack" End Sub @@ -3565,7 +3520,7 @@ mnuPrint_err_hdr: Exit Sub End If - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Print error, mnuPrint" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Print error, mnuPrint" End Sub @@ -3605,7 +3560,7 @@ On Error GoTo mnuSave_err_hdr mnuSave_err_hdr: If Err.Number = cdlCancel Then Exit Sub 'Cancel button in Common Dialog - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Save Setup File Error, mnuSave" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Save Setup File Error, mnuSave" End Sub @@ -4276,10 +4231,10 @@ On Error GoTo mnuText_err_hdr Exit Sub mnuText_err_hdr: If Err.Number = 75 Then - MsgBox "Please Open Setup File. Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Open Setup File Error, PrintSetupFile" + MsgBox "Please Open Setup File. Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Open Setup File Error, PrintSetupFile" Exit Sub End If - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Open Setup File Error, PrintSetupFile" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source, vbExclamation, "Open Setup File Error, PrintSetupFile" End Sub 'Copy comm buffer contents to sensor data array and verify the Sensor data packet. @@ -4567,7 +4522,7 @@ Current_Err_Hdr: If Err.Number = cdlCancel Then Exit Sub End If - MsgBox "Error Number = " & Str(Err.Number) & ", " & Err.Description & ", " & Err.Source & ". Filename = " & comDialog2.FileName, vbExclamation, "File Error FiberTrack mnuCurrentReport" + MsgBox "Error Number = " & str(Err.Number) & ", " & Err.Description & ", " & Err.Source & ". Filename = " & comDialog2.FileName, vbExclamation, "File Error FiberTrack mnuCurrentReport" Exit Sub End Sub diff --git a/src/FiberTrack.vbp b/src/FiberTrack.vbp index 5ceaa31..9939b6d 100644 --- a/src/FiberTrack.vbp +++ b/src/FiberTrack.vbp @@ -1,8 +1,8 @@ Type=Exe -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\WINDOWS\system32\stdole2.tlb#OLE Automation -Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\..\..\..\WINDOWS\system32\scrrun.dll#Microsoft Scripting Runtime -Reference=*\G{3F4DACA7-160D-11D2-A8E9-00104B365C9F}#5.5#0#..\..\..\..\..\..\WINDOWS\system32\vbscript.dll\3#Microsoft VBScript Regular Expressions 5.5 -Reference=*\G{8F6C7660-E8A1-11D0-B9B3-2A92D0000000}#1.0#0#..\..\..\..\..\..\WINDOWS\system32\SQLPARSE.DLL#Microsoft SQL Parser Object Library 1.0 +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\WINDOWS\system32\stdole2.tlb#OLE Automation +Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\WINDOWS\system32\scrrun.dll#Microsoft Scripting Runtime +Reference=*\G{3F4DACA7-160D-11D2-A8E9-00104B365C9F}#5.5#0#..\..\..\WINDOWS\system32\vbscript.dll\3#Microsoft VBScript Regular Expressions 5.5 +Reference=*\G{8F6C7660-E8A1-11D0-B9B3-2A92D0000000}#1.0#0#..\..\..\WINDOWS\system32\SQLPARSE.DLL#Microsoft SQL Parser Object Library 1.0 Object={D940E4E4-6079-11CE-88CB-0020AF6845F6}#1.6#0; cwui.ocx Object={648A5603-2C6E-101B-82B6-000000000014}#1.1#0; MSCOMM32.OCX Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx diff --git a/src/settings.ini b/src/settings.ini index cde66af..e4cd1f0 100644 --- a/src/settings.ini +++ b/src/settings.ini @@ -4,12 +4,15 @@ GraphYCaption = Average Denier GraphCaption = Average ProductName = STC Online Fiber Monitoring System Name = FiberTrack +ApplicationName = Denier / Finish [Application] Type = SCALE_DENIER -Build = 02 +Build = 03 OpenMainFormMax =True IncludeCvColumn =True ExcelId = Excel.Application ExcelPath = C:\Program Files\Microsoft Office\OFFICE11\Excel.exe FileDateFormatAppend = yyyy_m_d_h_n_s -NameOfThreadLine =Package \ No newline at end of file +NameOfThreadLine =Package +Email=john.piso@sensatus.us +Phone=781-555-0000 \ No newline at end of file