Changeset 342 for Generics/TemplateGenerics/Generic

Timestamp:

Apr 3, 2012, 7:35:26 AM (12 years ago)

Author:

chronos

Message:

• Added: Update locking support for TGList.
• Modified: Enhanced TGStream methods.

Location:

Generics/TemplateGenerics/Generic

Files:

• GenericList.inc (modified) (21 diffs)
• GenericRectangle.inc (modified) (4 diffs)
• GenericStream.inc (modified) (1 diff)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -24 +24 @@
     FItems: array of TGListItem;
     FCount: TGListIndex;
+    FUpdateCount: NativeInt;
+    FOnUpdate: TNotifyEvent;
     function Get(Index: TGListIndex): TGListItem;
     function GetCapacity: TGListIndex;
@@ -72 +74 @@
     procedure Sort(Compare: TGListSortCompare);
     procedure SetArray(Values: array of TGListItem);
+    procedure BeginUpdate;
+    procedure EndUpdate;
+    procedure Update;
     property Count: TGListIndex read FCount write SetCount;
     property Capacity: TGListIndex read GetCapacity write SetCapacity;
@@ -107 +112 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -118 +124 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -130 +137 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -248 +256 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -294 +303 @@
   InsertCount(Index, 1);
   FItems[Index] := Item;
+  Update;
 end;
 
@@ -319 +329 @@
   if Index < FCount then
     System.Move(FItems[Index], FItems[Index + ACount], (FCount - ACount - Index) * SizeOf(TGListItem));
+  Update;
 end;
 
@@ -409 +420 @@
   //Delete(CurIndex);
   //Insert(NewIndex, Temp);
+  Update;
 end;
 
@@ -434 +446 @@
     end;
   end;
+  Update;
 end;
 
@@ -469 +482 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -475 +489 @@
   if FCount > 1 then
     QuickSort(0, FCount - 1, Compare);
+  Update;
 end;
 
@@ -486 +501 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -498 +514 @@
     I := I + 1;
   end;
+end;
+
+procedure TGList.BeginUpdate;
+begin
+  Inc(FUpdateCount);
+end;
+
+procedure TGList.EndUpdate;
+begin
+  Dec(FUpdateCount);
+  Update;
+end;
+
+procedure TGList.Update;
+begin
+  if Assigned(FOnUpdate) and (FUpdateCount = 0) then FOnUpdate(Self);
 end;
 
@@ -530 +562 @@
   Result := FCount - 1;
   FItems[Result] := Item;
+  Update;
 end;
 
@@ -545 +578 @@
     J := J + 1;
   end;
+  Update;
 end;
 
@@ -560 +594 @@
     J := J + 1;
   end;
+  Update;
 end;
 
@@ -575 +610 @@
   System.Move(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TGListItem));
   SetCapacityOptimized(Capacity - 1);
+  Update;
 end;
 
@@ -586 +622 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -597 +634 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -610 +648 @@
   FItems[Index1] := FItems[Index2];
   FItems[Index2] := Temp;
+  Update;
 end;
 

Generics/TemplateGenerics/Generic/GenericRectangle.inc

@@ -11 +11 @@
   function GetTopRight: TGRectanglePoint;
   function GetWidth: TGRectangleDimension;
+  function GetEmpty: Boolean;
   procedure SetBottom(const AValue: TGRectangleDimension);
   procedure SetBottomLeft(const AValue: TGRectanglePoint);
@@ -21 +22 @@
   procedure SetTopLeft(const AValue: TGRectanglePoint);
   procedure SetTopRight(const AValue: TGRectanglePoint);
-
   procedure SetWidth(const AValue: TGRectangleDimension);
+  procedure SetEmpty(const AValue: Boolean);
 public
   FLeft: TGRectangleDimension;
@@ -52 +53 @@
 
   property Size: TGRectanglePoint read GetSize write SetSize;
+  property Empty: Boolean read GetEmpty write SetEmpty;
 end;
 
@@ -199 +201 @@
 procedure TGRectangle.Intersect(Rect1, Rect2: TGRectangle);
 begin
-  Left := Max(Rect1.Left, Rect2.Left);
-  Top := Max(Rect1.Top, Rect2.Top);
-  Right := Min(Rect1.Right, Rect2.Right);
-  Bottom := Min(Rect1.Bottom, Rect2.Bottom);
+  if Rect1.Empty or Rect2.Empty then Empty := True
+  else begin
+    Left := Max(Rect1.Left, Rect2.Left);
+    Top := Max(Rect1.Top, Rect2.Top);
+    Right := Min(Rect1.Right, Rect2.Right);
+    Bottom := Min(Rect1.Bottom, Rect2.Bottom);
+  end;
 end;
 
 procedure TGRectangle.IntersectWith(Rect: TGRectangle);
 begin
-  Left := Max(Left, Rect.Left);
-  Top := Max(Top, Rect.Top);
-  Right := Min(Right, Rect.Right);
-  Bottom := Min(Bottom, Rect.Bottom);
+  if Empty or Rect.Empty then Empty := True
+  else begin
+    Left := Max(Left, Rect.Left);
+    Top := Max(Top, Rect.Top);
+    Right := Min(Right, Rect.Right);
+    Bottom := Min(Bottom, Rect.Bottom);
+  end;
 end;
 
 procedure TGRectangle.Union(Rect1, Rect2: TGRectangle);
 begin
-  Left := Min(Rect1.Left, Rect2.Left);
-  Top := Min(Rect1.Top, Rect2.Top);
-  Right := Max(Rect1.Right, Rect2.Right);
-  Bottom := Max(Rect1.Bottom, Rect2.Bottom);
+  if Rect1.Empty then Assign(Rect2)
+  else
+  if Rect2.Empty then Assign(Rect1)
+  else begin
+    Left := Min(Rect1.Left, Rect2.Left);
+    Top := Min(Rect1.Top, Rect2.Top);
+    Right := Max(Rect1.Right, Rect2.Right);
+    Bottom := Max(Rect1.Bottom, Rect2.Bottom);
+  end;
 end;
 
 procedure TGRectangle.UnionWith(Rect: TGRectangle);
 begin
-  Left := Min(Left, Rect.Left);
-  Top := Min(Top, Rect.Top);
-  Right := Max(Right, Rect.Right);
-  Bottom := Max(Bottom, Rect.Bottom);
+  if Empty then Assign(Rect)
+  else
+  if not Rect.Empty then begin
+    Left := Min(Left, Rect.Left);
+    Top := Min(Top, Rect.Top);
+    Right := Max(Right, Rect.Right);
+    Bottom := Max(Bottom, Rect.Bottom);
+  end;
+end;
+
+function TGRectangle.GetEmpty: Boolean;
+begin
+  Result := (Bottom <= Top) or (Right <= Left);
+end;
+
+procedure TGRectangle.SetEmpty(const AValue: Boolean);
+begin
+  Top := 0;
+  Bottom := 0;
+  Left := 0;
+  Right := 0;
 end;
 

Generics/TemplateGenerics/Generic/GenericStream.inc

@@ -13 +13 @@
   procedure Write(Item: TGStreamItem); virtual; abstract;
   procedure WriteArray(Item: array of TGStreamItem); virtual; abstract;
+  procedure WriteStream(Stream: TGStream; Count: TGStreamIndex); virtual; abstract;
   function Read: TGStreamItem; virtual; abstract;
   function ReadArray(Count: TGStreamIndex): TGStreamItemArray; virtual; abstract;
+  function ReadStream(Stream: TGStream; Count: TGStreamIndex): TGStreamIndex; virtual; abstract;
   function Insert(Count: TGStreamIndex): TGStreamIndex; virtual; abstract;
   function Remove(Count: TGStreamIndex): TGStreamIndex; virtual; abstract;