From adf78c2a5f87b3d0e8059c1ecd58fee4f1224775 Mon Sep 17 00:00:00 2001 From: alexs75 Date: Thu, 12 May 2016 05:22:06 +0000 Subject: [PATCH] RxFPC: remove depricated module rxcustomchartpanel.pas git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4646 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/registerrx.pas | 12 +- components/rx/trunk/rxcustomchartpanel.pas | 318 --------------------- components/rx/trunk/rxnew.lpk | 184 ++++++------ components/rx/trunk/rxnew.pas | 12 +- 4 files changed, 98 insertions(+), 428 deletions(-) delete mode 100644 components/rx/trunk/rxcustomchartpanel.pas diff --git a/components/rx/trunk/registerrx.pas b/components/rx/trunk/registerrx.pas index e6c9b5de4..7b815b4c3 100644 --- a/components/rx/trunk/registerrx.pas +++ b/components/rx/trunk/registerrx.pas @@ -55,10 +55,8 @@ uses {$IFDEF USE_TRxAppIcon} RxAppIcon, {$ENDIF} - Dialogs, ComponentEditors, DBPropEdits, rxctrls, - RxCustomChartPanel, AutoPanel, pickdate, tooledit, rxclock, - rxspin, RxTimeEdit, rxDateRangeEditUnit, - RxAboutDialog, RxViewsPanel, RxMDI; + Dialogs, ComponentEditors, DBPropEdits, rxctrls, AutoPanel, pickdate, tooledit, rxclock, + rxspin, RxTimeEdit, rxDateRangeEditUnit, RxAboutDialog, RxViewsPanel, RxMDI; {$IFDEF USE_TRxAppIcon} procedure RegisterRxAppIcon; @@ -115,11 +113,6 @@ begin end; -procedure RegisterChartPanel; -begin - RegisterComponents(RxCtrllPageName,[TRxChart]); -end; - procedure RegisterAutoPanel; begin RegisterComponents(RxCtrllPageName,[TAutoPanel]); @@ -192,7 +185,6 @@ begin RegisterUnit('rxappicon', @RegisterRxAppIcon); {$ENDIF} RegisterUnit('rxctrls', @RegisterRxCtrls); - RegisterUnit('RxCustomChartPanel', @RegisterChartPanel); RegisterUnit('AutoPanel', @RegisterAutoPanel); RegisterUnit('pickdate', @RegisterPickDate); RegisterUnit('tooledit', @RegisterToolEdit); diff --git a/components/rx/trunk/rxcustomchartpanel.pas b/components/rx/trunk/rxcustomchartpanel.pas deleted file mode 100644 index 035f79132..000000000 --- a/components/rx/trunk/rxcustomchartpanel.pas +++ /dev/null @@ -1,318 +0,0 @@ -{ rxcustomchartpanel unit - - Copyright (C) 2005-2010 Lagunov Aleksey alexs@yandex.ru and Lazarus team - original conception from rx library for Delphi (c) - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version with the following modification: - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules,and - to copy and distribute the resulting executable under terms of your choice, - provided that you also meet, for each linked independent module, the terms - and conditions of the license of that module. An independent module is a - module which is not derived from or based on this library. If you modify - this library, you may extend this exception to your version of the library, - but you are not obligated to do so. If you do not wish to do so, delete this - exception statement from your version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License - for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -} - -unit rxcustomchartpanel; - -{$mode objfpc}{$H+} - -interface - -uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls; - -type - TRxCustomChart = class; - TRxChartSeriesItem = class; - - { TRxChartValuesItem } - - TRxChartValuesItem = class(TCollectionItem) - private - FCaption: string; - FColor: TColor; - FVisible: boolean; - FLabel:double; - procedure SetCaption(const AValue: string); - procedure SetColor(const AValue: TColor); - procedure SetVisible(const AValue: boolean); - protected - function GetDisplayName: string; override; - public - constructor Create(ACollection: TCollection); override; - destructor Destroy; override; - published - property Caption:string read FCaption write SetCaption; - property Color:TColor read FColor write SetColor; - property Visible:boolean read FVisible write SetVisible; - property LabelAsFloat:double read FLabel write FLabel; - property LabelAsDateTime:TDateTime read FLabel write FLabel; - end; - - { TRxChartValues } - - TRxChartValues = class(TCollection) - private - FRxChartSeriesItem:TRxChartSeriesItem; - public - constructor Create(ARxChartSeriesItem:TRxChartSeriesItem); - end; - - { TRxChartSeriesItem } - - TRxChartSeriesItem = class(TCollectionItem) - private - FCaption: string; - FColor: TColor; - FVisible: boolean; - FChartValues:TRxChartValues; - function GetItems: TRxChartValues; - procedure SetCaption(const AValue: string); - procedure SetColor(const AValue: TColor); - procedure SetItems(const AValue: TRxChartValues); - procedure SetVisible(const AValue: boolean); - protected - function GetDisplayName: string; override; - public - constructor Create(ACollection: TCollection); override; - destructor Destroy; override; - published - property Values:TRxChartValues read GetItems write SetItems; - property Caption:string read FCaption write SetCaption; - property Color:TColor read FColor write SetColor; - property Visible:boolean read FVisible write SetVisible; - end; - - { TRxChartSeries } - - TRxChartSeries = class(TCollection) - private - FChart:TRxCustomChart; - function GetToolbarItem(Index: Integer): TRxChartSeriesItem; - procedure SetToolbarItem(Index: Integer; const AValue: TRxChartSeriesItem); - public - constructor Create(AChart:TRxCustomChart); - property Items[Index: Integer]: TRxChartSeriesItem read GetToolbarItem write SetToolbarItem; default; - published - end; - - { TRxCustomChart } - - TRxCustomChart = class(TCustomPanel) - private - FChartSeries:TRxChartSeries; - function GetItems: TRxChartSeries; - procedure SetItems(const AValue: TRxChartSeries); - { Private declarations } - protected - property ChartSeries:TRxChartSeries read GetItems write SetItems; - public - constructor Create(AOwner: TComponent); override; - destructor Destroy; override; - published - { Published declarations } - end; - - TRxChart = class(TRxCustomChart) - published - property ChartSeries; - - property Align; - property Alignment; - property Anchors; - property AutoSize; - property BorderSpacing; - property BevelInner; - property BevelOuter; - property BevelWidth; - property BorderWidth; - property BorderStyle; - property Caption; - property Constraints; - property DragMode; - property Enabled; - property Font; - property FullRepaint; - property ParentColor; - property ParentFont; - property ParentShowHint; - property PopupMenu; - property ShowHint; - property TabOrder; - property TabStop; - property Visible; - property OnClick; - property OnDblClick; - property OnDragDrop; - property OnDragOver; - property OnEndDrag; - property OnEnter; - property OnExit; - property OnMouseDown; - property OnMouseMove; - property OnMouseUp; - property OnResize; - property OnStartDrag; - end; - -implementation - - - -{ TRxChartSeriesItem } - -procedure TRxChartSeriesItem.SetCaption(const AValue: string); -begin - if FCaption=AValue then exit; - FCaption:=AValue; -end; - -function TRxChartSeriesItem.GetItems: TRxChartValues; -begin - Result:=FChartValues; -end; - -procedure TRxChartSeriesItem.SetColor(const AValue: TColor); -begin - if FColor=AValue then exit; - FColor:=AValue; -end; - -procedure TRxChartSeriesItem.SetItems(const AValue: TRxChartValues); -begin - FChartValues.Assign(AValue); -end; - -procedure TRxChartSeriesItem.SetVisible(const AValue: boolean); -begin - if FVisible=AValue then exit; - FVisible:=AValue; -end; - -function TRxChartSeriesItem.GetDisplayName: string; -begin - if FCaption<>'' then - Result:=FCaption - else - Result:=inherited GetDisplayName; -end; - -constructor TRxChartSeriesItem.Create(ACollection: TCollection); -begin - inherited Create(ACollection); - FChartValues:=TRxChartValues.Create(Self); -end; - -destructor TRxChartSeriesItem.Destroy; -begin - FreeAndNil(FChartValues); - inherited Destroy; -end; - -{ TRxChartSeries } - -function TRxChartSeries.GetToolbarItem(Index: Integer): TRxChartSeriesItem; -begin - result := TRxChartSeriesItem( inherited Items[Index] ); -end; - -procedure TRxChartSeries.SetToolbarItem(Index: Integer; - const AValue: TRxChartSeriesItem); -begin - Items[Index].Assign( AValue ); -end; - -constructor TRxChartSeries.Create(AChart: TRxCustomChart); -begin - inherited Create(TRxChartSeriesItem); - FChart:=AChart; -end; - -{ TRxCustomChart } - -function TRxCustomChart.GetItems: TRxChartSeries; -begin - Result:=FChartSeries; -end; - -procedure TRxCustomChart.SetItems(const AValue: TRxChartSeries); -begin - FChartSeries.Assign(AValue); -end; - -constructor TRxCustomChart.Create(AOwner: TComponent); -begin - inherited Create(AOwner); - FChartSeries:=TRxChartSeries.Create(Self); -end; - -destructor TRxCustomChart.Destroy; -begin - FreeAndNil(FChartSeries); - inherited Destroy; -end; - -{ TRxChartValues } - -constructor TRxChartValues.Create(ARxChartSeriesItem: TRxChartSeriesItem); -begin - inherited Create(TRxChartValuesItem); - FRxChartSeriesItem := ARxChartSeriesItem; -end; - -{ TRxChartValuesItem } - -procedure TRxChartValuesItem.SetCaption(const AValue: string); -begin - if FCaption=AValue then exit; - FCaption:=AValue; -end; - -procedure TRxChartValuesItem.SetColor(const AValue: TColor); -begin - if FColor=AValue then exit; - FColor:=AValue; -end; - -procedure TRxChartValuesItem.SetVisible(const AValue: boolean); -begin - if FVisible=AValue then exit; - FVisible:=AValue; -end; - -function TRxChartValuesItem.GetDisplayName: string; -begin - if FCaption<>'' then - Result:=FCaption - else - Result:=inherited GetDisplayName; -end; - -constructor TRxChartValuesItem.Create(ACollection: TCollection); -begin - inherited Create(ACollection); -end; - -destructor TRxChartValuesItem.Destroy; -begin - inherited Destroy; -end; - -end. diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk index 53f710183..509d86e0c 100644 --- a/components/rx/trunk/rxnew.lpk +++ b/components/rx/trunk/rxnew.lpk @@ -25,7 +25,7 @@ translate to Lazarus by alexs in 2005 - 2016 "/> - + @@ -122,189 +122,185 @@ translate to Lazarus by alexs in 2005 - 2016 - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/components/rx/trunk/rxnew.pas b/components/rx/trunk/rxnew.pas index 448e60490..d119e2f29 100644 --- a/components/rx/trunk/rxnew.pas +++ b/components/rx/trunk/rxnew.pas @@ -11,12 +11,12 @@ uses AutoPanel, boxprocs, curredit, dbcurredit, dbdateedit, dbutils, duallist, fduallst, folderlister, pagemngr, pickdate, registerrx, RegisterRxDB, RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, rxapputils, - rxclock, rxconst, rxctrls, rxcustomchartpanel, RxDBColorBox, rxdbcomb, - RxDBCtrls, rxdbgrid, rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, - RxDBTimeEdit, rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, - rxmemds, rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, - rxtbrsetup, RxTimeEdit, rxtoolbar, RxVersInfo, RxViewsPanel, rxxpman, - seldsfrm, tooledit, vclutils, RxCloseFormValidator, RxHistoryNavigator, + rxclock, rxconst, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid, + rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit, + rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, rxmemds, + rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, rxtbrsetup, + RxTimeEdit, rxtoolbar, RxVersInfo, RxViewsPanel, rxxpman, seldsfrm, + tooledit, vclutils, RxCloseFormValidator, RxHistoryNavigator, ex_rx_bin_datapacket, ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby, RxMDI, RxIniPropStorage, rxDateRangeEditUnit, RxDBGridFooterTools, rxdbgridfootertools_setup, rxShortCutUnit, LazarusPackageIntf;