RxFPC:TRxDBGridExportPDF - fix errors

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5097 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-08-22 13:32:34 +00:00
parent 826d8ceba8
commit 0b6ed46e90
15 changed files with 643 additions and 244 deletions

View File

@@ -24,16 +24,25 @@
<FormatVersion Value="1"/>
</local>
</RunParams>
<RequiredPackages Count="3">
<RequiredPackages Count="6">
<Item1>
<PackageName Value="FCL"/>
<PackageName Value="rxdbgrid_print"/>
</Item1>
<Item2>
<PackageName Value="rxnew"/>
<PackageName Value="rxdbgrid_export_spreadsheet"/>
</Item2>
<Item3>
<PackageName Value="LCL"/>
<PackageName Value="lazreport"/>
</Item3>
<Item4>
<PackageName Value="FCL"/>
</Item4>
<Item5>
<PackageName Value="rxnew"/>
</Item5>
<Item6>
<PackageName Value="LCL"/>
</Item6>
</RequiredPackages>
<Units Count="2">
<Unit0>

View File

@@ -3,13 +3,13 @@
<ProjectSession>
<Version Value="9"/>
<BuildModes Active="Default"/>
<Units Count="82">
<Units Count="84">
<Unit0>
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="81" Y="12"/>
<UsageCount Value="108"/>
<UsageCount Value="117"/>
</Unit0>
<Unit1>
<Filename Value="unit1.pas"/>
@@ -19,9 +19,8 @@
<ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/>
<IsVisibleTab Value="True"/>
<TopLine Value="110"/>
<CursorPos Y="125"/>
<UsageCount Value="108"/>
<CursorPos X="7" Y="21"/>
<UsageCount Value="117"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit1>
@@ -29,19 +28,16 @@
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<UnitName Value="RxDBGridExportSpreadSheet"/>
<EditorIndex Value="-1"/>
<TopLine Value="143"/>
<CursorPos X="31" Y="32"/>
<TopLine Value="154"/>
<CursorPos X="8" Y="145"/>
<UsageCount Value="12"/>
</Unit2>
<Unit3>
<Filename Value="../../rxdbgrid.pas"/>
<EditorIndex Value="2"/>
<TopLine Value="5626"/>
<CursorPos Y="5653"/>
<UsageCount Value="28"/>
<Bookmarks Count="1">
<Item0 X="89" Y="5603" ID="1"/>
</Bookmarks>
<EditorIndex Value="3"/>
<TopLine Value="3486"/>
<CursorPos X="3" Y="3503"/>
<UsageCount Value="32"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
@@ -55,9 +51,9 @@
<Unit5>
<Filename Value="../../rxdconst.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="161"/>
<CursorPos X="18" Y="177"/>
<UsageCount Value="3"/>
<TopLine Value="170"/>
<CursorPos X="43" Y="197"/>
<UsageCount Value="12"/>
</Unit5>
<Unit6>
<Filename Value="../../../install/source/fpcsrc/rtl/objpas/classes/reader.inc"/>
@@ -92,14 +88,15 @@
<Filename Value="../../rxdbgridexportpdf.pas"/>
<UnitName Value="RxDBGridExportPdf"/>
<EditorIndex Value="1"/>
<TopLine Value="485"/>
<CursorPos Y="491"/>
<UsageCount Value="52"/>
<Bookmarks Count="4">
<Item0 X="3" Y="456" ID="2"/>
<Item1 Y="417" ID="3"/>
<Item2 X="18" Y="566" ID="4"/>
<Item3 X="15" Y="329" ID="5"/>
<TopLine Value="772"/>
<CursorPos Y="781"/>
<UsageCount Value="56"/>
<Bookmarks Count="5">
<Item0 X="3" Y="457" ID="2"/>
<Item1 Y="421" ID="3"/>
<Item2 Y="594" ID="4"/>
<Item3 X="15" Y="334" ID="5"/>
<Item4 X="12" Y="631" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit10>
@@ -206,8 +203,6 @@
<Filename Value="../../../lazutils/fileutil.pas"/>
<UnitName Value="FileUtil"/>
<EditorIndex Value="-1"/>
<TopLine Value="220"/>
<CursorPos X="17" Y="235"/>
<UsageCount Value="10"/>
</Unit24>
<Unit25>
@@ -244,9 +239,9 @@
<Filename Value="../../../lazreport/source/lr_class.pas"/>
<UnitName Value="LR_Class"/>
<EditorIndex Value="-1"/>
<TopLine Value="3503"/>
<CursorPos X="3" Y="3506"/>
<UsageCount Value="4"/>
<TopLine Value="3782"/>
<CursorPos X="13" Y="3780"/>
<UsageCount Value="10"/>
</Unit29>
<Unit30>
<Filename Value="C:/lazarus/components/lazutils/easylazfreetype.pas"/>
@@ -401,8 +396,8 @@
<Filename Value="../../../../lcl/grids.pas"/>
<UnitName Value="Grids"/>
<EditorIndex Value="-1"/>
<TopLine Value="11194"/>
<CursorPos Y="11210"/>
<TopLine Value="4258"/>
<CursorPos X="3" Y="4247"/>
<UsageCount Value="14"/>
</Unit50>
<Unit51>
@@ -463,10 +458,12 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridExportPdfSetupUnit"/>
<EditorIndex Value="-1"/>
<TopLine Value="57"/>
<CursorPos X="23" Y="81"/>
<UsageCount Value="19"/>
<EditorIndex Value="2"/>
<TopLine Value="43"/>
<CursorPos X="11" Y="66"/>
<UsageCount Value="21"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit58>
<Unit59>
<Filename Value="../../rxdbgridexportspreadsheet_paramsunit.pas"/>
@@ -477,7 +474,7 @@
<EditorIndex Value="-1"/>
<TopLine Value="31"/>
<CursorPos X="3" Y="46"/>
<UsageCount Value="6"/>
<UsageCount Value="10"/>
</Unit59>
<Unit60>
<Filename Value="../../../../lcl/controls.pp"/>
@@ -490,17 +487,16 @@
<Unit61>
<Filename Value="/home/OPTORG/alexs/1/1/testfppdf.lpr"/>
<EditorIndex Value="4"/>
<UsageCount Value="34"/>
<UsageCount Value="38"/>
<Loaded Value="True"/>
</Unit61>
<Unit62>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-pdf/src/fppdf.pp"/>
<UnitName Value="fpPDF"/>
<EditorIndex Value="5"/>
<TopLine Value="755"/>
<CursorPos X="27" Y="770"/>
<UsageCount Value="28"/>
<Loaded Value="True"/>
<EditorIndex Value="-1"/>
<TopLine Value="3194"/>
<CursorPos X="3" Y="3196"/>
<UsageCount Value="32"/>
</Unit62>
<Unit63>
<Filename Value="/home/install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
@@ -547,11 +543,10 @@
<Unit69>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-pdf/src/fpttf.pp"/>
<UnitName Value="fpTTF"/>
<EditorIndex Value="3"/>
<EditorIndex Value="-1"/>
<TopLine Value="17"/>
<CursorPos X="29" Y="21"/>
<UsageCount Value="24"/>
<Loaded Value="True"/>
<UsageCount Value="25"/>
</Unit69>
<Unit70>
<Filename Value="../../../../lcl/include/canvas.inc"/>
@@ -628,10 +623,10 @@
<Unit80>
<Filename Value="/home/install/source/fpcsrc/packages/fcl-image/src/fpimage.pp"/>
<UnitName Value="FPimage"/>
<EditorIndex Value="6"/>
<EditorIndex Value="5"/>
<TopLine Value="10"/>
<CursorPos X="3" Y="25"/>
<UsageCount Value="10"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit80>
<Unit81>
@@ -642,127 +637,146 @@
<CursorPos X="15" Y="33"/>
<UsageCount Value="10"/>
</Unit81>
<Unit82>
<Filename Value="../../rxdbgridprintgrid_setupunit.pas"/>
<ComponentName Value="RxDBGridPrintGrid_SetupForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridPrintGrid_SetupUnit"/>
<EditorIndex Value="-1"/>
<TopLine Value="17"/>
<CursorPos Y="99"/>
<UsageCount Value="12"/>
</Unit82>
<Unit83>
<Filename Value="../../../../lcl/include/customcombobox.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="927"/>
<CursorPos Y="946"/>
<UsageCount Value="10"/>
</Unit83>
</Units>
<JumpHistory Count="29" HistoryIndex="28">
<Position1>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="1897" Column="41" TopLine="1872"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="592" TopLine="578"/>
</Position1>
<Position2>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="1899" Column="41" TopLine="1874"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="556"/>
</Position2>
<Position3>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="2600" Column="16" TopLine="2575"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="571" TopLine="556"/>
</Position3>
<Position4>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="2615" Column="23" TopLine="2585"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="556"/>
</Position4>
<Position5>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="2607" TopLine="2601"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="572" TopLine="550"/>
</Position5>
<Position6>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="2617" Column="54" TopLine="2601"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="550"/>
</Position6>
<Position7>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="2620" Column="64" TopLine="2601"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="575" Column="25" TopLine="555"/>
</Position7>
<Position8>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3026" Column="67" TopLine="3000"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="555"/>
</Position8>
<Position9>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3029" Column="68" TopLine="3002"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="570" TopLine="555"/>
</Position9>
<Position10>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3033" Column="65" TopLine="3005"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="555"/>
</Position10>
<Position11>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3063" Column="42" TopLine="3036"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="581" Column="32" TopLine="555"/>
</Position11>
<Position12>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3518" Column="58" TopLine="3490"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="555"/>
</Position12>
<Position13>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="3801" Column="40" TopLine="3772"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="570" TopLine="555"/>
</Position13>
<Position14>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4190" Column="65" TopLine="4162"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="572" TopLine="555"/>
</Position14>
<Position15>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4249" Column="82" TopLine="4222"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="574" TopLine="555"/>
</Position15>
<Position16>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4286" Column="38" TopLine="4257"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="573" TopLine="555"/>
</Position16>
<Position17>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4339" Column="36" TopLine="4313"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="574" TopLine="555"/>
</Position17>
<Position18>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5618" Column="89" TopLine="5589"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="573" TopLine="555"/>
</Position18>
<Position19>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="101" Column="22" TopLine="80"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="574" TopLine="555"/>
</Position19>
<Position20>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5633" Column="20" TopLine="5620"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="573" TopLine="555"/>
</Position20>
<Position21>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5634" Column="29" TopLine="5620"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="575" TopLine="555"/>
</Position21>
<Position22>
<Filename Value="../../rxdbgrid.pas"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="567" TopLine="555"/>
</Position22>
<Position23>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="681" Column="31" TopLine="657"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="569" TopLine="555"/>
</Position23>
<Position24>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="4811" Column="45" TopLine="4786"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="570" TopLine="555"/>
</Position24>
<Position25>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5446" Column="46" TopLine="5421"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="574" Column="13" TopLine="567"/>
</Position25>
<Position26>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5452" Column="47" TopLine="5427"/>
<Caret Line="3503" Column="3" TopLine="3486"/>
</Position26>
<Position27>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5633" Column="29" TopLine="5609"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="192" Column="66" TopLine="169"/>
</Position27>
<Position28>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5634" Column="29" TopLine="5610"/>
<Filename Value="../../rxdbgridexportpdfsetupunit.pas"/>
<Caret Line="58" Column="5" TopLine="43"/>
</Position28>
<Position29>
<Filename Value="../../rxdbgrid.pas"/>
<Caret Line="5635" Column="29" TopLine="5611"/>
<Filename Value="../../rxdbgridexportpdf.pas"/>
<Caret Line="780" TopLine="772"/>
</Position29>
</JumpHistory>
</ProjectSession>
<Debugging>
<BreakPoints Count="2">
<BreakPoints Count="3">
<Item1>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsLocal"/>
@@ -777,6 +791,13 @@
<Source Value="/home/install/source/fpcsrc/packages/fcl-pdf/src/fpttf.pp"/>
<Line Value="320"/>
</Item2>
<Item3>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsLocal"/>
<WatchKind Value="wpkWrite"/>
<Source Value="../../rxdbgridexportpdf.pas"/>
<Line Value="780"/>
</Item3>
</BreakPoints>
<Watches Count="1">
<Item1>

View File

@@ -115,6 +115,7 @@ object Form1: TForm1
Value = 'Максимум:'
ValueType = fvtStaticText
end>
WordWrap = True
end
item
Title.Alignment = taCenter
@@ -176,7 +177,7 @@ object Form1: TForm1
Alignment = taCenter
Title.Alignment = taCenter
Title.Orientation = toHorizontal
Title.Caption = 'Страна'
Title.Caption = 'Адрес|Страна'
Width = 200
FieldName = 'Country'
EditButtons = <>
@@ -189,7 +190,7 @@ object Form1: TForm1
item
Title.Alignment = taCenter
Title.Orientation = toHorizontal
Title.Caption = 'Город'
Title.Caption = 'Адрес|Город'
Width = 200
FieldName = 'Sity'
EditButtons = <>
@@ -259,7 +260,7 @@ object Form1: TForm1
FooterOptions.Color = clYellow
FooterOptions.RowCount = 3
FooterOptions.DrawFullLine = True
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgFooterRows, rdgAllowQuickFilter, rdgAllowToolMenu, rdgWordWrapTitles]
OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgFooterRows, rdgAllowQuickFilter, rdgAllowToolMenu, rdgWordWrap]
FooterColor = clYellow
FooterRowCount = 3
Align = alClient
@@ -415,12 +416,12 @@ object Form1: TForm1
RxDBGrid = RxDBGrid1
Caption = 'Export to PDF file'
FileName = 'test111.pdf'
Options = [repExportTitle, repExportColors, repExportFooter, repOverwriteExisting]
Options = [repExportTitle, repExportColors, repExportFooter, repOverwriteExisting, repExportImages]
PdfOptions.PaperOrientation = ppoLandscape
PdfOptions.Options = [poCompressText, poCompressFonts, poCompressImages, poUseRawJPEG]
OpenAfterExport = True
AuthorPdf = 'Лагунов А.А.'
ProducerPdf = 'alexs'
AuthorPdf = 'Lagunov A.A.'
ProducerPdf = 'Test project'
PageMargin.Left = 40
PageMargin.Top = 40
PageMargin.Right = 40
@@ -531,4 +532,24 @@ object Form1: TForm1
0000000000000000000000000000
}
end
object frReport1: TfrReport
InitialZoom = pzDefault
Options = []
PreviewButtons = [pbZoom, pbLoad, pbSave, pbPrint, pbFind, pbHelp, pbExit]
DataType = dtDataSet
left = 304
top = 88
end
object RxDBGridExportSpreadSheet1: TRxDBGridExportSpreadSheet
Caption = 'Экспорт в электронную таблицу'
Options = []
left = 304
top = 154
end
object RxDBGridPrint1: TRxDBGridPrint
Caption = 'Печать списка'
Options = [rxpoShowTitle, rxpoShowFooter, rxpoShowGridColor, rxpoShowFooterColor, rxpoShowReportTitle]
left = 346
top = 154
end
end

View File

@@ -5,9 +5,9 @@ unit Unit1;
interface
uses
Classes, SysUtils, FileUtil, rxmemds, rxdbgrid,
RxDBGridExportPdf, Forms, Controls, Graphics,
Dialogs, ExtCtrls, StdCtrls, ComCtrls, Spin, db;
Classes, SysUtils, FileUtil, rxmemds, rxdbgrid, RxDBGridExportPdf,
RxDBGridExportSpreadSheet, RxDBGridPrintGrid, LR_Class, Forms, Controls,
Graphics, Dialogs, ExtCtrls, StdCtrls, ComCtrls, Spin, db;
type
@@ -16,12 +16,15 @@ type
TForm1 = class(TForm)
Button1: TButton;
DataSource1: TDataSource;
frReport1: TfrReport;
ImageList1: TImageList;
Memo1: TMemo;
PageControl1: TPageControl;
Panel1: TPanel;
RxDBGrid1: TRxDBGrid;
RxDBGridExportPDF1: TRxDBGridExportPDF;
RxDBGridExportSpreadSheet1: TRxDBGridExportSpreadSheet;
RxDBGridPrint1: TRxDBGridPrint;
RxMemoryData1: TRxMemoryData;
RxMemoryData1Country: TStringField;
RxMemoryData1FLAG: TLongintField;