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

1. TRxDBGrid - fix error in calc title height procedure on resize column

Browse Source 
2. TRxDBGrid - start work on DB independed filter procedure in grid
3. TRxDBGrid - fix calc sum in footer row on Zeos dataset with filter
4. TRxDBGrid - fix calc width of filter combobox after resize filtred column


git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2712 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2013-03-28 15:40:03 +00:00
parent b85c797fd5
commit 94c53ecb53
3 changed files with 181 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/rx/exsortzeos.pas
View File

@ -27,15 +27,60 @@ type
THackZeosDS = class(TZAbstractRODataset);
THackRxColumnFooter = class(TRxColumnFooter);
THackDataLink = class(TDataLink);
THackDataSet = class(TDataSet);
THackRxDBGrid = class(TRxDBGrid);
procedure TZeosDataSetSortEngine.UpdateFooterRows(ADataSet: TDataSet;
AGrid: TRxDBGrid);
var
RS:IZResultSet;
CurRow, i:integer;
Col:TRxColumn;
DHL:THackDataLink;
DHS:THackDataSet;
SaveState:TDataSetState;
SavePos:integer;
SaveActiveRecord:integer;
begin
if not Assigned(ADataSet) then exit;
RS:=THackZeosDS(ADataSet).ResultSet;
DHL:=THackDataLink(THackRxDBGrid(AGrid).Datalink);
DHS:=THackDataSet(ADataSet);
SaveState:=DHS.SetTempState(dsBrowse);
SaveActiveRecord:=DHL.ActiveRecord;
DHL.ActiveRecord:=0;
SavePos:=ADataSet.RecNo;
ADataSet.First;
while not ADataSet.EOF do
begin
for i:=0 to AGrid.Columns.Count-1 do
begin
Col:=TRxColumn(AGrid.Columns[i]);
if THackRxColumnFooter(Col.Footer).ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( ADataSet.FieldByName(Col.Footer.FieldName).Value);
end;
ADataSet.Next;
end;
DHS.RecNo := DHL.RecordCount + SavePos + 1;
while not ADataSet.BOF do
begin
if SavePos = ADataSet.RecNo then
break;
ADataSet.Prior;
end;
DHL.ActiveRecord:=SaveActiveRecord;
DHS.RestoreState(SaveState);
{ RS:=THackZeosDS(ADataSet).ResultSet;
CurRow:=RS.GetRow;
RS.First;
// while not RS.IsLast do
@ -49,7 +94,7 @@ begin
end;
RS.Next;
end;
RS.MoveAbsolute(CurRow);
RS.MoveAbsolute(CurRow);}
end;
function TZeosDataSetSortEngine.EnabledFooterRowsCalc: boolean;

115
components/rx/rxdbgrid.pas
View File

@ -110,6 +110,7 @@ type
TRxDSState = (rxdsInactive, rxdsActive);
TRxFilterOpCode = (fopEQ, fopNotEQ, fopStartFrom, fopEndTo, fopLike, fopNotLike);
{ TRxDBGridKeyStroke }
TRxDBGridKeyStroke = class(TCollectionItem)
@ -135,11 +136,9 @@ type
TRxDBGridKeyStrokes = class(TOwnedCollection)
private
//FOwn: TPersistent;
function GetItem(Index: integer): TRxDBGridKeyStroke;
procedure SetItem(Index: integer; const AValue: TRxDBGridKeyStroke);
protected
//function GetOwner: TPersistent; override;
procedure Update(Item: TCollectionItem); override;
public
constructor Create(AOwner: TPersistent);
@ -150,8 +149,7 @@ type
function FindRxCommand(AKey: word; AShift: TShiftState): TRxDBGridCommand;
function FindRxKeyStrokes(ACommand: TRxDBGridCommand): TRxDBGridKeyStroke;
public
property Items[Index: integer]: TRxDBGridKeyStroke read GetItem write SetItem;
default;
property Items[Index: integer]: TRxDBGridKeyStroke read GetItem write SetItem; default;
end;
{ TRxDBGridFooterOptions }
@ -275,6 +273,22 @@ type
read FValueType write SetValueType default fvtNon;
end;
{ TRxFilterItem }
TRxFilterItem = class
FVAlue:string;
FCol:TRxColumn;
OpCode:TRxFilterOpCode;
function TestValue:Boolean;
end;
{ TRxFilterItems }
TRxFilterItems = class(TFPList)
function AcceptRecord:boolean;
end;
{ TRxColumnFilter }
TRxColumnFilter = class(TPersistent)
@ -390,7 +404,7 @@ type
constructor Create(ACollection: TCollection); override;
destructor Destroy; override;
procedure OptimizeWidth;
property SortOrder: TSortMarker read FSortOrder;
property SortOrder: TSortMarker read FSortOrder write FSortOrder;
property SortPosition: integer read FSortPosition;
published
property Footer: TRxColumnFooter read GetFooter write SetFooter;
@ -551,9 +565,7 @@ type
procedure OnIniLoad(Sender: TObject);
procedure CleanDSEvent;
procedure CollumnSortListUpdate;
procedure CollumnSortListClear;
procedure CollumnSortListApply;
procedure UpdateRowsHeight;
procedure ResetRowHeght;
@ -561,6 +573,10 @@ type
procedure DoClearInvalidTitle;
procedure DoDrawInvalidTitle;
protected
procedure CollumnSortListUpdate;
procedure CollumnSortListClear;
procedure CollumnSortListApply;
function DatalinkActive: boolean;
procedure LinkActive(Value: Boolean); override;
@ -603,8 +619,9 @@ type
procedure InternalOptimizeColumnsWidth(AColList: TList);
function IsDefaultRowHeightStored: boolean;
procedure VisualChange; override;
procedure SetQuickUTF8Search(AValue: string);
procedure EditorWidthChanged(aCol,aWidth: Integer); override;
procedure SetQuickUTF8Search(AValue: string);
procedure BeforeDel(DataSet: TDataSet);
procedure BeforePo(DataSet: TDataSet);
procedure ErrorDel(DataSet: TDataSet; E: EDatabaseError;
@ -631,9 +648,11 @@ type
procedure FilterRec(DataSet: TDataSet; var Accept: boolean);
function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override;
procedure LayoutChanged; override;
procedure SetFocus; override;
procedure ShowFindDialog;
procedure ShowColumnsDialog;
procedure ShowSortDialog;
procedure ShowFilterDialog;
function ColumnByFieldName(AFieldName: string): TRxColumn;
function ColumnByCaption(ACaption: string): TRxColumn;
procedure CalcStatTotals;
@ -870,6 +889,42 @@ type
procedure EditingDone; override;
end;
{ TRxFilterItems }
function TRxFilterItems.AcceptRecord: boolean;
var
i:integer;
begin
Result:=true;
for i:=0 to Count-1 do
begin
if not TRxFilterItem(Items[i]).TestValue then
begin
Result:=false;
exit;
end;
end;
end;
{ TRxFilterItem }
function TRxFilterItem.TestValue: Boolean;
var
ATestValue: string;
begin
ATestValue:=FCol.Field.DisplayText;
case OpCode of
fopEQ:Result:=ATestValue = FVAlue;
fopNotEQ:Result:=ATestValue <> FVAlue;
fopStartFrom:Result:=UTF8Copy(ATestValue, 1, UTF8Length(FVAlue)) = FVAlue;
fopEndTo:Result:=Copy(ATestValue, UTF8Length(ATestValue) - UTF8Length(FVAlue), UTF8Length(FVAlue)) = FVAlue;
fopLike:Result:=UTF8Pos(FVAlue, ATestValue) > 0;
fopNotLike:Result:=UTF8Pos(FVAlue, ATestValue) = 0;
else
Result:=false;
end;
end;
{ TRxDbGridColumnsSortList }
function TRxDbGridColumnsSortList.GetCollumn(Index: Integer): TRxColumn;
@ -1886,16 +1941,16 @@ begin
S := MLRec1.Caption;
if not Assigned(MLRec1.Prior) then
begin
W := rxCol.Width;//MLRec1.Width;
W := rxCol.Width;
P := MLRec1.Next;
while Assigned(P) do
begin
Inc(W, P.Col.Width);//P.Width);
Inc(W, P.Col.Width);
P := P.Next;
end;
W1 := tmpCanvas.TextWidth(MLRec1.Caption) + 2;
if W1 > W then
MLRec1.Hegth := W1 div Max(W, 1) + 1
MLRec1.Hegth := Min(W1 div Max(W, 1) + 1, UTF8Length(MLRec1.Caption))
else
MLRec1.Hegth := 1;
@ -2307,6 +2362,7 @@ var
S:string;
Asc:array of boolean;
begin
if (FSortColumns.Count = 0) then exit;
FSortingNow:=true;
if FSortColumns.Count>1 then
begin
@ -3465,6 +3521,7 @@ end;
procedure TRxDBGrid.Paint;
begin
Inc(FInProcessCalc);
if rdgWordWrap in FOptionsRx then
UpdateRowsHeight;
@ -3476,14 +3533,15 @@ begin
if FFooterOptions.Active and (FFooterOptions.RowCount > 0) then
DrawFooterRows;
Dec(FInProcessCalc);
end;
procedure TRxDBGrid.UpdateActive;
begin
if FInProcessCalc > 0 then
exit;
{ if FInProcessCalc > 0 then
exit;}
inherited UpdateActive;
if FInProcessCalc < 0 then
{ if FInProcessCalc < 0 then
begin
FInProcessCalc := 0;
UpdateFooterRowOnUpdateActive;
@ -3491,7 +3549,7 @@ begin
else
if FFooterOptions.Active and (FFooterOptions.RowCount > 0) then
UpdateFooterRowOnUpdateActive;
}
// UpdateRowsHeight;
end;
@ -3638,6 +3696,19 @@ begin
UpdateRowsHeight;}
end;
procedure TRxDBGrid.EditorWidthChanged(aCol, aWidth: Integer);
var
R:TRect;
begin
inherited EditorWidthChanged(aCol, aWidth);
if FFilterListEditor.Visible then
begin
R:=CellRect(FFilterListEditor.Col+1,0);
FFilterListEditor.Width:=Columns[FFilterListEditor.Col].Width;
FFilterListEditor.Left:=R.Left;
end;
end;
function TRxDBGrid.EditorByStyle(Style: TColumnButtonStyle): TWinControl;
var
F: TField;
@ -4308,6 +4379,13 @@ begin
CalcStatTotals;
end;
procedure TRxDBGrid.SetFocus;
begin
inherited SetFocus;
if FFilterListEditor.Visible then
FFilterListEditor.Hide;
end;
procedure TRxDBGrid.ShowFindDialog;
begin
ShowRxDBGridFindForm(Self);
@ -4323,6 +4401,11 @@ begin
OnSortBy(nil);
end;
procedure TRxDBGrid.ShowFilterDialog;
begin
OnFilterBy(nil);
end;
function TRxDBGrid.ColumnByFieldName(AFieldName: string): TRxColumn;
var
i: integer;

37
components/rx/rxsortmemds.pas
View File

@ -57,25 +57,58 @@ uses rxmemds;
type
THackRxMemoryData = class(TRxMemoryData);
THackRxColumnFooter = class(TRxColumnFooter);
THackDataLink = class(TDataLink);
THackDataSet = class(TDataSet);
THackRxDBGrid = class(TRxDBGrid);
procedure TRxMemoryDataSortEngine.UpdateFooterRows(ADataSet: TDataSet;
AGrid: TRxDBGrid);
var
i, j:integer;
Col:TRxColumn;
DHL:THackDataLink;
DHS:THackDataSet;
SaveState:TDataSetState;
SavePos:integer;
SaveActiveRecord:integer;
begin
if not Assigned(ADataSet) then exit;
for j:=0 to ADataSet.RecordCount-1 do
DHL:=THackDataLink(THackRxDBGrid(AGrid).Datalink);
DHS:=THackDataSet(ADataSet);
SaveState:=DHS.SetTempState(dsBrowse);
SaveActiveRecord:=DHL.ActiveRecord;
DHL.ActiveRecord:=0;
SavePos:=ADataSet.RecNo;
ADataSet.First;
while not ADataSet.EOF do
begin
for i:=0 to AGrid.Columns.Count-1 do
begin
Col:=TRxColumn(AGrid.Columns[i]);
if THackRxColumnFooter(Col.Footer).ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( THackRxMemoryData(ADataSet).GetAnyRecField(j, ADataSet.FieldByName(Col.Footer.FieldName)));
THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( ADataSet.FieldByName(Col.Footer.FieldName).Value);
end;
ADataSet.Next;
end;
DHS.RecNo := DHL.RecordCount + SavePos + 1;
while not ADataSet.BOF do
begin
if SavePos = ADataSet.RecNo then
break;
ADataSet.Prior;
end;
DHL.ActiveRecord:=SaveActiveRecord;
DHS.RestoreState(SaveState);
end;
function TRxMemoryDataSortEngine.EnabledFooterRowsCalc: boolean;