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

fpspreadsheet: Improved painting speed of TsWorksheetGrid for large files (draws borders and calculates row heights only for visual part of the grid) - still not perfect.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4038 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-03-16 09:45:58 +00:00
parent 186029ef86
commit 99276082a3
3 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
View File

@ -59,13 +59,6 @@
<OtherUnitFiles Value="..\..\.."/>
<UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions>
<Debugging>
<Exceptions Count="3">

8
components/fpspreadsheet/examples/visual/spready/spready.lpi
View File

@ -27,13 +27,6 @@
<OtherUnitFiles Value="../..;../shared"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions>
</Item2>
<Item3 Name="Release">
@ -133,7 +126,6 @@
<Filename Value="..\shared\scurrencyform.pas"/>
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
<UnitName Value="scurrencyform"/>
</Unit6>
</Units>
</ProjectOptions>

52
components/fpspreadsheet/fpspreadsheetgrid.pas
View File

@ -181,6 +181,7 @@ type
procedure SetEditText(ACol, ARow: Longint; const AValue: string); override;
procedure Setup;
procedure Sort(AColSorting: Boolean; AIndex, AIndxFrom, AIndxTo:Integer); override;
procedure TopLeftChanged; override;
function TrimToCell(ACell: PCell): String;
procedure UpdateColWidths(AStartIndex: Integer = 0);
procedure UpdateRowHeights(AStartIndex: Integer = 0);
@ -1483,22 +1484,41 @@ end;
procedure TsCustomWorksheetGrid.DrawCellBorders;
var
cell: PCell;
c, r: Integer;
gc, gr: Integer;
sr1, sc1, sr2, sc2: Cardinal;
rect: TRect;
begin
if Worksheet = nil then
exit;
sr1 := GetWorksheetRow(GCache.VisibleGrid.Top);
sc1 := GetWorksheetCol(GCache.VisibleGrid.Left);
sr2 := GetWorksheetRow(GCache.VisibleGrid.Bottom);
sc2 := GetWorksheetCol(GCache.VisibleGrid.Right);
for cell in Worksheet.Cells.GetRangeEnumerator(sr1, sc1, sr2, sc2) do
if (uffBorder in Worksheet.ReadUsedFormatting(cell)) then
begin
gc := GetGridCol(cell^.Col);
gr := GetGridRow(cell^.Row);
rect := CellRect(gc, gr);
DrawCellBorders(gc, gr, rect, cell);
end;
{
gr := TopLeft.Y;
gc := TopLeft.X;
for cell in Worksheet.Cells do
begin
if (uffBorder in Worksheet.ReadUsedFormatting(cell)) then
begin
c := GetGridCol(cell^.Col);
r := GetGridRow(cell^.Row);
rect := CellRect(c, r);
DrawCellBorders(c, r, rect, cell);
gc := GetGridCol(cell^.Col);
gr := GetGridRow(cell^.Row);
rect := CellRect(gc, gr);
DrawCellBorders(gc, gr, rect, cell);
end;
end;
}
end;
{@@ ----------------------------------------------------------------------------
@ -3810,6 +3830,17 @@ begin
);
end;
{@@ ----------------------------------------------------------------------------
Inherited method called whenever to grid is scrolled, i.e. the top/left cell
changes.
Is overridden to calculate the row heights of the currently visible grid
-------------------------------------------------------------------------------}
procedure TsCustomWorksheetGrid.TopLeftChanged;
begin
UpdateRowHeights;
inherited;
end;
{@@ ----------------------------------------------------------------------------
Modifies the text that is show for cells which are too narrow to hold the
entire text. The method follows the behavior of Excel and Open/LibreOffice:
@ -3955,6 +3986,7 @@ var
lRow: PRow;
h: Integer;
begin
{
BeginUpdate;
if AStartIndex <= 0 then AStartIndex := FHeaderCount;
for i := AStartIndex to RowCount-1 do begin
@ -3968,6 +4000,16 @@ begin
RowHeights[i] := h;
end;
EndUpdate;
}
for i:=GCache.VisibleGrid.Top to GCache.VisibleGrid.Bottom do begin
h := CalcAutoRowHeight(i);
if Worksheet <> nil then
begin
lRow := Worksheet.FindRow(i - FHeaderCount);
if (lRow <> nil) then
h := CalcRowHeight(lRow^.Height);
end;
end;
end;