paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 18:00:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, stringgrid, rework calc or rowcount when loading CSV data, issue #28230

Browse Source 
git-svn-id: trunk@49244 -
This commit is contained in:
jesus 2015-06-02 21:07:50 +00:00
parent 1e433ebf42
commit e57d6b4ea6
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lcl/grids.pas
View File

@ -10858,6 +10858,15 @@ var
MaxCols: Integer = 0;
MaxRows: Integer = 0;
function RowOffset: Integer;
begin
// return row offset of current CSV record (MaxRows) which is 1 based
if withHeader then
result := Max(0, FixedRows-1) + Max(MaxRows-1, 0)
else
result := FixedRows + Max(MaxRows-2, 0);
end;
procedure NewRecord(Fields:TStringlist);
var
i, aRow: Integer;
@ -10884,8 +10893,9 @@ var
end;
// and rows ...
if RowCount<MaxRows then
RowCount := RowCount + 20;
aRow := RowOffset;
if aRow>RowCount-1 then
RowCount := aRow + 20;
// setup columns captions of custom columns if they are enabled
if (MaxRows=1) and withHeader and Columns.Enabled then begin
@ -10893,15 +10903,6 @@ var
Columns[i].Title.Caption:=Fields[i];
end;
if not WithHeader then
aRow := FixedRows + (MaxRows-2) // MaxRows is 1 based, 2nd one is our first row
else begin
aRow := FixedRows-1;
if aRow<0 then
aRow := 0;
aRow := aRow + (MaxRows-1);
end;
for i:=0 to Fields.Count-1 do
Cells[i, aRow] := Fields[i];
end;
@ -10910,12 +10911,16 @@ begin
BeginUpdate;
try
LCSVUtils.LoadFromCSVStream(AStream, @NewRecord, ADelimiter);
RowCount := MaxRows;
// last row offset + 1 (offset is 0 based)
RowCount := RowOffset + 1;
if not Columns.Enabled then
ColCount := MaxCols
else
while Columns.Count > MaxCols do
Columns.Delete(Columns.Count-1);
finally
EndUpdate;
end;