Changeset 36

Timestamp:

May 4, 2018, 1:36:00 PM (7 years ago)

Author:

chronos

Message:

• Modified: Drawing using pen with connected lines instead of individual pixels.
• Added: Negative image function for RGB8 format.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (2 diffs)
• Packages/FastGraphics/ColorFormats/UColorRGB8.pas (modified) (5 diffs)
• Packages/FastGraphics/UFGraphics.pas (modified) (3 diffs)
• Packages/FastGraphics/UGGraphics.pas (modified) (1 diff)
• UCore.lfm (modified) (3 diffs)
• UCore.pas (modified) (2 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 648
+  Left = 546
   Height = 640
-  Top = 323
+  Top = 316
   Width = 920
   Caption = 'LibrePaint'

trunk/Forms/UFormMain.pas

@@ -223 +223 @@
       P := Core.Project.View.DestToSrcPos(Point(X, Y));
       if (P.X >= 0) and (P.X < Core.Project.Bitmap.Size.X) and (P.Y >= 0) and (P.Y < Core.Project.Bitmap.Size.Y) then
-        Core.Project.Bitmap.Pixels[P.X, P.Y] := TFColor.Create(Core.Project.Bitmap.ColorFormat, ColorButton1.ButtonColor);
+        Core.Project.Bitmap.Canvas.Pen.MoveTo(Point(P.X, P.Y));
       Redraw;
     end;
@@ -253 +253 @@
     if ImageTool = itPen then begin
       P := Core.Project.View.DestToSrcPos(Point(X, Y));
-      if (P.X >= 0) and (P.X < Core.Project.Bitmap.Size.X) and (P.Y >= 0) and (P.Y < Core.Project.Bitmap.Size.Y) then
-        Core.Project.Bitmap.Pixels[P.X, P.Y] := TFColor.Create(Core.Project.Bitmap.ColorFormat, ColorButton1.ButtonColor);
+      if (P.X >= 0) and (P.X < Core.Project.Bitmap.Size.X) and (P.Y >= 0) and (P.Y < Core.Project.Bitmap.Size.Y) then begin
+        Core.Project.Bitmap.Canvas.Pen.Color := TFColor.Create(Core.Project.Bitmap.ColorFormat, ColorButton1.ButtonColor);
+        Core.Project.Bitmap.Canvas.Pen.LineTo(Point(P.X, P.Y));
+      end;
       Redraw;
     end;

trunk/Packages/FastGraphics/ColorFormats/UColorRGB8.pas

@@ -47 +47 @@
     FillCallBack: TGetColorPos;
     function FillGetColor(Position: TPoint): TColorRGB8;
+    function NegativeFunc(Position: TPoint): TColorRGB8;
   protected
     function GetPixel(X, Y: Integer): IBColor;  override;
@@ -55 +56 @@
     procedure Mirror; override;
     procedure Flip; override;
+    procedure Negative; override;
     procedure Fill(Color: IBColor); override;
     procedure Fill(Func: TGetColorPos); override;
+    procedure Line(P1, P2: TPoint; Color: IBColor); override;
     procedure PaintToCanvas(Canvas: TCanvas); override;
     procedure PaintToCanvas(Canvas: TCanvas; Rect: TRect); override;
@@ -143 +146 @@
 end;
 
+function TBPixmapRGB8.NegativeFunc(Position: TPoint): TColorRGB8;
+var
+  C: TColorRGB8;
+begin
+  C := Pixmap.Pixels[Position.X, Position.Y];
+  Result.R := 255 - C.R;
+  Result.G := 255 - C.G;
+  Result.B := 255 - C.B;
+end;
+
 function TBPixmapRGB8.GetPixel(X, Y: Integer): IBColor;
 begin
@@ -169 +182 @@
 end;
 
+procedure TBPixmapRGB8.Negative;
+begin
+  Pixmap.Fill(NegativeFunc);
+end;
+
 procedure TBPixmapRGB8.Fill(Color: IBColor);
 begin
@@ -181 +199 @@
 end;
 
+procedure TBPixmapRGB8.Line(P1, P2: TPoint; Color: IBColor);
+begin
+  Pixmap.Canvas.Pen.Color := (Color as TBColorRGB8).Value;
+  Pixmap.Canvas.Pen.MoveTo(P1);
+  Pixmap.Canvas.Pen.LineTo(P2);
+end;
+
 procedure TBPixmapRGB8.PaintToCanvas(Canvas: TCanvas);
 begin

trunk/Packages/FastGraphics/UFGraphics.pas

@@ -42 +42 @@
     procedure Mirror; virtual;
     procedure Flip; virtual;
+    procedure Negative; virtual;
     procedure Fill(Color: IBColor); virtual; overload;
     procedure Fill(Func: TGetColorPos); virtual; overload;
@@ -391 +392 @@
 procedure TBImage.Mirror;
 begin
-
 end;
 
 procedure TBImage.Flip;
+begin
+end;
+
+procedure TBImage.Negative;
 begin
 end;
@@ -505 +509 @@
 procedure TFPixmap.Negative;
 begin
-
+  FBackend.Negative;
 end;
 

trunk/Packages/FastGraphics/UGGraphics.pas

@@ -344 +344 @@
       for X := 0 to FSize.X - 1 do begin
         if (X >= 0) and (X < FSize.X) and (Y >= 0) and (Y < FSize.Y) then
-          PInteger(DstPtr.Pixel)^ := ColorConvertFunc(PInteger(SrcPtr.Pixel)^);
+          PGColor(DstPtr.Pixel)^ := ColorConvertFunc(PInteger(SrcPtr.Pixel)^);
         SrcPtr.NextPixel;
         DstPtr.NextPixel;

trunk/UCore.lfm

@@ -3 +3 @@
   OnDestroy = DataModuleDestroy
   OldCreateOrder = False
-  Height = 491
-  HorizontalOffset = 838
-  VerticalOffset = 420
-  Width = 857
+  Height = 614
+  HorizontalOffset = 799
+  VerticalOffset = 416
+  Width = 1071
+  PPI = 120
   object ActionList1: TActionList
     Images = ImageList1
-    left = 201
-    top = 160
+    left = 251
+    top = 200
     object AExit: TAction
       Caption = 'Exit'
@@ -107 +108 @@
   end
   object ImageList1: TImageList
-    left = 200
-    top = 240
+    left = 250
+    top = 300
   end
   object OpenPictureDialog1: TOpenPictureDialog
-    left = 462
-    top = 126
+    left = 578
+    top = 158
   end
   object SavePictureDialog1: TSavePictureDialog
-    left = 462
-    top = 208
+    left = 578
+    top = 260
   end
   object PersistentForm1: TPersistentForm
     MinVisiblePart = 50
     EntireVisible = False
-    left = 64
-    top = 48
+    left = 80
+    top = 60
   end
   object ApplicationInfo1: TApplicationInfo
@@ -139 +140 @@
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'
-    left = 62
-    top = 133
+    left = 78
+    top = 166
   end
 end

trunk/UCore.pas

@@ -234 +234 @@
 procedure TCore.AFileSaveAsExecute(Sender: TObject);
 begin
-  SavePictureDialog1.FileName := Project.FileName;
+  SavePictureDialog1.InitialDir := ExtractFileDir(Project.FileName);
+  SavePictureDialog1.FileName := ExtractFileName(Project.FileName);
   if SavePictureDialog1.Execute then begin
     Project.FileName := SavePictureDialog1.FileName;
@@ -251 +252 @@
     Image := TImage.Create(nil);
     Image.Picture.Bitmap.SetSize(Project.Bitmap.Size.X, Project.Bitmap.Size.Y);
-    Project.Bitmap.PaintToCanvas(Image.Picture.Bitmap.Canvas,
+    Project.Bitmap.PaintToBitmap(Image.Picture.Bitmap,
       Rect(0, 0, Image.Picture.Bitmap.Width, Image.Picture.Bitmap.Height));
     Image.Picture.SaveToFile(SavePictureDialog1.FileName);