From ef49aac4dcd07428555cc0b3fca30cad8c0cc843 Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 20 Sep 2013 13:33:07 +0000
Subject: [PATCH] fpvviewer: Much improves the zoom/position auto-adjustment of
 documents

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2796 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/fpvviewer/fpvv_mainform.lfm |  2 +-
 applications/fpvviewer/fpvv_mainform.pas | 37 ++++++++++++------------
 applications/fpvviewer/fpvviewer.lpi     |  6 ++--
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/applications/fpvviewer/fpvv_mainform.lfm b/applications/fpvviewer/fpvv_mainform.lfm
index 4823fe84f..a03932d8e 100644
--- a/applications/fpvviewer/fpvv_mainform.lfm
+++ b/applications/fpvviewer/fpvv_mainform.lfm
@@ -8,7 +8,7 @@ object frmFPVViewer: TfrmFPVViewer
   ClientWidth = 485
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '1.1'
+  LCLVersion = '1.3'
   object notebook: TNotebook
     Left = 0
     Height = 424
diff --git a/applications/fpvviewer/fpvv_mainform.pas b/applications/fpvviewer/fpvv_mainform.pas
index abccb82ad..20ed2efaf 100644
--- a/applications/fpvviewer/fpvv_mainform.pas
+++ b/applications/fpvviewer/fpvv_mainform.pas
@@ -333,24 +333,25 @@ const
   FPVVIEWER_MIN_IMAGE_SIZE = 100;
   FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS = 100;
 var
-  CanvasSize: TPoint;
+  lSpaceForNegCoords: TPoint;
+  lCurPage: TvPage;
+  lZoom: Double;
+  lCanvasWidth: Integer;
 begin
   Render_PrepareFile();
   try
-    // We need to be robust, because sometimes the document size won't be given
-    // also give up drawing everything if we need more then 4MB of RAM for the image
-    // and also give some space in the image to allow for negative coordinates
-    if FVec.Width * spinScale.Value > FPVVIEWER_MAX_IMAGE_SIZE then CanvasSize.X := FPVVIEWER_MAX_IMAGE_SIZE
-    else if FVec.Width < FPVVIEWER_MIN_IMAGE_SIZE then CanvasSize.X := Drawer.Width
-    else CanvasSize.X := Round(FVec.Width * spinScale.Value);
-    if CanvasSize.X < Drawer.Width then CanvasSize.X := Drawer.Width;
+    lCurPage := FVec.GetPage(0);
+    lCurPage.CalculateDocumentSize();
 
-    if FVec.Height * spinScale.Value > FPVVIEWER_MAX_IMAGE_SIZE then CanvasSize.Y := FPVVIEWER_MAX_IMAGE_SIZE
-    else  if FVec.Height < FPVVIEWER_MIN_IMAGE_SIZE then CanvasSize.Y := Drawer.Height
-    else CanvasSize.Y := Round(FVec.Height * spinScale.Value);
-    if CanvasSize.Y < Drawer.Height then CanvasSize.Y := Drawer.Height;
-
-    Render_DoRender(Drawer.Width, Drawer.Height, 4, 4, FVec.Width / Drawer.Width);
+    lCanvasWidth := Drawer.Width;
+    lZoom := (Drawer.Width / lCurPage.Width) * 0.8;
+    spinScale.Value := lZoom;
+    // Centralizes the image in the canvas
+    lSpaceForNegCoords.X := Round(lCurPage.MinX * -1 * lZoom + Drawer.Width * 0.1);
+    lSpaceForNegCoords.Y := Round(lCurPage.MinY * lZoom - Drawer.Height * 0.1);
+    spinAdjustX.Value := lSpaceForNegCoords.X - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS;
+    spinAdjustY.Value := lSpaceForNegCoords.Y + FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS;
+    Render_DoRender(Drawer.Width, Drawer.Height, lSpaceForNegCoords.X, lSpaceForNegCoords.Y, lZoom);
   finally
     Render_FreeFile();
   end;
@@ -559,10 +560,10 @@ begin
     FVec.GetPageAsVectorial(0).DrawBackground(Drawer.Drawing.Canvas);
   FVec.GetPageAsVectorial(0).Render(
     Drawer.Drawing.Canvas,
-    FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + ADrawerPosX,
-    Drawer.Drawing.Height - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + ADrawerPosY,
-    spinScale.Value,
-    -1 * spinScale.Value);
+    ADrawerPosX,
+    Drawer.Drawing.Height + ADrawerPosY,
+    AScale,
+    -1 * AScale);
   Drawer.Invalidate;
 end;
 
diff --git a/applications/fpvviewer/fpvviewer.lpi b/applications/fpvviewer/fpvviewer.lpi
index dda5c373d..0383bf6ed 100644
--- a/applications/fpvviewer/fpvviewer.lpi
+++ b/applications/fpvviewer/fpvviewer.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -61,9 +61,11 @@
             </CompilerMessages>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
-          <LCLWidgetType Value="qt"/>
         </CompilerOptions>
       </Item3>
+      <SharedMatrixOptions Count="1">
+        <Item1 ID="669514139583" Modes="qt" Type="IDEMacro" MacroName="LCLWidgetType" Value="qt"/>
+      </SharedMatrixOptions>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>