Index: cprs/trunk/CPRS-Chart/Vitals/fVitalsDate.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/fVitalsDate.dfm	(revision 456)
+++ cprs/trunk/CPRS-Chart/Vitals/fVitalsDate.dfm	(revision 829)
@@ -1,20 +1,18 @@
-object frmVitalsDate: TfrmVitalsDate
+inherited frmVitalsDate: TfrmVitalsDate
   Left = 193
   Top = 381
-  Width = 363
-  Height = 87
   Caption = 'Vitals Date & Time'
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  OldCreateOrder = False
+  ClientHeight = 60
+  ClientWidth = 355
   Position = poScreenCenter
   OnCreate = FormCreate
+  ExplicitWidth = 363
+  ExplicitHeight = 87
+  DesignSize = (
+    355
+    60)
   PixelsPerInch = 96
   TextHeight = 13
-  object Label1: TLabel
+  object Label1: TLabel [0]
     Left = 8
     Top = 12
@@ -23,5 +21,5 @@
     Caption = 'Enter Vital Entry Date and Time:'
   end
-  object dteVitals: TORDateBox
+  object dteVitals: TORDateBox [1]
     Tag = 11
     Left = 167
@@ -34,5 +32,5 @@
     Caption = 'Enter Vital Entry Date and Time:'
   end
-  object btnOK: TButton
+  object btnOK: TButton [2]
     Left = 195
     Top = 36
@@ -45,5 +43,5 @@
     TabOrder = 2
   end
-  object btnCancel: TButton
+  object btnCancel: TButton [3]
     Left = 275
     Top = 36
@@ -56,5 +54,5 @@
     TabOrder = 3
   end
-  object btnNow: TButton
+  object btnNow: TButton [4]
     Left = 307
     Top = 8
@@ -66,3 +64,21 @@
     OnClick = btnNowClick
   end
+  inherited amgrMain: TVA508AccessibilityManager
+    Data = (
+      (
+        'Component = dteVitals'
+        'Status = stsDefault')
+      (
+        'Component = btnOK'
+        'Status = stsDefault')
+      (
+        'Component = btnCancel'
+        'Status = stsDefault')
+      (
+        'Component = btnNow'
+        'Status = stsDefault')
+      (
+        'Component = frmVitalsDate'
+        'Status = stsDefault'))
+  end
 end
Index: cprs/trunk/CPRS-Chart/Vitals/fVitalsDate.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/fVitalsDate.pas	(revision 456)
+++ cprs/trunk/CPRS-Chart/Vitals/fVitalsDate.pas	(revision 829)
@@ -5,8 +5,8 @@
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ORDtTm;
+  StdCtrls, ORDtTm, fBase508Form, VA508AccessibilityManager;
 
 type
-  TfrmVitalsDate = class(TForm)
+  TfrmVitalsDate = class(TfrmBase508Form)
     dteVitals: TORDateBox;
     Label1: TLabel;
Index: cprs/trunk/CPRS-Chart/Vitals/mVitAll.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitAll.dfm	(revision 456)
+++ 	(revision )
@@ -1,61 +1,0 @@
-object fraVitAll: TfraVitAll
-  Left = 0
-  Top = 0
-  Width = 446
-  Height = 478
-  TabOrder = 0
-  inline fraVitMetric1: TfraVitMetric
-    Left = 120
-    Top = 4
-  end
-  inline fraVitTemp1: TfraVitTemp
-    Left = 142
-    Top = 72
-    TabOrder = 1
-  end
-  inline fraVitPulse1: TfraVitPulse
-    Left = 201
-    Top = 104
-    TabOrder = 2
-  end
-  inline fraVitResp1: TfraVitResp
-    Left = 203
-    Top = 136
-    TabOrder = 3
-  end
-  inline fraVitPB1: TfraVitPB
-    Left = 153
-    Top = 168
-    TabOrder = 4
-  end
-  inline fraVitHeight1: TfraVitHeight
-    Left = 128
-    Top = 200
-    TabOrder = 5
-  end
-  inline fraVitWeight1: TfraVitWeight
-    Left = 122
-    Top = 232
-    TabOrder = 6
-  end
-  inline fraVitPain1: TfraVitPain
-    Left = 153
-    Top = 264
-    TabOrder = 7
-  end
-  inline fraVitPO21: TfraVitPO2
-    Left = 191
-    Top = 296
-    TabOrder = 8
-  end
-  inline fraVitCVP1: TfraVitCVP
-    Left = 27
-    Top = 328
-    TabOrder = 10
-  end
-  inline fraVitCircum1: TfraVitCircum
-    Left = 144
-    Top = 360
-    TabOrder = 9
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitAll.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitAll.pas	(revision 456)
+++ 	(revision )
@@ -1,33 +1,0 @@
-unit mVitAll;
-
-interface
-
-uses 
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, mVitCirGirth, mVitCVP, mVitPO2, mVitPain, mVitWeight,
-  mVitHeight, mVitBP, mVitResp, mVitPulse, mVitBase, mVitTemp, mVitMetric;
-
-type
-  TfraVitAll = class(TFrame)
-    fraVitMetric1: TfraVitMetric;
-    fraVitTemp1: TfraVitTemp;
-    fraVitPulse1: TfraVitPulse;
-    fraVitResp1: TfraVitResp;
-    fraVitPB1: TfraVitPB;
-    fraVitHeight1: TfraVitHeight;
-    fraVitWeight1: TfraVitWeight;
-    fraVitPain1: TfraVitPain;
-    fraVitPO21: TfraVitPO2;
-    fraVitCVP1: TfraVitCVP;
-    fraVitCircum1: TfraVitCircum;
-  private
-  public
-  end;
-
-implementation
-
-uses uVitals;
-
-{$R *.DFM}
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitBP.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitBP.dfm	(revision 456)
+++ 	(revision )
@@ -1,53 +1,0 @@
-inherited fraVitPB: TfraVitPB
-  Width = 288
-  inherited lblVitalType: TLabel
-    Width = 17
-    Caption = 'BP:'
-  end
-  object lblSlash: TLabel [1]
-    Left = 70
-    Top = 0
-    Width = 5
-    Height = 21
-    AutoSize = False
-    Caption = '/'
-    Layout = tlCenter
-  end
-  inherited btnQuals: TBitBtn
-    Left = 129
-  end
-  object udSystolic: TUpDown
-    Left = 50
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 1
-    Wrap = False
-  end
-  object edtSystolic: TEdit
-    Left = 19
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 2
-  end
-  object udDiastolic: TUpDown
-    Left = 111
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 3
-    Wrap = False
-  end
-  object edtDiastolic: TEdit
-    Left = 80
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 4
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitBP.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitBP.pas	(revision 456)
+++ 	(revision )
@@ -1,41 +1,0 @@
-unit mVitBP;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls;
-
-type
-  TfraVitPB = class(TfraVitBase)
-    udSystolic: TUpDown;
-    edtSystolic: TEdit;
-    udDiastolic: TUpDown;
-    edtDiastolic: TEdit;
-    lblSlash: TLabel;
-  private
-    { Private declarations }
-  public
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitPB: TfraVitPB;
-
-implementation
-
-uses uVitals;
-
-{$R *.DFM}
-
-{ TfraVitPB }
-
-function TfraVitPB.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtBP;
-  Result.VValue := edtSystolic.Text + '/' + edtDiastolic.Text;
-  if Result.VValue = '/' then
-    Result.VValue := '';
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitBase.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitBase.dfm	(revision 456)
+++ 	(revision )
@@ -1,39 +1,0 @@
-object fraVitBase: TfraVitBase
-  Left = 0
-  Top = 0
-  Width = 319
-  Height = 21
-  TabOrder = 0
-  object lblVitalType: TLabel
-    Left = 0
-    Top = 0
-    Width = 54
-    Height = 21
-    Align = alLeft
-    Caption = 'lblVitalType'
-    Layout = tlCenter
-  end
-  object btnQuals: TBitBtn
-    Left = 160
-    Top = 0
-    Width = 159
-    Height = 21
-    Anchors = [akTop, akRight, akBottom]
-    Caption = 'Qualifiers'
-    TabOrder = 0
-    Glyph.Data = {
-      3E010000424D3E010000000000007600000028000000280000000A0000000100
-      040000000000C800000000000000000000001000000000000000000000000000
-      8000008000000080800080000000800080008080000080808000C0C0C0000000
-      FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00888888888888
-      888888888888888888888888888888887788888888FF88888888FF88888888FF
-      88888888F7888888887F888888887F888888880F8888888F877888888778F888
-      888788F888888078F888888F887888888788F888888788F888888078F88888F8
-      8877888877888F888878888F888807888F8888F88887888878888F888878888F
-      888807888F888F8888877887788888F887888888F880788888F88FFFFFFF7887
-      777777F887777777F880000000F8888888888888888888888888888888888888
-      8888}
-    Layout = blGlyphRight
-    NumGlyphs = 4
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitBase.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitBase.pas	(revision 456)
+++ 	(revision )
@@ -1,58 +1,0 @@
-unit mVitBase;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, Buttons, uVitals;
-
-type
-  TVitInfo = record
-    VType: TVitalType;
-    VValue: string;
-  end;
-
-  TfraVitBase = class(TFrame)
-    lblVitalType: TLabel;
-    btnQuals: TBitBtn;
-  private
-    { Private declarations }
-  public
-    constructor Create(AOwner: TComponent); override;
-    procedure VitalsMetricChanged; virtual;
-    procedure VitalsCVPUnitsChanged; virtual;
-    function GetVitalInfo: TVitInfo; virtual;
-  end;
-
-var
-  VitEnabledColor: array[boolean] of TColor = (clBtnFace, clWindow);
-  
-implementation
-
-{$R *.DFM}
-
-{ TFrame1 }
-
-constructor TfraVitBase.Create(AOwner: TComponent);
-begin
-  inherited;
-  VitalsFrameCreated(Self);
-  VitalsMetricChanged;
-  VitalsCVPUnitsChanged;
-end;
-
-function TfraVitBase.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtUnknown;
-  Result.VValue := '';
-end;
-
-procedure TfraVitBase.VitalsCVPUnitsChanged;
-begin
-end;
-
-procedure TfraVitBase.VitalsMetricChanged;
-begin
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitCVP.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitCVP.dfm	(revision 456)
+++ 	(revision )
@@ -1,61 +1,0 @@
-inherited fraVitCVP: TfraVitCVP
-  Width = 414
-  inherited lblVitalType: TLabel
-    Width = 24
-    Caption = 'CVP:'
-  end
-  object lblMm: TLabel [1]
-    Left = 154
-    Top = 0
-    Width = 30
-    Height = 21
-    AutoSize = False
-    Caption = 'mmHg'
-    Layout = tlCenter
-  end
-  object lblCm: TLabel [2]
-    Left = 61
-    Top = 0
-    Width = 36
-    Height = 21
-    AutoSize = False
-    Caption = 'cmH2O'
-    Layout = tlCenter
-  end
-  inherited btnQuals: TBitBtn
-    Left = 255
-  end
-  object edtCVPcm: TEdit
-    Left = 26
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 1
-  end
-  object UpDown1: TUpDown
-    Left = 101
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 2
-    Wrap = False
-  end
-  object edtCVPmm: TEdit
-    Left = 118
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 3
-  end
-  object cbcmH2O: TORCheckBox
-    Left = 196
-    Top = 3
-    Width = 55
-    Height = 16
-    Caption = 'cmH2O'
-    TabOrder = 4
-    OnClick = cbcmH2OClick
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitCVP.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitCVP.pas	(revision 456)
+++ 	(revision )
@@ -1,66 +1,0 @@
-unit mVitCVP;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, ComCtrls, StdCtrls, Buttons, ORCtrls;
-
-type
-  TfraVitCVP = class(TfraVitBase)
-    edtCVPcm: TEdit;
-    UpDown1: TUpDown;
-    lblMm: TLabel;
-    edtCVPmm: TEdit;
-    lblCm: TLabel;
-    cbcmH2O: TORCheckBox;
-    procedure cbcmH2OClick(Sender: TObject);
-  private
-    FChanging: boolean;
-  public
-    function GetVitalInfo: TVitInfo; override;
-    procedure VitalsCVPUnitsChanged; override;
-  end;
-
-var
-  fraVitCVP: TfraVitCVP;
-
-implementation
-
-uses uVitals, rVitals;
-
-{$R *.DFM}
-
-{ TfraVitCVP }
-
-function TfraVitCVP.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtCVP;
-  Result.VValue := edtCVPcm.Text;
-end;
-
-procedure TfraVitCVP.VitalsCVPUnitsChanged;
-begin
-  inherited;
-  edtCVPmm.Color := VitEnabledColor[uVitCVPmmHg];
-  edtCVPmm.Enabled := uVitCVPmmHg;
-  edtCVPmm.TabStop := uVitCVPmmHg;
-  edtCVPcm.Color := VitEnabledColor[not uVitCVPmmHg];
-  edtCVPcm.Enabled := not uVitCVPmmHg;
-  edtCVPcm.TabStop := not uVitCVPmmHg;
-  FChanging := TRUE;
-  try
-    cbcmH2O.Checked := not uVitCVPmmHg;
-  finally
-    FChanging := FALSE;
-  end;
-end;
-
-procedure TfraVitCVP.cbcmH2OClick(Sender: TObject);
-begin
-  inherited;
-  if FChanging then exit;
-  SetVitCVPmmHg(not cbcmH2O.Checked);
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitCirGirth.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitCirGirth.dfm	(revision 456)
+++ 	(revision )
@@ -1,52 +1,0 @@
-inherited fraVitCircum: TfraVitCircum
-  Width = 297
-  inherited lblVitalType: TLabel
-    Width = 18
-    Caption = 'CG:'
-  end
-  object lblIn: TLabel [1]
-    Left = 55
-    Top = 0
-    Width = 8
-    Height = 21
-    AutoSize = False
-    Caption = 'in'
-    Layout = tlCenter
-  end
-  object lblCm: TLabel [2]
-    Left = 119
-    Top = 0
-    Width = 14
-    Height = 21
-    AutoSize = False
-    Caption = 'cm'
-    Layout = tlCenter
-  end
-  inherited btnQuals: TBitBtn
-    Left = 138
-  end
-  object edtCirIn: TEdit
-    Left = 20
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 1
-  end
-  object udCir: TUpDown
-    Left = 67
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 2
-    Wrap = False
-  end
-  object edtCirCm: TEdit
-    Left = 84
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 3
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitCirGirth.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitCirGirth.pas	(revision 456)
+++ 	(revision )
@@ -1,51 +1,0 @@
-unit mVitCirGirth;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls;
-
-type
-  TfraVitCircum = class(TfraVitBase)
-    edtCirIn: TEdit;
-    lblIn: TLabel;
-    udCir: TUpDown;
-    edtCirCm: TEdit;
-    lblCm: TLabel;
-  private
-    { Private declarations }
-  public
-    procedure VitalsMetricChanged; override;
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitCircum: TfraVitCircum;
-
-implementation
-
-uses uVitals, rVitals;
-
-{$R *.DFM}
-
-{ TfraVitCircum }
-
-function TfraVitCircum.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtCircum;
-  Result.VValue := edtCirIn.Text;
-end;
-
-procedure TfraVitCircum.VitalsMetricChanged;
-begin
-  inherited;
-  edtCirCm.Color := VitEnabledColor[uVitalsMetric];
-  edtCirCm.Enabled := uVitalsMetric;
-  edtCirCm.TabStop := uVitalsMetric;
-  edtCirIn.Color := VitEnabledColor[not uVitalsMetric];
-  edtCirIn.Enabled := not uVitalsMetric;
-  edtCirIn.TabStop := not uVitalsMetric;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitHeight.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitHeight.dfm	(revision 456)
+++ 	(revision )
@@ -1,52 +1,0 @@
-inherited fraVitHeight: TfraVitHeight
-  Width = 313
-  inherited lblVitalType: TLabel
-    Width = 34
-    Caption = 'Height:'
-  end
-  object lblIn: TLabel [1]
-    Left = 71
-    Top = 0
-    Width = 8
-    Height = 21
-    AutoSize = False
-    Caption = 'in'
-    Layout = tlCenter
-  end
-  object Label1: TLabel [2]
-    Left = 135
-    Top = 0
-    Width = 14
-    Height = 21
-    AutoSize = False
-    Caption = 'cm'
-    Layout = tlCenter
-  end
-  inherited btnQuals: TBitBtn
-    Left = 154
-  end
-  object edtHtIn: TEdit
-    Left = 36
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 1
-  end
-  object udHeight: TUpDown
-    Left = 83
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 2
-    Wrap = False
-  end
-  object edtHtCm: TEdit
-    Left = 100
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 3
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitHeight.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitHeight.pas	(revision 456)
+++ 	(revision )
@@ -1,51 +1,0 @@
-unit mVitHeight;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls;
-
-type
-  TfraVitHeight = class(TfraVitBase)
-    edtHtIn: TEdit;
-    lblIn: TLabel;
-    udHeight: TUpDown;
-    edtHtCm: TEdit;
-    Label1: TLabel;
-  private
-    { Private declarations }
-  public
-    procedure VitalsMetricChanged; override;
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitHeight: TfraVitHeight;
-
-implementation
-
-uses uVitals, rVitals;
-
-{$R *.DFM}
-
-{ TfraVitHeight }
-
-function TfraVitHeight.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtHeight;
-  Result.VValue := edtHtIn.Text;
-end;
-
-procedure TfraVitHeight.VitalsMetricChanged;
-begin
-  inherited;
-  edtHtCm.Color := VitEnabledColor[uVitalsMetric];
-  edtHtCm.Enabled := uVitalsMetric;
-  edtHtCm.TabStop := uVitalsMetric;
-  edtHtIn.Color := VitEnabledColor[not uVitalsMetric];
-  edtHtIn.Enabled := not uVitalsMetric;
-  edtHtIn.TabStop := not uVitalsMetric;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitMetric.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitMetric.dfm	(revision 456)
+++ 	(revision )
@@ -1,22 +1,0 @@
-object fraVitMetric: TfraVitMetric
-  Left = 0
-  Top = 0
-  Width = 161
-  Height = 40
-  TabOrder = 0
-  object rgMetric: TRadioGroup
-    Left = 0
-    Top = 0
-    Width = 161
-    Height = 40
-    Align = alClient
-    Caption = 'Measurements'
-    Columns = 2
-    ItemIndex = 0
-    Items.Strings = (
-      'Standard'
-      'Metric')
-    TabOrder = 0
-    OnClick = rgMetricClick
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitMetric.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitMetric.pas	(revision 456)
+++ 	(revision )
@@ -1,54 +1,0 @@
-unit mVitMetric;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ExtCtrls;
-
-type
-  TfraVitMetric = class(TFrame)
-    rgMetric: TRadioGroup;
-    procedure rgMetricClick(Sender: TObject);
-  private
-    FChanging: boolean;
-  public
-    constructor Create(AOwner: TComponent); override;
-    procedure VitalsMetricChanged;
-  end;
-
-implementation
-
-uses rVitals, uVitals;
-
-{$R *.DFM}
-
-{ TfraVitMetric }
-
-constructor TfraVitMetric.Create(AOwner: TComponent);
-begin
-  inherited;
-  VitalsMetricChanged;
-  VitalsFrameCreated(Self);
-end;
-
-procedure TfraVitMetric.rgMetricClick(Sender: TObject);
-begin
-  if FChanging then exit;
-  SetVitalsMetric(rgMetric.ItemIndex = 1);
-end;
-
-procedure TfraVitMetric.VitalsMetricChanged;
-begin
-  FChanging := TRUE;
-  try
-    if uVitalsMetric then
-      rgMetric.ItemIndex := 1
-    else
-      rgMetric.ItemIndex := 0;
-  finally
-    FCHanging := FALSE;
-  end;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitPO2.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitPO2.dfm	(revision 456)
+++ 	(revision )
@@ -1,36 +1,0 @@
-inherited fraVitPO2: TfraVitPO2
-  Width = 250
-  inherited lblVitalType: TLabel
-    Width = 24
-    Caption = 'PO2:'
-  end
-  object lblPercent: TLabel [1]
-    Left = 61
-    Top = 0
-    Width = 8
-    Height = 21
-    AutoSize = False
-    Caption = '%'
-    Layout = tlCenter
-  end
-  inherited btnQuals: TBitBtn
-    Left = 91
-  end
-  object UpDown1: TUpDown
-    Left = 73
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 1
-    Wrap = False
-  end
-  object edtPO2: TEdit
-    Left = 26
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 2
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitPO2.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitPO2.pas	(revision 456)
+++ 	(revision )
@@ -1,37 +1,0 @@
-unit mVitPO2;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ORCtrls, ComCtrls;
-
-type
-  TfraVitPO2 = class(TfraVitBase)
-    UpDown1: TUpDown;
-    lblPercent: TLabel;
-    edtPO2: TEdit;
-  private
-    { Private declarations }
-  public
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitPO2: TfraVitPO2;
-
-implementation
-
-uses uVitals;
-
-{$R *.DFM}
-
-{ TfraVitPO2 }
-
-function TfraVitPO2.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtPO2;
-  Result.VValue := edtPO2.Text;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitPain.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitPain.dfm	(revision 456)
+++ 	(revision )
@@ -1,29 +1,0 @@
-inherited fraVitPain: TfraVitPain
-  Width = 288
-  inherited lblVitalType: TLabel
-    Width = 24
-    Caption = 'Pain:'
-  end
-  inherited btnQuals: TBitBtn
-    Left = 129
-  end
-  object cbxPain: TORComboBox
-    Left = 26
-    Top = 0
-    Width = 102
-    Height = 21
-    Style = orcsDropDown
-    AutoSelect = True
-    Color = clWindow
-    DropDownCount = 8
-    ItemHeight = 13
-    ItemTipColor = clWindow
-    ItemTipEnable = True
-    ListItemsOnly = False
-    LongList = False
-    MaxLength = 0
-    Sorted = False
-    SynonymChars = '<>'
-    TabOrder = 1
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitPain.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitPain.pas	(revision 456)
+++ 	(revision )
@@ -1,35 +1,0 @@
-unit mVitPain;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ORCtrls;
-
-type
-  TfraVitPain = class(TfraVitBase)
-    cbxPain: TORComboBox;
-  private
-    { Private declarations }
-  public
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitPain: TfraVitPain;
-
-implementation
-
-uses uVitals;
-
-{$R *.DFM}
-
-{ TfraVitPain }
-
-function TfraVitPain.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtPain;
-  Result.VValue := cbxPain.ItemID;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitPulse.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitPulse.dfm	(revision 456)
+++ 	(revision )
@@ -1,27 +1,0 @@
-inherited fraVitPulse: TfraVitPulse
-  Width = 240
-  inherited lblVitalType: TLabel
-    Width = 29
-    Caption = 'Pulse:'
-  end
-  inherited btnQuals: TBitBtn
-    Left = 81
-  end
-  object edtPulse: TEdit
-    Left = 31
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 1
-  end
-  object UpDown1: TUpDown
-    Left = 62
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 2
-    Wrap = False
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitPulse.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitPulse.pas	(revision 456)
+++ 	(revision )
@@ -1,36 +1,0 @@
-unit mVitPulse;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls, Spin;
-
-type
-  TfraVitPulse = class(TfraVitBase)
-    edtPulse: TEdit;
-    UpDown1: TUpDown;
-  private
-    { Private declarations }
-  public
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitPulse: TfraVitPulse;
-
-implementation
-
-uses uVitals;
-
-{$R *.DFM}
-
-{ TfraVitPulse }
-
-function TfraVitPulse.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtPulse;
-  Result.VValue := edtPulse.Text;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitResp.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitResp.dfm	(revision 456)
+++ 	(revision )
@@ -1,27 +1,0 @@
-inherited fraVitResp: TfraVitResp
-  Width = 238
-  inherited lblVitalType: TLabel
-    Width = 28
-    Caption = 'Resp:'
-  end
-  inherited btnQuals: TBitBtn
-    Left = 79
-  end
-  object UpDown1: TUpDown
-    Left = 61
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 1
-    Wrap = False
-  end
-  object edtResp: TEdit
-    Left = 30
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 2
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitResp.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitResp.pas	(revision 456)
+++ 	(revision )
@@ -1,36 +1,0 @@
-unit mVitResp;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls;
-
-type
-  TfraVitResp = class(TfraVitBase)
-    UpDown1: TUpDown;
-    edtResp: TEdit;
-  private
-    { Private declarations }
-  public
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitResp: TfraVitResp;
-
-implementation
-
-uses uVitals;
-
-{$R *.DFM}
-
-{ TfraVitResp }
-
-function TfraVitResp.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtResp;
-  Result.VValue := edtResp.Text;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitTemp.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitTemp.dfm	(revision 456)
+++ 	(revision )
@@ -1,52 +1,0 @@
-inherited fraVitTemp: TfraVitTemp
-  Width = 299
-  inherited lblVitalType: TLabel
-    Width = 30
-    Caption = 'Temp:'
-  end
-  object lblF: TLabel [1]
-    Left = 67
-    Top = 0
-    Width = 6
-    Height = 21
-    AutoSize = False
-    Caption = 'F'
-    Layout = tlCenter
-  end
-  object lblC: TLabel [2]
-    Left = 129
-    Top = 0
-    Width = 7
-    Height = 21
-    AutoSize = False
-    Caption = 'C'
-    Layout = tlCenter
-  end
-  inherited btnQuals: TBitBtn
-    Left = 140
-  end
-  object edtTempF: TEdit
-    Left = 32
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 1
-  end
-  object udTemp: TUpDown
-    Left = 77
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 2
-    Wrap = False
-  end
-  object edtTempC: TEdit
-    Left = 94
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 3
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitTemp.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitTemp.pas	(revision 456)
+++ 	(revision )
@@ -1,51 +1,0 @@
-unit mVitTemp;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls;
-
-type
-  TfraVitTemp = class(TfraVitBase)
-    edtTempF: TEdit;
-    udTemp: TUpDown;
-    edtTempC: TEdit;
-    lblF: TLabel;
-    lblC: TLabel;
-  private
-    { Private declarations }
-  public
-    procedure VitalsMetricChanged; override;
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitTemp: TfraVitTemp;
-
-implementation
-
-uses uVitals, rVitals;
-
-{$R *.DFM}
-
-{ TfraVitTemp }
-
-function TfraVitTemp.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtTemp;
-  Result.VValue := edtTempF.Text;
-end;
-
-procedure TfraVitTemp.VitalsMetricChanged;
-begin
-  inherited;
-  edtTempC.Color := VitEnabledColor[uVitalsMetric];
-  edtTempC.Enabled := uVitalsMetric;
-  edtTempC.TabStop := uVitalsMetric;
-  edtTempF.Color := VitEnabledColor[not uVitalsMetric];
-  edtTempF.Enabled := not uVitalsMetric;
-  edtTempF.TabStop := not uVitalsMetric;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/mVitWeight.dfm
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitWeight.dfm	(revision 456)
+++ 	(revision )
@@ -1,48 +1,0 @@
-inherited fraVitWeight: TfraVitWeight
-  inherited lblVitalType: TLabel
-    Width = 37
-    Caption = 'Weight:'
-  end
-  object lblLbs: TLabel [1]
-    Left = 74
-    Top = 0
-    Width = 13
-    Height = 21
-    AutoSize = False
-    Caption = 'lbs'
-    Layout = tlCenter
-  end
-  object Label1: TLabel [2]
-    Left = 143
-    Top = 0
-    Width = 12
-    Height = 21
-    AutoSize = False
-    Caption = 'kg'
-    Layout = tlCenter
-  end
-  object edtWtLbs: TEdit
-    Left = 39
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 1
-  end
-  object udWeight: TUpDown
-    Left = 91
-    Top = 0
-    Width = 16
-    Height = 21
-    Min = 0
-    Position = 0
-    TabOrder = 2
-    Wrap = False
-  end
-  object edtWtKg: TEdit
-    Left = 108
-    Top = 0
-    Width = 31
-    Height = 21
-    TabOrder = 3
-  end
-end
Index: cprs/trunk/CPRS-Chart/Vitals/mVitWeight.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/mVitWeight.pas	(revision 456)
+++ 	(revision )
@@ -1,51 +1,0 @@
-unit mVitWeight;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  mVitBase, StdCtrls, Buttons, ComCtrls;
-
-type
-  TfraVitWeight = class(TfraVitBase)
-    edtWtLbs: TEdit;
-    lblLbs: TLabel;
-    udWeight: TUpDown;
-    edtWtKg: TEdit;
-    Label1: TLabel;
-  private
-    { Private declarations }
-  public
-    procedure VitalsMetricChanged; override;
-    function GetVitalInfo: TVitInfo; override;
-  end;
-
-var
-  fraVitWeight: TfraVitWeight;
-
-implementation
-
-uses uVitals, rVitals;
-
-{$R *.DFM}
-
-{ TfraVitWeight }
-
-function TfraVitWeight.GetVitalInfo: TVitInfo;
-begin
-  Result.VType := vtWeight;
-  Result.VValue := edtWtLbs.Text;
-end;
-
-procedure TfraVitWeight.VitalsMetricChanged;
-begin
-  inherited;
-  edtWtKg.Color := VitEnabledColor[uVitalsMetric];
-  edtWtKg.Enabled := uVitalsMetric;
-  edtWtKg.TabStop := uVitalsMetric;
-  edtWtLbs.Color := VitEnabledColor[not uVitalsMetric];
-  edtWtLbs.Enabled := not uVitalsMetric;
-  edtWtLbs.TabStop := not uVitalsMetric;
-end;
-
-end.
Index: cprs/trunk/CPRS-Chart/Vitals/rVitals.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/rVitals.pas	(revision 456)
+++ cprs/trunk/CPRS-Chart/Vitals/rVitals.pas	(revision 829)
@@ -49,5 +49,5 @@
   IDString := patientid;  //*DFN*
   CallV('ORQQVI VITALS', [IDString]);
-  Dest.assign(RPCBrokerV.Results);
+  FastAssign(RPCBrokerV.Results, Dest);
 end;
 
@@ -86,5 +86,5 @@
   NoteIENStr := IntToStr(NoteIen);
   CallV('ORQQVI NOTEVIT', [IDString, NoteIENStr]);
-  Dest.assign(RPCBrokerV.Results);
+  FastAssign(RPCBrokerV.Results, Dest);
 end;
 
@@ -96,5 +96,5 @@
   EncDate := FloatToStr(DateTime);
   CallV('ORQQVI VITALS', [IDString, EncDate]);
-  Dest.assign(RPCBrokerV.Results);
+  FastAssign(RPCBrokerV.Results, Dest);
 end;
 
@@ -139,5 +139,5 @@
     if(RPCBrokerV.Results.Count > 0) then
       RPCBrokerV.Results.Delete(0);
-    uVitalList.assign(RPCBrokerV.Results);
+    FastAssign(RPCBrokerV.Results, uVitalList);
   end;
   Result := uVitalList;
Index: cprs/trunk/CPRS-Chart/Vitals/uVitals.pas
===================================================================
--- cprs/trunk/CPRS-Chart/Vitals/uVitals.pas	(revision 456)
+++ cprs/trunk/CPRS-Chart/Vitals/uVitals.pas	(revision 829)
@@ -32,6 +32,4 @@
 function ConvertVitalData(const Value: string; VitalType: TVitalType; UnitType: string = ''): string;
 procedure VitalsFrameCreated(Frame: TFrame);
-procedure SetVitalsMetric(const Value: boolean);
-procedure SetVitCVPmmHg(const Value: boolean);
 function ValidVitalsDate(var ADate: TFMDateTime; SkipFirst: boolean = FALSE; Show: boolean = true): boolean;
 function IsNumericWeight(const x: string): Boolean;
@@ -80,5 +78,4 @@
   VitalLocationStr = 'VST^HL^';
 
-  SHARE_DIR = '\VISTA\Common Files\';
   GMV_CONTEXT = 'OR CPRS GUI CHART';
   GMV_APP_SIGNATURE = 'CPRS';
@@ -126,6 +123,6 @@
 
 var
-  VitalsDLLHandle : THandle;
-  DLLForceClose : Boolean = False;
+  VitalsDLLHandle : THandle = 0;
+//  DLLForceClose : Boolean = False;  // jm - removed as part of timeout fix
 
 
@@ -177,5 +174,5 @@
 
 uses
-  uCore, rCore, rVitals, Contnrs, mVitBase, mVitMetric, fVitalsDate;
+  uCore, rCore, rVitals, Contnrs, fVitalsDate, VAUtils;
   
 var
@@ -191,5 +188,7 @@
     if assigned(VitalsExit) then
       VitalsExit();
-    DLLForceClose := True;
+    FreeLibrary(VitalsDLLHandle);
+    VitalsDLLHandle := 0;
+//    DLLForceClose := True;   // jm - removed as part of timeout fix
   end;
 end;
@@ -379,5 +378,5 @@
   end;
   if(Result) then
-    ShowMessage(VitalErrorText(VType));
+    ShowMsg(VitalErrorText(VType));
 end;
 
@@ -575,38 +574,4 @@
 end;
 
-procedure SetVitalsMetric(const Value: boolean);
-var
-  i: integer;
-
-begin
-  if(uVitalsMetric <> Value) then
-  begin
-    uVitalsMetric := Value;
-    for i := 0 to uVitalFrames.Count-1 do
-    begin
-      if uVitalFrames[i] is TfraVitBase then
-        TfraVitBase(uVitalFrames[i]).VitalsMetricChanged
-      else
-      if uVitalFrames[i] is TfraVitMetric then
-        TfraVitMetric(uVitalFrames[i]).VitalsMetricChanged
-    end;   
-  end;
-end;
-
-procedure SetVitCVPmmHg(const Value: boolean);
-var
-  i: integer;
-
-begin
-  if(uVitCVPmmHg <> Value) then
-  begin
-    uVitCVPmmHg := Value;
-    for i := 0 to uVitalFrames.Count-1 do
-      if uVitalFrames[i] is TfraVitBase then
-        TfraVitBase(uVitalFrames[i]).VitalsCVPUnitsChanged;
-  end;
-end;
-
-
 function ValidVitalsDate(var ADate: TFMDateTime; SkipFirst: boolean = FALSE; Show: boolean = true): boolean;   //AGP Change 26.1
 var