pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpvviewer improvements

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3947 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2015-02-17 00:12:03 +00:00
parent f34b79c6fd
commit 6fc4a28b47
3 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
applications/fpvviewer/fpvv_mainform.lfm
View File

@ -8,7 +8,7 @@ object frmFPVViewer: TfrmFPVViewer
ClientWidth = 485 ClientWidth = 485
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
LCLVersion = '1.3' LCLVersion = '1.5'
object notebook: TNotebook object notebook: TNotebook
Left = 0 Left = 0
Height = 424 Height = 424
@ -104,7 +104,7 @@ object frmFPVViewer: TfrmFPVViewer
end end
object spinScale: TFloatSpinEdit object spinScale: TFloatSpinEdit
Left = 72 Left = 72
Height = 23 Height = 16
Top = 97 Top = 97
Width = 168 Width = 168
DecimalPlaces = 6 DecimalPlaces = 6
@ -117,9 +117,9 @@ object frmFPVViewer: TfrmFPVViewer
end end
object Label1: TLabel object Label1: TLabel
Left = 8 Left = 8
Height = 15 Height = 16
Top = 97 Top = 97
Width = 46 Width = 55
Caption = 'Scale by:' Caption = 'Scale by:'
ParentColor = False ParentColor = False
end end
@ -161,15 +161,15 @@ object frmFPVViewer: TfrmFPVViewer
end end
object Label2: TLabel object Label2: TLabel
Left = 8 Left = 8
Height = 15 Height = 16
Top = 72 Top = 72
Width = 73 Width = 88
Caption = 'Y adjustment:' Caption = 'Y adjustment:'
ParentColor = False ParentColor = False
end end
object spinAdjustY: TSpinEdit object spinAdjustY: TSpinEdit
Left = 80 Left = 80
Height = 23 Height = 16
Top = 72 Top = 72
Width = 72 Width = 72
Increment = 100 Increment = 100
@ -180,7 +180,7 @@ object frmFPVViewer: TfrmFPVViewer
end end
object spinAdjustX: TSpinEdit object spinAdjustX: TSpinEdit
Left = 232 Left = 232
Height = 23 Height = 16
Top = 72 Top = 72
Width = 72 Width = 72
Increment = 50 Increment = 50
@ -191,9 +191,9 @@ object frmFPVViewer: TfrmFPVViewer
end end
object Label3: TLabel object Label3: TLabel
Left = 160 Left = 160
Height = 15 Height = 16
Top = 72 Top = 72
Width = 73 Width = 88
Caption = 'X adjustment:' Caption = 'X adjustment:'
ParentColor = False ParentColor = False
end end
@ -208,18 +208,18 @@ object frmFPVViewer: TfrmFPVViewer
end end
object Label4: TLabel object Label4: TLabel
Left = 9 Left = 9
Height = 15 Height = 16
Top = 126 Top = 126
Width = 128 Width = 153
Caption = 'Force encoding on read:' Caption = 'Force encoding on read:'
ParentColor = False ParentColor = False
end end
object comboEncoding: TComboBox object comboEncoding: TComboBox
Left = 144 Left = 144
Height = 23 Height = 20
Top = 126 Top = 126
Width = 128 Width = 128
ItemHeight = 15 ItemHeight = 0
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'Read from the file' 'Read from the file'
@ -255,17 +255,17 @@ object frmFPVViewer: TfrmFPVViewer
end end
object labelFileEncoding: TLabel object labelFileEncoding: TLabel
Left = 278 Left = 278
Height = 15 Height = 16
Top = 130 Top = 130
Width = 74 Width = 88
Caption = 'File encoding:' Caption = 'File encoding:'
ParentColor = False ParentColor = False
end end
object checkForceWhiteBackground: TCheckBox object checkForceWhiteBackground: TCheckBox
Left = 9 Left = 9
Height = 19 Height = 18
Top = 152 Top = 152
Width = 153 Width = 177
Caption = 'Force white background?' Caption = 'Force white background?'
TabOrder = 11 TabOrder = 11
end end
@ -298,9 +298,9 @@ object frmFPVViewer: TfrmFPVViewer
end end
object checkShowPage: TCheckBox object checkShowPage: TCheckBox
Left = 216 Left = 216
Height = 19 Height = 18
Top = 152 Top = 152
Width = 78 Width = 90
Caption = 'Show Page' Caption = 'Show Page'
TabOrder = 15 TabOrder = 15
end end

18
applications/fpvviewer/fpvv_mainform.pas
View File

@ -109,13 +109,16 @@ begin
Vec := TvVectorialDocument.Create; Vec := TvVectorialDocument.Create;
try try
// some formats like HTML need an input of control size to render themselves
Vec.Width := Drawer.Width;
Vec.Height := Drawer.Height;
// If we desire, force a encoding for the read operation // If we desire, force a encoding for the read operation
if comboEncoding.ItemIndex > 0 then if comboEncoding.ItemIndex > 0 then
Vec.ForcedEncodingOnRead := comboEncoding.Text Vec.ForcedEncodingOnRead := comboEncoding.Text
else Vec.ForcedEncodingOnRead := ''; else Vec.ForcedEncodingOnRead := '';
Vec.ReadFromFile(editFileName.FileName); Vec.ReadFromFile(editFileName.FileName);
// Show document properties // Show document properties
labelFileEncoding.Caption := 'File encoding: ' + Vec.Encoding; labelFileEncoding.Caption := 'File encoding: ' + Vec.Encoding;
@ -157,6 +160,10 @@ begin
spinScale.Value, spinScale.Value,
-1 * spinScale.Value); -1 * spinScale.Value);
Drawer.Invalidate; Drawer.Invalidate;
// Show debug tokens
TokensTreeView.Items.Clear;
Vec.GenerateDebugTree(@FPVDebugAddItemProc);
finally finally
Vec.Free; Vec.Free;
end; end;
@ -326,8 +333,13 @@ begin
notebook.PageIndex := 1; notebook.PageIndex := 1;
Vec := TvVectorialDocument.Create; {Vec := TvVectorialDocument.Create;
try try
// some formats like HTML need an input of control size to render themselves
Vec.Width := Drawer.Width;
Vec.Height := Drawer.Height;
// read
Vec.ReadFromFile(editFileName.FileName); Vec.ReadFromFile(editFileName.FileName);
// Generate the positioning info // Generate the positioning info
@ -341,7 +353,7 @@ begin
Vec.GenerateDebugTree(@FPVDebugAddItemProc); Vec.GenerateDebugTree(@FPVDebugAddItemProc);
finally finally
Vec.Free; Vec.Free;
end; end; }
end; end;
procedure TfrmFPVViewer.buttonAdjustClick(Sender: TObject); procedure TfrmFPVViewer.buttonAdjustClick(Sender: TObject);

49
applications/fpvviewer/fpvviewer.lpi
View File

@ -14,7 +14,7 @@
<VersionInfo> <VersionInfo>
<StringTable ProductVersion=""/> <StringTable ProductVersion=""/>
</VersionInfo> </VersionInfo>
<BuildModes Count="3"> <BuildModes Count="4">
<Item1 Name="default" Default="True"/> <Item1 Name="default" Default="True"/>
<Item2 Name="win32-console"> <Item2 Name="win32-console">
<CompilerOptions> <CompilerOptions>
@ -26,12 +26,6 @@
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
</Item2> </Item2>
<Item3 Name="qt"> <Item3 Name="qt">
@ -55,16 +49,33 @@
</Win32> </Win32>
</Options> </Options>
</Linking> </Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
</Item3> </Item3>
<SharedMatrixOptions Count="1"> <Item4 Name="cocoa">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="cocoa"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="fpvviewer"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions>
</Item4>
<SharedMatrixOptions Count="2">
<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"/>
</SharedMatrixOptions> </SharedMatrixOptions>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
@ -96,7 +107,6 @@
<Unit0> <Unit0>
<Filename Value="fpvviewer.lpr"/> <Filename Value="fpvviewer.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="fpvviewer"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="fpvv_mainform.pas"/> <Filename Value="fpvv_mainform.pas"/>
@ -109,17 +119,14 @@
<Unit2> <Unit2>
<Filename Value="dxftokentotree.pas"/> <Filename Value="dxftokentotree.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="dxftokentotree"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="fpvv_drawer.pas"/> <Filename Value="fpvv_drawer.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="fpvv_drawer"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="coreconrec.pas"/> <Filename Value="coreconrec.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="CoreConRec"/>
</Unit4> </Unit4>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
@ -139,12 +146,6 @@
</Win32> </Win32>
</Options> </Options>
</Linking> </Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions Count="3"> <Exceptions Count="3">