Changeset 4 for trunk/UGraphic.pas

Timestamp:

Sep 16, 2014, 11:55:35 AM (10 years ago)

Author:

chronos

Message:

• Added: Action to fill image with random image.
• Fixed: Pixel load/save to bitmap was using Move with pointers instead pointed value.

File:

• trunk/UGraphic.pas (modified) (7 diffs)

trunk/UGraphic.pas

@@ -25 +25 @@
     function ChannelUsed(Channel: TGColorChannel): Boolean;
     function ColorToTColor(Color: TGColor): TColor; virtual;
+    procedure ColorFromTColor(GColor: TGColor; Color: TColor); virtual;
     function GetColorClass: TGColorClass; virtual;
   end;
@@ -38 +39 @@
     function GetChannel(Channel: TGColorChannel): TGColor;
     procedure SetColorFormat(AValue: TGColorFormatClass);
-    procedure LoadData(Data: Pointer); virtual;
-    procedure SaveData(Data: Pointer); virtual;
+    procedure LoadData(BitmapData: Pointer); virtual;
+    procedure SaveData(BitmapData: Pointer); virtual;
   public
     function ToTColor: TColor;
+    procedure FromTColor(Color: TColor);
     procedure Assign(Source: TGColor); virtual;
     property Channels[Channel: TGColorChannel]: TGColor read GetChannel;
@@ -69 +71 @@
     procedure PaintToCanvas(Canvas: TCanvas);
     procedure Clear;
+    procedure Random;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -164 +167 @@
 end;
 
+procedure TGColorFormat.ColorFromTColor(GColor: TGColor; Color: TColor);
+begin
+  FillChar(GColor.Data^, GetPixelSize, 0);
+end;
+
 function TGColorFormat.GetColorClass: TGColorClass;
 begin
@@ -187 +195 @@
 end;
 
-procedure TGColor.LoadData(Data: Pointer);
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Move(FData, Data, F.GetPixelSize);
-  F.Free;
-end;
-
-procedure TGColor.SaveData(Data: Pointer);
-var
-  F: TGColorFormat;
-begin
-  F := FColorFormat.Create;
-  Move(Data, FData, F.GetPixelSize);
+procedure TGColor.LoadData(BitmapData: Pointer);
+var
+  F: TGColorFormat;
+begin
+  F := FColorFormat.Create;
+  Move(BitmapData^, FData^, F.GetPixelSize);
+  F.Free;
+end;
+
+procedure TGColor.SaveData(BitmapData: Pointer);
+var
+  F: TGColorFormat;
+begin
+  F := FColorFormat.Create;
+  Move(FData^, BitmapData^, F.GetPixelSize);
   F.Free;
 end;
@@ -211 +219 @@
   F := FColorFormat.Create;
   Result := F.ColorToTColor(Self);
+  F.Free;
+end;
+
+procedure TGColor.FromTColor(Color: TColor);
+var
+  F: TGColorFormat;
+begin
+  F := FColorFormat.Create;
+  F.ColorFromTColor(Self, Color);
   F.Free;
 end;
@@ -305 +322 @@
 end;
 
+procedure TGBitmap.Random;
+var
+  X, Y: Integer;
+  Color: TGColor;
+begin
+  Color := TGColor.Create;
+  Color.Format := ColorFormat;
+  for Y := 0 to Size.Y - 1 do
+    for X := 0 to Size.X - 1 do begin
+      Color.FromTColor(System.Random($ffffff));
+      Pixels[X, Y] := Color;
+    end;
+  Color.Free;
+end;
+
 constructor TGBitmap.Create;
 begin