diff options
| -rw-r--r-- | extras/contributed/report_tool/demo/u_demo.pas | 461 | ||||
| -rw-r--r-- | extras/contributed/report_tool/reportengine/u_imprime.pas | 260 | ||||
| -rw-r--r-- | extras/contributed/report_tool/reportengine/u_visu.pas | 160 |
3 files changed, 441 insertions, 440 deletions
diff --git a/extras/contributed/report_tool/demo/u_demo.pas b/extras/contributed/report_tool/demo/u_demo.pas index 7853e4b1..98a707a7 100644 --- a/extras/contributed/report_tool/demo/u_demo.pas +++ b/extras/contributed/report_tool/demo/u_demo.pas @@ -125,7 +125,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeEmptyPage(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -177,7 +177,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeSimpleText(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -229,7 +229,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeMultiPages(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -281,7 +281,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeMultiSections(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -333,7 +333,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeOutlines(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -385,7 +385,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeCadres(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -437,7 +437,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeColor(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -489,7 +489,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeLines(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -541,7 +541,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeGrid(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -593,7 +593,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeGraph(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -645,7 +645,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin -// Langue:= Version; +// Language:= Version; ImprimeSurf(False); if T_Section(Sections[Pred(Sections.Count)]).TotPages= 0 then @@ -693,7 +693,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'EmptyPage.pdf'; ImprimeEmptyPage(True); Free; @@ -705,7 +705,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'SimpleText.pdf'; ImprimeSimpleText(True); Free; @@ -717,7 +717,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'MultiPages.pdf'; ImprimeMultiPages(True); Free; @@ -729,7 +729,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'MultiSections.pdf'; ImprimeMultiSections(True); Free; @@ -741,7 +741,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Outlines.pdf'; ImprimeOutlines(True); Free; @@ -753,7 +753,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Cadres.pdf'; ImprimeCadres(True); Free; @@ -765,7 +765,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Color.pdf'; ImprimeColor(True); Free; @@ -777,7 +777,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Lines.pdf'; ImprimeLines(True); Free; @@ -789,7 +789,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Grid.pdf'; ImprimeGrid(True); Free; @@ -801,7 +801,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Graph.pdf'; ImprimeGraph(True); Free; @@ -813,7 +813,7 @@ begin FImprime:= T_Imprime.Create; with FImprime do begin - //Langue:= Version; + //Language:= Version; DefaultFile:= 'Surface.pdf'; ImprimeSurf(True); Free; @@ -885,13 +885,13 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins Section(0,0,0,0); // create an empty page Page; // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -902,23 +902,23 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins: 10 mm each side Section(10,10,10,10); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTexte1:= Fonte('helvetica-15:bold',clBlack); - FtTexte2:= Fonte('helvetica-8',clBlack); - FtTexte3:= Fonte('helvetica-8:italic',clBlack); + FtTexte1:= Font('helvetica-15:bold',clBlack); + FtTexte2:= Font('helvetica-8',clBlack); + FtTexte3:= Font('helvetica-8:italic',clBlack); // write the text at position 100 mm from left and 120 mm from top - EcritPage(100,120,'Big text at absolute position',-1,FtTexte1); + WritePage(100,120,'Big text at absolute position',-1,FtTexte1); // write the text aligned to left - EcritPage(cnLeft,50,'Text aligned to left',ColDefaut,FtTexte2); + WritePage(cnLeft,50,'Text aligned to left',ColDefaut,FtTexte2); // write the text aligned to right - EcritPage(cnRight,75,'Text aligned to right',ColDefaut,FtTexte3); + WritePage(cnRight,75,'Text aligned to right',ColDefaut,FtTexte3); // write the text aligned to center - EcritPage(cnCenter,100,'Text aligned to center',ColDefaut,FtTexte2); + WritePage(cnCenter,100,'Text aligned to center',ColDefaut,FtTexte2); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -930,21 +930,21 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins Section(20,10,10,10); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtTexte:= Fonte('helvetica-8',clBlack); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtTexte:= Font('helvetica-8',clBlack); // write title on each page - EcritEnTete(cnCenter,lnFin,'MULTIPAGE DOCUMENT',ColDefaut,FtTitre); + WriteHeader(cnCenter,lnFin,'MULTIPAGE DOCUMENT',ColDefaut,FtTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte); // create five new empty pages for Cpt:= 1 to 5 do Page; // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -957,24 +957,24 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitreS1:= Fonte('helvetica-15:bold',clBlack); - FtTitreS2:= Fonte('helvetica-14:italic',clBlack); - FtTitreS3:= Fonte('helvetica-12:bold:italic',clBlack); - FtTexte:= Fonte('helvetica-8',clBlack); - FtNum:= Fonte('helvetica-7:italic',clBlack); - FtNumS:= Fonte('helvetica-7:italic',clGray); + FtTitreS1:= Font('helvetica-15:bold',clBlack); + FtTitreS2:= Font('helvetica-14:italic',clBlack); + FtTitreS3:= Font('helvetica-12:bold:italic',clBlack); + FtTexte:= Font('helvetica-8',clBlack); + FtNum:= Font('helvetica-7:italic',clBlack); + FtNumS:= Font('helvetica-7:italic',clGray); // create a new section and define the margins Section(20,10,10,10); // write title on each page of the section - EcritEnTete(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS1); + WriteHeader(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS1); // write section number and total of sections on each page - NumSectionEnTete(cnRight,lnFin,'Section','of',True,False,ColDefaut,FtNum); + NumSectionHeader(cnRight,lnFin,'Section','of',True,False,ColDefaut,FtNum); // write page number for the section and total pages of the section on each page - NumPageSectionPied(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); + NumPageSectionFooter(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); // write page number and total of pages on each page - NumPagePied(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); + NumPageFooter(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); // create some new empty pages in the section for Cpt:= 1 to 3 do Page; @@ -982,15 +982,15 @@ with FImprime do // create a new section and define the margins Section(10,10,10,10,0,oLandscape); // create a default column for section2 which is landscape oriented - ColDefSect2:= Colonne(20,257); + ColDefSect2:= Column(20,257); // write title on each page of the section - EcritEnTete(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefSect2,FtTitreS2); + WriteHeader(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefSect2,FtTitreS2); // write section number and total of sections on each page - NumSectionEnTete(cnRight,lnFin,'Section','of',True,False,ColDefSect2,FtNum); + NumSectionHeader(cnRight,lnFin,'Section','of',True,False,ColDefSect2,FtNum); // write page number for the section and total pages of the section on each page - NumPageSectionEnTete(cnCenter,lnFin,'Section page','of',True,True,ColDefSect2,FtNumS); + NumPageSectionHeader(cnCenter,lnFin,'Section page','of',True,True,ColDefSect2,FtNumS); // write page number and total of pages on each page - NumPagePied(cnCenter,lnFin,'Page','of',True,ColDefSect2,FtNum); + NumPageFooter(cnCenter,lnFin,'Page','of',True,ColDefSect2,FtNum); // create some new empty pages in the section for Cpt:= 1 to 2 do Page; @@ -998,19 +998,19 @@ with FImprime do // create a new section and define the margins Section(20,20,20,20); // write title on each page of the section - EcritEnTete(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS3); + WriteHeader(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS3); // write section number and total of sections on each page - NumSectionEnTete(cnRight,lnFin,'Section','of',True,True,ColDefaut,FtNum); + NumSectionHeader(cnRight,lnFin,'Section','of',True,True,ColDefaut,FtNum); // write page number for the section and total pages of the section on each page - NumPageSectionEnTete(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); + NumPageSectionHeader(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); // write page number and total of pages on each page - NumPagePied(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); + NumPageFooter(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); // create some new empty pages in the section for Cpt:= 1 to 4 do Page; // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -1023,39 +1023,39 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitreS1:= Fonte('helvetica-15:bold',clBlack); - FtTitreS2:= Fonte('helvetica-14:italic',clBlack); - FtTitreS3:= Fonte('helvetica-12:bold:italic',clBlack); - FtTexte:= Fonte('helvetica-8',clBlack); - FtNum:= Fonte('helvetica-7:italic',clBlack); - FtNumS:= Fonte('helvetica-7:italic',clGray); + FtTitreS1:= Font('helvetica-15:bold',clBlack); + FtTitreS2:= Font('helvetica-14:italic',clBlack); + FtTitreS3:= Font('helvetica-12:bold:italic',clBlack); + FtTexte:= Font('helvetica-8',clBlack); + FtNum:= Font('helvetica-7:italic',clBlack); + FtNumS:= Font('helvetica-7:italic',clGray); // create a new section and define the margins Section(20,10,10,10); // write title on each page of the section - EcritEnTete(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS1); + WriteHeader(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS1); // write section number and total of sections on each page - NumSectionEnTete(cnRight,lnFin,'Section','of',True,False,ColDefaut,FtNum); + NumSectionHeader(cnRight,lnFin,'Section','of',True,False,ColDefaut,FtNum); // write page number for the section and total pages of the section on each page - NumPageSectionPied(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); + NumPageSectionFooter(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); // write page number and total of pages on each page - NumPagePied(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); + NumPageFooter(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); // create some new empty pages in the section for Cpt:= 1 to 3 do Page; // create a new section and define the margins Section(10,10,10,10,0,oLandscape); - TitreSection:= 'Landscape oriented'; + SectionTitle:= 'Landscape oriented'; // write title on each page of the section - EcritEnTete(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS2); + WriteHeader(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS2); // write section number and total of sections on each page - NumSectionEnTete(cnRight,lnFin,'Section','of',True,False,ColDefaut,FtNum); + NumSectionHeader(cnRight,lnFin,'Section','of',True,False,ColDefaut,FtNum); // write page number for the section and total pages of the section on each page - NumPageSectionEnTete(cnCenter,lnFin,'Section page','of',True,True,ColDefaut,FtNumS); + NumPageSectionHeader(cnCenter,lnFin,'Section page','of',True,True,ColDefaut,FtNumS); // write page number and total of pages on each page - NumPagePied(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); + NumPageFooter(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); // create some new empty pages in the section for Cpt:= 1 to 2 do Page; @@ -1063,20 +1063,20 @@ with FImprime do // create a new section and define the margins Section(20,20,20,20); // write title on each page of the section - EcritEnTete(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS3); + WriteHeader(cnCenter,lnFin,'MULTI SECTION DOCUMENT',ColDefaut,FtTitreS3); // write section number and total of sections on each page - NumSectionEnTete(cnRight,lnFin,'Section','of',True,True,ColDefaut,FtNum); + NumSectionHeader(cnRight,lnFin,'Section','of',True,True,ColDefaut,FtNum); // write page number for the section and total pages of the section on each page - NumPageSectionEnTete(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); + NumPageSectionHeader(cnCenter,lnFin,'Section page','of',True,False,ColDefaut,FtNumS); // write page number and total of pages on each page - NumPagePied(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); + NumPageFooter(cnCenter,lnFin,'Page','of',True,ColDefaut,FtNum); // create some new empty pages in the section for Cpt:= 1 to 4 do Page; // preparation is finished, so create PDF objects Outline:= True; - Fin; + EndWrite; end; end; @@ -1089,32 +1089,33 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins with an additional one due to frames drawing Section(20,10,10,10,5); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtTexte:= Fonte('helvetica-8',clBlack); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtTexte:= Font('helvetica-8',clBlack); // create the style of lines to be used - TsFin:= StyleTrait(0.2,clBlack,lsSolid); - TsNorm:= StyleTrait(1,clBlack,lsSolid); - TsEpais:= StyleTrait(2,clBlack,lsSolid); + TsFin:= LineStyle(0.2,clBlack,lsSolid); + TsNorm:= LineStyle(1,clBlack,lsSolid); + TsEpais:= LineStyle(2,clBlack,lsSolid); // create line spacings to be used - IlTitre:= Interligne(3,0,3); - IlTexte:= Interligne(1,0,1); + IlTitre:= LineSpace(3,0,3); + IlTexte:= LineSpace(1,0,1); // write title on each page - EcritEnTete(cnCenter,lnFin,'SHOWING FRAMES',ColDefaut,FtTitre,IlTitre); + WriteHeader(cnCenter,lnFin,'SHOWING FRAMES',ColDefaut,FtTitre,IlTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); // draw thin frame rectangle at margins // CadreMarges(TsFin); // draw thick frame rectangle at header - CadreEnTete(TsEpais); + FrameHeader(TsEpais); // draw thick frame rectangle at footer - CadrePied(TsNorm); - CadrePage(TsEpais); + FramePage(TsNorm); + // draw normal frame rectangle at page + FrameFooter(TsEpais); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -1130,52 +1131,52 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins with an additional one due to frames drawing Section(20,10,10,10); // create the filling colors to be used - FdBlanc:= Fond(clWhite); - FdBeige:= Fond(clBeige); - FdEau:= Fond(clAqua); - FdVertPale:= Fond(clPaleGreen); + FdBlanc:= BackColor(clWhite); + FdBeige:= BackColor(clBeige); + FdEau:= BackColor(clAqua); + FdVertPale:= BackColor(clPaleGreen); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtNormBlack:= Fonte('helvetica-8',clBlack); - FtNormRed:= Fonte('helvetica-8',clRed); - FtNormGreen:= Fonte('helvetica-8',clGreen); - FtBoldBlue:= Fonte('helvetica-8:bold',clBlue); - FtItalGray:= Fonte('helvetica-8:italic',clGray); - FtBoldItalFuchsia:= Fonte('helvetica-8:bold:italic',clFuchsia); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtNormBlack:= Font('helvetica-8',clBlack); + FtNormRed:= Font('helvetica-8',clRed); + FtNormGreen:= Font('helvetica-8',clGreen); + FtBoldBlue:= Font('helvetica-8:bold',clBlue); + FtItalGray:= Font('helvetica-8:italic',clGray); + FtBoldItalFuchsia:= Font('helvetica-8:bold:italic',clFuchsia); // create the style of lines to be used - TsFinNoir:= StyleTrait(1,clBlack,lsSolid); - TsFinBleu:= StyleTrait(1,clBlue,lsSolid); - TsFinRouge:= StyleTrait(1,clRed,lsSolid); - TsEpaisNoir:= StyleTrait(3,clBlack,lsSolid); - TsEpaisGris:= StyleTrait(3,clGray,lsdot); - TsEpaisGreen:= StyleTrait(3,clGreen,lsSolid); + TsFinNoir:= LineStyle(1,clBlack,lsSolid); + TsFinBleu:= LineStyle(1,clBlue,lsSolid); + TsFinRouge:= LineStyle(1,clRed,lsSolid); + TsEpaisNoir:= LineStyle(3,clBlack,lsSolid); + TsEpaisGris:= LineStyle(3,clGray,lsdot); + TsEpaisGreen:= LineStyle(3,clGreen,lsSolid); // create columns to be used - Col1:= Colonne(20,100,2); - Col2:= Colonne(120,80,1); - Col3:= Colonne(70,100,5); + Col1:= Column(20,100,2); + Col2:= Column(120,80,1); + Col3:= Column(70,100,5); // create line spacings to be used - IlTitre:= Interligne(5,0,5); - IlTexte:= Interligne(0,0,0); + IlTitre:= LineSpace(5,0,5); + IlTexte:= LineSpace(0,0,0); // write title on each page - EcritEnTete(cnCenter,lnFin,'SHOWING COLORS',ColDefaut,FtTitre,IlTitre); + WriteHeader(cnCenter,lnFin,'SHOWING COLORS',ColDefaut,FtTitre,IlTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtNormRed,IlTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtNormRed,IlTexte); // write some example texts - EcritPage(cnLeft,lnFin,'Bold blue text aligned to left',ColDefaut,FtBoldBlue,IlTexte); - EspacePage(10,ColDefaut,FdVertPale); - EcritPage(cnCenter,lnFin,'followed by centered normal black text after a 1 cm colored space',ColDefaut,FtNormBlack,IlTexte); - EspacePage(15); - EcritPage(cnLeft,lnFin,'text written on colored background after a 1.5 cm colored space',ColDefaut,FtItalGray,IlTexte,FdEau); - EspacePage(10); - EcritPage(cnLeft,lnCourante,'This text starts in column 1',Col1,FtNormGreen,IlTexte,FdBeige); - EcritPage(cnLeft,lnFin,'and ends in column 2',Col2,FtBoldItalFuchsia,IlTexte); - EcritPage(cnCenter,lnFin,'And this one is centered in column 3',Col3,FtNormRed,IlTexte,FdBeige); + WritePage(cnLeft,lnFin,'Bold blue text aligned to left',ColDefaut,FtBoldBlue,IlTexte); + SpacePage(10,ColDefaut,FdVertPale); + WritePage(cnCenter,lnFin,'followed by centered normal black text after a 1 cm colored space',ColDefaut,FtNormBlack,IlTexte); + SpacePage(15); + WritePage(cnLeft,lnFin,'text written on colored background after a 1.5 cm colored space',ColDefaut,FtItalGray,IlTexte,FdEau); + SpacePage(10); + WritePage(cnLeft,lnCourante,'This text starts in column 1',Col1,FtNormGreen,IlTexte,FdBeige); + WritePage(cnLeft,lnFin,'and ends in column 2',Col2,FtBoldItalFuchsia,IlTexte); + WritePage(cnCenter,lnFin,'And this one is centered in column 3',Col3,FtNormRed,IlTexte,FdBeige); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -1190,45 +1191,45 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins with an additional one due to frames drawing Section(20,10,10,10); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtTexte:= Fonte('helvetica-8',clBlack); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtTexte:= Font('helvetica-8',clBlack); // create the style of lines to be used - TsFinNoir:= StyleTrait(0.2,clBlack,lsSolid); - TsFinBleu:= StyleTrait(0.1,clBlue,lsDash); - TsEpais:= StyleTrait(2,clBlack,lsSolid); - TsFinRouge:= StyleTrait(1,clRed,lsDashDot); + TsFinNoir:= LineStyle(0.2,clBlack,lsSolid); + TsFinBleu:= LineStyle(0.1,clBlue,lsDash); + TsEpais:= LineStyle(2,clBlack,lsSolid); + TsFinRouge:= LineStyle(1,clRed,lsDashDot); // create line spacings to be used - IlTitre:= Interligne(3,0,3); - IlTexte:= Interligne(0,0,0); + IlTitre:= LineSpace(3,0,3); + IlTexte:= LineSpace(0,0,0); // define column borders - BdRect:= Bordure([bcGauche,bcDroite,bcHaut,bcBas],TsEpais); - BdColn:= Bordure([bcGauche,bcDroite,bcHaut],TsFinBleu); - BdFinCol:= Bordure([bcGauche,bcDroite,bcHaut,bcBas],TsFinNoir); + BdRect:= Border([bcGauche,bcDroite,bcHaut,bcBas],TsEpais); + BdColn:= Border([bcGauche,bcDroite,bcHaut],TsFinBleu); + BdFinCol:= Border([bcGauche,bcDroite,bcHaut,bcBas],TsFinNoir); // create columns to be used - Col1:= Colonne(20,60,2); - Col2:= Colonne(80,60,2); - Col3:= Colonne(140,60,2); + Col1:= Column(20,60,2); + Col2:= Column(80,60,2); + Col3:= Column(140,60,2); // write title on each page - EcritEnTete(cnCenter,lnFin,'SHOWING LINES',ColDefaut,FtTitre,IlTitre); + WriteHeader(cnCenter,lnFin,'SHOWING LINES',ColDefaut,FtTitre,IlTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); // write some example texts with column borders - EcritPage(cnLeft,lnCourante,'Example of lines',Col1,FtTexte,IlTexte,-1,BdColn); - EcritPage(cnLeft,lnCourante,'with column borders',Col2,FtTexte,IlTexte,-1,BdFinCol); - EcritPage(cnLeft,lnFin,'',Col3,FtTexte); - EspacePage(5); - EcritPage(cnLeft,lnFin,'A thick border',Col3,FtTexte,IlTexte,-1,BdRect); - TraitHorizPage(2,2,Col2,TsEpais); - TraitPage(30,100,150,150,tsFinNoir); - TraitPage(50,70,180,100,tsFinBleu); - TraitPage(40,140,160,80,tsFinRouge); - TraitPage(60,50,60,120,tsEpais); + WritePage(cnLeft,lnCourante,'Example of lines',Col1,FtTexte,IlTexte,-1,BdColn); + WritePage(cnLeft,lnCourante,'with column borders',Col2,FtTexte,IlTexte,-1,BdFinCol); + WritePage(cnLeft,lnFin,'',Col3,FtTexte); + SpacePage(5); + WritePage(cnLeft,lnFin,'A thick border',Col3,FtTexte,IlTexte,-1,BdRect); + HorizLinePage(2,2,Col2,TsEpais); + LinePage(30,100,150,150,tsFinNoir); + LinePage(50,70,180,100,tsFinBleu); + LinePage(40,140,160,80,tsFinRouge); + LinePage(60,50,60,120,tsEpais); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -1257,59 +1258,59 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins with an additional one due to frames drawing Section(20,10,10,10); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtTexte:= Fonte('helvetica-7',clBlack); - FtTexteBlue:= Fonte('helvetica-7',clBlue); - FtTexteRed:= Fonte('helvetica-7',clRed); - FtSTitre:= Fonte('helvetica-9:bold:italic',clBlue); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtTexte:= Font('helvetica-7',clBlack); + FtTexteBlue:= Font('helvetica-7',clBlue); + FtTexteRed:= Font('helvetica-7',clRed); + FtSTitre:= Font('helvetica-9:bold:italic',clBlue); // create the style of lines to be used - TsFinNoir:= StyleTrait(0.5,clBlack,lsSolid); - TsEpaisBleu:= StyleTrait(1.5,clBlue,lsSolid); + TsFinNoir:= LineStyle(0.5,clBlack,lsSolid); + TsEpaisBleu:= LineStyle(1.5,clBlue,lsSolid); // create line spacings to be used - IlTitre:= Interligne(3,0,3); - IlTexte:= Interligne(1,0,0); + IlTitre:= LineSpace(3,0,3); + IlTexte:= LineSpace(1,0,0); // define column background color - FdBeige:= Fond(clBeige); + FdBeige:= BackColor(clBeige); // define column borders - BdColn:= Bordure([bcGauche,bcDroite],TsFinNoir); - BdColnG:= Bordure([bcGauche],TsEpaisBleu); - BdColnD:= Bordure([bcDroite],TsEpaisBleu); + BdColn:= Border([bcGauche,bcDroite],TsFinNoir); + BdColnG:= Border([bcGauche],TsEpaisBleu); + BdColnD:= Border([bcDroite],TsEpaisBleu); // create columns to be used - Col[1]:= Colonne(Col1Pos,Col1Wid,2); - Col[2]:= Colonne(Col2Pos,Col2Wid,2); - Col[3]:= Colonne(Col3Pos,Col3Wid,2); - Col[4]:= Colonne(Col4Pos,Col4Wid,2); - Col[5]:= Colonne(Col5Pos,Col5Wid,2); + Col[1]:= Column(Col1Pos,Col1Wid,2); + Col[2]:= Column(Col2Pos,Col2Wid,2); + Col[3]:= Column(Col3Pos,Col3Wid,2); + Col[4]:= Column(Col4Pos,Col4Wid,2); + Col[5]:= Column(Col5Pos,Col5Wid,2); // write title on each page - EcritEnTete(cnCenter,lnFin,'SHOWING GRIDS',ColDefaut,FtTitre,IlTitre); + WriteHeader(cnCenter,lnFin,'SHOWING GRIDS',ColDefaut,FtTitre,IlTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); // write a grid without borders - EcritPage(cnCenter,lnFin,'Grid without borders',ColDefaut,FtSTitre,IlTitre); + WritePage(cnCenter,lnFin,'Grid without borders',ColDefaut,FtSTitre,IlTitre); for CptLig:= 1 to 10 do for CptCol:= 1 to 5 do if CptCol= 5 then - EcritPage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte) + WritePage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte) else - EcritPage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte); - EspacePage(5); + WritePage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte); + SpacePage(5); // write a grid with borders - PosHoriz:= EcritPage(cnCenter,lnFin,'Grid with borders and colors',ColDefaut,FtSTitre,IlTitre); - TraitPage(Col1Pos,PosHoriz,Col5Pos+Col5Wid,PosHoriz,TsEpaisBleu); + PosHoriz:= WritePage(cnCenter,lnFin,'Grid with borders and colors',ColDefaut,FtSTitre,IlTitre); + LinePage(Col1Pos,PosHoriz,Col5Pos+Col5Wid,PosHoriz,TsEpaisBleu); for CptLig:= 1 to 10 do for CptCol:= 1 to 5 do if CptCol= 1 then if CptLig mod 2= 0 then - EcritPage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,FdBeige,BdColnG) + WritePage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,FdBeige,BdColnG) else - EcritPage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteBlue,IlTexte,-1,BdColnG) + WritePage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteBlue,IlTexte,-1,BdColnG) else if CptCol= 5 then @@ -1317,40 +1318,40 @@ with FImprime do then begin PredPosHoriz:= PosHoriz; - PosHoriz:= EcritPage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteRed,IlTexte,FdBeige,BdColnD); - TraitPage(Col1Pos,PredPosHoriz,Col5Pos+Col5Wid,PredPosHoriz,TsFinNoir); - TraitPage(Col1Pos,PosHoriz,Col5Pos+Col5Wid,PosHoriz,TsEpaisBleu); - TraitPage(Col5Pos,PredPosHoriz,Col5Pos,PosHoriz,TsFinNoir); + PosHoriz:= WritePage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteRed,IlTexte,FdBeige,BdColnD); + LinePage(Col1Pos,PredPosHoriz,Col5Pos+Col5Wid,PredPosHoriz,TsFinNoir); + LinePage(Col1Pos,PosHoriz,Col5Pos+Col5Wid,PosHoriz,TsEpaisBleu); + LinePage(Col5Pos,PredPosHoriz,Col5Pos,PosHoriz,TsFinNoir); end else begin if CptLig= 1 then - PosHoriz:= EcritPage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,-1,BdColnD) + PosHoriz:= WritePage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,-1,BdColnD) else if CptLig mod 2= 0 then begin PredPosHoriz:= PosHoriz; - PosHoriz:= EcritPage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteRed,IlTexte,FdBeige,BdColnD); - TraitPage(Col1Pos,PredPosHoriz,Col5Pos+Col5Wid,PredPosHoriz,TsFinNoir); - TraitPage(Col5Pos,PredPosHoriz,Col5Pos,PosHoriz,TsFinNoir); + PosHoriz:= WritePage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteRed,IlTexte,FdBeige,BdColnD); + LinePage(Col1Pos,PredPosHoriz,Col5Pos+Col5Wid,PredPosHoriz,TsFinNoir); + LinePage(Col5Pos,PredPosHoriz,Col5Pos,PosHoriz,TsFinNoir); end else begin PredPosHoriz:= PosHoriz; - PosHoriz:= EcritPage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,-1,BdColnD); - TraitPage(Col1Pos,PredPosHoriz,Col5Pos+Col5Wid,PredPosHoriz,TsFinNoir); + PosHoriz:= WritePage(cnLeft,lnFin,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,-1,BdColnD); + LinePage(Col1Pos,PredPosHoriz,Col5Pos+Col5Wid,PredPosHoriz,TsFinNoir); end; end else if CptLig mod 2= 0 then - EcritPage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,FdBeige,BdColn) + WritePage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexte,IlTexte,FdBeige,BdColn) else - EcritPage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteBlue,IlTexte,-1,BdColn); + WritePage(cnLeft,lnCourante,'line '+IntToStr(CptLig)+' ; column '+IntToStr(CptCol),Col[CptCol],FtTexteBlue,IlTexte,-1,BdColn); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -1366,47 +1367,47 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins with an additional one due to frames drawing Section(10,10,10,10); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtTexte:= Fonte('helvetica-7',clBlack); - FtMax:= Fonte('helvetica-7',clFuchsia); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtTexte:= Font('helvetica-7',clBlack); + FtMax:= Font('helvetica-7',clFuchsia); // create line spacings to be used - IlTitre:= Interligne(3,0,3); - IlTexte:= Interligne(1,0,0); + IlTitre:= LineSpace(3,0,3); + IlTexte:= LineSpace(1,0,0); // create the style of lines to be used - TsNoir:= StyleTrait(1,clBlack,lsSolid); - TsGris:= StyleTrait(1,clGray,lsDot); - TsBleu:= StyleTrait(1,clBlue,lsSolid); - TsFuchsia:= StyleTrait(1,clFuchsia,lsDot); - EcritEnTete(cnCenter,lnFin,'SHOWING GRAPH',ColDefaut,FtTitre,IlTitre); + TsNoir:= LineStyle(1,clBlack,lsSolid); + TsGris:= LineStyle(1,clGray,lsDot); + TsBleu:= LineStyle(1,clBlue,lsSolid); + TsFuchsia:= LineStyle(1,clFuchsia,lsDot); + WriteHeader(cnCenter,lnFin,'SHOWING GRAPH',ColDefaut,FtTitre,IlTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); // draw a graph Max:= 0; - EcritPage(10,Base,'0',-1,FtTexte); - TraitPage(20,Base,200,Base,TsNoir); + WritePage(10,Base,'0',-1,FtTexte); + LinePage(20,Base,200,Base,TsNoir); for Cpt:= 1 to 5 do begin - EcritPage(10,Base-Cpt*20,IntToStr(Cpt),-1,FtTexte); - TraitPage(20,Base-Cpt*20,200,Base-Cpt*20,TsGris); + WritePage(10,Base-Cpt*20,IntToStr(Cpt),-1,FtTexte); + LinePage(20,Base-Cpt*20,200,Base-Cpt*20,TsGris); end; for Cpt:= 0 to 18 do begin if ChartValues[Cpt]> Max then Max:= ChartValues[Cpt]; - EcritPage(18+Cpt*10,Base+5,IntToStr(Cpt),-1,FtTexte); - TraitPage(20+Cpt*10,Base,20+Cpt*10,Base-ChartValues[Cpt],TsGris); + WritePage(18+Cpt*10,Base+5,IntToStr(Cpt),-1,FtTexte); + LinePage(20+Cpt*10,Base,20+Cpt*10,Base-ChartValues[Cpt],TsGris); if Cpt>0 then - TraitPage(20+Pred(Cpt)*10,Base-ChartValues[Pred(Cpt)],20+Cpt*10,Base-ChartValues[Cpt],TsBleu); + LinePage(20+Pred(Cpt)*10,Base-ChartValues[Pred(Cpt)],20+Cpt*10,Base-ChartValues[Cpt],TsBleu); end; - EcritPage(16,Base-Max,IntToStr(Max),-1,FtMax); - TraitPage(20,Base-Max,200,Base-Max,TsFuchsia); + WritePage(16,Base-Max,IntToStr(Max),-1,FtMax); + LinePage(20,Base-Max,200,Base-Max,TsFuchsia); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; @@ -1418,23 +1419,23 @@ begin with FImprime do begin // define orientation, page format, measurement unit, language, preview (true) or print (false) - Debut(oPortrait,A4,msMM,Langue,Preview); + BeginWrite(oPortrait,A4,msMM,Langue,Preview); // create a new section and define the margins with an additional one due to frames drawing Section(10,10,10,10); // create the fonts to be used (use one of the 14 Adobe PDF standard fonts) - FtTitre:= Fonte('helvetica-15:bold',clBlack); - FtTexte:= Fonte('helvetica-7',clBlack); + FtTitre:= Font('helvetica-15:bold',clBlack); + FtTexte:= Font('helvetica-7',clBlack); // create line spacings to be used - IlTitre:= Interligne(3,0,3); - IlTexte:= Interligne(1,0,0); - EcritEnTete(cnCenter,lnFin,'SHOWING SURFACE',ColDefaut,FtTitre,IlTitre); + IlTitre:= LineSpace(3,0,3); + IlTexte:= LineSpace(1,0,0); + WriteHeader(cnCenter,lnFin,'SHOWING SURFACE',ColDefaut,FtTitre,IlTitre); // write page number and total of pages on each page - NumPagePied(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); + NumPageFooter(cnRight,lnFin,'Page','of',True,ColDefaut,FtTexte,IlTexte); // paint some surfaces SurfPage([40,40,100],[50,110,80],clGreen); SurfPage([30,50,150,80,120,130],[120,180,180,160,140,120],clFuchsia); // preparation is finished, so create PDF objects - Fin; + EndWrite; end; end; diff --git a/extras/contributed/report_tool/reportengine/u_imprime.pas b/extras/contributed/report_tool/reportengine/u_imprime.pas index 3c5ca114..0847f7f6 100644 --- a/extras/contributed/report_tool/reportengine/u_imprime.pas +++ b/extras/contributed/report_tool/reportengine/u_imprime.pas @@ -85,17 +85,17 @@ type public constructor Create; destructor Destroy; override; - procedure Debut(IniOriente: TOrient= oPortrait; IniTypePapier: TTypePapier= A4; + procedure BeginWrite(IniOriente: TOrient= oPortrait; IniTypePapier: TTypePapier= A4; IniMesure: TMesure= msMM; IniVersion: Char= 'F'; IniVisu: Boolean= True); // starts preview and printing process with initializations // IniOriente = paper orientation >> oPortrait or oLandscape // IniTypePapier = (A4, Letter,Legal,Executive,Comm10,Monarch,DL,C5,B5) // IniMesure = millimeters (msMM) or inches (msInches) // IniVersion = version française 'F' or version English 'E', or other, to come - // IniVisu = True (visualisation) or False (direct printing or PDF generation) - procedure Fin; - procedure ImprimeDocument; - procedure Visualisation; + // IniVisu = True (Preview) or False (direct printing or PDF generation) + procedure EndWrite; + procedure WriteDocument; + procedure PagePreview; procedure Section(MgGauche,MgDroite,MgHaute,MgBasse: Single; Retrait: Single= 0; IniOriente: TOrient= oPortrait); // new section with initialization of margins @@ -103,29 +103,29 @@ type // IniOriente = paper orientation >> oPortrait or oLandscape procedure Page; // new page in the current section - function Fond(FdColor: TfpgColor): Integer; + function BackColor(FdColor: TfpgColor): Integer; // returns the number allocated to the color // FdColor = background color - function Fonte(FtNom: string; FtColor: TfpgColor): Integer; + function Font(FtNom: string; FtColor: TfpgColor): Integer; // returns the number allocated to the font // FtNom = FontDesc of the font // FtColor = font color - function StyleTrait(StEpais: Single; StColor: Tfpgcolor; StStyle: TfpgLineStyle): Integer; + function LineStyle(StEpais: Single; StColor: Tfpgcolor; StStyle: TfpgLineStyle): Integer; // returns the number allocated to the line style // StEpais = thickness of the line in pixels // StColor = line color // StStyle = line style - function Bordure(BdFlags: TFBordFlags; BdStyle: Integer): Integer; + function Border(BdFlags: TFBordFlags; BdStyle: Integer): Integer; // returns the number allocated to the border // BdFlags = position of the border (bdTop,bdBottom,bdLeft,bdRight) // BdStyle = border line style: thickness, color, style - function Colonne(ClnPos,ClnWidth: Single; ClnMargin: Single= 0; ClnColor: TfpgColor= clWhite): Integer; + function Column(ClnPos,ClnWidth: Single; ClnMargin: Single= 0; ClnColor: TfpgColor= clWhite): Integer; // returns the number allocated to the column // ClnPos = left position in numeric value in the measurement unit (msMM or msInch) // ClnWidth = width in numeric value in the measurement unit (msMM or msInch) // ClnMargin = left and right margins in numeric value in the measurement unit (msMM or msInch) // ClnColor = column background color - procedure EcritEnTete(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; + procedure WriteHeader(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) // or numeric value in the measurement unit (msMM or msInch) @@ -137,7 +137,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - function EcritPage(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; + function WritePage(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1): Single; // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) // or numeric value in the measurement unit (msMM or msInch) @@ -149,7 +149,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure EcritPied(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; + procedure WriteFooter(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) // or numeric value in the measurement unit (msMM or msInch) @@ -161,7 +161,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure NumSectionEnTete(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; + procedure NumSectionHeader(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) @@ -177,7 +177,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure NumSectionPied(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; + procedure NumSectionFooter(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) @@ -193,7 +193,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure NumPageEnTete(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; + procedure NumPageHeader(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; Total: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) @@ -208,7 +208,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure NumPagePied(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; + procedure NumPageFooter(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; Total: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) @@ -223,7 +223,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure NumPageSectionEnTete(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; + procedure NumPageSectionHeader(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) @@ -238,7 +238,7 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure NumPageSectionPied(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; + procedure NumPageSectionFooter(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); // Horiz = horizontal position in column (cnLeft,cnCenter,cnRight) @@ -253,60 +253,60 @@ type // InterNum = space between lines reference // CoulFdNum = background color reference, if > -1, replaces the column background color if any // BordNum = border reference, if > -1 - procedure TraitHorizEnTete(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); + procedure HorizLineHeader(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); // EspAvant = empty space before the horizontal line : numeric value in the measurement unit (msMM or msInch) // EspApres = empty space after the horizontal line : numeric value in the measurement unit (msMM or msInch) // ColNum = column reference, default between left and right margins // StyleNum = reference of the line style - procedure TraitHorizPage(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); + procedure HorizLinePage(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); // EspAvant = empty space before the horizontal line : numeric value in the measurement unit (msMM or msInch) // EspApres = empty space after the horizontal line : numeric value in the measurement unit (msMM or msInch) // ColNum = column reference, default between left and right margins // StyleNum = reference of the line style - procedure TraitHorizPied(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); + procedure HorizLineFooter(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); // EspAvant = empty space before the horizontal line : numeric value in the measurement unit (msMM or msInch) // EspApres = empty space after the horizontal line : numeric value in the measurement unit (msMM or msInch) // ColNum = column reference, default between left and right margins // StyleNum = reference of the line style - procedure EspaceEnTete(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); + procedure SpaceHeader(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); // Verti = height of the empty space : numeric value in the measurement unit (msMM or msInch) // ColNum = column reference, default between left and right margins // CoulFdNum = background color reference, if > -1, replaces the column background color if any - procedure EspacePage(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); + procedure SpacePage(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); // Verti = height of the empty space : numeric value in the measurement unit (msMM or msInch) // ColNum = column reference, default between left and right margins // CoulFdNum = background color reference, if > -1, replaces the column background color if any - procedure EspacePied(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); + procedure SpaceFooter(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); // Verti = height of the empty space : numeric value in the measurement unit (msMM or msInch) // ColNum = column reference, default between left and right margins // CoulFdNum = background color reference, if > -1, replaces the column background color if any - function Interligne(ItlSup,ItlInt,ItlInf: Single): Integer; + function LineSpace(ItlSup,ItlInt,ItlInf: Single): Integer; // IntSup = space between lines, top : numeric value in the measurement unit (msMM or msInch) // IntInt = space between lines, internal if wrapping : numeric value in the measurement unit (msMM or msInch) // IntInf = space between lines, botom : numeric value in the measurement unit (msMM or msInch) - procedure Groupe(SautPage: Boolean= False); + procedure BeginGroup(SautPage: Boolean= False); // SautPage = True >> forces new page before the group // = False >> does not create a new page if the whole group can stand on the same page as the preceding text - procedure FinGroupe(SautPage: Boolean= False); + procedure EndGroup(SautPage: Boolean= False); // SautPage = True >> forces new page after the group // = False >> lets continue on the same page after the group procedure ColorColChange(ColNum: Integer; ColColor: TfpgColor); // Changes the background color of a column // ColNum = column reference // ColColor = new background color for the column - procedure CadreMarges(AStyle: Integer); + procedure FrameMargins(AStyle: Integer); // draw a frame at the page margins // AStyle = reference of the line style of the frame - procedure CadreEnTete(AStyle: Integer); + procedure FrameHeader(AStyle: Integer); // draw a frame at the limits of the header // AStyle = reference of the line style of the frame - procedure CadrePage(AStyle: Integer); + procedure FramePage(AStyle: Integer); // draw a frame at the page limits : left and right margins, header bottom and footer top // AStyle = reference of the line style of the frame - procedure CadrePied(AStyle: Integer); + procedure FrameFooter(AStyle: Integer); // draw a frame at the limits of the footer // AStyle = reference of the line style of the frame - procedure TraitPage(XDebut,YDebut,XFin,YFin: Single; AStyle: Integer); + procedure LinePage(XDebut,YDebut,XFin,YFin: Single; AStyle: Integer); // draw a line at absolute position // XDebut = horizontal position of starting point in numeric value in the measurement unit (msMM or msInch) // YDebut = vertical position of starting point in numeric value in the measurement unit (msMM or msInch) @@ -314,16 +314,16 @@ type // YFin = vertical position of ending point in numeric value in the measurement unit (msMM or msInch) // AStyle = reference of the line style of the line procedure SurfPage(XLimits,YLimits: array of Single; AColor: TfpgColor); - property Langue: Char read FVersion write FVersion; + property Language: Char read FVersion write FVersion; property Visualiser: Boolean read FVisualisation write FVisualisation; - property NumeroSection: Integer read FNmSection write FNmSection; - property NumeroPage: Integer read FNmPage write FNmPage; - property NumeroPageSection: Integer read FNmPageSect write FNmPageSect; - property HauteurPapier: Integer read GetHauteurPapier; - property LargeurPapier: Integer read GetLargeurPapier; + property NumSection: Integer read FNmSection write FNmSection; + property NumPage: Integer read FNmPage write FNmPage; + property NumPageSection: Integer read FNmPageSect write FNmPageSect; + property PaperHeight: Integer read GetHauteurPapier; + property PagerWidth: Integer read GetLargeurPapier; property DefaultFile: string read FDefaultFile write FDefaultFile; - property CouleurCourante: Integer read FColorCourante write FColorCourante; - property TitreSection: string read GetTitreSection write SetTitreSection; + property CurrentColor: Integer read FColorCourante write FColorCourante; + property SectionTitle: string read GetTitreSection write SetTitreSection; end; // classes for interface with PDF generation @@ -555,7 +555,7 @@ end; procedure T_Imprime.Bv_VisuPaint(Sender: TObject); begin -ImprimePage(NumeroPage); +ImprimePage(NumPage); end; procedure T_Imprime.PrepareFormat; @@ -725,10 +725,10 @@ repeat LaPage:= T_Page(Pages.Items[Pred(CptPage)]); until (LaPage.PagesTot= PageNumero) or (CptPage= Pages.Count); until (LaPage.PagesTot= PageNumero) or (CptSect= Sections.Count); -NumeroPage:= PageNumero; -NumeroSection:= CptSect; -NumeroPageSection:= LaPage.PagesSect; -with T_Section(Sections[Pred(NumeroSection)]) do +NumPage:= PageNumero; +NumSection:= CptSect; +NumPageSection:= LaPage.PagesSect; +with T_Section(Sections[Pred(NumSection)]) do begin if CmdEnTete.Count> 0 then @@ -753,11 +753,11 @@ with T_Section(Sections[Pred(NumeroSection)]) do with Cmd as T_Trait do TraceTrait(GetPosX,GetPosY,GetEndX,GetEndY,GetStyle); end; - if GetCmdPage(NumeroPageSection).Count> 0 + if GetCmdPage(NumPageSection).Count> 0 then - for CptCmd:= 0 to Pred(GetCmdPage(NumeroPageSection).Count) do + for CptCmd:= 0 to Pred(GetCmdPage(NumPageSection).Count) do begin - Cmd:= T_Commande(GetCmdPage(NumeroPageSection).Items[CptCmd]); + Cmd:= T_Commande(GetCmdPage(NumPageSection).Items[CptCmd]); if Cmd is T_EcritTexte then with Cmd as T_EcritTexte do @@ -816,7 +816,7 @@ var Cpt: Integer; Cmd: T_Commande; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do if CmdPied.Count> 0 then for Cpt:= 0 to Pred(CmdPied.Count) do @@ -879,7 +879,7 @@ var StylTrait: TfpgLineStyle; Wraplst: TStringList; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do begin FinDeLigne:= False; if FPreparation= ppPrepare @@ -895,7 +895,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do Fnt:= T_Fonte(Fontes[FonteNum]).GetFonte; if Interlignes.Count= 0 then - Interligne(0,0,0); + LineSpace(0,0,0); if FInterLCourante<> InterL then FInterLCourante:= InterL; @@ -1133,7 +1133,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfRect:= TPdfRect.Create; with PdfRect do begin - PageId:= NumeroPage; + PageId:= NumPage; FGauche:= ColPos; FBas:= Paper.H-PosY+IntLSup-HautTxt; FHaut:= HautTxt; @@ -1161,7 +1161,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos; FStartY:= Paper.H-PosY+IntLSup; FEndX:= ColPos; @@ -1178,7 +1178,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos+ColWidth; FStartY:= Paper.H-PosY+IntLSup; FEndX:= ColPos+ColWidth; @@ -1195,7 +1195,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos; FStartY:= Paper.H-PosY+IntLSup; FEndX:= ColPos+ColWidth; @@ -1212,7 +1212,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos; FStartY:= Paper.H-PosY+IntLSup-HautTxt; FEndX:= ColPos+ColWidth; @@ -1230,7 +1230,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfTexte:= TPdfTexte.Create; with PdfTexte do begin - PageId:= NumeroPage; + PageId:= NumPage; FFont:= FonteNum; FSize:= T_Fonte(Fontes[FonteNum]).GetSize; FColor:= T_Fonte(Fontes[FonteNum]).GetColor; @@ -1259,7 +1259,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfTexte:= TPdfTexte.Create; with PdfTexte do begin - PageId:= NumeroPage; + PageId:= NumPage; FFont:= FonteNum; FSize:= T_Fonte(Fontes[FonteNum]).GetSize; FColor:= T_Fonte(Fontes[FonteNum]).GetColor; @@ -1284,7 +1284,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfTexte:= TPdfTexte.Create; with PdfTexte do begin - PageId:= NumeroPage; + PageId:= NumPage; FFont:= FonteNum; FSize:= T_Fonte(Fontes[FonteNum]).GetSize; FColor:= T_Fonte(Fontes[FonteNum]).GetColor; @@ -1310,17 +1310,17 @@ function T_Imprime.EcritNum(PosX,PosY: Single; Colonne,TexteNum,TexteTot,FonteNu PageNum: if Total then - Result:= Textes[TexteNum]+' '+IntToStr(NumeroPage)+' '+Textes[TexteTot]+' ' + Result:= Textes[TexteNum]+' '+IntToStr(NumPage)+' '+Textes[TexteTot]+' ' +IntToStr(T_Section(Sections[Pred(Sections.Count)]).TotPages) else - Result:= Textes[TexteNum]+' '+IntToStr(NumeroPage); + Result:= Textes[TexteNum]+' '+IntToStr(NumPage); SectNum: begin if Alpha then - NumAlpha:= ConvertitEnAlpha(NumeroSection) + NumAlpha:= ConvertitEnAlpha(NumSection) else - NumAlpha:= IntToStr(NumeroSection); + NumAlpha:= IntToStr(NumSection); if Total then Result:= Textes[TexteNum]+' '+NumAlpha+' '+Textes[TexteTot]+' '+IntToStr(Sections.Count) @@ -1331,13 +1331,13 @@ function T_Imprime.EcritNum(PosX,PosY: Single; Colonne,TexteNum,TexteTot,FonteNu begin if Alpha then - NumAlpha:= ConvertitEnAlpha(NumeroPageSection) + NumAlpha:= ConvertitEnAlpha(NumPageSection) else - NumAlpha:= IntToStr(NumeroPageSection); + NumAlpha:= IntToStr(NumPageSection); if Total then Result:= Textes[TexteNum]+' '+NumAlpha+' '+Textes[TexteTot]+' ' - +IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages) + +IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages) else Result:= Textes[TexteNum]+' '+NumAlpha; end; @@ -1352,7 +1352,7 @@ var StylTrait: TfpgLineStyle; Chaine: string; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do begin FinDeLigne:= False; if FPreparation= ppPrepare @@ -1368,7 +1368,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do Fnt:= T_Fonte(Fontes[FonteNum]).GetFonte; if Interlignes.Count= 0 then - Interligne(0,0,0); + LineSpace(0,0,0); if FInterLCourante<> InterL then FInterLCourante:= InterL; @@ -1555,7 +1555,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfRect:= TPdfRect.Create; with PdfRect do begin - PageId:= NumeroPage; + PageId:= NumPage; FGauche:= ColPos; FBas:= Paper.H-PosY+IntLSup-HautTxt; FHaut:= HautTxt; @@ -1583,7 +1583,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos; FStartY:= Paper.H-PosY+IntLSup; FEndX:= ColPos; @@ -1600,7 +1600,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos+ColWidth; FStartY:= Paper.H-PosY+IntLSup; FEndX:= ColPos+ColWidth; @@ -1617,7 +1617,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos; FStartY:= Paper.H-PosY+IntLSup; FEndX:= ColPos+ColWidth; @@ -1634,7 +1634,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= ColPos; FStartY:= Paper.H-PosY+IntLSup-HautTxt; FEndX:= ColPos+ColWidth; @@ -1649,7 +1649,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfTexte:= TPdfTexte.Create; with PdfTexte do begin - PageId:= NumeroPage; + PageId:= NumPage; FFont:= FonteNum; FSize:= T_Fonte(Fontes[FonteNum]).GetSize; FColor:= T_Fonte(Fontes[FonteNum]).GetColor; @@ -1671,7 +1671,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfTexte:= TPdfTexte.Create; with PdfTexte do begin - PageId:= NumeroPage; + PageId:= NumPage; FFont:= FonteNum; FSize:= T_Fonte(Fontes[FonteNum]).GetSize; FColor:= T_Fonte(Fontes[FonteNum]).GetColor; @@ -1691,7 +1691,7 @@ function T_Imprime.InsereEspace(PosY: Single; Colonne: Integer; EspHeight: Singl var PosV: Single; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do begin if PosY> -1 then @@ -1760,7 +1760,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfRect:= TPdfRect.Create; with PdfRect do begin - PageId:= NumeroPage; + PageId:= NumPage; FGauche:= ColPos; FBas:= Paper.H-PosY-EspHeight; FHaut:= EspHeight; @@ -1783,7 +1783,7 @@ end; procedure T_Imprime.FinLigne(Zone: TZone); begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do case Zone of zEnTete: LoadCmdEnTete; @@ -1802,7 +1802,7 @@ procedure T_Imprime.TraceCadre(StTrait: Integer; Zone: TZone); var Half,MargeL,MargeR,MargeT,MargeB,EnTeteH,PiedH: Integer; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do case FPreparation of ppPrepare: LoadCadre(StTrait,Zone); @@ -1860,7 +1860,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfRect:= TPdfRect.Create; with PdfRect do begin - PageId:= NumeroPage; + PageId:= NumPage; with T_TraitStyle(TraitStyles[StTrait]) do begin FEpais:= GetEpais; @@ -1908,7 +1908,7 @@ end; procedure T_Imprime.TraceTrait(XDebut,YDebut,XFin,YFin: Single; StTrait: Integer); begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do case FPreparation of ppPrepare: LoadTrait(XDebut,YDebut,ColDefaut,XFin,YFin,StTrait); @@ -1927,7 +1927,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= XDebut; FStartY:= Paper.H-YDebut; FEndX:= XFin; @@ -1945,7 +1945,7 @@ procedure T_Imprime.TraceTraitHoriz(XDebut,YDebut: Single; Colonne: Integer; XFi var PosV: Single; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do case FPreparation of ppPrepare: begin @@ -1998,7 +1998,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do PdfLine:= TPdfLine.Create; with PdfLine do begin - PageId:= NumeroPage; + PageId:= NumPage; FStartX:= XDebut; FStartY:= Paper.H-YDebut; FEndX:= XFin; @@ -2018,7 +2018,7 @@ var Cpt: Integer; Pts: array of TPoint; begin -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do case FPreparation of ppPrepare: LoadSurf(Points,Couleur); @@ -2046,7 +2046,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do end; with PdfSurf do begin - PageId:= NumeroPage; + PageId:= NumPage; //SetLength(FPoints,Length(Points)); //for Cpt:= 0 to Pred(Length(Points)) do // weird behaviour: points gets length= 0 inside the with clause ! // begin @@ -2148,7 +2148,7 @@ DecimalSeparator:= OldSeparator; inherited; end; -procedure T_Imprime.Debut(IniOriente: TOrient= oPortrait; IniTypePapier: TTypePapier= A4; +procedure T_Imprime.BeginWrite(IniOriente: TOrient= oPortrait; IniTypePapier: TTypePapier= A4; IniMesure: TMesure= msMM; IniVersion: Char= 'F'; IniVisu: Boolean= True); begin FVersion:= IniVersion; @@ -2166,7 +2166,7 @@ FInterLCourante:= -1; FGroupe:= False; end; -procedure T_Imprime.Fin; +procedure T_Imprime.EndWrite; var Cpt: Integer; begin @@ -2175,24 +2175,24 @@ if Sections.Count> 0 then for Cpt:= 1 to Sections.Count do begin - NumeroSection:= Cpt; - if T_Section(Sections[Pred(NumeroSection)]).TotPages> 0 + NumSection:= Cpt; + if T_Section(Sections[Pred(NumSection)]).TotPages> 0 then begin - NumeroPageSection:= 1; - NumeroPage:= 1; + NumPageSection:= 1; + NumPage:= 1; end; end else Exit; -for Cpt:= 1 to T_Section(Sections[Pred(NumeroSection)]).TotPages do +for Cpt:= 1 to T_Section(Sections[Pred(NumSection)]).TotPages do ImprimePage(Cpt); if FVisualisation then begin FPreparation:= ppVisualise; try - ImprimeDocument; + WriteDocument; F_Visu.ShowModal; finally F_Visu.Free; @@ -2200,14 +2200,14 @@ then end; end; -procedure T_Imprime.ImprimeDocument; +procedure T_Imprime.WriteDocument; begin if FVisualisation then FCanevas:= Bv_Visu.Canvas; end; -procedure T_Imprime.Visualisation; +procedure T_Imprime.PagePreview; begin FVisualisation:= not FVisualisation; if FVisualisation @@ -2252,8 +2252,8 @@ case FPreparation of FEnTeteHeight:= 0; FPageHeight:= 0; FPiedHeight:= 0; - NumeroSection:= NumeroSection+1; - ASection:= T_Section.Create(FPapier,FMargeCourante,NumeroSection); + NumSection:= NumSection+1; + ASection:= T_Section.Create(FPapier,FMargeCourante,NumSection); Sections.Add(ASection); CMargin:= Dim2Pixels(Retrait); AColonne:= T_Colonne.Create(FMargeCourante.L,FMargeCourante.R-FMargeCourante.L,CMargin,clWhite); @@ -2267,32 +2267,32 @@ begin if FPreparation= ppPrepare then begin - NumeroPage:= NumeroPage+1; - T_Section(Sections[Pred(Sections.Count)]).LoadPage(NumeroPage); + NumPage:= NumPage+1; + T_Section(Sections[Pred(Sections.Count)]).LoadPage(NumPage); FPosRef.Y:= FMargeCourante.T+FEnTeteHeight; FPageHeight:= 0; end; end; -function T_Imprime.Fond(FdColor: TfpgColor): Integer; +function T_Imprime.BackColor(FdColor: TfpgColor): Integer; begin AFond:= T_Fond.Create(FdColor); Result:= Fonds.Add(AFond); end; -function T_Imprime.Fonte(FtNom: string; FtColor: TfpgColor): Integer; +function T_Imprime.Font(FtNom: string; FtColor: TfpgColor): Integer; begin AFonte:= T_Fonte.Create(FtNom,FtColor); Result:= Fontes.Add(AFonte); end; -function T_Imprime.StyleTrait(StEpais: Single; StColor: Tfpgcolor; StStyle: TfpgLineStyle): Integer; +function T_Imprime.LineStyle(StEpais: Single; StColor: Tfpgcolor; StStyle: TfpgLineStyle): Integer; begin ATraitStyle:= T_TraitStyle.Create(StEpais,StColor,StStyle); Result:= TraitStyles.Add(ATraitStyle); end; -function T_Imprime.Bordure(BdFlags: TFBordFlags; BdStyle: Integer): Integer; +function T_Imprime.Border(BdFlags: TFBordFlags; BdStyle: Integer): Integer; begin ABord:= T_Bord.Create(BdFlags,BdStyle); Result:= Bords.Add(ABord); @@ -2304,12 +2304,12 @@ end; //Result:= Bords.Add(ABord); //end; -function T_Imprime.Colonne(ClnPos,ClnWidth: Single; ClnMargin: Single= 0; ClnColor: TfpgColor= clWhite): Integer; +function T_Imprime.Column(ClnPos,ClnWidth: Single; ClnMargin: Single= 0; ClnColor: TfpgColor= clWhite): Integer; var CPos,CWidth,CMargin: Single; begin CPos:= Dim2Pixels(ClnPos); -with T_Section(Sections[Pred(NumeroSection)]) do +with T_Section(Sections[Pred(NumSection)]) do begin if CPos< Marges.L then @@ -2324,7 +2324,7 @@ AColonne:= T_Colonne.Create(CPos,CWidth,CMargin,ClnColor); Result:= T_Section(Sections[Pred(Sections.Count)]).Colonnes.Add(AColonne); end; -procedure T_Imprime.EcritEnTete(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; +procedure T_Imprime.WriteHeader(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var RefTexte: Integer; @@ -2356,7 +2356,7 @@ then EcritLigne(Horiz,Verti,ColNum,RefTexte,FonteNum,CoulFdNum,BordNum,InterNum,Flags,ZEnTete); end; -function T_Imprime.EcritPage(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; +function T_Imprime.WritePage(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1): Single; var RefTexte: Integer; @@ -2388,7 +2388,7 @@ then Result:= EcritLigne(Horiz,Verti,ColNum,RefTexte,FonteNum,CoulFdNum,BordNum,InterNum,Flags,ZPage); end; -procedure T_Imprime.EcritPied(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; +procedure T_Imprime.WriteFooter(Horiz,Verti: Single; Texte: string; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var RefTexte: Integer; @@ -2420,7 +2420,7 @@ then EcritLigne(Horiz,Verti,ColNum,RefTexte,FonteNum,CoulFdNum,BordNum,InterNum,Flags,ZPied); end; -procedure T_Imprime.NumSectionEnTete(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; +procedure T_Imprime.NumSectionHeader(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var @@ -2457,7 +2457,7 @@ then EcritNum(Horiz,Verti,ColNum,RefTextePage,RefTexteTot,FonteNum,CoulFdNum,BordNum,InterNum,Flags,Total,Alpha,ZEnTete,SectNum); end; -procedure T_Imprime.NumSectionPied(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; +procedure T_Imprime.NumSectionFooter(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0;CoulFdNum: Integer= -1; BordNum: Integer= -1); var @@ -2494,7 +2494,7 @@ then EcritNum(Horiz,Verti,ColNum,RefTextePage,RefTexteTot,FonteNum,CoulFdNum,BordNum,InterNum,Flags,Total,Alpha,ZPied,SectNum); end; -procedure T_Imprime.NumPageEnTete(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; +procedure T_Imprime.NumPageHeader(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; Total: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var @@ -2531,7 +2531,7 @@ then EcritNum(Horiz,Verti,ColNum,RefTextePage,RefTexteTot,FonteNum,CoulFdNum,BordNum,InterNum,Flags,Total,False,ZEnTete,PageNum); end; -procedure T_Imprime.NumPagePied(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; +procedure T_Imprime.NumPageFooter(Horiz,Verti: Single; TextePage: string= ''; TexteTotal: string= ''; Total: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var @@ -2568,7 +2568,7 @@ then EcritNum(Horiz,Verti,ColNum,RefTextePage,RefTexteTot,FonteNum,CoulFdNum,BordNum,InterNum,Flags,Total,False,ZPied,PageNum); end; -procedure T_Imprime.NumPageSectionEnTete(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; +procedure T_Imprime.NumPageSectionHeader(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var @@ -2605,7 +2605,7 @@ then EcritNum(Horiz,Verti,ColNum,RefTextePage,RefTexteTot,FonteNum,CoulFdNum,BordNum,InterNum,Flags,Total,Alpha,ZEnTete,PSectNum); end; -procedure T_Imprime.NumPageSectionPied(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; +procedure T_Imprime.NumPageSectionFooter(Horiz,Verti: Single; TexteSect: string= ''; TexteTot: string= ''; Total: Boolean= False; Alpha: Boolean= False; ColNum: Integer= 0; FonteNum: Integer= 0; InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1); var @@ -2642,37 +2642,37 @@ then EcritNum(Horiz,Verti,ColNum,RefTextePage,RefTexteTot,FonteNum,CoulFdNum,BordNum,InterNum,Flags,Total,Alpha,ZPied,PSectNum); end; -procedure T_Imprime.TraitHorizEnTete(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); +procedure T_Imprime.HorizLineHeader(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); begin TraceTraitHoriz(Dim2Pixels(EspAvant),Dim2Pixels(EspApres),ColNum,-1,StyleNum,zEntete); end; -procedure T_Imprime.TraitHorizPage(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); +procedure T_Imprime.HorizLinePage(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); begin TraceTraitHoriz(Dim2Pixels(EspAvant),Dim2Pixels(EspApres),ColNum,-1,StyleNum,zPage); end; -procedure T_Imprime.TraitHorizPied(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); +procedure T_Imprime.HorizLineFooter(EspAvant,EspApres: Single; ColNum: Integer= 0; StyleNum: Integer= 0); begin TraceTraitHoriz(Dim2Pixels(EspAvant),Dim2Pixels(EspApres),ColNum,-1,StyleNum,zPied); end; -procedure T_Imprime.EspaceEnTete(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); +procedure T_Imprime.SpaceHeader(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); begin InsereEspace(-1,ColNum,Dim2Pixels(Verti),CoulFdNum,zEntete); end; -procedure T_Imprime.EspacePage(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); +procedure T_Imprime.SpacePage(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); begin InsereEspace(-1,ColNum,Dim2Pixels(Verti),CoulFdNum,zPage); end; -procedure T_Imprime.EspacePied(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); +procedure T_Imprime.SpaceFooter(Verti: Single; ColNum: Integer=0; CoulFdNum: Integer= -1); begin InsereEspace(-1,ColNum,Dim2Pixels(Verti),CoulFdNum,zPied); end; -function T_Imprime.Interligne(ItlSup,ItlInt,ItlInf: Single): Integer; +function T_Imprime.LineSpace(ItlSup,ItlInt,ItlInf: Single): Integer; var Sup,Int,Inf: Integer; begin @@ -2695,7 +2695,7 @@ AInterligne:= T_Interligne.Create(Sup,Int,Inf); Result:= Interlignes.Add(AInterligne); end; -procedure T_Imprime.Groupe(SautPage: Boolean= False); +procedure T_Imprime.BeginGroup(SautPage: Boolean= False); begin AGroupe:= T_Groupe.Create; FGroupe:= True; @@ -2704,7 +2704,7 @@ then Page; end; -procedure T_Imprime.FinGroupe(SautPage: Boolean= False); +procedure T_Imprime.EndGroup(SautPage: Boolean= False); begin T_Section(Sections[Pred(Sections.Count)]).LoadCmdGroupeToPage; FGroupe:= False; @@ -2719,27 +2719,27 @@ begin T_Colonne(T_Section(Sections[Pred(Sections.Count)]).Colonnes[ColNum]).SetColColor(ColColor); end; -procedure T_Imprime.CadreMarges(AStyle: Integer); +procedure T_Imprime.FrameMargins(AStyle: Integer); begin TraceCadre(AStyle,zMarges); end; -procedure T_Imprime.CadreEnTete(AStyle: Integer); +procedure T_Imprime.FrameHeader(AStyle: Integer); begin TraceCadre(AStyle,zEntete); end; -procedure T_Imprime.CadrePage(AStyle: Integer); +procedure T_Imprime.FramePage(AStyle: Integer); begin TraceCadre(AStyle,zPage); end; -procedure T_Imprime.CadrePied(AStyle: Integer); +procedure T_Imprime.FrameFooter(AStyle: Integer); begin TraceCadre(AStyle,zPied); end; -procedure T_Imprime.TraitPage(XDebut,YDebut,XFin,YFin: Single; AStyle: Integer); +procedure T_Imprime.LinePage(XDebut,YDebut,XFin,YFin: Single; AStyle: Integer); begin TraceTrait(Dim2Pixels(XDebut),Dim2Pixels(YDebut),Dim2Pixels(XFin),Dim2Pixels(YFin),AStyle); end; diff --git a/extras/contributed/report_tool/reportengine/u_visu.pas b/extras/contributed/report_tool/reportengine/u_visu.pas index 7d155547..1e3c39fe 100644 --- a/extras/contributed/report_tool/reportengine/u_visu.pas +++ b/extras/contributed/report_tool/reportengine/u_visu.pas @@ -104,12 +104,12 @@ with FImprime do if T_Section(Sections[Pred(Sections.Count)]).TotPages= 1 then E_NumPage.Focusable:= False; - E_NumPage.Text:= IntToStr(NumeroPage); + E_NumPage.Text:= IntToStr(NumPage); L_NbrPages.Text:= IntToStr(T_Section(Sections[Pred(Sections.Count)]).TotPages); - E_NumSect.Text:= IntToStr(NumeroSection); + E_NumSect.Text:= IntToStr(NumSection); L_NbrSect.Text:= IntToStr(Sections.Count); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); ChangeBoutons; end; end; @@ -174,12 +174,12 @@ procedure TF_Visu.Bt_PremPageClick(Sender: TObject); begin with FImprime do begin - NumeroPage:= 1; - NumeroSection:= 1; - NumeroPageSection:= 1; - E_NumPage.Text:= IntToStr(NumeroPage); + NumPage:= 1; + NumSection:= 1; + NumPageSection:= 1; + E_NumPage.Text:= IntToStr(NumPage); Bv_Visu.Visible:= False; - with T_Section(Sections[Pred(NumeroSection)]),F_Visu do + with T_Section(Sections[Pred(NumSection)]),F_Visu do begin Bv_Visu.Height:= Paper.H; Bv_Visu.Width:= Paper.W; @@ -188,9 +188,9 @@ with FImprime do end; Bv_Visu.Visible:= True; ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -198,14 +198,14 @@ procedure TF_Visu.Bt_PrecPageClick(Sender: TObject); begin with FImprime do begin - NumeroPage:= NumeroPage-1; - if NumeroPageSection= 1 + NumPage:= NumPage-1; + if NumPageSection= 1 then begin - NumeroSection:= NumeroSection-1; - NumeroPageSection:= T_Section(Sections[Pred(NumeroSection)]).NbPages; + NumSection:= NumSection-1; + NumPageSection:= T_Section(Sections[Pred(NumSection)]).NbPages; Bv_Visu.Visible:= False; - with T_Section(Sections[Pred(NumeroSection)]),F_Visu do + with T_Section(Sections[Pred(NumSection)]),F_Visu do begin Bv_Visu.Height:= Paper.H; Bv_Visu.Width:= Paper.W; @@ -216,14 +216,14 @@ with FImprime do end else begin - NumeroPageSection:= NumeroPageSection-1; + NumPageSection:= NumPageSection-1; Bv_Visu.Invalidate; end; - E_NumPage.Text:= IntToStr(NumeroPage); + E_NumPage.Text:= IntToStr(NumPage); ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -231,14 +231,14 @@ procedure TF_Visu.Bt_SuivPageClick(Sender: TObject); begin with FImprime do begin - NumeroPage:= NumeroPage+1; - if NumeroPageSection= T_Section(Sections[Pred(NumeroSection)]).NbPages + NumPage:= NumPage+1; + if NumPageSection= T_Section(Sections[Pred(NumSection)]).NbPages then begin - NumeroSection:= NumeroSection+1; - NumeroPageSection:= 1; + NumSection:= NumSection+1; + NumPageSection:= 1; Bv_Visu.Visible:= False; - with T_Section(Sections[Pred(NumeroSection)]),F_Visu do + with T_Section(Sections[Pred(NumSection)]),F_Visu do begin Bv_Visu.Height:= Paper.H; Bv_Visu.Width:= Paper.W; @@ -249,14 +249,14 @@ with FImprime do end else begin - NumeroPageSection:= NumeroPageSection+1; + NumPageSection:= NumPageSection+1; Bv_Visu.Invalidate; end; - E_NumPage.Text:= IntToStr(NumeroPage); + E_NumPage.Text:= IntToStr(NumPage); ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -264,12 +264,12 @@ procedure TF_Visu.Bt_DernPageClick(Sender: TObject); begin with FImprime do begin - NumeroPage:= T_Section(Sections[Pred(Sections.Count)]).TotPages; - NumeroSection:= Sections.Count; - NumeroPageSection:= T_Section(Sections[Pred(Sections.Count)]).NbPages; - E_NumPage.Text:= IntToStr(NumeroPage); + NumPage:= T_Section(Sections[Pred(Sections.Count)]).TotPages; + NumSection:= Sections.Count; + NumPageSection:= T_Section(Sections[Pred(Sections.Count)]).NbPages; + E_NumPage.Text:= IntToStr(NumPage); Bv_Visu.Visible:= False; - with T_Section(Sections[Pred(NumeroSection)]),F_Visu do + with T_Section(Sections[Pred(NumSection)]),F_Visu do begin Bv_Visu.Height:= Paper.H; Bv_Visu.Width:= Paper.W; @@ -278,9 +278,9 @@ with FImprime do end; Bv_Visu.Visible:= True; ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -288,12 +288,12 @@ procedure TF_Visu.Bt_PrecSectClick(Sender: TObject); begin with FImprime do begin - NumeroSection:= NumeroSection-1; - NumeroPage:= T_Section(Sections[Pred(NumeroSection)]).FirstPage; - NumeroPageSection:= 1; - E_NumPage.Text:= IntToStr(NumeroPage); + NumSection:= NumSection-1; + NumPage:= T_Section(Sections[Pred(NumSection)]).FirstPage; + NumPageSection:= 1; + E_NumPage.Text:= IntToStr(NumPage); Bv_Visu.Visible:= False; - with T_Section(Sections[Pred(NumeroSection)]),F_Visu do + with T_Section(Sections[Pred(NumSection)]),F_Visu do begin Bv_Visu.Height:= Paper.H; Bv_Visu.Width:= Paper.W; @@ -302,9 +302,9 @@ with FImprime do end; Bv_Visu.Visible:= True; ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -312,12 +312,12 @@ procedure TF_Visu.Bt_SuivSectClick(Sender: TObject); begin with FImprime do begin - NumeroSection:= NumeroSection+1; - NumeroPage:= T_Section(Sections[Pred(NumeroSection)]).FirstPage; - NumeroPageSection:= 1; - E_NumPage.Text:= IntToStr(NumeroPage); + NumSection:= NumSection+1; + NumPage:= T_Section(Sections[Pred(NumSection)]).FirstPage; + NumPageSection:= 1; + E_NumPage.Text:= IntToStr(NumPage); Bv_Visu.Visible:= False; - with T_Section(Sections[Pred(NumeroSection)]),F_Visu do + with T_Section(Sections[Pred(NumSection)]),F_Visu do begin Bv_Visu.Height:= Paper.H; Bv_Visu.Width:= Paper.W; @@ -326,9 +326,9 @@ with FImprime do end; Bv_Visu.Visible:= True; ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -337,7 +337,7 @@ begin with FImprime do if T_Section(Sections[Pred(Sections.Count)]).TotPages> 1 then - if NumeroPage= 1 + if NumPage= 1 then begin Bt_PremPage.Enabled:= False; @@ -352,7 +352,7 @@ with FImprime do Bt_SuivSect.Enabled:= False; end else - if NumeroPage= T_Section(Sections[Pred(Sections.Count)]).TotPages + if NumPage= T_Section(Sections[Pred(Sections.Count)]).TotPages then begin Bt_PremPage.Enabled:= True; @@ -374,14 +374,14 @@ with FImprime do Bt_DernPage.Enabled:= True; if Sections.Count> 1 then - if NumeroSection= 1 + if NumSection= 1 then begin Bt_PrecSect.Enabled:= False; Bt_SuivSect.Enabled:= True; end else - if NumeroSection= Sections.Count + if NumSection= Sections.Count then begin Bt_PrecSect.Enabled:= True; @@ -420,14 +420,14 @@ then begin if E_NumPage.Value> T_Section(Sections[Pred(Sections.Count)]).TotPages then - NumeroPage:= T_Section(Sections[Pred(Sections.Count)]).TotPages + NumPage:= T_Section(Sections[Pred(Sections.Count)]).TotPages else if E_NumPage.Value= 0 then - NumeroPage:= 1 + NumPage:= 1 else - NumeroPage:= E_NumPage.Value; - E_NumPage.Value:= NumeroPage; + NumPage:= E_NumPage.Value; + E_NumPage.Value:= NumPage; CptSect:= 0; CptPage:= 0; repeat @@ -436,15 +436,15 @@ then repeat Inc(CptPage); Inc(CptPageSect); - until (CptPage= NumeroPage) or (CptPage= T_Section(Sections[Pred(Cptsect)]).NbPages); - until CptPage= NumeroPage; - NumeroSection:= CptSect; - NumeroPageSection:= CptPagesect; + until (CptPage= NumPage) or (CptPage= T_Section(Sections[Pred(Cptsect)]).NbPages); + until CptPage= NumPage; + NumSection:= CptSect; + NumPageSection:= CptPagesect; Bv_Visu.Invalidate; ChangeBoutons; - E_NumSect.Text:= IntToStr(NumeroSection); - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + E_NumSect.Text:= IntToStr(NumSection); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; @@ -457,21 +457,21 @@ then begin if E_NumSect.Value> Sections.Count then - NumeroSection:= Sections.Count + NumSection:= Sections.Count else if E_NumSect.Value= 0 then - NumeroSection:= 1 + NumSection:= 1 else - NumeroSection:= E_NumSect.Value; - E_NumSect.Value:= NumeroSection; - NumeroPage:= T_Section(Sections[Pred(Numerosection)]).FirstPage; - NumeroPageSection:= 1; - E_NumPage.Value:= NumeroPage; + NumSection:= E_NumSect.Value; + E_NumSect.Value:= NumSection; + NumPage:= T_Section(Sections[Pred(NumSection)]).FirstPage; + NumPageSection:= 1; + E_NumPage.Value:= NumPage; Bv_Visu.Invalidate; ChangeBoutons; - L_NumPageSect.Text:= IntToStr(NumeroPageSection); - L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumeroSection)]).NbPages); + L_NumPageSect.Text:= IntToStr(NumPageSection); + L_NbrPageSect.Text:= IntToStr(T_Section(Sections[Pred(NumSection)]).NbPages); end; end; |