Merged revision(s) 51009 #fc5f053bc6, 51015 #1dc657f13d from trunk:

TAChart: Check validity of base of logarithmic transform (issue #29242)
........
TAChart: updated Russian translation
........

git-svn-id: branches/fixes_1_6@51016 -
This commit is contained in:
maxim 2015-12-23 23:49:40 +00:00
parent 0136f6c7bb
commit ad194c5521
8 changed files with 27 additions and 1 deletions

View File

@ -105,6 +105,10 @@ msgstr "Distanzmessung"
msgid "Function series" msgid "Function series"
msgstr "Funktions-Diagramm" msgstr "Funktions-Diagramm"
#: tachartstrconsts.rsinvalidlogbase
msgid "Logarithm base must be > 0 and <> 1."
msgstr "Die Logarithmus-Basis muss größer als 0 und darf nicht gleich 1 sein."
#: tachartstrconsts.rsleastsquaresfitseries #: tachartstrconsts.rsleastsquaresfitseries
msgid "Least-squares fit series" msgid "Least-squares fit series"
msgstr "Fit" msgstr "Fit"

View File

@ -93,6 +93,10 @@ msgstr "Etäisyysmittaus"
msgid "Function series" msgid "Function series"
msgstr "Funktiokuvaaja" msgstr "Funktiokuvaaja"
#: tachartstrconsts.rsinvalidlogbase
msgid "Logarithm base must be > 0 and <> 1."
msgstr ""
#: tachartstrconsts.rsleastsquaresfitseries #: tachartstrconsts.rsleastsquaresfitseries
msgid "Least-squares fit series" msgid "Least-squares fit series"
msgstr "Pienimpään neliösummaan sopiva kuvaaja" msgstr "Pienimpään neliösummaan sopiva kuvaaja"

View File

@ -103,6 +103,10 @@ msgstr "Mesure des distances"
msgid "Function series" msgid "Function series"
msgstr "Séries de fonctions" msgstr "Séries de fonctions"
#: tachartstrconsts.rsinvalidlogbase
msgid "Logarithm base must be > 0 and <> 1."
msgstr ""
#: tachartstrconsts.rsleastsquaresfitseries #: tachartstrconsts.rsleastsquaresfitseries
msgid "Least-squares fit series" msgid "Least-squares fit series"
msgstr "Séries de moindres carrés ajustés" msgstr "Séries de moindres carrés ajustés"

View File

@ -93,6 +93,10 @@ msgstr ""
msgid "Function series" msgid "Function series"
msgstr "" msgstr ""
#: tachartstrconsts.rsinvalidlogbase
msgid "Logarithm base must be > 0 and <> 1."
msgstr ""
#: tachartstrconsts.rsleastsquaresfitseries #: tachartstrconsts.rsleastsquaresfitseries
msgid "Least-squares fit series" msgid "Least-squares fit series"
msgstr "" msgstr ""

View File

@ -103,6 +103,10 @@ msgstr "Измерение расстояния"
msgid "Function series" msgid "Function series"
msgstr "Диаграмма по функции" msgstr "Диаграмма по функции"
#: tachartstrconsts.rsinvalidlogbase
msgid "Logarithm base must be > 0 and <> 1."
msgstr "Основание логарифма должно быть больше нуля и не равно единице."
#: tachartstrconsts.rsleastsquaresfitseries #: tachartstrconsts.rsleastsquaresfitseries
msgid "Least-squares fit series" msgid "Least-squares fit series"
msgstr "Диаграмма по методу наименьших квадратов" msgstr "Диаграмма по методу наименьших квадратов"
@ -200,4 +204,3 @@ msgstr "Невозможно переименовать компоненты: %s
#: tachartstrconsts.tastoolseditortitle #: tachartstrconsts.tastoolseditortitle
msgid "Edit tools" msgid "Edit tools"
msgstr "Редактор средств диаграмм" msgstr "Редактор средств диаграмм"

View File

@ -106,6 +106,10 @@ msgstr "Avståndsmätning"
msgid "Function series" msgid "Function series"
msgstr "Funktionskurva" msgstr "Funktionskurva"
#: tachartstrconsts.rsinvalidlogbase
msgid "Logarithm base must be > 0 and <> 1."
msgstr ""
#: tachartstrconsts.rsleastsquaresfitseries #: tachartstrconsts.rsleastsquaresfitseries
msgid "Least-squares fit series" msgid "Least-squares fit series"
msgstr "Least-squares fit kurva" msgstr "Least-squares fit kurva"

View File

@ -64,6 +64,7 @@ resourcestring
rsLinear = 'Linear'; rsLinear = 'Linear';
rsLogarithmic = 'Logarithmic'; rsLogarithmic = 'Logarithmic';
rsUserDefined = 'User-defined'; rsUserDefined = 'User-defined';
rsInvalidLogBase = 'Logarithm base must be > 0 and <> 1.';
// ChartUtils // ChartUtils
tasFailedSubcomponentRename = 'Failed to rename components: %s'; tasFailedSubcomponentRename = 'Failed to rename components: %s';

View File

@ -656,6 +656,8 @@ end;
procedure TLogarithmAxisTransform.SetBase(AValue: Double); procedure TLogarithmAxisTransform.SetBase(AValue: Double);
begin begin
if FBase = AValue then exit; if FBase = AValue then exit;
if (AValue <= 0) or (AValue = 1.0) then
raise Exception.Create(rsInvalidLogBase);
FBase := AValue; FBase := AValue;
Changed; Changed;
end; end;