Changeset 413 for PinConnection/UCommSerialPort.pas

Timestamp:

Aug 16, 2012, 12:59:53 PM (12 years ago)

Author:

chronos

Message:

• Modified: Classes using TCommPin class now inherits from TCommNode which inherits from TComponent. All TCommNodes are now registred as components in PinConnection group on component palette.
• Modified: TCommPin now have reference to parent TCommNode.

File:

• PinConnection/UCommSerialPort.pas (modified) (5 diffs)

PinConnection/UCommSerialPort.pas

@@ -13 +13 @@
   { TCommSerialPort }
 
-  TCommSerialPort = class(TSerialPort)
+  TCommSerialPort = class(TCommNode)
   private
     procedure Receive(Sender: TCommPin; Stream: TListByte);
     procedure SetStatus(Sender: TCommPin; AValue: Integer);
     procedure ReceiveData(Stream: TListByte);
+  protected
+    procedure SetActive(AValue: Boolean); override;
   public
+    SerialPort: TSerialPort;
     Lock: TCriticalSection;
     Pin: TCommPin;
     destructor Destroy; override;
-    constructor Create;
+    constructor Create(AOwner: TComponent); override;
   end;
 
@@ -33 +36 @@
 procedure TCommSerialPort.ReceiveData(Stream: TListByte);
 begin
-  if Active then Pin.Send(Stream);
+  if SerialPort.Active then Pin.Send(Stream);
+end;
+
+procedure TCommSerialPort.SetActive(AValue: Boolean);
+begin
+  inherited SetActive(AValue);
+  SerialPort.Active := AValue;
 end;
 
@@ -40 +49 @@
   try
     Lock.Acquire;
-    if (AValue and 1) = 1 then Parity := paMark else Parity := paSpace;
+    if (AValue and 1) = 1 then SerialPort.Parity := paMark
+      else SerialPort.Parity := paSpace;
   finally
     Lock.Release;
@@ -46 +56 @@
 end;
 
-constructor TCommSerialPort.Create;
+constructor TCommSerialPort.Create(AOwner: TComponent);
 begin
   inherited;
+  SerialPort := TSerialPort.Create;
+  SerialPort.OnReceiveData := ReceiveData;
   Lock := TCriticalSection.Create;
   Pin := TCommPin.Create;
   Pin.OnReceive := Receive;
   Pin.OnSetSatus := SetStatus;
-  OnReceiveData := ReceiveData;
+  Pin.Node := Self;
 end;
 
 destructor TCommSerialPort.Destroy;
 begin
-  OnReceiveData := nil;
+  SerialPort.OnReceiveData := nil;
   Pin.Free;
   Lock.Free;
+  SerialPort.Free;
   inherited;
 end;
@@ -71 +84 @@
     S := TMemoryStream.Create;
     Stream.WriteToStream(S);
-    if Active then begin
+    if SerialPort.Active then begin
       S.Position := 0;
       repeat
         try
           Lock.Acquire;
-          if CanWrite(0) then
-            SendStreamRaw(S);
+          if SerialPort.CanWrite(0) then
+            SerialPort.SendStreamRaw(S);
         finally
           Lock.Release;