paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpvviewer: Fix compilation and operation with rsvg-convert on Windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9350 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-05-11 15:49:43 +00:00
parent 9f9ac7cd2a
commit a7fe32c308
6 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
applications/fpvviewer/fpvv_mainform.lfm
View File

@ -6,9 +6,9 @@ object frmFPVViewer: TfrmFPVViewer
Caption = 'Free Pascal Vectorial Viewer' Caption = 'Free Pascal Vectorial Viewer'
ClientHeight = 600 ClientHeight = 600
ClientWidth = 485 ClientWidth = 485
LCLVersion = '3.99.0.0'
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
LCLVersion = '1.7'
object notebook: TNotebook object notebook: TNotebook
Left = 0 Left = 0
Height = 408 Height = 408
@ -32,7 +32,6 @@ object frmFPVViewer: TfrmFPVViewer
Align = alBottom Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 7 BorderSpacing.Top = 7
DefaultItemHeight = 18
TabOrder = 0 TabOrder = 0
end end
object editSearchInTokens: TEdit object editSearchInTokens: TEdit
@ -49,8 +48,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 0 Top = 0
Width = 155 Width = 155
Caption = 'Search in Token Tree' Caption = 'Search in Token Tree'
OnClick = btnSearchInTokensClick
TabOrder = 2 TabOrder = 2
OnClick = btnSearchInTokensClick
end end
end end
object pageDebug: TPage object pageDebug: TPage
@ -84,7 +83,7 @@ object frmFPVViewer: TfrmFPVViewer
Left = 184 Left = 184
Height = 19 Height = 19
Top = 168 Top = 168
Width = 153 Width = 151
Caption = 'Force Bottom-Left Origin' Caption = 'Force Bottom-Left Origin'
TabOrder = 18 TabOrder = 18
end end
@ -107,8 +106,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 40 Top = 40
Width = 96 Width = 96
Caption = 'Visualize' Caption = 'Visualize'
OnClick = btnVisualizeClick
TabOrder = 1 TabOrder = 1
OnClick = btnVisualizeClick
end end
object spinScale: TFloatSpinEdit object spinScale: TFloatSpinEdit
Left = 72 Left = 72
@ -118,10 +117,9 @@ object frmFPVViewer: TfrmFPVViewer
DecimalPlaces = 6 DecimalPlaces = 6
Increment = 0.1 Increment = 0.1
MaxValue = 100 MaxValue = 100
MinValue = 0
OnChange = spinScaleChange
TabOrder = 2 TabOrder = 2
Value = 1 Value = 1
OnChange = spinScaleChange
end end
object Label1: TLabel object Label1: TLabel
Left = 8 Left = 8
@ -137,8 +135,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 40 Top = 40
Width = 128 Width = 128
Caption = 'View DXF Tokens' Caption = 'View DXF Tokens'
OnClick = btnViewDXFTokensClick
TabOrder = 3 TabOrder = 3
OnClick = btnViewDXFTokensClick
end end
object buttonAutoFitView: TButton object buttonAutoFitView: TButton
Left = 112 Left = 112
@ -146,8 +144,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 40 Top = 40
Width = 96 Width = 96
Caption = 'Auto Fit View' Caption = 'Auto Fit View'
OnClick = buttonAutoFitViewClick
TabOrder = 4 TabOrder = 4
OnClick = buttonAutoFitViewClick
end end
object buttonConvertToSVG: TButton object buttonConvertToSVG: TButton
Left = 360 Left = 360
@ -155,8 +153,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 40 Top = 40
Width = 120 Width = 120
Caption = 'Convert to SVG' Caption = 'Convert to SVG'
OnClick = buttonConvertToSVGClick
TabOrder = 5 TabOrder = 5
OnClick = buttonConvertToSVGClick
end end
object btnContourLines: TButton object btnContourLines: TButton
Left = 256 Left = 256
@ -164,8 +162,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 97 Top = 97
Width = 224 Width = 224
Caption = 'Generate Contour Lines' Caption = 'Generate Contour Lines'
OnClick = btnContourLinesClick
TabOrder = 6 TabOrder = 6
OnClick = btnContourLinesClick
end end
object Label2: TLabel object Label2: TLabel
Left = 8 Left = 8
@ -183,8 +181,8 @@ object frmFPVViewer: TfrmFPVViewer
Increment = 100 Increment = 100
MaxValue = 1000 MaxValue = 1000
MinValue = -1000 MinValue = -1000
OnChange = spinAdjustYChange
TabOrder = 7 TabOrder = 7
OnChange = spinAdjustYChange
end end
object spinAdjustX: TSpinEdit object spinAdjustX: TSpinEdit
Left = 232 Left = 232
@ -194,8 +192,8 @@ object frmFPVViewer: TfrmFPVViewer
Increment = 50 Increment = 50
MaxValue = 1000 MaxValue = 1000
MinValue = -1000 MinValue = -1000
OnChange = spinAdjustXChange
TabOrder = 8 TabOrder = 8
OnChange = spinAdjustXChange
end end
object Label3: TLabel object Label3: TLabel
Left = 160 Left = 160
@ -211,8 +209,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 70 Top = 70
Width = 168 Width = 168
Caption = 'View FPVectorial Tokens' Caption = 'View FPVectorial Tokens'
OnClick = buttonViewFPVTokensClick
TabOrder = 9 TabOrder = 9
OnClick = buttonViewFPVTokensClick
end end
object Label4: TLabel object Label4: TLabel
Left = 9 Left = 9
@ -273,7 +271,7 @@ object frmFPVViewer: TfrmFPVViewer
Left = 9 Left = 9
Height = 19 Height = 19
Top = 152 Top = 152
Width = 153 Width = 151
Caption = 'Force white background?' Caption = 'Force white background?'
TabOrder = 11 TabOrder = 11
end end
@ -283,8 +281,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 153 Top = 153
Width = 107 Width = 107
Caption = 'View Debug Info' Caption = 'View Debug Info'
OnClick = buttonViewDebugInfoClick
TabOrder = 12 TabOrder = 12
OnClick = buttonViewDebugInfoClick
end end
object buttonPrint: TButton object buttonPrint: TButton
Left = 416 Left = 416
@ -292,8 +290,8 @@ object frmFPVViewer: TfrmFPVViewer
Top = 8 Top = 8
Width = 59 Width = 59
Caption = 'Print' Caption = 'Print'
OnClick = buttonPrintClick
TabOrder = 13 TabOrder = 13
OnClick = buttonPrintClick
end end
object buttonAdjust: TButton object buttonAdjust: TButton
Left = 344 Left = 344
@ -301,14 +299,14 @@ object frmFPVViewer: TfrmFPVViewer
Top = 8 Top = 8
Width = 56 Width = 56
Caption = 'Adjust' Caption = 'Adjust'
OnClick = buttonAdjustClick
TabOrder = 14 TabOrder = 14
OnClick = buttonAdjustClick
end end
object checkShowPage: TCheckBox object checkShowPage: TCheckBox
Left = 184 Left = 184
Height = 19 Height = 19
Top = 152 Top = 152
Width = 78 Width = 76
Caption = 'Show Page' Caption = 'Show Page'
TabOrder = 15 TabOrder = 15
end end
@ -318,14 +316,14 @@ object frmFPVViewer: TfrmFPVViewer
Top = 153 Top = 153
Width = 64 Width = 64
Caption = 'Auto Fit' Caption = 'Auto Fit'
OnClick = buttonAutoFitClick
TabOrder = 16 TabOrder = 16
OnClick = buttonAutoFitClick
end end
object checkboxSVGviaRSVG: TCheckBox object checkboxSVGviaRSVG: TCheckBox
Left = 9 Left = 9
Height = 19 Height = 19
Top = 168 Top = 168
Width = 147 Width = 145
Caption = 'SVG Rendering via RSVG' Caption = 'SVG Rendering via RSVG'
TabOrder = 17 TabOrder = 17
end end

2
applications/fpvviewer/fpvv_mainform.pas
View File

@ -560,7 +560,7 @@ begin
FVec.ReaderSettings.HelperToolPath := ExtractFilePath(paramstr(0))+'rsvg\rsvg-convert.exe'; FVec.ReaderSettings.HelperToolPath := ExtractFilePath(paramstr(0))+'rsvg\rsvg-convert.exe';
{$endif} {$endif}
if checkboxForceBottomLeftOrigin.Checked then if checkboxForceBottomLeftOrigin.Checked then
FVec.ReaderSettings.VecReaderFlags := [vrfSVG_UseBottomLeftCoords] FVec.ReaderSettings.VecReaderFlags := [vrf_UseBottomLeftCoords]
else else
FVec.ReaderSettings.VecReaderFlags := []; FVec.ReaderSettings.VecReaderFlags := [];
if checkboxSVGviaRSVG.Checked then if checkboxSVGviaRSVG.Checked then

25
applications/fpvviewer/fpvviewer.lpi
View File

@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="9"/> <Version Value="12"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
</General> </General>
<i18n> <i18n>
<EnableI18N LFM="False"/> <EnableI18N LFM="False"/>
</i18n> </i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="5"> <BuildModes Count="5">
<Item1 Name="default" Default="True"/> <Item1 Name="default" Default="True"/>
<Item2 Name="win32-console"> <Item2 Name="win32-console">
@ -98,20 +97,20 @@
</Linking> </Linking>
</CompilerOptions> </CompilerOptions>
</Item5> </Item5>
<SharedMatrixOptions Count="2"> <SharedMatrixOptions Count="3">
<Item1 ID="669514139583" Modes="qt" Type="IDEMacro" MacroName="LCLWidgetType" Value="qt"/> <Item1 ID="669514139583" Modes="qt" Type="IDEMacro" MacroName="LCLWidgetType" Value="qt"/>
<Item2 ID="166328276776" Modes="cocoa" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/> <Item2 ID="166328276776" Modes="cocoa" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/>
<Item3 ID="574418906724" Modes="default" Value="-gw3"/>
</SharedMatrixOptions> </SharedMatrixOptions>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<local> <FormatVersion Value="2"/>
<FormatVersion Value="1"/> <Modes Count="1">
</local> <Mode0 Name="default"/>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="4"> <RequiredPackages Count="4">
<Item1> <Item1>
@ -139,7 +138,6 @@
<ComponentName Value="frmFPVViewer"/> <ComponentName Value="frmFPVViewer"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="fpvv_mainform"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="dxftokentotree.pas"/> <Filename Value="dxftokentotree.pas"/>
@ -165,6 +163,9 @@
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Linking> <Linking>
<Debugging>
<DebugInfoType Value="dsDwarf3"/>
</Debugging>
<Options> <Options>
<Win32> <Win32>
<GraphicApplication Value="True"/> <GraphicApplication Value="True"/>

1
applications/fpvviewer/fpvviewer.lpr
View File

@ -13,6 +13,7 @@ uses
{$R *.res} {$R *.res}
begin begin
Application.Title:='';
Application.Initialize; Application.Initialize;
Application.CreateForm(TfrmFPVViewer, frmFPVViewer); Application.CreateForm(TfrmFPVViewer, frmFPVViewer);
Application.Run; Application.Run;

7
applications/fpvviewer/rsvg/etc/fonts/fonts.conf
View File

@ -65,13 +65,6 @@
<string>sans-serif</string> <string>sans-serif</string>
</edit> </edit>
</match> </match>
<alias>
<family>sans-serif</family>
<prefer>
<family>segoe ui</family>
<family>tahoma</family>
</prefer>
</alias>
<!-- <!--
Load local system customization file Load local system customization file
--> -->

BIN
applications/fpvviewer/rsvg/rsvg-convert.exe
View File

Binary file not shown.