fpvviewer: Updates to compile with the latest fpvectorial

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2771 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2013-08-09 12:25:19 +00:00
parent 1e9328723a
commit 94daafcf93
2 changed files with 8 additions and 7 deletions

View File

@ -127,10 +127,10 @@ begin
Drawer.Drawing.Canvas.Brush.Color := clWhite; Drawer.Drawing.Canvas.Brush.Color := clWhite;
Drawer.Drawing.Canvas.Brush.Style := bsSolid; Drawer.Drawing.Canvas.Brush.Style := bsSolid;
Drawer.Drawing.Canvas.FillRect(0, 0, Drawer.Drawing.Width, Drawer.Drawing.Height); Drawer.Drawing.Canvas.FillRect(0, 0, Drawer.Drawing.Width, Drawer.Drawing.Height);
if checkForceWhiteBackground.Checked then Vec.GetPage(0).BackgroundColor := colWhite; if checkForceWhiteBackground.Checked then Vec.GetPageAsVectorial(0).BackgroundColor := colWhite;
if not checkForceWhiteBackground.Checked then if not checkForceWhiteBackground.Checked then
Vec.GetPage(0).DrawBackground(Drawer.Drawing.Canvas); Vec.GetPageAsVectorial(0).DrawBackground(Drawer.Drawing.Canvas);
Vec.GetPage(0).Render( Vec.GetPageAsVectorial(0).Render(
Drawer.Drawing.Canvas, Drawer.Drawing.Canvas,
FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosX, FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosX,
Drawer.Drawing.Height - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosY, Drawer.Drawing.Height - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + Drawer.PosY,
@ -168,7 +168,7 @@ begin
Vec := TvVectorialDocument.Create; Vec := TvVectorialDocument.Create;
Vec.ReadFromFile(editFileName.FileName); Vec.ReadFromFile(editFileName.FileName);
lPage := Vec.GetPage(0); lPage := Vec.GetPageAsVectorial(0);
lRasterImage := TvRasterImage(lPage.GetEntity(0)); lRasterImage := TvRasterImage(lPage.GetEntity(0));
// create dynamicaly the vectors and datafield // create dynamicaly the vectors and datafield
@ -311,7 +311,7 @@ begin
// Generate the positioning info // Generate the positioning info
for i := 0 to Vec.GetPageCount()-1 do for i := 0 to Vec.GetPageCount()-1 do
Vec.GetPage(i).PositionEntitySubparts(Canvas, 0, 0); Vec.GetPageAsVectorial(i).PositionEntitySubparts(Canvas, 0, 0);
TokensTreeView.Items.Clear; TokensTreeView.Items.Clear;
Vec.GenerateDebugTree(@FPVDebugAddItemProc); Vec.GenerateDebugTree(@FPVDebugAddItemProc);

View File

@ -61,9 +61,11 @@
</CompilerMessages> </CompilerMessages>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>
</Other> </Other>
<LCLWidgetType Value="qt"/>
</CompilerOptions> </CompilerOptions>
</Item3> </Item3>
<SharedMatrixOptions Count="1">
<Item1 ID="194024408686" Modes="qt" Type="IDEMacro" MacroName="LCLWidgetType" Value="qt"/>
</SharedMatrixOptions>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -73,7 +75,6 @@
<RunParams> <RunParams>
<local> <local>
<FormatVersion Value="1"/> <FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="3"> <RequiredPackages Count="3">