From 25b666c666f70f70e853f48be457794e52c0aeab Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 5 Feb 2016 10:21:08 +0000
Subject: [PATCH] fpvviewer: Minor improvements
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4488 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
applications/fpvviewer/fpvv_mainform.pas | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/applications/fpvviewer/fpvv_mainform.pas b/applications/fpvviewer/fpvv_mainform.pas
index 41c6958ec..4eb0b2c1a 100644
--- a/applications/fpvviewer/fpvv_mainform.pas
+++ b/applications/fpvviewer/fpvv_mainform.pas
@@ -96,7 +96,6 @@ procedure TfrmFPVViewer.btnVisualizeClick(Sender: TObject);
const
FPVVIEWER_MAX_IMAGE_SIZE = 1000;
FPVVIEWER_MIN_IMAGE_SIZE = 100;
- FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS = 100;
var
CanvasSize: TPoint;
lCurPage: TvVectorialPage;
@@ -132,15 +131,15 @@ begin
lPage.DrawBackground(Drawer.Drawing.Canvas);
lPage.Render(
Drawer.Drawing.Canvas,
- FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosX,
- Drawer.Drawing.Height - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosY,
+ Drawer.PosX,
+ Drawer.Drawing.Height - Drawer.PosY,
spinScale.Value,
YAxisMultiplier * spinScale.Value);
if checkShowPage.Checked then
lPage.RenderPageBorder(
Drawer.Drawing.Canvas,
- FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosX,
- Drawer.Drawing.Height - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosY,
+ Drawer.PosX,
+ Drawer.Drawing.Height + Drawer.PosY,
spinScale.Value,
YAxisMultiplier * spinScale.Value);
Drawer.Invalidate;
@@ -457,6 +456,8 @@ begin
end;
procedure TfrmFPVViewer.FormCreate(Sender: TObject);
+const
+ FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS = 100;
begin
Drawer := TFPVVDrawer.Create(Self);
Drawer.Parent := pageViewer;
@@ -467,6 +468,9 @@ begin
Drawer.OnMouseWheel := @HandleDrawerMouseWheel;
Drawer.PosChangedCallback := @HandleDrawerPosChanged;
Drawer.RedrawCallback := @HandleDrawerRedraw;
+ Drawer.PosX := FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS;
+ Drawer.PosY := -1 * FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS;
+ HandleDrawerPosChanged(nil);
FPVUDebugOutCallback := @ViewerDebugOutCallback;
end;
@@ -570,7 +574,6 @@ procedure TfrmFPVViewer.Render_DoRender(ACanvasSizeX, ACanvasSizeY,
const
FPVVIEWER_MAX_IMAGE_SIZE = 1000;
FPVVIEWER_MIN_IMAGE_SIZE = 100;
- FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS = 100;
begin
Drawer.Drawing.Width := ACanvasSizeX;
Drawer.Drawing.Height := ACanvasSizeY;