Changeset 26 for trunk/UCore.pas

Timestamp:

Dec 22, 2016, 5:07:02 PM (8 years ago)

Author:

chronos

Message:

• Modified: Used FastGraphics package for handling bitmaps.

File:

• trunk/UCore.pas (modified) (6 diffs)

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, ActnList, UProject, UGraphic, Controls, Graphics,
+  Classes, SysUtils, FileUtil, ActnList, UProject, UFGraphics, Controls, Graphics,
   ExtDlgs, ExtCtrls;
 
@@ -87 +87 @@
 begin
   Project := TProject.Create;
-
-  ColorManager.RegisterFormat(TGColorFormatRGBA8);
-  ColorManager.RegisterFormat(TGColorFormatRGB565);
-  ColorManager.RegisterFormat(TGColorFormatGray8);
-  ColorManager.RegisterFormat(TGColorFormatGray4);
-  ColorManager.RegisterFormat(TGColorFormatGray1);
 end;
 
@@ -103 +97 @@
 begin
   // Set default
-  Project.Bitmap.ColorFormat := ColorManager.Formats[0];
+  Project.Bitmap.ColorFormat := ColorFormatManager.Formats[0];
   Project.Bitmap.Size := Point(200, 100);
-  if ColorManager.FormatCount > 0 then
-    Project.Bitmap.ColorFormat := ColorManager.Formats[0];
   Project.View.DestRect := Bounds(0, 0, FormMain.PaintBox1.Width, FormMain.PaintBox1.Height);
   Core.AZoomAll.Execute;
@@ -114 +106 @@
 begin
   if FormNew.ShowModal = mrOk then begin
-    Project.Bitmap.ColorFormat := TGColorFormat.Create;
+    Project.Bitmap.ColorFormat := TColorFormat.Create;
 
     Project.FileName := 'New image';
     Project.Bitmap.Size := Point(FormNew.SpinEditWidth.Value, FormNew.SpinEditHeight.Value);
-    Project.Bitmap.ColorFormat := ColorManager.Formats[FormNew.ComboBoxColorFormat.ItemIndex];
-    Project.Bitmap.BackgroundColor.FromTColor(clBlack);
-    Project.Bitmap.DPI := FormNew.SpinEditDPI.Value;
+    Project.Bitmap.ColorFormat := ColorFormatManager.Formats[FormNew.ComboBoxColorFormat.ItemIndex];
+//    Project.Bitmap.BackgroundColor.FromTColor(clBlack);
+//    Project.Bitmap.DPI := FormNew.SpinEditDPI.Value;
     AZoomAll.Execute;
   end;
@@ -177 +169 @@
     Image.Picture.LoadFromFile(OpenPictureDialog1.FileName);
     Image.Picture.Bitmap.BeginUpdate(True);
-    Project.Bitmap.LoadFromCanvas(Image.Picture.Bitmap.Canvas,
-      Point(Image.Picture.Bitmap.Width, Image.Picture.Bitmap.Height));
+    Project.Bitmap.Size := Point(Image.Picture.Bitmap.Width, Image.Picture.Bitmap.Height);
+    Project.Bitmap.LoadFromCanvas(Image.Picture.Bitmap.Canvas);
     Image.Picture.Bitmap.EndUpdate;
     Image.Free;
+    AZoomAll.Execute;
     FormMain.Redraw;
     Project.FileName := OpenPictureDialog1.FileName;
@@ -214 +207 @@
 begin
   Project.Bitmap.Clear;
-  Project.Bitmap.Canvas.Pen.Color.Format := Project.Bitmap.ColorFormat;
-  Project.Bitmap.Canvas.Pen.Color.FromTColor(clWhite);
+  TFColor(Project.Bitmap.Canvas.Pen.Color).ColorFormat := Project.Bitmap.ColorFormat;
+  TFColor(Project.Bitmap.Canvas.Pen.Color).SetColorName(cnWhite);
   Project.Bitmap.Canvas.Pen.MoveTo(Point(80, 80));
   Project.Bitmap.Canvas.Pen.LineTo(Point(50, 20));