Changeset 39 for trunk

Timestamp:

Oct 10, 2018, 3:48:47 PM (6 years ago)

Author:

chronos

Message:

• Added: Mirror, Flip, Gradient, Negative for 4-bit gray image.

Location:

trunk

Files:

• Packages/FastGraphics/ColorFormats/UColorGray1.pas (modified) (2 diffs)
• Packages/FastGraphics/ColorFormats/UColorGray2.pas (modified) (2 diffs)
• Packages/FastGraphics/ColorFormats/UColorGray4.pas (modified) (6 diffs)
• Packages/FastGraphics/ColorFormats/UColorRGB8.pas (modified) (2 diffs)
• Packages/FastGraphics/UFGraphics.pas (modified) (13 diffs)
• UCore.pas (modified) (1 diff)

trunk/Packages/FastGraphics/ColorFormats/UColorGray1.pas

@@ -36 +36 @@
   { TBPixmapGray1 }
 
-  TBPixmapGray1 = class(TBImage)
+  TBPixmapGray1 = class(TBPixmap)
   private
     FillCallBack: TGetColorPos;
@@ -73 +73 @@
   BitDepth := 1;
   BackendColorClass := TBColorGray1;
-  BackendImageClass := TBPixmapGray1;
+  BackendPixmapClass := TBPixmapGray1;
   AddChannel('Gray', 0, 1);
 end;

trunk/Packages/FastGraphics/ColorFormats/UColorGray2.pas

@@ -35 +35 @@
   { TBPixmapGray2 }
 
-  TBPixmapGray2 = class(TBImage)
+  TBPixmapGray2 = class(TBPixmap)
   private
     FillCallBack: TGetColorPos;
@@ -71 +71 @@
   BitDepth := 2;
   BackendColorClass := TBColorGray2;
-  BackendImageClass := TBPixmapGray2;
+  BackendPixmapClass := TBPixmapGray2;
   AddChannel('Gray', 0, 2);
 end;

trunk/Packages/FastGraphics/ColorFormats/UColorGray4.pas

@@ -31 +31 @@
     procedure SetColorName(ColorName: TColorName); override;
     procedure SetRandom; override;
+    procedure SetColor(Color: TColor); override;
   end;
 
   { TBPixmapGray4 }
 
-  TBPixmapGray4 = class(TBImage)
+  TBPixmapGray4 = class(TBPixmap)
   private
     FillCallBack: TGetColorPos;
     function FillGetColor(Position: TPoint): TColorGray4;
+    function NegativeFunc(Position: TPoint): TColorGray4;
   protected
     procedure SetSize(AValue: TPoint); override;
@@ -45 +47 @@
   public
     Pixmap: TPixmapGray4;
+    procedure Flip; override;
+    procedure Mirror; override;
+    procedure Negative; override;
     procedure Fill(Color: IBColor); override;
     procedure Fill(Func: TGetColorPos); override;
@@ -70 +75 @@
   BitDepth := 4;
   BackendColorClass := TBColorGray4;
-  BackendImageClass := TBPixmapGray4;
+  BackendPixmapClass := TBPixmapGray4;
   AddChannel('Gray', 0, 4);
 end;
@@ -110 +115 @@
 end;
 
+procedure TBColorGray4.SetColor(Color: TColor);
+begin
+  Value := ((Color shr 0) and $ff + (Color shr 8) and $ff + (Color shr 16) and $ff) div (3 * 16);
+end;
+
 { TBPixmapGray2 }
 
@@ -115 +125 @@
 begin
   Result := (FillCallBack(Position) as TBColorGray4).Value;
+end;
+
+function TBPixmapGray4.NegativeFunc(Position: TPoint): TColorGray4;
+var
+  C: TColorGray4;
+begin
+  C := Pixmap.Pixels[Position.X, Position.Y];
+  Result := 16 - (C and $f);
 end;
 
@@ -131 +149 @@
 begin
   Pixmap.Pixels[X, Y] := (AValue as TBColorGray4).Value;
+end;
+
+procedure TBPixmapGray4.Flip;
+begin
+  Pixmap.Flip;
+end;
+
+procedure TBPixmapGray4.Mirror;
+begin
+  Pixmap.Mirror;
+end;
+
+procedure TBPixmapGray4.Negative;
+begin
+  Pixmap.Fill(NegativeFunc);
 end;
 

trunk/Packages/FastGraphics/ColorFormats/UColorRGB8.pas

@@ -43 +43 @@
   { TBPixmapRGB8 }
 
-  TBPixmapRGB8 = class(TBImage)
+  TBPixmapRGB8 = class(TBPixmap)
   private
     FillCallBack: TGetColorPos;
@@ -81 +81 @@
   BitDepth := 24;
   Name := 'RGB8';
-  BackendImageClass := TBPixmapRGB8;
+  BackendPixmapClass := TBPixmapRGB8;
   BackendColorClass := TBColorRGB8;
   AddChannel('Red', 0, 8);

trunk/Packages/FastGraphics/UFGraphics.pas

@@ -27 +27 @@
   IBColorClass = class of TBColor;
 
-  { TBImage }
-
-  TBImage = class
+  { TBPixmap }
+
+  TBPixmap = class
   public
     type
@@ -57 +57 @@
   end;
 
-  TBPixmapClass = class of TBImage;
+  TBPixmapClass = class of TBPixmap;
 
   { TColorFormatChannel }
@@ -74 +74 @@
     Channels: array of TColorFormatChannel;
     BackendColorClass: IBColorClass;
-    BackendImageClass: TBPixmapClass;
+    BackendPixmapClass: TBPixmapClass;
     procedure AddChannel(Name: string; Position, BitWidth: Integer);
     function GetBackendColor: IBColor;
-    function GetBackendImage: TBImage;
+    function GetBackendImage: TBPixmap;
     constructor Create; virtual;
     function GetChannelStateCount(Channel: Integer): Integer;
@@ -117 +117 @@
     procedure SetColorName(ColorName: TColorName);
     procedure SetRandom;
+    procedure SetColor(Color: TColor);
     constructor Create; overload;
     constructor Create(ColorFormat: TColorFormat; ColorName: TColorName); overload;
@@ -161 +162 @@
       TGetColorPos = function (Position: TPoint; ColorFormat: TColorFormat): IFColor of object;
   private
-    FBackend: TBImage;
+    FBackend: TBPixmap;
     FCanvas: TFCanvas;
     FColorFormat: TColorFormat;
@@ -190 +191 @@
     destructor Destroy; override;
     property Canvas: TFCanvas read FCanvas;
-    property Backend: TBImage read FBackend;
+    property Backend: TBPixmap read FBackend;
     property ColorFormat: TColorFormat read FColorFormat write SetColorFormat;
     property Size: TPoint read FSize write SetSize;
@@ -313 +314 @@
 end;
 
-function TColorFormat.GetBackendImage: TBImage;
-begin
-  Result := BackendImageClass.Create;
+function TColorFormat.GetBackendImage: TBPixmap;
+begin
+  Result := BackendPixmapClass.Create;
 end;
 
@@ -323 +324 @@
   BitDepth := 0;
   BackendColorClass := TBColor;
-  BackendImageClass := TBImage;
+  BackendPixmapClass := TBPixmap;
 end;
 
@@ -350 +351 @@
 end;
 
+procedure TFColor.SetColor(Color: TColor);
+begin
+  Backend.SetColor(Color);
+end;
+
 constructor TFColor.Create;
 begin
@@ -373 +379 @@
 end;
 
-{ TBImage }
-
-function TBImage.GetPixel(X, Y: Integer): IBColor;
+{ TBPixmap }
+
+function TBPixmap.GetPixel(X, Y: Integer): IBColor;
 begin
   Result := TBColor.Create;
 end;
 
-procedure TBImage.SetPixel(X, Y: Integer; AValue: IBColor);
-begin
-end;
-
-procedure TBImage.SetSize(AValue: TPoint);
+procedure TBPixmap.SetPixel(X, Y: Integer; AValue: IBColor);
+begin
+end;
+
+procedure TBPixmap.SetSize(AValue: TPoint);
 begin
   if (FSize.X = AValue.X) and (FSize.Y = AValue.Y) then Exit;
@@ -390 +396 @@
 end;
 
-procedure TBImage.Mirror;
-begin
-end;
-
-procedure TBImage.Flip;
-begin
-end;
-
-procedure TBImage.Negative;
-begin
-end;
-
-procedure TBImage.Fill(Color: IBColor);
-begin
-end;
-
-procedure TBImage.Fill(Func: TGetColorPos);
-begin
-end;
-
-procedure TBImage.Line(P1, P2: TPoint; Color: IBColor);
-begin
-end;
-
-procedure TBImage.PaintToCanvas(Canvas: TCanvas);
-begin
-end;
-
-procedure TBImage.PaintToCanvas(Canvas: TCanvas; Rect: TRect);
-begin
-end;
-
-procedure TBImage.PaintToBitmap(Bitmap: TBitmap; Rect: TRect);
-begin
-end;
-
-procedure TBImage.LoadFromCanvas(Canvas: TCanvas);
-begin
-end;
-
-procedure TBImage.LoadFromBitmap(Bitmap: TBitmap);
-begin
-end;
-
-function TBImage.GetDataSize: Integer;
+procedure TBPixmap.Mirror;
+begin
+end;
+
+procedure TBPixmap.Flip;
+begin
+end;
+
+procedure TBPixmap.Negative;
+begin
+end;
+
+procedure TBPixmap.Fill(Color: IBColor);
+begin
+end;
+
+procedure TBPixmap.Fill(Func: TGetColorPos);
+begin
+end;
+
+procedure TBPixmap.Line(P1, P2: TPoint; Color: IBColor);
+begin
+end;
+
+procedure TBPixmap.PaintToCanvas(Canvas: TCanvas);
+begin
+end;
+
+procedure TBPixmap.PaintToCanvas(Canvas: TCanvas; Rect: TRect);
+begin
+end;
+
+procedure TBPixmap.PaintToBitmap(Bitmap: TBitmap; Rect: TRect);
+begin
+end;
+
+procedure TBPixmap.LoadFromCanvas(Canvas: TCanvas);
+begin
+end;
+
+procedure TBPixmap.LoadFromBitmap(Bitmap: TBitmap);
+begin
+end;
+
+function TBPixmap.GetDataSize: Integer;
 begin
   Result := 0;
 end;
 
-constructor TBImage.Create;
+constructor TBPixmap.Create;
 begin
   Size := Point(0, 0);
@@ -503 +509 @@
 
 procedure TFPixmap.Gradient;
-begin
-
+var
+  X, Y: Integer;
+  Color: IFColor;
+begin
+  Color := TFColor.Create;
+  (Color as TFColor).ColorFormat := ColorFormat;
+  for Y := 0 to Size.Y div 4 - 1 do
+    for X := 0 to Size.X - 1 do begin
+      (Color as TFColor).SetColor(RGBToColor(
+        Trunc(X / Size.X * 256),
+        0,
+        0
+      ));
+      Pixels[X, Y] := Color;
+    end;
+  for Y := Size.Y div 4 to 2 * Size.Y div 4 - 1 do
+    for X := 0 to Size.X - 1 do begin
+      (Color as TFColor).SetColor(RGBToColor(
+        0,
+        Trunc(X / Size.X * 256),
+        0
+      ));
+      Pixels[X, Y] := Color;
+    end;
+  for Y := 2 * Size.Y div 4 to 3 * Size.Y div 4 - 1 do
+    for X := 0 to Size.X - 1 do begin
+      (Color as TFColor).SetColor(RGBToColor(
+        0,
+        0,
+        Trunc(X / Size.X * 256)
+      ));
+      Pixels[X, Y] := Color;
+    end;
+  for Y := 3 * Size.Y div 4 to Size.Y - 1 do
+    for X := 0 to Size.X - 1 do begin
+      (Color as TFColor).SetColor(RGBToColor(
+        Trunc(X / Size.X * 256),
+        Trunc(X / Size.X * 256),
+        Trunc(X / Size.X * 256)
+      ));
+      Pixels[X, Y] := Color;
+    end;
 end;
 
@@ -561 +607 @@
 begin
   inherited;
-  FBackend := TBImage.Create;
+  FBackend := TBPixmap.Create;
   FCanvas := TFCanvas.Create;
   FCanvas.Pixmap := Self;

trunk/UCore.pas

@@ -85 +85 @@
 
 uses
-  UFormNew, UFormMain, Forms, UColorRGBA8, UColorGray8, UColorGray1, UColorGray4,
-  UColorRGB565, UFormSettings;
+  UFormNew, UFormMain, Forms, UFormSettings;
 
 { TCore }