ScatterCtrl: Fixed << ambiguity issues

git-svn-id: svn://ultimatepp.org/upp/trunk@9926 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-06-12 06:11:47 +00:00
parent 0a61d7e290
commit 5f65ade1f1
2 changed files with 3 additions and 3 deletions

View file

@ -101,8 +101,8 @@ void TextsTab::Change()
{
ScatterCtrl &scatter = *pscatter;
scatter.SetTitle(title);
scatter.SetLabels(xLabel, yLabel, yLabel2);
scatter.SetTitle(~title);
scatter.SetLabels(~xLabel, ~yLabel, ~yLabel2);
scatter.SetPlotAreaMargin(~leftMargin, ~rightMargin, ~topMargin, ~bottomMargin);
scatter.SetModify();

View file

@ -301,7 +301,7 @@ public:
eval.SetVariable(i, coeff[i]);
return eval.Eval(strEquation);
}
String SetName(String _name) {name = _name;}
void SetName(String _name) {name = _name;}
virtual String GetName() {return name;}
virtual String GetEquation(int numDigits = 3) {return eval.EvalStr(strEquation, numDigits);}
virtual void GuessCoeff(DataSource &series) {}