Changeset 33 for trunk/UCore.pas

Timestamp:

Jan 5, 2017, 11:48:36 PM (8 years ago)

Author:

chronos

Message:

• Added: Remember last used image size and color format.
• Added: Automatically create blank image.

File:

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

trunk/UCore.pas

@@ -13 +13 @@
 
 type
-  TFloatPoint = record
-    X, Y: Double;
-  end;
-
   { TCore }
 
@@ -67 +63 @@
   public
     LastColorFormat: string;
+    LastImageSize: TPoint;
     Project: TProject;
     RegistryContext: TRegistryContext;
     procedure ProjectOpen(FileName: string);
+    procedure ProjectNew;
     procedure Init;
     procedure LoadConfig;
@@ -85 +83 @@
   UFormNew, UFormMain, Forms, UColorRGBA8, UColorGray8, UColorGray1, UColorGray4,
   UColorRGB565;
-
-function FloatPoint(AX, AY: Double): TFloatPoint;
-begin
-  Result.X := AX;
-  Result.Y := AY;
-end;
 
 { TCore }
@@ -120 +112 @@
   //Image.Picture.Bitmap.EndUpdate;
   Image.Free;
-  AZoomAll.Execute;
+  Project.View.ZoomAll(Project.Bitmap.Size);
   FormMain.Redraw;
   Project.FileName := FileName;
+end;
+
+procedure TCore.ProjectNew;
+var
+  ColorFormatIndex: Integer;
+begin
+  // Set default
+  ColorFormatIndex := ColorFormatManager.FindByName(LastColorFormat);
+  if ColorFormatIndex < ColorFormatManager.Formats.Count then
+    Project.Bitmap.ColorFormat := ColorFormatManager.Formats[ColorFormatIndex]
+    else Project.Bitmap.ColorFormat := ColorFormatManager.Formats[0];
+  Project.Bitmap.Size := LastImageSize;
+
+  Project.View.DestRect := Bounds(0, 0, FormMain.PaintBox1.Width, FormMain.PaintBox1.Height);
+  Project.View.ZoomAll(Project.Bitmap.Size);
 end;
 
@@ -130 +137 @@
   LoadConfig;
 
-  // Set default
-  Project.Bitmap.ColorFormat := ColorFormatManager.Formats[0];
-  Project.Bitmap.Size := Point(200, 100);
-  Project.View.DestRect := Bounds(0, 0, FormMain.PaintBox1.Width, FormMain.PaintBox1.Height);
-  Core.AZoomAll.Execute;
+  ProjectNew;
+  FormMain.Redraw;
 end;
 
@@ -145 +149 @@
 
     LastColorFormat := ReadStringWithDefault('LastColorFormat', '');
+    LastImageSize.X := ReadIntegerWithDefault('LastImageSizeX', 600);
+    LastImageSize.Y := ReadIntegerWithDefault('LastImageSizeY', 400);
   finally
     Free;
@@ -158 +164 @@
 
     WriteString('LastColorFormat', LastColorFormat);
+    WriteInteger('LastImageSizeX', LastImageSize.X);
+    WriteInteger('LastImageSizeY', LastImageSize.Y);
   finally
     Free;
@@ -165 +173 @@
 procedure TCore.AFileNewExecute(Sender: TObject);
 begin
+  FormNew.DefaultSize := LastImageSize;
   if FormNew.ShowModal = mrOk then begin
     Project.Bitmap.ColorFormat := TColorFormat.Create;
@@ -173 +182 @@
 //    Project.Bitmap.BackgroundColor.FromTColor(clBlack);
 //    Project.Bitmap.DPI := FormNew.SpinEditDPI.Value;
-    AZoomAll.Execute;
+    Project.View.ZoomAll(Project.Bitmap.Size);
+    FormMain.Redraw;
+    LastImageSize := Project.Bitmap.Size;
   end;
 end;
 
 procedure TCore.AZoomAllExecute(Sender: TObject);
-var
-  Factor: TFloatPoint;
-begin
-  with Core.Project, View do begin
-    Factor := FloatPoint((DestRect.Right - DestRect.Left) / Bitmap.Size.X,
-      (DestRect.Bottom - DestRect.Top) / Bitmap.Size.Y);
-    if Factor.X < Factor.Y then Zoom := Factor.X
-      else Zoom := Factor.Y;
-    Center(Rect(0, 0, Bitmap.Size.X, Bitmap.Size.Y));
-  end;
+begin
+  with Core.Project do
+    View.ZoomAll(Bitmap.Size);
   FormMain.Redraw;
 end;