Changeset 196 for Generics/TemplateGenerics/Generic/GenericMatrix.inc

Timestamp:

Mar 12, 2011, 6:53:25 PM (14 years ago)

Author:

george

Message:

• Added: Generic Bitmap class.
• Modified: Swaped X, Y parameters in ItemsXY property of generic TMatrix.

File:

• Generics/TemplateGenerics/Generic/GenericMatrix.inc (modified) (12 diffs)

Generics/TemplateGenerics/Generic/GenericMatrix.inc

@@ -19 +19 @@
     FItems: array of array of TGMatrixItem;
     FCount: TGMatrixIndex;
-    function GetXY(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixItem;
-    function Get(Index: TGMatrixIndex): TGMatrixItem;
+    function GetItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY): TGMatrixItem;
+    function GetItem(Index: TGMatrixIndex): TGMatrixItem;
     function GetCapacity: TGMatrixIndex;
     function GetLast: TGMatrixItem;
@@ -27 +27 @@
     procedure SetLast(AValue: TGMatrixItem);
     procedure SetFirst(AValue: TGMatrixItem);
-    procedure PutXY(Y: TGMatrixIndexY; X: TGMatrixIndexX; const AValue: TGMatrixItem); virtual;
-    procedure Put(Index: TGMatrixIndex; const AValue: TGMatrixItem); virtual;
+    procedure PutItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY; const AValue: TGMatrixItem); virtual;
+    procedure PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem); virtual;
     procedure SetCount(const AValue: TGMatrixIndex);
   public
@@ -45 +45 @@
     procedure Exchange(Index1, Index2: TGMatrixIndex);
     property First: TGMatrixItem read GetFirst write SetFirst;
+    procedure FillAll(Value: TGMatrixItem);
     procedure Fill(Start, Count: TGMatrixIndex; Value: TGMatrixItem);
     function Implode(RowSeparator, ColSeparator: string; Converter: TGMatrixToStringConverter): string;
@@ -65 +66 @@
     property Count: TGMatrixIndex read FCount write SetCount;
     property Capacity: TGMatrixIndex read GetCapacity write SetCapacity;
-    property ItemsXY[Y: TGMatrixIndexY; X: TGMatrixIndexX]: TGMatrixItem read GetXY write PutXY; default;
-    property Items[Index: TGMatrixIndex]: TGMatrixItem read Get write Put;
+    property ItemsXY[X: TGMatrixIndexX; Y: TGMatrixIndexY]: TGMatrixItem
+      read GetItemXY write PutItemXY; default;
+    property Items[Index: TGMatrixIndex]: TGMatrixItem
+      read GetItem write PutItem;
     property Last: TGMatrixItem read GetLast write SetLast;
   end;
@@ -97 +100 @@
     X := 0;
     while X < Source.Count.X do begin
-      ItemsXY[Index.Y + Y, Index.X + X] := Source.ItemsXY[Y, X];
+      ItemsXY[Index.X + X, Index.Y + Y] := Source.ItemsXY[X, Y];
       X := X + 1;
     end;
@@ -113 +116 @@
     X := 0;
     while X < Source.Count.X do begin
-      ItemsXY[Index.Y + Y, Index.X + X] := Proc(ItemsXY[Index.Y + Y, Index.X + X], Source.ItemsXY[Y, X]);
+      ItemsXY[Index.X + X, Index.Y + Y] := Proc(ItemsXY[Index.X + X, Index.Y + Y], Source.ItemsXY[X, Y]);
       X := X + 1;
     end;
@@ -149 +152 @@
 end;
 
-function TGMatrix.GetXY(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixItem;
+function TGMatrix.GetItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY): TGMatrixItem;
 begin
   if (X < 0) or (X >= Count.X) or
@@ -157 +160 @@
 end;
 
-function TGMatrix.Get(Index: TGMatrixIndex): TGMatrixItem;
+function TGMatrix.GetItem(Index: TGMatrixIndex): TGMatrixItem;
 begin
   if (Index.X < 0) or (Index.X >= Count.X) or
@@ -165 +168 @@
 end;
 
-procedure TGMatrix.PutXY(Y: TGMatrixIndexY; X: TGMatrixIndexX; const AValue: TGMatrixItem);
+procedure TGMatrix.PutItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY; const AValue: TGMatrixItem);
 begin
   if (X < 0) or (X >= Count.X) or
@@ -173 +176 @@
 end;
 
-procedure TGMatrix.Put(Index: TGMatrixIndex; const AValue: TGMatrixItem);
+procedure TGMatrix.PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem);
 begin
   if (Index.X < 0) or (Index.X >= Count.X) or
@@ -510 +513 @@
     X := 0;
     while X < Count.X do begin
-      Result := Result + Converter(ItemsXY[Y, X]);
+      Result := Result + Converter(ItemsXY[X, Y]);
       if X < (Count.X - 1) then
         Result := Result + ColSeparator;
@@ -589 +592 @@
     X := Start.X;
     while X < Count.X do begin
-      ItemsXY[Y, X] := Value;
+      ItemsXY[X, Y] := Value;
       X := X + 1;
     end;
     Y := Y + 1;
   end;
+end;
+
+procedure TGMatrix.FillAll(Value: TGMatrixItem);
+begin
+  Fill(CreateIndex(0, 0), CreateIndex(Count.X - 1, Count.Y - 1), Value);
 end;