paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 05:00:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Fix TDataPointEditor to mark the property as modified after data entry (issue #29236). Minor optical brush up of form.

Browse Source 
git-svn-id: trunk@51031 -
This commit is contained in:
wp 2015-12-25 12:22:56 +00:00
parent 2f9f2db741
commit 629feb6d13
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/tachart/editors/tadatapointseditor.lfm
View File

@ -43,11 +43,12 @@ object DataPointsEditorForm: TDataPointsEditorForm
Width = 81
end>
DefaultColWidth = 32
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goRowMoving, goEditing, goAutoAddRows, goRowSelect, goAlwaysShowEditor, goSmoothScroll, goFixedRowNumbering]
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goRowMoving, goEditing, goAutoAddRows, goAlwaysShowEditor, goSmoothScroll, goFixedRowNumbering]
PopupMenu = pmRows
TabOrder = 0
OnDrawCell = sgDataDrawCell
OnButtonClick = sgDataButtonClick
OnPrepareCanvas = sgDataPrepareCanvas
ColWidths = (
32
80

29
components/tachart/editors/tadatapointseditor.pas
View File

@ -36,13 +36,15 @@ type
procedure sgDataDrawCell(
ASender: TObject; ACol, ARow: Integer; ARect: TRect;
AState: TGridDrawState);
procedure sgDataPrepareCanvas(sender: TObject; aCol, aRow: Integer;
aState: TGridDrawState);
strict private
FCurrentRow: Integer;
FDataPoints: TStrings;
FYCount: Integer;
public
procedure InitData(AYCount: Integer; ADataPoints: TStrings);
procedure ExtractData;
procedure ExtractData(out AModified: Boolean);
end;
procedure Register;
@ -72,11 +74,13 @@ end;
{ TDataPointsEditorForm }
procedure TDataPointsEditorForm.ExtractData;
procedure TDataPointsEditorForm.ExtractData(out AModified: Boolean);
var
i: Integer;
s: String;
oldDataPoints: String;
begin
oldDataPoints := FDataPoints.Text;
FDataPoints.BeginUpdate;
try
FDataPoints.Clear;
@ -91,6 +95,7 @@ begin
end;
finally
FDataPoints.EndUpdate;
AModified := FDataPoints.Text <> oldDataPoints;
end;
end;
@ -174,17 +179,33 @@ begin
sgData.Canvas.Rectangle(ARect);
end;
procedure TDataPointsEditorForm.sgDataPrepareCanvas(sender: TObject; aCol,
aRow: Integer; aState: TGridDrawState);
var
ts: TTextStyle;
begin
if ACol = 0 then begin
ts := TStringGrid(Sender).Canvas.TextStyle;
ts.Alignment := taRightJustify;
TStringGrid(Sender).Canvas.TextStyle := ts;
end;
end;
{ TDataPointsPropertyEditor }
procedure TDataPointsPropertyEditor.Edit;
var
dataModified: Boolean;
begin
with TDataPointsEditorForm.Create(nil) do
try
InitData(
(GetComponent(0) as TListChartSource).YCount,
GetObjectValue as TStrings);
if ShowModal = mrOK then
ExtractData;
if ShowModal = mrOK then begin
ExtractData(dataModified);
if dataModified then Modified;
end;
finally
Free;
end;