fpspreadsheet: Add units (mm, cm, in, pts, lines/chars) for column width and row heights. Update all demos (some issues left).

NOTE: This revision breaks existing code if the worksheet's DefaultRowHeight/DefaultColWidth is changed - value must be in millimeters now. Methods for accessing individual row heiths and column widths are fine, but are marked as deprecated, they use the old units. Optionally a unit parameter can be specified.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4568 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-03-18 19:50:40 +00:00
parent 08e1a619ca
commit 5b946b751f
65 changed files with 990 additions and 845 deletions

View File

@ -73,7 +73,6 @@
<ComponentName Value="Form1"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="mainform"/>
</Unit1>
</Units>
</ProjectOptions>

View File

@ -7,7 +7,7 @@ object Form1: TForm1
ClientHeight = 634
ClientWidth = 877
OnCreate = FormCreate
LCLVersion = '1.5'
LCLVersion = '1.7'
object Panel1: TPanel
Left = 0
Height = 40
@ -78,6 +78,8 @@ object Form1: TForm1
Align = alClient
AutoAdvance = aaDown
ColCount = 27
DefaultColWidth = 64
DefaultRowHeight = 22
Font.Color = clBlack
Font.Height = -15
Font.Name = 'Calibri'
@ -125,7 +127,6 @@ object Form1: TForm1
)
Title.Visible = True
Align = alTop
ParentColor = False
object Chart1AreaSeries1: TAreaSeries
AreaBrush.Color = clSkyBlue
AreaLinesPen.Style = psClear
@ -158,7 +159,6 @@ object Form1: TForm1
)
Title.Visible = True
Align = alClient
ParentColor = False
object Chart2BarSeries1: TBarSeries
Marks.Distance = 15
Marks.Format = '%0:.2f'
@ -199,7 +199,6 @@ object Form1: TForm1
)
Title.Visible = True
Align = alBottom
ParentColor = False
object Chart3PieSeries1: TPieSeries
Legend.Multiplicity = lmPoint
Marks.Distance = 8

View File

@ -7,12 +7,20 @@ object FPSChartForm: TFPSChartForm
ClientHeight = 382
ClientWidth = 697
OnCreate = FormCreate
LCLVersion = '1.5'
LCLVersion = '1.7'
object MyChart: TChart
AnchorSideLeft.Control = Bevel1
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = editXAxis
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 352
Height = 264
Top = 112
Width = 336
Height = 263
Top = 111
Width = 337
AxisList = <
item
Minors = <>
@ -34,23 +42,39 @@ object FPSChartForm: TFPSChartForm
Title.Text.Strings = (
'TAChart'
)
ParentColor = False
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 8
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
object MyChartBarSeries1: TBarSeries
BarBrush.Color = clRed
Source = FPSChartSource
end
end
object WorksheetGrid: TsWorksheetGrid
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = editXAxis
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Bevel1
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 264
Top = 112
Height = 263
Top = 111
Width = 336
FrozenCols = 0
FrozenRows = 0
ReadFormulas = False
TextOverflow = True
WorkbookSource = WorksheetGrid.internal
Anchors = [akTop, akLeft, akRight, akBottom]
AutoAdvance = aaDown
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Bottom = 8
ColCount = 27
DefaultColWidth = 64
DefaultRowHeight = 22
ExtendedSelect = False
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goEditing, goThumbTracking]
RowCount = 101
@ -70,6 +94,7 @@ object FPSChartForm: TFPSChartForm
Height = 42
Top = 4
Width = 678
Anchors = [akTop, akLeft, akRight]
AutoSize = False
Caption = 'Please add data to the grid or load it from a file, then choose the location of the data for the X and Y axises and click on the button "Create Graphic" to generate a chart.'
ParentColor = False
@ -147,6 +172,15 @@ object FPSChartForm: TFPSChartForm
TabOrder = 6
Text = 'B3:B14'
end
object Bevel1: TBevel
AnchorSideLeft.Control = Owner
AnchorSideLeft.Side = asrCenter
Left = 344
Height = 50
Top = 83
Width = 8
Shape = bsSpacer
end
object FPSChartSource: TsWorksheetChartSource
PointsNumber = 5
YFirstCellCol = 1

View File

@ -15,6 +15,7 @@ type
{ TFPSChartForm }
TFPSChartForm = class(TForm)
Bevel1: TBevel;
btnCreateGraphic: TButton;
btnLoadSpreadsheet: TButton;
editSourceFile: TFileNameEdit;